[seam-commits] Seam SVN: r11262 - in branches/community/Seam_2_2/doc/Seam_Reference_Guide: bn-IN and 22 other directories.

seam-commits at lists.jboss.org seam-commits at lists.jboss.org
Wed Jul 8 10:44:49 EDT 2009


Author: nico.ben
Date: 2009-07-08 10:44:47 -0400 (Wed, 08 Jul 2009)
New Revision: 11262

Modified:
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/as-IN/Testing.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/as-IN/Webservices.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/bn-IN/Testing.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/bn-IN/Webservices.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/de-DE/Testing.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/de-DE/Webservices.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/es-ES/Testing.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/es-ES/Webservices.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/es-MX/Testing.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/es-MX/Webservices.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/fr-FR/Testing.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/fr-FR/Webservices.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/gu-IN/Testing.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/gu-IN/Webservices.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/hi-IN/Testing.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/hi-IN/Webservices.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/ja-JP/Testing.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/ja-JP/Webservices.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/kn-IN/Testing.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/kn-IN/Webservices.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/ko-KR/Testing.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/ko-KR/Webservices.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/ml-IN/Testing.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/ml-IN/Webservices.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/mr-IN/Testing.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/mr-IN/Webservices.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/or-IN/Testing.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/or-IN/Webservices.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pa-IN/Testing.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pa-IN/Webservices.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Annotations.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Author_Group.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Book_Info.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Cache.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/ClusteringAndEJBPassivation.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Components.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Concepts.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Configuration.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Controls.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Conversations.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Dependencies.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Drools.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Elenhancements.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Events.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Excel.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Feedback.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Framework.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Getting_Started_With_JBoss_Tools.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Gettingstarted.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Glassfish.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Groovy.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Guice.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Gwt.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Hsearch.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/I18n.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Itext.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Jbpm.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Jms.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Mail.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Performance.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Persistence.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Preface.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Remoting.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Revision_History.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Rss.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Security.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Spring.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Testing.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Text.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Tools.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Tutorial.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Validation.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Weblogic.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Webservices.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Websphere.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Wicket.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Xml.pot
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pt-BR/Testing.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/pt-BR/Webservices.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/ru-RU/Testing.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/ru-RU/Webservices.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/si-LK/Testing.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/si-LK/Webservices.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/sl-SL/Testing.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/sl-SL/Webservices.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/ta-IN/Testing.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/ta-IN/Webservices.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/te-IN/Testing.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/te-IN/Webservices.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/zh-CN/Testing.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/zh-CN/Webservices.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/zh-TW/Testing.po
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/zh-TW/Webservices.po
Log:
POT and PO regeneration

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/as-IN/Testing.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/as-IN/Testing.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/as-IN/Testing.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-05 18:37+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -717,15 +717,15 @@
 #: Testing.xml:390
 #, no-c-format
 msgid ""
-"If you need to insert or clean data in your database before each test you "
+"If you want to insert or clean data in your database before each test you "
 "can use Seam's integration with DBUnit. To do this, extend "
-"<literal>DBUnitSeamTest</literal> rather than SeamTest."
+"<literal>DBUnitSeamTest</literal> rather than <literal>SeamTest</literal>."
 msgstr ""
 
 #. Tag: para
 #: Testing.xml:396
 #, no-c-format
-msgid "You need to provide a dataset for DBUnit."
+msgid "You have to provide a dataset for DBUnit."
 msgstr ""
 
 #. Tag: caution
@@ -760,12 +760,12 @@
 #: Testing.xml:408
 #, no-c-format
 msgid ""
-"and tell Seam about it by overriding <literal>prepareDBUnitOperations()</"
-"literal>:"
+"In your test class, configure your dataset with overriding "
+"<literal>prepareDBUnitOperations()</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:412
+#: Testing.xml:413
 #, no-c-format
 msgid ""
 "<![CDATA[protected void prepareDBUnitOperations() {\n"
@@ -776,7 +776,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:414
+#: Testing.xml:415
 #, no-c-format
 msgid ""
 "<literal>DataSetOperation</literal> defaults to <literal>DatabaseOperation."
@@ -787,7 +787,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:422
+#: Testing.xml:423
 #, no-c-format
 msgid ""
 "If you require extra cleanup after a test method executes, add operations to "
@@ -795,7 +795,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:427
+#: Testing.xml:428
 #, no-c-format
 msgid ""
 "You need to tell DBUnit about the datasource you are using by setting a "
@@ -803,7 +803,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:432
+#: Testing.xml:433
 #, no-c-format
 msgid ""
 "<![CDATA[<parameter name=\"datasourceJndiName\" value=\"java:/"
@@ -811,70 +811,66 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:434
+#: Testing.xml:435
 #, no-c-format
 msgid ""
 "DBUnitSeamTest has support for MySQL and HSQL - you need to tell it which "
-"database is being used:"
+"database is being used, otherwise it defaults to HSQL:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:439
+#: Testing.xml:440
 #, no-c-format
-msgid "<![CDATA[<parameter name=\"database\" value=\"HSQL\" />]]>"
+msgid "<![CDATA[<parameter name=\"database\" value=\"MYSQL\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:441
+#: Testing.xml:442
 #, no-c-format
 msgid ""
 "It also allows you to insert binary data into the test data set (n.b. this "
-"is untested on Windows). You need to tell it where to locate these resources:"
+"is untested on Windows). You need to tell it where to locate these resources "
+"on your classpath:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:447
+#: Testing.xml:448
 #, no-c-format
 msgid "<![CDATA[<parameter name=\"binaryDir\" value=\"images/\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:449
+#: Testing.xml:450
 #, no-c-format
 msgid ""
-"You <emphasis>must</emphasis> specify these three parameters in your "
-"<literal>testng.xml</literal>."
+"You do not have to configure any of these parameters if you use HSQL and "
+"have no binary imports. However, unless you specify "
+"<literal>datasourceJndiName</literal> in your test configuration, you will "
+"have to call <literal>setDatabaseJndiName()</literal> before your test runs. "
+"If you are not using HSQL or MySQL, you need to override some methods. See "
+"the Javadoc of <literal>DBUnitSeamTest</literal> for more details."
 msgstr ""
 
-#. Tag: para
-#: Testing.xml:454
-#, no-c-format
-msgid ""
-"If you want to use DBUnitSeamTest with another database, you'll need to "
-"implement some methods. Read the javadoc of <literal>AbstractDBUnitSeamTest</"
-"literal> for more."
-msgstr ""
-
 #. Tag: title
-#: Testing.xml:463
+#: Testing.xml:461
 #, no-c-format
 msgid "Integration Testing Seam Mail"
 msgstr ""
 
 #. Tag: caution
-#: Testing.xml:465
+#: Testing.xml:463
 #, no-c-format
 msgid "Warning! This feature is still under development."
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:469
+#: Testing.xml:467
 #, no-c-format
 msgid "It's very easy to integration test your Seam Mail:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:473
+#: Testing.xml:471
 #, no-c-format
 msgid ""
 "<![CDATA[public class MailTest extends SeamTest {\n"
@@ -907,7 +903,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:475
+#: Testing.xml:473
 #, no-c-format
 msgid ""
 "We create a new <literal>FacesRequest</literal> as normal. Inside the "
@@ -919,7 +915,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:484
+#: Testing.xml:482
 #, no-c-format
 msgid ""
 "There is no support for rendering standard JSF components so you can't test "

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/as-IN/Webservices.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/as-IN/Webservices.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/as-IN/Webservices.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-11 07:43+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -955,45 +955,59 @@
 #: Webservices.xml:449
 #, no-c-format
 msgid ""
-"Seam includes an extended unit testing superclass that helps you in creating "
-"unit tests for a RESTful architecture. Extend the <literal>ResourceSeamTest</"
-"literal> class to emulate HTTP requests/response cycles:"
+"Seam includes a unit testing utility class that helps you create unit tests "
+"for a RESTful architecture. Extend the <literal>SeamTest</literal> class as "
+"usual and use the <literal>ResourceRequestEnvironment.ResourceRequest</"
+"literal> to emulate HTTP requests/response cycles:"
 msgstr ""
 
 #. Tag: programlisting
-#: Webservices.xml:454
+#: Webservices.xml:455
 #, no-c-format
 msgid ""
-"<![CDATA[import org.jboss.seam.resteasy.testfwk.ResourceSeamTest;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletResponse;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletRequest;\n"
+"<![CDATA[import org.jboss.seam.mock.ResourceRequestEnvironment;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletRequest;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletResponse;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment."
+"ResourceRequest;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment.Method;\n"
 "\n"
-"public class MyTest extends ResourceSeamTest {\n"
+"public class MyTest extends SeamTest {\n"
 "\n"
-"   @Override\n"
-"   public Map<String, Object> getDefaultHeaders()\n"
-"   {\n"
-"      return new HashMap<String, Object>()\n"
-"      {{\n"
-"            put(\"Accept\", \"text/plain\");\n"
-"      }};\n"
+"   ResourceRequestEnvironment sharedEnvironment;\n"
+"\n"
+"   @BeforeClass\n"
+"   public void prepareSharedEnvironment() throws Exception {\n"
+"       sharedEnvironment = new ResourceRequestEnvironment(this) {\n"
+"            @Override\n"
+"            public Map<String, Object> getDefaultHeaders() {\n"
+"               return new HashMap<String, Object>() {{\n"
+"                   put(\"Accept\", \"text/plain\");\n"
+"               }};\n"
+"            }\n"
+"         };\n"
 "   }\n"
 "\n"
 "   @Test\n"
 "   public void test() throws Exception\n"
 "   {\n"
-"      new ResourceRequest(Method.GET, \"/my/relative/uri)\n"
+"      //Not shared: new ResourceRequest(new ResourceRequestEnvironment"
+"(this), Method.GET, \"/my/relative/uri)\n"
+"\n"
+"      new ResourceRequest(sharedEnvironment, Method.GET, \"/my/relative/"
+"uri)\n"
 "      {\n"
-"\n"
 "         @Override\n"
-"         protected void prepareRequest(MockHttpServletRequest request)\n"
+"         protected void prepareRequest(EnhancedMockHttpServletRequest "
+"request)\n"
 "         {\n"
 "            request.addQueryParameter(\"foo\", \"123\");\n"
 "            request.addHeader(\"Accept-Language\", \"en_US, de\");\n"
 "         }\n"
 "\n"
 "         @Override\n"
-"         protected void onResponse(MockHttpServletResponse response)\n"
+"         protected void onResponse(EnhancedMockHttpServletResponse "
+"response)\n"
 "         {\n"
 "            assert response.getStatus() == 200;\n"
 "            assert response.getContentAsString().equals(\"foobar\");\n"
@@ -1001,40 +1015,28 @@
 "\n"
 "      }.run();\n"
 "   }\n"
-"\n"
 "}]]>"
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:456
+#: Webservices.xml:457
 #, no-c-format
 msgid ""
 "This test only executes local calls, it does not communicate with the "
 "<literal>SeamResourceServlet</literal> through TCP. The mock request is "
 "passed through the Seam servlet and filters and the response is then "
 "available for test assertions. Overriding the <literal>getDefaultHeaders()</"
-"literal> method allows you to set request headers for every test method in "
-"the test class."
+"literal> method in a shared instance of <literal>ResourceRequestEnvironment</"
+"literal> allows you to set request headers for every test method in the test "
+"class."
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:463
+#: Webservices.xml:465
 #, no-c-format
 msgid ""
 "Note that a <literal>ResourceRequest</literal> has to be executed in a "
 "<literal>@Test</literal> method or in a <literal>@BeforeMethod</literal> "
-"callback. You can and should not execute it in any other callback, such as "
-"<literal>@BeforeClass</literal>. (This is an implementation limitation we "
-"will remove in a future update.)"
+"callback. You can not execute it in any other callback, such as "
+"<literal>@BeforeClass</literal>."
 msgstr ""
-
-#. Tag: para
-#: Webservices.xml:470
-#, no-c-format
-msgid ""
-"Also note that the imported mock objects are not the same as the mock "
-"objects you use in other Seam unit tests, which are in the package "
-"<literal>org.jboss.seam.mock</literal>. The <literal>org.jboss.seam.resteasy."
-"testfwk</literal> variations mimic real requests and responses much more "
-"closely."
-msgstr ""

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/bn-IN/Testing.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/bn-IN/Testing.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/bn-IN/Testing.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-05 18:37+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -717,15 +717,15 @@
 #: Testing.xml:390
 #, no-c-format
 msgid ""
-"If you need to insert or clean data in your database before each test you "
+"If you want to insert or clean data in your database before each test you "
 "can use Seam's integration with DBUnit. To do this, extend "
-"<literal>DBUnitSeamTest</literal> rather than SeamTest."
+"<literal>DBUnitSeamTest</literal> rather than <literal>SeamTest</literal>."
 msgstr ""
 
 #. Tag: para
 #: Testing.xml:396
 #, no-c-format
-msgid "You need to provide a dataset for DBUnit."
+msgid "You have to provide a dataset for DBUnit."
 msgstr ""
 
 #. Tag: caution
@@ -760,12 +760,12 @@
 #: Testing.xml:408
 #, no-c-format
 msgid ""
-"and tell Seam about it by overriding <literal>prepareDBUnitOperations()</"
-"literal>:"
+"In your test class, configure your dataset with overriding "
+"<literal>prepareDBUnitOperations()</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:412
+#: Testing.xml:413
 #, no-c-format
 msgid ""
 "<![CDATA[protected void prepareDBUnitOperations() {\n"
@@ -776,7 +776,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:414
+#: Testing.xml:415
 #, no-c-format
 msgid ""
 "<literal>DataSetOperation</literal> defaults to <literal>DatabaseOperation."
@@ -787,7 +787,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:422
+#: Testing.xml:423
 #, no-c-format
 msgid ""
 "If you require extra cleanup after a test method executes, add operations to "
@@ -795,7 +795,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:427
+#: Testing.xml:428
 #, no-c-format
 msgid ""
 "You need to tell DBUnit about the datasource you are using by setting a "
@@ -803,7 +803,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:432
+#: Testing.xml:433
 #, no-c-format
 msgid ""
 "<![CDATA[<parameter name=\"datasourceJndiName\" value=\"java:/"
@@ -811,70 +811,66 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:434
+#: Testing.xml:435
 #, no-c-format
 msgid ""
 "DBUnitSeamTest has support for MySQL and HSQL - you need to tell it which "
-"database is being used:"
+"database is being used, otherwise it defaults to HSQL:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:439
+#: Testing.xml:440
 #, no-c-format
-msgid "<![CDATA[<parameter name=\"database\" value=\"HSQL\" />]]>"
+msgid "<![CDATA[<parameter name=\"database\" value=\"MYSQL\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:441
+#: Testing.xml:442
 #, no-c-format
 msgid ""
 "It also allows you to insert binary data into the test data set (n.b. this "
-"is untested on Windows). You need to tell it where to locate these resources:"
+"is untested on Windows). You need to tell it where to locate these resources "
+"on your classpath:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:447
+#: Testing.xml:448
 #, no-c-format
 msgid "<![CDATA[<parameter name=\"binaryDir\" value=\"images/\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:449
+#: Testing.xml:450
 #, no-c-format
 msgid ""
-"You <emphasis>must</emphasis> specify these three parameters in your "
-"<literal>testng.xml</literal>."
+"You do not have to configure any of these parameters if you use HSQL and "
+"have no binary imports. However, unless you specify "
+"<literal>datasourceJndiName</literal> in your test configuration, you will "
+"have to call <literal>setDatabaseJndiName()</literal> before your test runs. "
+"If you are not using HSQL or MySQL, you need to override some methods. See "
+"the Javadoc of <literal>DBUnitSeamTest</literal> for more details."
 msgstr ""
 
-#. Tag: para
-#: Testing.xml:454
-#, no-c-format
-msgid ""
-"If you want to use DBUnitSeamTest with another database, you'll need to "
-"implement some methods. Read the javadoc of <literal>AbstractDBUnitSeamTest</"
-"literal> for more."
-msgstr ""
-
 #. Tag: title
-#: Testing.xml:463
+#: Testing.xml:461
 #, no-c-format
 msgid "Integration Testing Seam Mail"
 msgstr ""
 
 #. Tag: caution
-#: Testing.xml:465
+#: Testing.xml:463
 #, no-c-format
 msgid "Warning! This feature is still under development."
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:469
+#: Testing.xml:467
 #, no-c-format
 msgid "It's very easy to integration test your Seam Mail:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:473
+#: Testing.xml:471
 #, no-c-format
 msgid ""
 "<![CDATA[public class MailTest extends SeamTest {\n"
@@ -907,7 +903,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:475
+#: Testing.xml:473
 #, no-c-format
 msgid ""
 "We create a new <literal>FacesRequest</literal> as normal. Inside the "
@@ -919,7 +915,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:484
+#: Testing.xml:482
 #, no-c-format
 msgid ""
 "There is no support for rendering standard JSF components so you can't test "

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/bn-IN/Webservices.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/bn-IN/Webservices.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/bn-IN/Webservices.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-11 07:43+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -955,45 +955,59 @@
 #: Webservices.xml:449
 #, no-c-format
 msgid ""
-"Seam includes an extended unit testing superclass that helps you in creating "
-"unit tests for a RESTful architecture. Extend the <literal>ResourceSeamTest</"
-"literal> class to emulate HTTP requests/response cycles:"
+"Seam includes a unit testing utility class that helps you create unit tests "
+"for a RESTful architecture. Extend the <literal>SeamTest</literal> class as "
+"usual and use the <literal>ResourceRequestEnvironment.ResourceRequest</"
+"literal> to emulate HTTP requests/response cycles:"
 msgstr ""
 
 #. Tag: programlisting
-#: Webservices.xml:454
+#: Webservices.xml:455
 #, no-c-format
 msgid ""
-"<![CDATA[import org.jboss.seam.resteasy.testfwk.ResourceSeamTest;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletResponse;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletRequest;\n"
+"<![CDATA[import org.jboss.seam.mock.ResourceRequestEnvironment;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletRequest;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletResponse;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment."
+"ResourceRequest;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment.Method;\n"
 "\n"
-"public class MyTest extends ResourceSeamTest {\n"
+"public class MyTest extends SeamTest {\n"
 "\n"
-"   @Override\n"
-"   public Map<String, Object> getDefaultHeaders()\n"
-"   {\n"
-"      return new HashMap<String, Object>()\n"
-"      {{\n"
-"            put(\"Accept\", \"text/plain\");\n"
-"      }};\n"
+"   ResourceRequestEnvironment sharedEnvironment;\n"
+"\n"
+"   @BeforeClass\n"
+"   public void prepareSharedEnvironment() throws Exception {\n"
+"       sharedEnvironment = new ResourceRequestEnvironment(this) {\n"
+"            @Override\n"
+"            public Map<String, Object> getDefaultHeaders() {\n"
+"               return new HashMap<String, Object>() {{\n"
+"                   put(\"Accept\", \"text/plain\");\n"
+"               }};\n"
+"            }\n"
+"         };\n"
 "   }\n"
 "\n"
 "   @Test\n"
 "   public void test() throws Exception\n"
 "   {\n"
-"      new ResourceRequest(Method.GET, \"/my/relative/uri)\n"
+"      //Not shared: new ResourceRequest(new ResourceRequestEnvironment"
+"(this), Method.GET, \"/my/relative/uri)\n"
+"\n"
+"      new ResourceRequest(sharedEnvironment, Method.GET, \"/my/relative/"
+"uri)\n"
 "      {\n"
-"\n"
 "         @Override\n"
-"         protected void prepareRequest(MockHttpServletRequest request)\n"
+"         protected void prepareRequest(EnhancedMockHttpServletRequest "
+"request)\n"
 "         {\n"
 "            request.addQueryParameter(\"foo\", \"123\");\n"
 "            request.addHeader(\"Accept-Language\", \"en_US, de\");\n"
 "         }\n"
 "\n"
 "         @Override\n"
-"         protected void onResponse(MockHttpServletResponse response)\n"
+"         protected void onResponse(EnhancedMockHttpServletResponse "
+"response)\n"
 "         {\n"
 "            assert response.getStatus() == 200;\n"
 "            assert response.getContentAsString().equals(\"foobar\");\n"
@@ -1001,40 +1015,28 @@
 "\n"
 "      }.run();\n"
 "   }\n"
-"\n"
 "}]]>"
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:456
+#: Webservices.xml:457
 #, no-c-format
 msgid ""
 "This test only executes local calls, it does not communicate with the "
 "<literal>SeamResourceServlet</literal> through TCP. The mock request is "
 "passed through the Seam servlet and filters and the response is then "
 "available for test assertions. Overriding the <literal>getDefaultHeaders()</"
-"literal> method allows you to set request headers for every test method in "
-"the test class."
+"literal> method in a shared instance of <literal>ResourceRequestEnvironment</"
+"literal> allows you to set request headers for every test method in the test "
+"class."
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:463
+#: Webservices.xml:465
 #, no-c-format
 msgid ""
 "Note that a <literal>ResourceRequest</literal> has to be executed in a "
 "<literal>@Test</literal> method or in a <literal>@BeforeMethod</literal> "
-"callback. You can and should not execute it in any other callback, such as "
-"<literal>@BeforeClass</literal>. (This is an implementation limitation we "
-"will remove in a future update.)"
+"callback. You can not execute it in any other callback, such as "
+"<literal>@BeforeClass</literal>."
 msgstr ""
-
-#. Tag: para
-#: Webservices.xml:470
-#, no-c-format
-msgid ""
-"Also note that the imported mock objects are not the same as the mock "
-"objects you use in other Seam unit tests, which are in the package "
-"<literal>org.jboss.seam.mock</literal>. The <literal>org.jboss.seam.resteasy."
-"testfwk</literal> variations mimic real requests and responses much more "
-"closely."
-msgstr ""

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/de-DE/Testing.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/de-DE/Testing.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/de-DE/Testing.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-05 18:37+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -717,15 +717,15 @@
 #: Testing.xml:390
 #, no-c-format
 msgid ""
-"If you need to insert or clean data in your database before each test you "
+"If you want to insert or clean data in your database before each test you "
 "can use Seam's integration with DBUnit. To do this, extend "
-"<literal>DBUnitSeamTest</literal> rather than SeamTest."
+"<literal>DBUnitSeamTest</literal> rather than <literal>SeamTest</literal>."
 msgstr ""
 
 #. Tag: para
 #: Testing.xml:396
 #, no-c-format
-msgid "You need to provide a dataset for DBUnit."
+msgid "You have to provide a dataset for DBUnit."
 msgstr ""
 
 #. Tag: caution
@@ -760,12 +760,12 @@
 #: Testing.xml:408
 #, no-c-format
 msgid ""
-"and tell Seam about it by overriding <literal>prepareDBUnitOperations()</"
-"literal>:"
+"In your test class, configure your dataset with overriding "
+"<literal>prepareDBUnitOperations()</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:412
+#: Testing.xml:413
 #, no-c-format
 msgid ""
 "<![CDATA[protected void prepareDBUnitOperations() {\n"
@@ -776,7 +776,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:414
+#: Testing.xml:415
 #, no-c-format
 msgid ""
 "<literal>DataSetOperation</literal> defaults to <literal>DatabaseOperation."
@@ -787,7 +787,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:422
+#: Testing.xml:423
 #, no-c-format
 msgid ""
 "If you require extra cleanup after a test method executes, add operations to "
@@ -795,7 +795,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:427
+#: Testing.xml:428
 #, no-c-format
 msgid ""
 "You need to tell DBUnit about the datasource you are using by setting a "
@@ -803,7 +803,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:432
+#: Testing.xml:433
 #, no-c-format
 msgid ""
 "<![CDATA[<parameter name=\"datasourceJndiName\" value=\"java:/"
@@ -811,70 +811,66 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:434
+#: Testing.xml:435
 #, no-c-format
 msgid ""
 "DBUnitSeamTest has support for MySQL and HSQL - you need to tell it which "
-"database is being used:"
+"database is being used, otherwise it defaults to HSQL:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:439
+#: Testing.xml:440
 #, no-c-format
-msgid "<![CDATA[<parameter name=\"database\" value=\"HSQL\" />]]>"
+msgid "<![CDATA[<parameter name=\"database\" value=\"MYSQL\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:441
+#: Testing.xml:442
 #, no-c-format
 msgid ""
 "It also allows you to insert binary data into the test data set (n.b. this "
-"is untested on Windows). You need to tell it where to locate these resources:"
+"is untested on Windows). You need to tell it where to locate these resources "
+"on your classpath:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:447
+#: Testing.xml:448
 #, no-c-format
 msgid "<![CDATA[<parameter name=\"binaryDir\" value=\"images/\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:449
+#: Testing.xml:450
 #, no-c-format
 msgid ""
-"You <emphasis>must</emphasis> specify these three parameters in your "
-"<literal>testng.xml</literal>."
+"You do not have to configure any of these parameters if you use HSQL and "
+"have no binary imports. However, unless you specify "
+"<literal>datasourceJndiName</literal> in your test configuration, you will "
+"have to call <literal>setDatabaseJndiName()</literal> before your test runs. "
+"If you are not using HSQL or MySQL, you need to override some methods. See "
+"the Javadoc of <literal>DBUnitSeamTest</literal> for more details."
 msgstr ""
 
-#. Tag: para
-#: Testing.xml:454
-#, no-c-format
-msgid ""
-"If you want to use DBUnitSeamTest with another database, you'll need to "
-"implement some methods. Read the javadoc of <literal>AbstractDBUnitSeamTest</"
-"literal> for more."
-msgstr ""
-
 #. Tag: title
-#: Testing.xml:463
+#: Testing.xml:461
 #, no-c-format
 msgid "Integration Testing Seam Mail"
 msgstr ""
 
 #. Tag: caution
-#: Testing.xml:465
+#: Testing.xml:463
 #, no-c-format
 msgid "Warning! This feature is still under development."
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:469
+#: Testing.xml:467
 #, no-c-format
 msgid "It's very easy to integration test your Seam Mail:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:473
+#: Testing.xml:471
 #, no-c-format
 msgid ""
 "<![CDATA[public class MailTest extends SeamTest {\n"
@@ -907,7 +903,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:475
+#: Testing.xml:473
 #, no-c-format
 msgid ""
 "We create a new <literal>FacesRequest</literal> as normal. Inside the "
@@ -919,7 +915,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:484
+#: Testing.xml:482
 #, no-c-format
 msgid ""
 "There is no support for rendering standard JSF components so you can't test "

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/de-DE/Webservices.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/de-DE/Webservices.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/de-DE/Webservices.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-11 07:43+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -955,45 +955,59 @@
 #: Webservices.xml:449
 #, no-c-format
 msgid ""
-"Seam includes an extended unit testing superclass that helps you in creating "
-"unit tests for a RESTful architecture. Extend the <literal>ResourceSeamTest</"
-"literal> class to emulate HTTP requests/response cycles:"
+"Seam includes a unit testing utility class that helps you create unit tests "
+"for a RESTful architecture. Extend the <literal>SeamTest</literal> class as "
+"usual and use the <literal>ResourceRequestEnvironment.ResourceRequest</"
+"literal> to emulate HTTP requests/response cycles:"
 msgstr ""
 
 #. Tag: programlisting
-#: Webservices.xml:454
+#: Webservices.xml:455
 #, no-c-format
 msgid ""
-"<![CDATA[import org.jboss.seam.resteasy.testfwk.ResourceSeamTest;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletResponse;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletRequest;\n"
+"<![CDATA[import org.jboss.seam.mock.ResourceRequestEnvironment;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletRequest;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletResponse;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment."
+"ResourceRequest;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment.Method;\n"
 "\n"
-"public class MyTest extends ResourceSeamTest {\n"
+"public class MyTest extends SeamTest {\n"
 "\n"
-"   @Override\n"
-"   public Map<String, Object> getDefaultHeaders()\n"
-"   {\n"
-"      return new HashMap<String, Object>()\n"
-"      {{\n"
-"            put(\"Accept\", \"text/plain\");\n"
-"      }};\n"
+"   ResourceRequestEnvironment sharedEnvironment;\n"
+"\n"
+"   @BeforeClass\n"
+"   public void prepareSharedEnvironment() throws Exception {\n"
+"       sharedEnvironment = new ResourceRequestEnvironment(this) {\n"
+"            @Override\n"
+"            public Map<String, Object> getDefaultHeaders() {\n"
+"               return new HashMap<String, Object>() {{\n"
+"                   put(\"Accept\", \"text/plain\");\n"
+"               }};\n"
+"            }\n"
+"         };\n"
 "   }\n"
 "\n"
 "   @Test\n"
 "   public void test() throws Exception\n"
 "   {\n"
-"      new ResourceRequest(Method.GET, \"/my/relative/uri)\n"
+"      //Not shared: new ResourceRequest(new ResourceRequestEnvironment"
+"(this), Method.GET, \"/my/relative/uri)\n"
+"\n"
+"      new ResourceRequest(sharedEnvironment, Method.GET, \"/my/relative/"
+"uri)\n"
 "      {\n"
-"\n"
 "         @Override\n"
-"         protected void prepareRequest(MockHttpServletRequest request)\n"
+"         protected void prepareRequest(EnhancedMockHttpServletRequest "
+"request)\n"
 "         {\n"
 "            request.addQueryParameter(\"foo\", \"123\");\n"
 "            request.addHeader(\"Accept-Language\", \"en_US, de\");\n"
 "         }\n"
 "\n"
 "         @Override\n"
-"         protected void onResponse(MockHttpServletResponse response)\n"
+"         protected void onResponse(EnhancedMockHttpServletResponse "
+"response)\n"
 "         {\n"
 "            assert response.getStatus() == 200;\n"
 "            assert response.getContentAsString().equals(\"foobar\");\n"
@@ -1001,40 +1015,28 @@
 "\n"
 "      }.run();\n"
 "   }\n"
-"\n"
 "}]]>"
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:456
+#: Webservices.xml:457
 #, no-c-format
 msgid ""
 "This test only executes local calls, it does not communicate with the "
 "<literal>SeamResourceServlet</literal> through TCP. The mock request is "
 "passed through the Seam servlet and filters and the response is then "
 "available for test assertions. Overriding the <literal>getDefaultHeaders()</"
-"literal> method allows you to set request headers for every test method in "
-"the test class."
+"literal> method in a shared instance of <literal>ResourceRequestEnvironment</"
+"literal> allows you to set request headers for every test method in the test "
+"class."
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:463
+#: Webservices.xml:465
 #, no-c-format
 msgid ""
 "Note that a <literal>ResourceRequest</literal> has to be executed in a "
 "<literal>@Test</literal> method or in a <literal>@BeforeMethod</literal> "
-"callback. You can and should not execute it in any other callback, such as "
-"<literal>@BeforeClass</literal>. (This is an implementation limitation we "
-"will remove in a future update.)"
+"callback. You can not execute it in any other callback, such as "
+"<literal>@BeforeClass</literal>."
 msgstr ""
-
-#. Tag: para
-#: Webservices.xml:470
-#, no-c-format
-msgid ""
-"Also note that the imported mock objects are not the same as the mock "
-"objects you use in other Seam unit tests, which are in the package "
-"<literal>org.jboss.seam.mock</literal>. The <literal>org.jboss.seam.resteasy."
-"testfwk</literal> variations mimic real requests and responses much more "
-"closely."
-msgstr ""

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/es-ES/Testing.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/es-ES/Testing.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/es-ES/Testing.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-05 18:37+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -717,15 +717,15 @@
 #: Testing.xml:390
 #, no-c-format
 msgid ""
-"If you need to insert or clean data in your database before each test you "
+"If you want to insert or clean data in your database before each test you "
 "can use Seam's integration with DBUnit. To do this, extend "
-"<literal>DBUnitSeamTest</literal> rather than SeamTest."
+"<literal>DBUnitSeamTest</literal> rather than <literal>SeamTest</literal>."
 msgstr ""
 
 #. Tag: para
 #: Testing.xml:396
 #, no-c-format
-msgid "You need to provide a dataset for DBUnit."
+msgid "You have to provide a dataset for DBUnit."
 msgstr ""
 
 #. Tag: caution
@@ -760,12 +760,12 @@
 #: Testing.xml:408
 #, no-c-format
 msgid ""
-"and tell Seam about it by overriding <literal>prepareDBUnitOperations()</"
-"literal>:"
+"In your test class, configure your dataset with overriding "
+"<literal>prepareDBUnitOperations()</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:412
+#: Testing.xml:413
 #, no-c-format
 msgid ""
 "<![CDATA[protected void prepareDBUnitOperations() {\n"
@@ -776,7 +776,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:414
+#: Testing.xml:415
 #, no-c-format
 msgid ""
 "<literal>DataSetOperation</literal> defaults to <literal>DatabaseOperation."
@@ -787,7 +787,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:422
+#: Testing.xml:423
 #, no-c-format
 msgid ""
 "If you require extra cleanup after a test method executes, add operations to "
@@ -795,7 +795,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:427
+#: Testing.xml:428
 #, no-c-format
 msgid ""
 "You need to tell DBUnit about the datasource you are using by setting a "
@@ -803,7 +803,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:432
+#: Testing.xml:433
 #, no-c-format
 msgid ""
 "<![CDATA[<parameter name=\"datasourceJndiName\" value=\"java:/"
@@ -811,70 +811,66 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:434
+#: Testing.xml:435
 #, no-c-format
 msgid ""
 "DBUnitSeamTest has support for MySQL and HSQL - you need to tell it which "
-"database is being used:"
+"database is being used, otherwise it defaults to HSQL:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:439
+#: Testing.xml:440
 #, no-c-format
-msgid "<![CDATA[<parameter name=\"database\" value=\"HSQL\" />]]>"
+msgid "<![CDATA[<parameter name=\"database\" value=\"MYSQL\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:441
+#: Testing.xml:442
 #, no-c-format
 msgid ""
 "It also allows you to insert binary data into the test data set (n.b. this "
-"is untested on Windows). You need to tell it where to locate these resources:"
+"is untested on Windows). You need to tell it where to locate these resources "
+"on your classpath:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:447
+#: Testing.xml:448
 #, no-c-format
 msgid "<![CDATA[<parameter name=\"binaryDir\" value=\"images/\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:449
+#: Testing.xml:450
 #, no-c-format
 msgid ""
-"You <emphasis>must</emphasis> specify these three parameters in your "
-"<literal>testng.xml</literal>."
+"You do not have to configure any of these parameters if you use HSQL and "
+"have no binary imports. However, unless you specify "
+"<literal>datasourceJndiName</literal> in your test configuration, you will "
+"have to call <literal>setDatabaseJndiName()</literal> before your test runs. "
+"If you are not using HSQL or MySQL, you need to override some methods. See "
+"the Javadoc of <literal>DBUnitSeamTest</literal> for more details."
 msgstr ""
 
-#. Tag: para
-#: Testing.xml:454
-#, no-c-format
-msgid ""
-"If you want to use DBUnitSeamTest with another database, you'll need to "
-"implement some methods. Read the javadoc of <literal>AbstractDBUnitSeamTest</"
-"literal> for more."
-msgstr ""
-
 #. Tag: title
-#: Testing.xml:463
+#: Testing.xml:461
 #, no-c-format
 msgid "Integration Testing Seam Mail"
 msgstr ""
 
 #. Tag: caution
-#: Testing.xml:465
+#: Testing.xml:463
 #, no-c-format
 msgid "Warning! This feature is still under development."
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:469
+#: Testing.xml:467
 #, no-c-format
 msgid "It's very easy to integration test your Seam Mail:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:473
+#: Testing.xml:471
 #, no-c-format
 msgid ""
 "<![CDATA[public class MailTest extends SeamTest {\n"
@@ -907,7 +903,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:475
+#: Testing.xml:473
 #, no-c-format
 msgid ""
 "We create a new <literal>FacesRequest</literal> as normal. Inside the "
@@ -919,7 +915,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:484
+#: Testing.xml:482
 #, no-c-format
 msgid ""
 "There is no support for rendering standard JSF components so you can't test "

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/es-ES/Webservices.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/es-ES/Webservices.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/es-ES/Webservices.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-11 07:43+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -955,45 +955,59 @@
 #: Webservices.xml:449
 #, no-c-format
 msgid ""
-"Seam includes an extended unit testing superclass that helps you in creating "
-"unit tests for a RESTful architecture. Extend the <literal>ResourceSeamTest</"
-"literal> class to emulate HTTP requests/response cycles:"
+"Seam includes a unit testing utility class that helps you create unit tests "
+"for a RESTful architecture. Extend the <literal>SeamTest</literal> class as "
+"usual and use the <literal>ResourceRequestEnvironment.ResourceRequest</"
+"literal> to emulate HTTP requests/response cycles:"
 msgstr ""
 
 #. Tag: programlisting
-#: Webservices.xml:454
+#: Webservices.xml:455
 #, no-c-format
 msgid ""
-"<![CDATA[import org.jboss.seam.resteasy.testfwk.ResourceSeamTest;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletResponse;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletRequest;\n"
+"<![CDATA[import org.jboss.seam.mock.ResourceRequestEnvironment;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletRequest;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletResponse;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment."
+"ResourceRequest;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment.Method;\n"
 "\n"
-"public class MyTest extends ResourceSeamTest {\n"
+"public class MyTest extends SeamTest {\n"
 "\n"
-"   @Override\n"
-"   public Map<String, Object> getDefaultHeaders()\n"
-"   {\n"
-"      return new HashMap<String, Object>()\n"
-"      {{\n"
-"            put(\"Accept\", \"text/plain\");\n"
-"      }};\n"
+"   ResourceRequestEnvironment sharedEnvironment;\n"
+"\n"
+"   @BeforeClass\n"
+"   public void prepareSharedEnvironment() throws Exception {\n"
+"       sharedEnvironment = new ResourceRequestEnvironment(this) {\n"
+"            @Override\n"
+"            public Map<String, Object> getDefaultHeaders() {\n"
+"               return new HashMap<String, Object>() {{\n"
+"                   put(\"Accept\", \"text/plain\");\n"
+"               }};\n"
+"            }\n"
+"         };\n"
 "   }\n"
 "\n"
 "   @Test\n"
 "   public void test() throws Exception\n"
 "   {\n"
-"      new ResourceRequest(Method.GET, \"/my/relative/uri)\n"
+"      //Not shared: new ResourceRequest(new ResourceRequestEnvironment"
+"(this), Method.GET, \"/my/relative/uri)\n"
+"\n"
+"      new ResourceRequest(sharedEnvironment, Method.GET, \"/my/relative/"
+"uri)\n"
 "      {\n"
-"\n"
 "         @Override\n"
-"         protected void prepareRequest(MockHttpServletRequest request)\n"
+"         protected void prepareRequest(EnhancedMockHttpServletRequest "
+"request)\n"
 "         {\n"
 "            request.addQueryParameter(\"foo\", \"123\");\n"
 "            request.addHeader(\"Accept-Language\", \"en_US, de\");\n"
 "         }\n"
 "\n"
 "         @Override\n"
-"         protected void onResponse(MockHttpServletResponse response)\n"
+"         protected void onResponse(EnhancedMockHttpServletResponse "
+"response)\n"
 "         {\n"
 "            assert response.getStatus() == 200;\n"
 "            assert response.getContentAsString().equals(\"foobar\");\n"
@@ -1001,40 +1015,28 @@
 "\n"
 "      }.run();\n"
 "   }\n"
-"\n"
 "}]]>"
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:456
+#: Webservices.xml:457
 #, no-c-format
 msgid ""
 "This test only executes local calls, it does not communicate with the "
 "<literal>SeamResourceServlet</literal> through TCP. The mock request is "
 "passed through the Seam servlet and filters and the response is then "
 "available for test assertions. Overriding the <literal>getDefaultHeaders()</"
-"literal> method allows you to set request headers for every test method in "
-"the test class."
+"literal> method in a shared instance of <literal>ResourceRequestEnvironment</"
+"literal> allows you to set request headers for every test method in the test "
+"class."
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:463
+#: Webservices.xml:465
 #, no-c-format
 msgid ""
 "Note that a <literal>ResourceRequest</literal> has to be executed in a "
 "<literal>@Test</literal> method or in a <literal>@BeforeMethod</literal> "
-"callback. You can and should not execute it in any other callback, such as "
-"<literal>@BeforeClass</literal>. (This is an implementation limitation we "
-"will remove in a future update.)"
+"callback. You can not execute it in any other callback, such as "
+"<literal>@BeforeClass</literal>."
 msgstr ""
-
-#. Tag: para
-#: Webservices.xml:470
-#, no-c-format
-msgid ""
-"Also note that the imported mock objects are not the same as the mock "
-"objects you use in other Seam unit tests, which are in the package "
-"<literal>org.jboss.seam.mock</literal>. The <literal>org.jboss.seam.resteasy."
-"testfwk</literal> variations mimic real requests and responses much more "
-"closely."
-msgstr ""

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/es-MX/Testing.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/es-MX/Testing.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/es-MX/Testing.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Seam_-_Contextual_Components VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-05 18:37+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-11-06 00:10+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -717,15 +717,15 @@
 #: Testing.xml:390
 #, no-c-format
 msgid ""
-"If you need to insert or clean data in your database before each test you "
+"If you want to insert or clean data in your database before each test you "
 "can use Seam's integration with DBUnit. To do this, extend "
-"<literal>DBUnitSeamTest</literal> rather than SeamTest."
+"<literal>DBUnitSeamTest</literal> rather than <literal>SeamTest</literal>."
 msgstr ""
 
 #. Tag: para
 #: Testing.xml:396
 #, no-c-format
-msgid "You need to provide a dataset for DBUnit."
+msgid "You have to provide a dataset for DBUnit."
 msgstr ""
 
 #. Tag: caution
@@ -760,12 +760,12 @@
 #: Testing.xml:408
 #, no-c-format
 msgid ""
-"and tell Seam about it by overriding <literal>prepareDBUnitOperations()</"
-"literal>:"
+"In your test class, configure your dataset with overriding "
+"<literal>prepareDBUnitOperations()</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:412
+#: Testing.xml:413
 #, no-c-format
 msgid ""
 "<![CDATA[protected void prepareDBUnitOperations() {\n"
@@ -776,7 +776,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:414
+#: Testing.xml:415
 #, no-c-format
 msgid ""
 "<literal>DataSetOperation</literal> defaults to <literal>DatabaseOperation."
@@ -787,7 +787,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:422
+#: Testing.xml:423
 #, no-c-format
 msgid ""
 "If you require extra cleanup after a test method executes, add operations to "
@@ -795,7 +795,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:427
+#: Testing.xml:428
 #, no-c-format
 msgid ""
 "You need to tell DBUnit about the datasource you are using by setting a "
@@ -803,7 +803,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:432
+#: Testing.xml:433
 #, no-c-format
 msgid ""
 "<![CDATA[<parameter name=\"datasourceJndiName\" value=\"java:/"
@@ -811,70 +811,66 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:434
+#: Testing.xml:435
 #, no-c-format
 msgid ""
 "DBUnitSeamTest has support for MySQL and HSQL - you need to tell it which "
-"database is being used:"
+"database is being used, otherwise it defaults to HSQL:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:439
+#: Testing.xml:440
 #, no-c-format
-msgid "<![CDATA[<parameter name=\"database\" value=\"HSQL\" />]]>"
+msgid "<![CDATA[<parameter name=\"database\" value=\"MYSQL\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:441
+#: Testing.xml:442
 #, no-c-format
 msgid ""
 "It also allows you to insert binary data into the test data set (n.b. this "
-"is untested on Windows). You need to tell it where to locate these resources:"
+"is untested on Windows). You need to tell it where to locate these resources "
+"on your classpath:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:447
+#: Testing.xml:448
 #, no-c-format
 msgid "<![CDATA[<parameter name=\"binaryDir\" value=\"images/\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:449
+#: Testing.xml:450
 #, no-c-format
 msgid ""
-"You <emphasis>must</emphasis> specify these three parameters in your "
-"<literal>testng.xml</literal>."
+"You do not have to configure any of these parameters if you use HSQL and "
+"have no binary imports. However, unless you specify "
+"<literal>datasourceJndiName</literal> in your test configuration, you will "
+"have to call <literal>setDatabaseJndiName()</literal> before your test runs. "
+"If you are not using HSQL or MySQL, you need to override some methods. See "
+"the Javadoc of <literal>DBUnitSeamTest</literal> for more details."
 msgstr ""
 
-#. Tag: para
-#: Testing.xml:454
-#, no-c-format
-msgid ""
-"If you want to use DBUnitSeamTest with another database, you'll need to "
-"implement some methods. Read the javadoc of <literal>AbstractDBUnitSeamTest</"
-"literal> for more."
-msgstr ""
-
 #. Tag: title
-#: Testing.xml:463
+#: Testing.xml:461
 #, no-c-format
 msgid "Integration Testing Seam Mail"
 msgstr ""
 
 #. Tag: caution
-#: Testing.xml:465
+#: Testing.xml:463
 #, no-c-format
 msgid "Warning! This feature is still under development."
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:469
+#: Testing.xml:467
 #, no-c-format
 msgid "It's very easy to integration test your Seam Mail:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:473
+#: Testing.xml:471
 #, no-c-format
 msgid ""
 "<![CDATA[public class MailTest extends SeamTest {\n"
@@ -907,7 +903,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:475
+#: Testing.xml:473
 #, no-c-format
 msgid ""
 "We create a new <literal>FacesRequest</literal> as normal. Inside the "
@@ -919,7 +915,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:484
+#: Testing.xml:482
 #, no-c-format
 msgid ""
 "There is no support for rendering standard JSF components so you can't test "

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/es-MX/Webservices.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/es-MX/Webservices.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/es-MX/Webservices.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Seam_-_Contextual_Components VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-11 07:43+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-11-06 00:10+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -955,45 +955,59 @@
 #: Webservices.xml:449
 #, no-c-format
 msgid ""
-"Seam includes an extended unit testing superclass that helps you in creating "
-"unit tests for a RESTful architecture. Extend the <literal>ResourceSeamTest</"
-"literal> class to emulate HTTP requests/response cycles:"
+"Seam includes a unit testing utility class that helps you create unit tests "
+"for a RESTful architecture. Extend the <literal>SeamTest</literal> class as "
+"usual and use the <literal>ResourceRequestEnvironment.ResourceRequest</"
+"literal> to emulate HTTP requests/response cycles:"
 msgstr ""
 
 #. Tag: programlisting
-#: Webservices.xml:454
+#: Webservices.xml:455
 #, no-c-format
 msgid ""
-"<![CDATA[import org.jboss.seam.resteasy.testfwk.ResourceSeamTest;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletResponse;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletRequest;\n"
+"<![CDATA[import org.jboss.seam.mock.ResourceRequestEnvironment;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletRequest;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletResponse;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment."
+"ResourceRequest;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment.Method;\n"
 "\n"
-"public class MyTest extends ResourceSeamTest {\n"
+"public class MyTest extends SeamTest {\n"
 "\n"
-"   @Override\n"
-"   public Map<String, Object> getDefaultHeaders()\n"
-"   {\n"
-"      return new HashMap<String, Object>()\n"
-"      {{\n"
-"            put(\"Accept\", \"text/plain\");\n"
-"      }};\n"
+"   ResourceRequestEnvironment sharedEnvironment;\n"
+"\n"
+"   @BeforeClass\n"
+"   public void prepareSharedEnvironment() throws Exception {\n"
+"       sharedEnvironment = new ResourceRequestEnvironment(this) {\n"
+"            @Override\n"
+"            public Map<String, Object> getDefaultHeaders() {\n"
+"               return new HashMap<String, Object>() {{\n"
+"                   put(\"Accept\", \"text/plain\");\n"
+"               }};\n"
+"            }\n"
+"         };\n"
 "   }\n"
 "\n"
 "   @Test\n"
 "   public void test() throws Exception\n"
 "   {\n"
-"      new ResourceRequest(Method.GET, \"/my/relative/uri)\n"
+"      //Not shared: new ResourceRequest(new ResourceRequestEnvironment"
+"(this), Method.GET, \"/my/relative/uri)\n"
+"\n"
+"      new ResourceRequest(sharedEnvironment, Method.GET, \"/my/relative/"
+"uri)\n"
 "      {\n"
-"\n"
 "         @Override\n"
-"         protected void prepareRequest(MockHttpServletRequest request)\n"
+"         protected void prepareRequest(EnhancedMockHttpServletRequest "
+"request)\n"
 "         {\n"
 "            request.addQueryParameter(\"foo\", \"123\");\n"
 "            request.addHeader(\"Accept-Language\", \"en_US, de\");\n"
 "         }\n"
 "\n"
 "         @Override\n"
-"         protected void onResponse(MockHttpServletResponse response)\n"
+"         protected void onResponse(EnhancedMockHttpServletResponse "
+"response)\n"
 "         {\n"
 "            assert response.getStatus() == 200;\n"
 "            assert response.getContentAsString().equals(\"foobar\");\n"
@@ -1001,40 +1015,28 @@
 "\n"
 "      }.run();\n"
 "   }\n"
-"\n"
 "}]]>"
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:456
+#: Webservices.xml:457
 #, no-c-format
 msgid ""
 "This test only executes local calls, it does not communicate with the "
 "<literal>SeamResourceServlet</literal> through TCP. The mock request is "
 "passed through the Seam servlet and filters and the response is then "
 "available for test assertions. Overriding the <literal>getDefaultHeaders()</"
-"literal> method allows you to set request headers for every test method in "
-"the test class."
+"literal> method in a shared instance of <literal>ResourceRequestEnvironment</"
+"literal> allows you to set request headers for every test method in the test "
+"class."
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:463
+#: Webservices.xml:465
 #, no-c-format
 msgid ""
 "Note that a <literal>ResourceRequest</literal> has to be executed in a "
 "<literal>@Test</literal> method or in a <literal>@BeforeMethod</literal> "
-"callback. You can and should not execute it in any other callback, such as "
-"<literal>@BeforeClass</literal>. (This is an implementation limitation we "
-"will remove in a future update.)"
+"callback. You can not execute it in any other callback, such as "
+"<literal>@BeforeClass</literal>."
 msgstr ""
-
-#. Tag: para
-#: Webservices.xml:470
-#, no-c-format
-msgid ""
-"Also note that the imported mock objects are not the same as the mock "
-"objects you use in other Seam unit tests, which are in the package "
-"<literal>org.jboss.seam.mock</literal>. The <literal>org.jboss.seam.resteasy."
-"testfwk</literal> variations mimic real requests and responses much more "
-"closely."
-msgstr ""

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/fr-FR/Testing.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/fr-FR/Testing.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/fr-FR/Testing.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-05 18:37+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -717,15 +717,15 @@
 #: Testing.xml:390
 #, no-c-format
 msgid ""
-"If you need to insert or clean data in your database before each test you "
+"If you want to insert or clean data in your database before each test you "
 "can use Seam's integration with DBUnit. To do this, extend "
-"<literal>DBUnitSeamTest</literal> rather than SeamTest."
+"<literal>DBUnitSeamTest</literal> rather than <literal>SeamTest</literal>."
 msgstr ""
 
 #. Tag: para
 #: Testing.xml:396
 #, no-c-format
-msgid "You need to provide a dataset for DBUnit."
+msgid "You have to provide a dataset for DBUnit."
 msgstr ""
 
 #. Tag: caution
@@ -760,12 +760,12 @@
 #: Testing.xml:408
 #, no-c-format
 msgid ""
-"and tell Seam about it by overriding <literal>prepareDBUnitOperations()</"
-"literal>:"
+"In your test class, configure your dataset with overriding "
+"<literal>prepareDBUnitOperations()</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:412
+#: Testing.xml:413
 #, no-c-format
 msgid ""
 "<![CDATA[protected void prepareDBUnitOperations() {\n"
@@ -776,7 +776,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:414
+#: Testing.xml:415
 #, no-c-format
 msgid ""
 "<literal>DataSetOperation</literal> defaults to <literal>DatabaseOperation."
@@ -787,7 +787,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:422
+#: Testing.xml:423
 #, no-c-format
 msgid ""
 "If you require extra cleanup after a test method executes, add operations to "
@@ -795,7 +795,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:427
+#: Testing.xml:428
 #, no-c-format
 msgid ""
 "You need to tell DBUnit about the datasource you are using by setting a "
@@ -803,7 +803,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:432
+#: Testing.xml:433
 #, no-c-format
 msgid ""
 "<![CDATA[<parameter name=\"datasourceJndiName\" value=\"java:/"
@@ -811,70 +811,66 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:434
+#: Testing.xml:435
 #, no-c-format
 msgid ""
 "DBUnitSeamTest has support for MySQL and HSQL - you need to tell it which "
-"database is being used:"
+"database is being used, otherwise it defaults to HSQL:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:439
+#: Testing.xml:440
 #, no-c-format
-msgid "<![CDATA[<parameter name=\"database\" value=\"HSQL\" />]]>"
+msgid "<![CDATA[<parameter name=\"database\" value=\"MYSQL\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:441
+#: Testing.xml:442
 #, no-c-format
 msgid ""
 "It also allows you to insert binary data into the test data set (n.b. this "
-"is untested on Windows). You need to tell it where to locate these resources:"
+"is untested on Windows). You need to tell it where to locate these resources "
+"on your classpath:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:447
+#: Testing.xml:448
 #, no-c-format
 msgid "<![CDATA[<parameter name=\"binaryDir\" value=\"images/\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:449
+#: Testing.xml:450
 #, no-c-format
 msgid ""
-"You <emphasis>must</emphasis> specify these three parameters in your "
-"<literal>testng.xml</literal>."
+"You do not have to configure any of these parameters if you use HSQL and "
+"have no binary imports. However, unless you specify "
+"<literal>datasourceJndiName</literal> in your test configuration, you will "
+"have to call <literal>setDatabaseJndiName()</literal> before your test runs. "
+"If you are not using HSQL or MySQL, you need to override some methods. See "
+"the Javadoc of <literal>DBUnitSeamTest</literal> for more details."
 msgstr ""
 
-#. Tag: para
-#: Testing.xml:454
-#, no-c-format
-msgid ""
-"If you want to use DBUnitSeamTest with another database, you'll need to "
-"implement some methods. Read the javadoc of <literal>AbstractDBUnitSeamTest</"
-"literal> for more."
-msgstr ""
-
 #. Tag: title
-#: Testing.xml:463
+#: Testing.xml:461
 #, no-c-format
 msgid "Integration Testing Seam Mail"
 msgstr ""
 
 #. Tag: caution
-#: Testing.xml:465
+#: Testing.xml:463
 #, no-c-format
 msgid "Warning! This feature is still under development."
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:469
+#: Testing.xml:467
 #, no-c-format
 msgid "It's very easy to integration test your Seam Mail:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:473
+#: Testing.xml:471
 #, no-c-format
 msgid ""
 "<![CDATA[public class MailTest extends SeamTest {\n"
@@ -907,7 +903,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:475
+#: Testing.xml:473
 #, no-c-format
 msgid ""
 "We create a new <literal>FacesRequest</literal> as normal. Inside the "
@@ -919,7 +915,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:484
+#: Testing.xml:482
 #, no-c-format
 msgid ""
 "There is no support for rendering standard JSF components so you can't test "

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/fr-FR/Webservices.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/fr-FR/Webservices.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/fr-FR/Webservices.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-11 07:43+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -955,45 +955,59 @@
 #: Webservices.xml:449
 #, no-c-format
 msgid ""
-"Seam includes an extended unit testing superclass that helps you in creating "
-"unit tests for a RESTful architecture. Extend the <literal>ResourceSeamTest</"
-"literal> class to emulate HTTP requests/response cycles:"
+"Seam includes a unit testing utility class that helps you create unit tests "
+"for a RESTful architecture. Extend the <literal>SeamTest</literal> class as "
+"usual and use the <literal>ResourceRequestEnvironment.ResourceRequest</"
+"literal> to emulate HTTP requests/response cycles:"
 msgstr ""
 
 #. Tag: programlisting
-#: Webservices.xml:454
+#: Webservices.xml:455
 #, no-c-format
 msgid ""
-"<![CDATA[import org.jboss.seam.resteasy.testfwk.ResourceSeamTest;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletResponse;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletRequest;\n"
+"<![CDATA[import org.jboss.seam.mock.ResourceRequestEnvironment;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletRequest;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletResponse;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment."
+"ResourceRequest;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment.Method;\n"
 "\n"
-"public class MyTest extends ResourceSeamTest {\n"
+"public class MyTest extends SeamTest {\n"
 "\n"
-"   @Override\n"
-"   public Map<String, Object> getDefaultHeaders()\n"
-"   {\n"
-"      return new HashMap<String, Object>()\n"
-"      {{\n"
-"            put(\"Accept\", \"text/plain\");\n"
-"      }};\n"
+"   ResourceRequestEnvironment sharedEnvironment;\n"
+"\n"
+"   @BeforeClass\n"
+"   public void prepareSharedEnvironment() throws Exception {\n"
+"       sharedEnvironment = new ResourceRequestEnvironment(this) {\n"
+"            @Override\n"
+"            public Map<String, Object> getDefaultHeaders() {\n"
+"               return new HashMap<String, Object>() {{\n"
+"                   put(\"Accept\", \"text/plain\");\n"
+"               }};\n"
+"            }\n"
+"         };\n"
 "   }\n"
 "\n"
 "   @Test\n"
 "   public void test() throws Exception\n"
 "   {\n"
-"      new ResourceRequest(Method.GET, \"/my/relative/uri)\n"
+"      //Not shared: new ResourceRequest(new ResourceRequestEnvironment"
+"(this), Method.GET, \"/my/relative/uri)\n"
+"\n"
+"      new ResourceRequest(sharedEnvironment, Method.GET, \"/my/relative/"
+"uri)\n"
 "      {\n"
-"\n"
 "         @Override\n"
-"         protected void prepareRequest(MockHttpServletRequest request)\n"
+"         protected void prepareRequest(EnhancedMockHttpServletRequest "
+"request)\n"
 "         {\n"
 "            request.addQueryParameter(\"foo\", \"123\");\n"
 "            request.addHeader(\"Accept-Language\", \"en_US, de\");\n"
 "         }\n"
 "\n"
 "         @Override\n"
-"         protected void onResponse(MockHttpServletResponse response)\n"
+"         protected void onResponse(EnhancedMockHttpServletResponse "
+"response)\n"
 "         {\n"
 "            assert response.getStatus() == 200;\n"
 "            assert response.getContentAsString().equals(\"foobar\");\n"
@@ -1001,40 +1015,28 @@
 "\n"
 "      }.run();\n"
 "   }\n"
-"\n"
 "}]]>"
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:456
+#: Webservices.xml:457
 #, no-c-format
 msgid ""
 "This test only executes local calls, it does not communicate with the "
 "<literal>SeamResourceServlet</literal> through TCP. The mock request is "
 "passed through the Seam servlet and filters and the response is then "
 "available for test assertions. Overriding the <literal>getDefaultHeaders()</"
-"literal> method allows you to set request headers for every test method in "
-"the test class."
+"literal> method in a shared instance of <literal>ResourceRequestEnvironment</"
+"literal> allows you to set request headers for every test method in the test "
+"class."
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:463
+#: Webservices.xml:465
 #, no-c-format
 msgid ""
 "Note that a <literal>ResourceRequest</literal> has to be executed in a "
 "<literal>@Test</literal> method or in a <literal>@BeforeMethod</literal> "
-"callback. You can and should not execute it in any other callback, such as "
-"<literal>@BeforeClass</literal>. (This is an implementation limitation we "
-"will remove in a future update.)"
+"callback. You can not execute it in any other callback, such as "
+"<literal>@BeforeClass</literal>."
 msgstr ""
-
-#. Tag: para
-#: Webservices.xml:470
-#, no-c-format
-msgid ""
-"Also note that the imported mock objects are not the same as the mock "
-"objects you use in other Seam unit tests, which are in the package "
-"<literal>org.jboss.seam.mock</literal>. The <literal>org.jboss.seam.resteasy."
-"testfwk</literal> variations mimic real requests and responses much more "
-"closely."
-msgstr ""

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/gu-IN/Testing.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/gu-IN/Testing.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/gu-IN/Testing.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-05 18:37+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -717,15 +717,15 @@
 #: Testing.xml:390
 #, no-c-format
 msgid ""
-"If you need to insert or clean data in your database before each test you "
+"If you want to insert or clean data in your database before each test you "
 "can use Seam's integration with DBUnit. To do this, extend "
-"<literal>DBUnitSeamTest</literal> rather than SeamTest."
+"<literal>DBUnitSeamTest</literal> rather than <literal>SeamTest</literal>."
 msgstr ""
 
 #. Tag: para
 #: Testing.xml:396
 #, no-c-format
-msgid "You need to provide a dataset for DBUnit."
+msgid "You have to provide a dataset for DBUnit."
 msgstr ""
 
 #. Tag: caution
@@ -760,12 +760,12 @@
 #: Testing.xml:408
 #, no-c-format
 msgid ""
-"and tell Seam about it by overriding <literal>prepareDBUnitOperations()</"
-"literal>:"
+"In your test class, configure your dataset with overriding "
+"<literal>prepareDBUnitOperations()</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:412
+#: Testing.xml:413
 #, no-c-format
 msgid ""
 "<![CDATA[protected void prepareDBUnitOperations() {\n"
@@ -776,7 +776,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:414
+#: Testing.xml:415
 #, no-c-format
 msgid ""
 "<literal>DataSetOperation</literal> defaults to <literal>DatabaseOperation."
@@ -787,7 +787,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:422
+#: Testing.xml:423
 #, no-c-format
 msgid ""
 "If you require extra cleanup after a test method executes, add operations to "
@@ -795,7 +795,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:427
+#: Testing.xml:428
 #, no-c-format
 msgid ""
 "You need to tell DBUnit about the datasource you are using by setting a "
@@ -803,7 +803,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:432
+#: Testing.xml:433
 #, no-c-format
 msgid ""
 "<![CDATA[<parameter name=\"datasourceJndiName\" value=\"java:/"
@@ -811,70 +811,66 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:434
+#: Testing.xml:435
 #, no-c-format
 msgid ""
 "DBUnitSeamTest has support for MySQL and HSQL - you need to tell it which "
-"database is being used:"
+"database is being used, otherwise it defaults to HSQL:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:439
+#: Testing.xml:440
 #, no-c-format
-msgid "<![CDATA[<parameter name=\"database\" value=\"HSQL\" />]]>"
+msgid "<![CDATA[<parameter name=\"database\" value=\"MYSQL\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:441
+#: Testing.xml:442
 #, no-c-format
 msgid ""
 "It also allows you to insert binary data into the test data set (n.b. this "
-"is untested on Windows). You need to tell it where to locate these resources:"
+"is untested on Windows). You need to tell it where to locate these resources "
+"on your classpath:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:447
+#: Testing.xml:448
 #, no-c-format
 msgid "<![CDATA[<parameter name=\"binaryDir\" value=\"images/\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:449
+#: Testing.xml:450
 #, no-c-format
 msgid ""
-"You <emphasis>must</emphasis> specify these three parameters in your "
-"<literal>testng.xml</literal>."
+"You do not have to configure any of these parameters if you use HSQL and "
+"have no binary imports. However, unless you specify "
+"<literal>datasourceJndiName</literal> in your test configuration, you will "
+"have to call <literal>setDatabaseJndiName()</literal> before your test runs. "
+"If you are not using HSQL or MySQL, you need to override some methods. See "
+"the Javadoc of <literal>DBUnitSeamTest</literal> for more details."
 msgstr ""
 
-#. Tag: para
-#: Testing.xml:454
-#, no-c-format
-msgid ""
-"If you want to use DBUnitSeamTest with another database, you'll need to "
-"implement some methods. Read the javadoc of <literal>AbstractDBUnitSeamTest</"
-"literal> for more."
-msgstr ""
-
 #. Tag: title
-#: Testing.xml:463
+#: Testing.xml:461
 #, no-c-format
 msgid "Integration Testing Seam Mail"
 msgstr ""
 
 #. Tag: caution
-#: Testing.xml:465
+#: Testing.xml:463
 #, no-c-format
 msgid "Warning! This feature is still under development."
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:469
+#: Testing.xml:467
 #, no-c-format
 msgid "It's very easy to integration test your Seam Mail:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:473
+#: Testing.xml:471
 #, no-c-format
 msgid ""
 "<![CDATA[public class MailTest extends SeamTest {\n"
@@ -907,7 +903,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:475
+#: Testing.xml:473
 #, no-c-format
 msgid ""
 "We create a new <literal>FacesRequest</literal> as normal. Inside the "
@@ -919,7 +915,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:484
+#: Testing.xml:482
 #, no-c-format
 msgid ""
 "There is no support for rendering standard JSF components so you can't test "

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/gu-IN/Webservices.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/gu-IN/Webservices.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/gu-IN/Webservices.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-11 07:43+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -955,45 +955,59 @@
 #: Webservices.xml:449
 #, no-c-format
 msgid ""
-"Seam includes an extended unit testing superclass that helps you in creating "
-"unit tests for a RESTful architecture. Extend the <literal>ResourceSeamTest</"
-"literal> class to emulate HTTP requests/response cycles:"
+"Seam includes a unit testing utility class that helps you create unit tests "
+"for a RESTful architecture. Extend the <literal>SeamTest</literal> class as "
+"usual and use the <literal>ResourceRequestEnvironment.ResourceRequest</"
+"literal> to emulate HTTP requests/response cycles:"
 msgstr ""
 
 #. Tag: programlisting
-#: Webservices.xml:454
+#: Webservices.xml:455
 #, no-c-format
 msgid ""
-"<![CDATA[import org.jboss.seam.resteasy.testfwk.ResourceSeamTest;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletResponse;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletRequest;\n"
+"<![CDATA[import org.jboss.seam.mock.ResourceRequestEnvironment;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletRequest;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletResponse;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment."
+"ResourceRequest;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment.Method;\n"
 "\n"
-"public class MyTest extends ResourceSeamTest {\n"
+"public class MyTest extends SeamTest {\n"
 "\n"
-"   @Override\n"
-"   public Map<String, Object> getDefaultHeaders()\n"
-"   {\n"
-"      return new HashMap<String, Object>()\n"
-"      {{\n"
-"            put(\"Accept\", \"text/plain\");\n"
-"      }};\n"
+"   ResourceRequestEnvironment sharedEnvironment;\n"
+"\n"
+"   @BeforeClass\n"
+"   public void prepareSharedEnvironment() throws Exception {\n"
+"       sharedEnvironment = new ResourceRequestEnvironment(this) {\n"
+"            @Override\n"
+"            public Map<String, Object> getDefaultHeaders() {\n"
+"               return new HashMap<String, Object>() {{\n"
+"                   put(\"Accept\", \"text/plain\");\n"
+"               }};\n"
+"            }\n"
+"         };\n"
 "   }\n"
 "\n"
 "   @Test\n"
 "   public void test() throws Exception\n"
 "   {\n"
-"      new ResourceRequest(Method.GET, \"/my/relative/uri)\n"
+"      //Not shared: new ResourceRequest(new ResourceRequestEnvironment"
+"(this), Method.GET, \"/my/relative/uri)\n"
+"\n"
+"      new ResourceRequest(sharedEnvironment, Method.GET, \"/my/relative/"
+"uri)\n"
 "      {\n"
-"\n"
 "         @Override\n"
-"         protected void prepareRequest(MockHttpServletRequest request)\n"
+"         protected void prepareRequest(EnhancedMockHttpServletRequest "
+"request)\n"
 "         {\n"
 "            request.addQueryParameter(\"foo\", \"123\");\n"
 "            request.addHeader(\"Accept-Language\", \"en_US, de\");\n"
 "         }\n"
 "\n"
 "         @Override\n"
-"         protected void onResponse(MockHttpServletResponse response)\n"
+"         protected void onResponse(EnhancedMockHttpServletResponse "
+"response)\n"
 "         {\n"
 "            assert response.getStatus() == 200;\n"
 "            assert response.getContentAsString().equals(\"foobar\");\n"
@@ -1001,40 +1015,28 @@
 "\n"
 "      }.run();\n"
 "   }\n"
-"\n"
 "}]]>"
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:456
+#: Webservices.xml:457
 #, no-c-format
 msgid ""
 "This test only executes local calls, it does not communicate with the "
 "<literal>SeamResourceServlet</literal> through TCP. The mock request is "
 "passed through the Seam servlet and filters and the response is then "
 "available for test assertions. Overriding the <literal>getDefaultHeaders()</"
-"literal> method allows you to set request headers for every test method in "
-"the test class."
+"literal> method in a shared instance of <literal>ResourceRequestEnvironment</"
+"literal> allows you to set request headers for every test method in the test "
+"class."
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:463
+#: Webservices.xml:465
 #, no-c-format
 msgid ""
 "Note that a <literal>ResourceRequest</literal> has to be executed in a "
 "<literal>@Test</literal> method or in a <literal>@BeforeMethod</literal> "
-"callback. You can and should not execute it in any other callback, such as "
-"<literal>@BeforeClass</literal>. (This is an implementation limitation we "
-"will remove in a future update.)"
+"callback. You can not execute it in any other callback, such as "
+"<literal>@BeforeClass</literal>."
 msgstr ""
-
-#. Tag: para
-#: Webservices.xml:470
-#, no-c-format
-msgid ""
-"Also note that the imported mock objects are not the same as the mock "
-"objects you use in other Seam unit tests, which are in the package "
-"<literal>org.jboss.seam.mock</literal>. The <literal>org.jboss.seam.resteasy."
-"testfwk</literal> variations mimic real requests and responses much more "
-"closely."
-msgstr ""

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/hi-IN/Testing.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/hi-IN/Testing.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/hi-IN/Testing.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-05 18:37+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -717,15 +717,15 @@
 #: Testing.xml:390
 #, no-c-format
 msgid ""
-"If you need to insert or clean data in your database before each test you "
+"If you want to insert or clean data in your database before each test you "
 "can use Seam's integration with DBUnit. To do this, extend "
-"<literal>DBUnitSeamTest</literal> rather than SeamTest."
+"<literal>DBUnitSeamTest</literal> rather than <literal>SeamTest</literal>."
 msgstr ""
 
 #. Tag: para
 #: Testing.xml:396
 #, no-c-format
-msgid "You need to provide a dataset for DBUnit."
+msgid "You have to provide a dataset for DBUnit."
 msgstr ""
 
 #. Tag: caution
@@ -760,12 +760,12 @@
 #: Testing.xml:408
 #, no-c-format
 msgid ""
-"and tell Seam about it by overriding <literal>prepareDBUnitOperations()</"
-"literal>:"
+"In your test class, configure your dataset with overriding "
+"<literal>prepareDBUnitOperations()</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:412
+#: Testing.xml:413
 #, no-c-format
 msgid ""
 "<![CDATA[protected void prepareDBUnitOperations() {\n"
@@ -776,7 +776,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:414
+#: Testing.xml:415
 #, no-c-format
 msgid ""
 "<literal>DataSetOperation</literal> defaults to <literal>DatabaseOperation."
@@ -787,7 +787,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:422
+#: Testing.xml:423
 #, no-c-format
 msgid ""
 "If you require extra cleanup after a test method executes, add operations to "
@@ -795,7 +795,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:427
+#: Testing.xml:428
 #, no-c-format
 msgid ""
 "You need to tell DBUnit about the datasource you are using by setting a "
@@ -803,7 +803,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:432
+#: Testing.xml:433
 #, no-c-format
 msgid ""
 "<![CDATA[<parameter name=\"datasourceJndiName\" value=\"java:/"
@@ -811,70 +811,66 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:434
+#: Testing.xml:435
 #, no-c-format
 msgid ""
 "DBUnitSeamTest has support for MySQL and HSQL - you need to tell it which "
-"database is being used:"
+"database is being used, otherwise it defaults to HSQL:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:439
+#: Testing.xml:440
 #, no-c-format
-msgid "<![CDATA[<parameter name=\"database\" value=\"HSQL\" />]]>"
+msgid "<![CDATA[<parameter name=\"database\" value=\"MYSQL\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:441
+#: Testing.xml:442
 #, no-c-format
 msgid ""
 "It also allows you to insert binary data into the test data set (n.b. this "
-"is untested on Windows). You need to tell it where to locate these resources:"
+"is untested on Windows). You need to tell it where to locate these resources "
+"on your classpath:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:447
+#: Testing.xml:448
 #, no-c-format
 msgid "<![CDATA[<parameter name=\"binaryDir\" value=\"images/\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:449
+#: Testing.xml:450
 #, no-c-format
 msgid ""
-"You <emphasis>must</emphasis> specify these three parameters in your "
-"<literal>testng.xml</literal>."
+"You do not have to configure any of these parameters if you use HSQL and "
+"have no binary imports. However, unless you specify "
+"<literal>datasourceJndiName</literal> in your test configuration, you will "
+"have to call <literal>setDatabaseJndiName()</literal> before your test runs. "
+"If you are not using HSQL or MySQL, you need to override some methods. See "
+"the Javadoc of <literal>DBUnitSeamTest</literal> for more details."
 msgstr ""
 
-#. Tag: para
-#: Testing.xml:454
-#, no-c-format
-msgid ""
-"If you want to use DBUnitSeamTest with another database, you'll need to "
-"implement some methods. Read the javadoc of <literal>AbstractDBUnitSeamTest</"
-"literal> for more."
-msgstr ""
-
 #. Tag: title
-#: Testing.xml:463
+#: Testing.xml:461
 #, no-c-format
 msgid "Integration Testing Seam Mail"
 msgstr ""
 
 #. Tag: caution
-#: Testing.xml:465
+#: Testing.xml:463
 #, no-c-format
 msgid "Warning! This feature is still under development."
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:469
+#: Testing.xml:467
 #, no-c-format
 msgid "It's very easy to integration test your Seam Mail:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:473
+#: Testing.xml:471
 #, no-c-format
 msgid ""
 "<![CDATA[public class MailTest extends SeamTest {\n"
@@ -907,7 +903,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:475
+#: Testing.xml:473
 #, no-c-format
 msgid ""
 "We create a new <literal>FacesRequest</literal> as normal. Inside the "
@@ -919,7 +915,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:484
+#: Testing.xml:482
 #, no-c-format
 msgid ""
 "There is no support for rendering standard JSF components so you can't test "

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/hi-IN/Webservices.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/hi-IN/Webservices.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/hi-IN/Webservices.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-11 07:43+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -955,45 +955,59 @@
 #: Webservices.xml:449
 #, no-c-format
 msgid ""
-"Seam includes an extended unit testing superclass that helps you in creating "
-"unit tests for a RESTful architecture. Extend the <literal>ResourceSeamTest</"
-"literal> class to emulate HTTP requests/response cycles:"
+"Seam includes a unit testing utility class that helps you create unit tests "
+"for a RESTful architecture. Extend the <literal>SeamTest</literal> class as "
+"usual and use the <literal>ResourceRequestEnvironment.ResourceRequest</"
+"literal> to emulate HTTP requests/response cycles:"
 msgstr ""
 
 #. Tag: programlisting
-#: Webservices.xml:454
+#: Webservices.xml:455
 #, no-c-format
 msgid ""
-"<![CDATA[import org.jboss.seam.resteasy.testfwk.ResourceSeamTest;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletResponse;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletRequest;\n"
+"<![CDATA[import org.jboss.seam.mock.ResourceRequestEnvironment;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletRequest;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletResponse;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment."
+"ResourceRequest;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment.Method;\n"
 "\n"
-"public class MyTest extends ResourceSeamTest {\n"
+"public class MyTest extends SeamTest {\n"
 "\n"
-"   @Override\n"
-"   public Map<String, Object> getDefaultHeaders()\n"
-"   {\n"
-"      return new HashMap<String, Object>()\n"
-"      {{\n"
-"            put(\"Accept\", \"text/plain\");\n"
-"      }};\n"
+"   ResourceRequestEnvironment sharedEnvironment;\n"
+"\n"
+"   @BeforeClass\n"
+"   public void prepareSharedEnvironment() throws Exception {\n"
+"       sharedEnvironment = new ResourceRequestEnvironment(this) {\n"
+"            @Override\n"
+"            public Map<String, Object> getDefaultHeaders() {\n"
+"               return new HashMap<String, Object>() {{\n"
+"                   put(\"Accept\", \"text/plain\");\n"
+"               }};\n"
+"            }\n"
+"         };\n"
 "   }\n"
 "\n"
 "   @Test\n"
 "   public void test() throws Exception\n"
 "   {\n"
-"      new ResourceRequest(Method.GET, \"/my/relative/uri)\n"
+"      //Not shared: new ResourceRequest(new ResourceRequestEnvironment"
+"(this), Method.GET, \"/my/relative/uri)\n"
+"\n"
+"      new ResourceRequest(sharedEnvironment, Method.GET, \"/my/relative/"
+"uri)\n"
 "      {\n"
-"\n"
 "         @Override\n"
-"         protected void prepareRequest(MockHttpServletRequest request)\n"
+"         protected void prepareRequest(EnhancedMockHttpServletRequest "
+"request)\n"
 "         {\n"
 "            request.addQueryParameter(\"foo\", \"123\");\n"
 "            request.addHeader(\"Accept-Language\", \"en_US, de\");\n"
 "         }\n"
 "\n"
 "         @Override\n"
-"         protected void onResponse(MockHttpServletResponse response)\n"
+"         protected void onResponse(EnhancedMockHttpServletResponse "
+"response)\n"
 "         {\n"
 "            assert response.getStatus() == 200;\n"
 "            assert response.getContentAsString().equals(\"foobar\");\n"
@@ -1001,40 +1015,28 @@
 "\n"
 "      }.run();\n"
 "   }\n"
-"\n"
 "}]]>"
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:456
+#: Webservices.xml:457
 #, no-c-format
 msgid ""
 "This test only executes local calls, it does not communicate with the "
 "<literal>SeamResourceServlet</literal> through TCP. The mock request is "
 "passed through the Seam servlet and filters and the response is then "
 "available for test assertions. Overriding the <literal>getDefaultHeaders()</"
-"literal> method allows you to set request headers for every test method in "
-"the test class."
+"literal> method in a shared instance of <literal>ResourceRequestEnvironment</"
+"literal> allows you to set request headers for every test method in the test "
+"class."
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:463
+#: Webservices.xml:465
 #, no-c-format
 msgid ""
 "Note that a <literal>ResourceRequest</literal> has to be executed in a "
 "<literal>@Test</literal> method or in a <literal>@BeforeMethod</literal> "
-"callback. You can and should not execute it in any other callback, such as "
-"<literal>@BeforeClass</literal>. (This is an implementation limitation we "
-"will remove in a future update.)"
+"callback. You can not execute it in any other callback, such as "
+"<literal>@BeforeClass</literal>."
 msgstr ""
-
-#. Tag: para
-#: Webservices.xml:470
-#, no-c-format
-msgid ""
-"Also note that the imported mock objects are not the same as the mock "
-"objects you use in other Seam unit tests, which are in the package "
-"<literal>org.jboss.seam.mock</literal>. The <literal>org.jboss.seam.resteasy."
-"testfwk</literal> variations mimic real requests and responses much more "
-"closely."
-msgstr ""

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/ja-JP/Testing.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/ja-JP/Testing.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/ja-JP/Testing.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: Tools\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-05 18:37+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2009-02-27 23:02+0900\n"
 "Last-Translator: rto <reiko.ohtsuka at gmail.com>\n"
 "Language-Team: Japanese <fedora-trans-ja at redhat.com>\n"
@@ -964,17 +964,17 @@
 #: Testing.xml:390
 #, fuzzy, no-c-format
 msgid ""
-"If you need to insert or clean data in your database before each test you "
+"If you want to insert or clean data in your database before each test you "
 "can use Seam's integration with DBUnit. To do this, extend "
-"<literal>DBUnitSeamTest</literal> rather than SeamTest."
+"<literal>DBUnitSeamTest</literal> rather than <literal>SeamTest</literal>."
 msgstr ""
 "各テストの前にデータベースにデータを挿入したり、消去したりしたい場合はDBUnit"
 "と連携します。SeamTestの替わりにDBUnitSeamTestを継承してください。"
 
 #. Tag: para
 #: Testing.xml:396
-#, no-c-format
-msgid "You need to provide a dataset for DBUnit."
+#, fuzzy, no-c-format
+msgid "You have to provide a dataset for DBUnit."
 msgstr "DBUnitのデータセットを記述します。"
 
 #. Tag: caution
@@ -1023,16 +1023,16 @@
 
 #. Tag: para
 #: Testing.xml:408
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"and tell Seam about it by overriding <literal>prepareDBUnitOperations()</"
-"literal>:"
+"In your test class, configure your dataset with overriding "
+"<literal>prepareDBUnitOperations()</literal>:"
 msgstr ""
 "<literal>prepareDBUnitOperations()</literal>をオーバーライドしてSeamに知らせ"
 "ます。"
 
 #. Tag: programlisting
-#: Testing.xml:412
+#: Testing.xml:413
 #, no-c-format
 msgid ""
 "<![CDATA[protected void prepareDBUnitOperations() {\n"
@@ -1048,7 +1048,7 @@
 " }]]>"
 
 #. Tag: para
-#: Testing.xml:414
+#: Testing.xml:415
 #, no-c-format
 msgid ""
 "<literal>DataSetOperation</literal> defaults to <literal>DatabaseOperation."
@@ -1064,7 +1064,7 @@
 "次に<literal>BaseData.xml</literal>に宣言されたすべての列を挿入します。"
 
 #. Tag: para
-#: Testing.xml:422
+#: Testing.xml:423
 #, no-c-format
 msgid ""
 "If you require extra cleanup after a test method executes, add operations to "
@@ -1075,7 +1075,7 @@
 "さい。"
 
 #. Tag: para
-#: Testing.xml:427
+#: Testing.xml:428
 #, no-c-format
 msgid ""
 "You need to tell DBUnit about the datasource you are using by setting a "
@@ -1085,7 +1085,7 @@
 "を指定して、DBUnitにデータソースを知らせます。"
 
 #. Tag: programlisting
-#: Testing.xml:432
+#: Testing.xml:433
 #, no-c-format
 msgid ""
 "<![CDATA[<parameter name=\"datasourceJndiName\" value=\"java:/"
@@ -1095,79 +1095,70 @@
 "seamdiscsDatasource\"/>]]>"
 
 #. Tag: para
-#: Testing.xml:434
-#, no-c-format
+#: Testing.xml:435
+#, fuzzy, no-c-format
 msgid ""
 "DBUnitSeamTest has support for MySQL and HSQL - you need to tell it which "
-"database is being used:"
+"database is being used, otherwise it defaults to HSQL:"
 msgstr ""
 "DBUnitSeamTestはMySQLとHSQLをサポートします。どちらを使うか、以下のように設定"
 "してください。"
 
 #. Tag: programlisting
-#: Testing.xml:439
-#, no-c-format
-msgid "<![CDATA[<parameter name=\"database\" value=\"HSQL\" />]]>"
+#: Testing.xml:440
+#, fuzzy, no-c-format
+msgid "<![CDATA[<parameter name=\"database\" value=\"MYSQL\" />]]>"
 msgstr "<![CDATA[<parameter name=\"database\" value=\"HSQL\" />]]>"
 
 #. Tag: para
-#: Testing.xml:441
-#, no-c-format
+#: Testing.xml:442
+#, fuzzy, no-c-format
 msgid ""
 "It also allows you to insert binary data into the test data set (n.b. this "
-"is untested on Windows). You need to tell it where to locate these resources:"
+"is untested on Windows). You need to tell it where to locate these resources "
+"on your classpath:"
 msgstr ""
 "バイナリデータをテストデータセットに挿入することもできます(Windowsでは未検証"
 "ですので注意してください)。リソースの場所を以下のように指定してください。"
 
 #. Tag: programlisting
-#: Testing.xml:447
+#: Testing.xml:448
 #, no-c-format
 msgid "<![CDATA[<parameter name=\"binaryDir\" value=\"images/\" />]]>"
 msgstr "<![CDATA[<parameter name=\"binaryDir\" value=\"images/\" />]]>"
 
 #. Tag: para
-#: Testing.xml:449
+#: Testing.xml:450
 #, no-c-format
 msgid ""
-"You <emphasis>must</emphasis> specify these three parameters in your "
-"<literal>testng.xml</literal>."
+"You do not have to configure any of these parameters if you use HSQL and "
+"have no binary imports. However, unless you specify "
+"<literal>datasourceJndiName</literal> in your test configuration, you will "
+"have to call <literal>setDatabaseJndiName()</literal> before your test runs. "
+"If you are not using HSQL or MySQL, you need to override some methods. See "
+"the Javadoc of <literal>DBUnitSeamTest</literal> for more details."
 msgstr ""
-"<literal>testng.xml</literal>にこの三つのパラメータを<emphasis>必ず</"
-"emphasis>指定してください。"
 
-#. Tag: para
-#: Testing.xml:454
-#, no-c-format
-msgid ""
-"If you want to use DBUnitSeamTest with another database, you'll need to "
-"implement some methods. Read the javadoc of <literal>AbstractDBUnitSeamTest</"
-"literal> for more."
-msgstr ""
-"DBUnitSeamTestで別のデータベースを使用するには、いくつかのメソッドを実装しな"
-"ければいけません。詳細は<literal>AbstractDBUnitSeamTest</literal>のjavadocを"
-"参照してください。"
-
 #. Tag: title
-#: Testing.xml:463
+#: Testing.xml:461
 #, no-c-format
 msgid "Integration Testing Seam Mail"
 msgstr "Seamメールの統合テスト"
 
 #. Tag: caution
-#: Testing.xml:465
+#: Testing.xml:463
 #, no-c-format
 msgid "Warning! This feature is still under development."
 msgstr "警告!この機能はまだ開発中です。"
 
 #. Tag: para
-#: Testing.xml:469
+#: Testing.xml:467
 #, no-c-format
 msgid "It's very easy to integration test your Seam Mail:"
 msgstr "Seamメールの統合テストはとても簡単です。"
 
 #. Tag: programlisting
-#: Testing.xml:473
+#: Testing.xml:471
 #, no-c-format
 msgid ""
 "<![CDATA[public class MailTest extends SeamTest {\n"
@@ -1227,7 +1218,7 @@
 "}]]>"
 
 #. Tag: para
-#: Testing.xml:475
+#: Testing.xml:473
 #, no-c-format
 msgid ""
 "We create a new <literal>FacesRequest</literal> as normal. Inside the "
@@ -1245,7 +1236,7 @@
 "メソッドも使用できます。"
 
 #. Tag: para
-#: Testing.xml:484
+#: Testing.xml:482
 #, no-c-format
 msgid ""
 "There is no support for rendering standard JSF components so you can't test "
@@ -1253,3 +1244,19 @@
 msgstr ""
 "標準JSFコンポーネントのレンダリングはサポートしませんので、メールボディをテス"
 "トするのは簡単ではありません。"
+
+#~ msgid ""
+#~ "You <emphasis>must</emphasis> specify these three parameters in your "
+#~ "<literal>testng.xml</literal>."
+#~ msgstr ""
+#~ "<literal>testng.xml</literal>にこの三つのパラメータを<emphasis>必ず</"
+#~ "emphasis>指定してください。"
+
+#~ msgid ""
+#~ "If you want to use DBUnitSeamTest with another database, you'll need to "
+#~ "implement some methods. Read the javadoc of "
+#~ "<literal>AbstractDBUnitSeamTest</literal> for more."
+#~ msgstr ""
+#~ "DBUnitSeamTestで別のデータベースを使用するには、いくつかのメソッドを実装し"
+#~ "なければいけません。詳細は<literal>AbstractDBUnitSeamTest</literal>の"
+#~ "javadocを参照してください。"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/ja-JP/Webservices.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/ja-JP/Webservices.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/ja-JP/Webservices.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: Tools\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-11 07:43+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2009-02-20 10:58-0500\n"
 "Last-Translator: kojiro miyamoto <kojiro_miyamoto at hotmail.com>\n"
 "Language-Team: Japanese <fedora-trans-ja at redhat.com>\n"
@@ -1268,45 +1268,59 @@
 #: Webservices.xml:449
 #, no-c-format
 msgid ""
-"Seam includes an extended unit testing superclass that helps you in creating "
-"unit tests for a RESTful architecture. Extend the <literal>ResourceSeamTest</"
-"literal> class to emulate HTTP requests/response cycles:"
+"Seam includes a unit testing utility class that helps you create unit tests "
+"for a RESTful architecture. Extend the <literal>SeamTest</literal> class as "
+"usual and use the <literal>ResourceRequestEnvironment.ResourceRequest</"
+"literal> to emulate HTTP requests/response cycles:"
 msgstr ""
 
 #. Tag: programlisting
-#: Webservices.xml:454
+#: Webservices.xml:455
 #, no-c-format
 msgid ""
-"<![CDATA[import org.jboss.seam.resteasy.testfwk.ResourceSeamTest;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletResponse;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletRequest;\n"
+"<![CDATA[import org.jboss.seam.mock.ResourceRequestEnvironment;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletRequest;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletResponse;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment."
+"ResourceRequest;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment.Method;\n"
 "\n"
-"public class MyTest extends ResourceSeamTest {\n"
+"public class MyTest extends SeamTest {\n"
 "\n"
-"   @Override\n"
-"   public Map<String, Object> getDefaultHeaders()\n"
-"   {\n"
-"      return new HashMap<String, Object>()\n"
-"      {{\n"
-"            put(\"Accept\", \"text/plain\");\n"
-"      }};\n"
+"   ResourceRequestEnvironment sharedEnvironment;\n"
+"\n"
+"   @BeforeClass\n"
+"   public void prepareSharedEnvironment() throws Exception {\n"
+"       sharedEnvironment = new ResourceRequestEnvironment(this) {\n"
+"            @Override\n"
+"            public Map<String, Object> getDefaultHeaders() {\n"
+"               return new HashMap<String, Object>() {{\n"
+"                   put(\"Accept\", \"text/plain\");\n"
+"               }};\n"
+"            }\n"
+"         };\n"
 "   }\n"
 "\n"
 "   @Test\n"
 "   public void test() throws Exception\n"
 "   {\n"
-"      new ResourceRequest(Method.GET, \"/my/relative/uri)\n"
+"      //Not shared: new ResourceRequest(new ResourceRequestEnvironment"
+"(this), Method.GET, \"/my/relative/uri)\n"
+"\n"
+"      new ResourceRequest(sharedEnvironment, Method.GET, \"/my/relative/"
+"uri)\n"
 "      {\n"
-"\n"
 "         @Override\n"
-"         protected void prepareRequest(MockHttpServletRequest request)\n"
+"         protected void prepareRequest(EnhancedMockHttpServletRequest "
+"request)\n"
 "         {\n"
 "            request.addQueryParameter(\"foo\", \"123\");\n"
 "            request.addHeader(\"Accept-Language\", \"en_US, de\");\n"
 "         }\n"
 "\n"
 "         @Override\n"
-"         protected void onResponse(MockHttpServletResponse response)\n"
+"         protected void onResponse(EnhancedMockHttpServletResponse "
+"response)\n"
 "         {\n"
 "            assert response.getStatus() == 200;\n"
 "            assert response.getContentAsString().equals(\"foobar\");\n"
@@ -1314,44 +1328,32 @@
 "\n"
 "      }.run();\n"
 "   }\n"
-"\n"
 "}]]>"
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:456
+#: Webservices.xml:457
 #, no-c-format
 msgid ""
 "This test only executes local calls, it does not communicate with the "
 "<literal>SeamResourceServlet</literal> through TCP. The mock request is "
 "passed through the Seam servlet and filters and the response is then "
 "available for test assertions. Overriding the <literal>getDefaultHeaders()</"
-"literal> method allows you to set request headers for every test method in "
-"the test class."
+"literal> method in a shared instance of <literal>ResourceRequestEnvironment</"
+"literal> allows you to set request headers for every test method in the test "
+"class."
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:463
+#: Webservices.xml:465
 #, no-c-format
 msgid ""
 "Note that a <literal>ResourceRequest</literal> has to be executed in a "
 "<literal>@Test</literal> method or in a <literal>@BeforeMethod</literal> "
-"callback. You can and should not execute it in any other callback, such as "
-"<literal>@BeforeClass</literal>. (This is an implementation limitation we "
-"will remove in a future update.)"
+"callback. You can not execute it in any other callback, such as "
+"<literal>@BeforeClass</literal>."
 msgstr ""
 
-#. Tag: para
-#: Webservices.xml:470
-#, no-c-format
-msgid ""
-"Also note that the imported mock objects are not the same as the mock "
-"objects you use in other Seam unit tests, which are in the package "
-"<literal>org.jboss.seam.mock</literal>. The <literal>org.jboss.seam.resteasy."
-"testfwk</literal> variations mimic real requests and responses much more "
-"closely."
-msgstr ""
-
 #, fuzzy
 #~ msgid ""
 #~ "Provider classes can also be Seam components, currently only "

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/kn-IN/Testing.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/kn-IN/Testing.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/kn-IN/Testing.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-05 18:37+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -717,15 +717,15 @@
 #: Testing.xml:390
 #, no-c-format
 msgid ""
-"If you need to insert or clean data in your database before each test you "
+"If you want to insert or clean data in your database before each test you "
 "can use Seam's integration with DBUnit. To do this, extend "
-"<literal>DBUnitSeamTest</literal> rather than SeamTest."
+"<literal>DBUnitSeamTest</literal> rather than <literal>SeamTest</literal>."
 msgstr ""
 
 #. Tag: para
 #: Testing.xml:396
 #, no-c-format
-msgid "You need to provide a dataset for DBUnit."
+msgid "You have to provide a dataset for DBUnit."
 msgstr ""
 
 #. Tag: caution
@@ -760,12 +760,12 @@
 #: Testing.xml:408
 #, no-c-format
 msgid ""
-"and tell Seam about it by overriding <literal>prepareDBUnitOperations()</"
-"literal>:"
+"In your test class, configure your dataset with overriding "
+"<literal>prepareDBUnitOperations()</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:412
+#: Testing.xml:413
 #, no-c-format
 msgid ""
 "<![CDATA[protected void prepareDBUnitOperations() {\n"
@@ -776,7 +776,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:414
+#: Testing.xml:415
 #, no-c-format
 msgid ""
 "<literal>DataSetOperation</literal> defaults to <literal>DatabaseOperation."
@@ -787,7 +787,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:422
+#: Testing.xml:423
 #, no-c-format
 msgid ""
 "If you require extra cleanup after a test method executes, add operations to "
@@ -795,7 +795,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:427
+#: Testing.xml:428
 #, no-c-format
 msgid ""
 "You need to tell DBUnit about the datasource you are using by setting a "
@@ -803,7 +803,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:432
+#: Testing.xml:433
 #, no-c-format
 msgid ""
 "<![CDATA[<parameter name=\"datasourceJndiName\" value=\"java:/"
@@ -811,70 +811,66 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:434
+#: Testing.xml:435
 #, no-c-format
 msgid ""
 "DBUnitSeamTest has support for MySQL and HSQL - you need to tell it which "
-"database is being used:"
+"database is being used, otherwise it defaults to HSQL:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:439
+#: Testing.xml:440
 #, no-c-format
-msgid "<![CDATA[<parameter name=\"database\" value=\"HSQL\" />]]>"
+msgid "<![CDATA[<parameter name=\"database\" value=\"MYSQL\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:441
+#: Testing.xml:442
 #, no-c-format
 msgid ""
 "It also allows you to insert binary data into the test data set (n.b. this "
-"is untested on Windows). You need to tell it where to locate these resources:"
+"is untested on Windows). You need to tell it where to locate these resources "
+"on your classpath:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:447
+#: Testing.xml:448
 #, no-c-format
 msgid "<![CDATA[<parameter name=\"binaryDir\" value=\"images/\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:449
+#: Testing.xml:450
 #, no-c-format
 msgid ""
-"You <emphasis>must</emphasis> specify these three parameters in your "
-"<literal>testng.xml</literal>."
+"You do not have to configure any of these parameters if you use HSQL and "
+"have no binary imports. However, unless you specify "
+"<literal>datasourceJndiName</literal> in your test configuration, you will "
+"have to call <literal>setDatabaseJndiName()</literal> before your test runs. "
+"If you are not using HSQL or MySQL, you need to override some methods. See "
+"the Javadoc of <literal>DBUnitSeamTest</literal> for more details."
 msgstr ""
 
-#. Tag: para
-#: Testing.xml:454
-#, no-c-format
-msgid ""
-"If you want to use DBUnitSeamTest with another database, you'll need to "
-"implement some methods. Read the javadoc of <literal>AbstractDBUnitSeamTest</"
-"literal> for more."
-msgstr ""
-
 #. Tag: title
-#: Testing.xml:463
+#: Testing.xml:461
 #, no-c-format
 msgid "Integration Testing Seam Mail"
 msgstr ""
 
 #. Tag: caution
-#: Testing.xml:465
+#: Testing.xml:463
 #, no-c-format
 msgid "Warning! This feature is still under development."
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:469
+#: Testing.xml:467
 #, no-c-format
 msgid "It's very easy to integration test your Seam Mail:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:473
+#: Testing.xml:471
 #, no-c-format
 msgid ""
 "<![CDATA[public class MailTest extends SeamTest {\n"
@@ -907,7 +903,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:475
+#: Testing.xml:473
 #, no-c-format
 msgid ""
 "We create a new <literal>FacesRequest</literal> as normal. Inside the "
@@ -919,7 +915,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:484
+#: Testing.xml:482
 #, no-c-format
 msgid ""
 "There is no support for rendering standard JSF components so you can't test "

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/kn-IN/Webservices.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/kn-IN/Webservices.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/kn-IN/Webservices.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-11 07:43+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -955,45 +955,59 @@
 #: Webservices.xml:449
 #, no-c-format
 msgid ""
-"Seam includes an extended unit testing superclass that helps you in creating "
-"unit tests for a RESTful architecture. Extend the <literal>ResourceSeamTest</"
-"literal> class to emulate HTTP requests/response cycles:"
+"Seam includes a unit testing utility class that helps you create unit tests "
+"for a RESTful architecture. Extend the <literal>SeamTest</literal> class as "
+"usual and use the <literal>ResourceRequestEnvironment.ResourceRequest</"
+"literal> to emulate HTTP requests/response cycles:"
 msgstr ""
 
 #. Tag: programlisting
-#: Webservices.xml:454
+#: Webservices.xml:455
 #, no-c-format
 msgid ""
-"<![CDATA[import org.jboss.seam.resteasy.testfwk.ResourceSeamTest;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletResponse;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletRequest;\n"
+"<![CDATA[import org.jboss.seam.mock.ResourceRequestEnvironment;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletRequest;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletResponse;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment."
+"ResourceRequest;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment.Method;\n"
 "\n"
-"public class MyTest extends ResourceSeamTest {\n"
+"public class MyTest extends SeamTest {\n"
 "\n"
-"   @Override\n"
-"   public Map<String, Object> getDefaultHeaders()\n"
-"   {\n"
-"      return new HashMap<String, Object>()\n"
-"      {{\n"
-"            put(\"Accept\", \"text/plain\");\n"
-"      }};\n"
+"   ResourceRequestEnvironment sharedEnvironment;\n"
+"\n"
+"   @BeforeClass\n"
+"   public void prepareSharedEnvironment() throws Exception {\n"
+"       sharedEnvironment = new ResourceRequestEnvironment(this) {\n"
+"            @Override\n"
+"            public Map<String, Object> getDefaultHeaders() {\n"
+"               return new HashMap<String, Object>() {{\n"
+"                   put(\"Accept\", \"text/plain\");\n"
+"               }};\n"
+"            }\n"
+"         };\n"
 "   }\n"
 "\n"
 "   @Test\n"
 "   public void test() throws Exception\n"
 "   {\n"
-"      new ResourceRequest(Method.GET, \"/my/relative/uri)\n"
+"      //Not shared: new ResourceRequest(new ResourceRequestEnvironment"
+"(this), Method.GET, \"/my/relative/uri)\n"
+"\n"
+"      new ResourceRequest(sharedEnvironment, Method.GET, \"/my/relative/"
+"uri)\n"
 "      {\n"
-"\n"
 "         @Override\n"
-"         protected void prepareRequest(MockHttpServletRequest request)\n"
+"         protected void prepareRequest(EnhancedMockHttpServletRequest "
+"request)\n"
 "         {\n"
 "            request.addQueryParameter(\"foo\", \"123\");\n"
 "            request.addHeader(\"Accept-Language\", \"en_US, de\");\n"
 "         }\n"
 "\n"
 "         @Override\n"
-"         protected void onResponse(MockHttpServletResponse response)\n"
+"         protected void onResponse(EnhancedMockHttpServletResponse "
+"response)\n"
 "         {\n"
 "            assert response.getStatus() == 200;\n"
 "            assert response.getContentAsString().equals(\"foobar\");\n"
@@ -1001,40 +1015,28 @@
 "\n"
 "      }.run();\n"
 "   }\n"
-"\n"
 "}]]>"
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:456
+#: Webservices.xml:457
 #, no-c-format
 msgid ""
 "This test only executes local calls, it does not communicate with the "
 "<literal>SeamResourceServlet</literal> through TCP. The mock request is "
 "passed through the Seam servlet and filters and the response is then "
 "available for test assertions. Overriding the <literal>getDefaultHeaders()</"
-"literal> method allows you to set request headers for every test method in "
-"the test class."
+"literal> method in a shared instance of <literal>ResourceRequestEnvironment</"
+"literal> allows you to set request headers for every test method in the test "
+"class."
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:463
+#: Webservices.xml:465
 #, no-c-format
 msgid ""
 "Note that a <literal>ResourceRequest</literal> has to be executed in a "
 "<literal>@Test</literal> method or in a <literal>@BeforeMethod</literal> "
-"callback. You can and should not execute it in any other callback, such as "
-"<literal>@BeforeClass</literal>. (This is an implementation limitation we "
-"will remove in a future update.)"
+"callback. You can not execute it in any other callback, such as "
+"<literal>@BeforeClass</literal>."
 msgstr ""
-
-#. Tag: para
-#: Webservices.xml:470
-#, no-c-format
-msgid ""
-"Also note that the imported mock objects are not the same as the mock "
-"objects you use in other Seam unit tests, which are in the package "
-"<literal>org.jboss.seam.mock</literal>. The <literal>org.jboss.seam.resteasy."
-"testfwk</literal> variations mimic real requests and responses much more "
-"closely."
-msgstr ""

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/ko-KR/Testing.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/ko-KR/Testing.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/ko-KR/Testing.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-05 18:37+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -717,15 +717,15 @@
 #: Testing.xml:390
 #, no-c-format
 msgid ""
-"If you need to insert or clean data in your database before each test you "
+"If you want to insert or clean data in your database before each test you "
 "can use Seam's integration with DBUnit. To do this, extend "
-"<literal>DBUnitSeamTest</literal> rather than SeamTest."
+"<literal>DBUnitSeamTest</literal> rather than <literal>SeamTest</literal>."
 msgstr ""
 
 #. Tag: para
 #: Testing.xml:396
 #, no-c-format
-msgid "You need to provide a dataset for DBUnit."
+msgid "You have to provide a dataset for DBUnit."
 msgstr ""
 
 #. Tag: caution
@@ -760,12 +760,12 @@
 #: Testing.xml:408
 #, no-c-format
 msgid ""
-"and tell Seam about it by overriding <literal>prepareDBUnitOperations()</"
-"literal>:"
+"In your test class, configure your dataset with overriding "
+"<literal>prepareDBUnitOperations()</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:412
+#: Testing.xml:413
 #, no-c-format
 msgid ""
 "<![CDATA[protected void prepareDBUnitOperations() {\n"
@@ -776,7 +776,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:414
+#: Testing.xml:415
 #, no-c-format
 msgid ""
 "<literal>DataSetOperation</literal> defaults to <literal>DatabaseOperation."
@@ -787,7 +787,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:422
+#: Testing.xml:423
 #, no-c-format
 msgid ""
 "If you require extra cleanup after a test method executes, add operations to "
@@ -795,7 +795,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:427
+#: Testing.xml:428
 #, no-c-format
 msgid ""
 "You need to tell DBUnit about the datasource you are using by setting a "
@@ -803,7 +803,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:432
+#: Testing.xml:433
 #, no-c-format
 msgid ""
 "<![CDATA[<parameter name=\"datasourceJndiName\" value=\"java:/"
@@ -811,70 +811,66 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:434
+#: Testing.xml:435
 #, no-c-format
 msgid ""
 "DBUnitSeamTest has support for MySQL and HSQL - you need to tell it which "
-"database is being used:"
+"database is being used, otherwise it defaults to HSQL:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:439
+#: Testing.xml:440
 #, no-c-format
-msgid "<![CDATA[<parameter name=\"database\" value=\"HSQL\" />]]>"
+msgid "<![CDATA[<parameter name=\"database\" value=\"MYSQL\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:441
+#: Testing.xml:442
 #, no-c-format
 msgid ""
 "It also allows you to insert binary data into the test data set (n.b. this "
-"is untested on Windows). You need to tell it where to locate these resources:"
+"is untested on Windows). You need to tell it where to locate these resources "
+"on your classpath:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:447
+#: Testing.xml:448
 #, no-c-format
 msgid "<![CDATA[<parameter name=\"binaryDir\" value=\"images/\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:449
+#: Testing.xml:450
 #, no-c-format
 msgid ""
-"You <emphasis>must</emphasis> specify these three parameters in your "
-"<literal>testng.xml</literal>."
+"You do not have to configure any of these parameters if you use HSQL and "
+"have no binary imports. However, unless you specify "
+"<literal>datasourceJndiName</literal> in your test configuration, you will "
+"have to call <literal>setDatabaseJndiName()</literal> before your test runs. "
+"If you are not using HSQL or MySQL, you need to override some methods. See "
+"the Javadoc of <literal>DBUnitSeamTest</literal> for more details."
 msgstr ""
 
-#. Tag: para
-#: Testing.xml:454
-#, no-c-format
-msgid ""
-"If you want to use DBUnitSeamTest with another database, you'll need to "
-"implement some methods. Read the javadoc of <literal>AbstractDBUnitSeamTest</"
-"literal> for more."
-msgstr ""
-
 #. Tag: title
-#: Testing.xml:463
+#: Testing.xml:461
 #, no-c-format
 msgid "Integration Testing Seam Mail"
 msgstr ""
 
 #. Tag: caution
-#: Testing.xml:465
+#: Testing.xml:463
 #, no-c-format
 msgid "Warning! This feature is still under development."
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:469
+#: Testing.xml:467
 #, no-c-format
 msgid "It's very easy to integration test your Seam Mail:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:473
+#: Testing.xml:471
 #, no-c-format
 msgid ""
 "<![CDATA[public class MailTest extends SeamTest {\n"
@@ -907,7 +903,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:475
+#: Testing.xml:473
 #, no-c-format
 msgid ""
 "We create a new <literal>FacesRequest</literal> as normal. Inside the "
@@ -919,7 +915,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:484
+#: Testing.xml:482
 #, no-c-format
 msgid ""
 "There is no support for rendering standard JSF components so you can't test "

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/ko-KR/Webservices.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/ko-KR/Webservices.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/ko-KR/Webservices.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-11 07:43+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -955,45 +955,59 @@
 #: Webservices.xml:449
 #, no-c-format
 msgid ""
-"Seam includes an extended unit testing superclass that helps you in creating "
-"unit tests for a RESTful architecture. Extend the <literal>ResourceSeamTest</"
-"literal> class to emulate HTTP requests/response cycles:"
+"Seam includes a unit testing utility class that helps you create unit tests "
+"for a RESTful architecture. Extend the <literal>SeamTest</literal> class as "
+"usual and use the <literal>ResourceRequestEnvironment.ResourceRequest</"
+"literal> to emulate HTTP requests/response cycles:"
 msgstr ""
 
 #. Tag: programlisting
-#: Webservices.xml:454
+#: Webservices.xml:455
 #, no-c-format
 msgid ""
-"<![CDATA[import org.jboss.seam.resteasy.testfwk.ResourceSeamTest;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletResponse;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletRequest;\n"
+"<![CDATA[import org.jboss.seam.mock.ResourceRequestEnvironment;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletRequest;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletResponse;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment."
+"ResourceRequest;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment.Method;\n"
 "\n"
-"public class MyTest extends ResourceSeamTest {\n"
+"public class MyTest extends SeamTest {\n"
 "\n"
-"   @Override\n"
-"   public Map<String, Object> getDefaultHeaders()\n"
-"   {\n"
-"      return new HashMap<String, Object>()\n"
-"      {{\n"
-"            put(\"Accept\", \"text/plain\");\n"
-"      }};\n"
+"   ResourceRequestEnvironment sharedEnvironment;\n"
+"\n"
+"   @BeforeClass\n"
+"   public void prepareSharedEnvironment() throws Exception {\n"
+"       sharedEnvironment = new ResourceRequestEnvironment(this) {\n"
+"            @Override\n"
+"            public Map<String, Object> getDefaultHeaders() {\n"
+"               return new HashMap<String, Object>() {{\n"
+"                   put(\"Accept\", \"text/plain\");\n"
+"               }};\n"
+"            }\n"
+"         };\n"
 "   }\n"
 "\n"
 "   @Test\n"
 "   public void test() throws Exception\n"
 "   {\n"
-"      new ResourceRequest(Method.GET, \"/my/relative/uri)\n"
+"      //Not shared: new ResourceRequest(new ResourceRequestEnvironment"
+"(this), Method.GET, \"/my/relative/uri)\n"
+"\n"
+"      new ResourceRequest(sharedEnvironment, Method.GET, \"/my/relative/"
+"uri)\n"
 "      {\n"
-"\n"
 "         @Override\n"
-"         protected void prepareRequest(MockHttpServletRequest request)\n"
+"         protected void prepareRequest(EnhancedMockHttpServletRequest "
+"request)\n"
 "         {\n"
 "            request.addQueryParameter(\"foo\", \"123\");\n"
 "            request.addHeader(\"Accept-Language\", \"en_US, de\");\n"
 "         }\n"
 "\n"
 "         @Override\n"
-"         protected void onResponse(MockHttpServletResponse response)\n"
+"         protected void onResponse(EnhancedMockHttpServletResponse "
+"response)\n"
 "         {\n"
 "            assert response.getStatus() == 200;\n"
 "            assert response.getContentAsString().equals(\"foobar\");\n"
@@ -1001,40 +1015,28 @@
 "\n"
 "      }.run();\n"
 "   }\n"
-"\n"
 "}]]>"
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:456
+#: Webservices.xml:457
 #, no-c-format
 msgid ""
 "This test only executes local calls, it does not communicate with the "
 "<literal>SeamResourceServlet</literal> through TCP. The mock request is "
 "passed through the Seam servlet and filters and the response is then "
 "available for test assertions. Overriding the <literal>getDefaultHeaders()</"
-"literal> method allows you to set request headers for every test method in "
-"the test class."
+"literal> method in a shared instance of <literal>ResourceRequestEnvironment</"
+"literal> allows you to set request headers for every test method in the test "
+"class."
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:463
+#: Webservices.xml:465
 #, no-c-format
 msgid ""
 "Note that a <literal>ResourceRequest</literal> has to be executed in a "
 "<literal>@Test</literal> method or in a <literal>@BeforeMethod</literal> "
-"callback. You can and should not execute it in any other callback, such as "
-"<literal>@BeforeClass</literal>. (This is an implementation limitation we "
-"will remove in a future update.)"
+"callback. You can not execute it in any other callback, such as "
+"<literal>@BeforeClass</literal>."
 msgstr ""
-
-#. Tag: para
-#: Webservices.xml:470
-#, no-c-format
-msgid ""
-"Also note that the imported mock objects are not the same as the mock "
-"objects you use in other Seam unit tests, which are in the package "
-"<literal>org.jboss.seam.mock</literal>. The <literal>org.jboss.seam.resteasy."
-"testfwk</literal> variations mimic real requests and responses much more "
-"closely."
-msgstr ""

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/ml-IN/Testing.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/ml-IN/Testing.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/ml-IN/Testing.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-05 18:37+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -717,15 +717,15 @@
 #: Testing.xml:390
 #, no-c-format
 msgid ""
-"If you need to insert or clean data in your database before each test you "
+"If you want to insert or clean data in your database before each test you "
 "can use Seam's integration with DBUnit. To do this, extend "
-"<literal>DBUnitSeamTest</literal> rather than SeamTest."
+"<literal>DBUnitSeamTest</literal> rather than <literal>SeamTest</literal>."
 msgstr ""
 
 #. Tag: para
 #: Testing.xml:396
 #, no-c-format
-msgid "You need to provide a dataset for DBUnit."
+msgid "You have to provide a dataset for DBUnit."
 msgstr ""
 
 #. Tag: caution
@@ -760,12 +760,12 @@
 #: Testing.xml:408
 #, no-c-format
 msgid ""
-"and tell Seam about it by overriding <literal>prepareDBUnitOperations()</"
-"literal>:"
+"In your test class, configure your dataset with overriding "
+"<literal>prepareDBUnitOperations()</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:412
+#: Testing.xml:413
 #, no-c-format
 msgid ""
 "<![CDATA[protected void prepareDBUnitOperations() {\n"
@@ -776,7 +776,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:414
+#: Testing.xml:415
 #, no-c-format
 msgid ""
 "<literal>DataSetOperation</literal> defaults to <literal>DatabaseOperation."
@@ -787,7 +787,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:422
+#: Testing.xml:423
 #, no-c-format
 msgid ""
 "If you require extra cleanup after a test method executes, add operations to "
@@ -795,7 +795,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:427
+#: Testing.xml:428
 #, no-c-format
 msgid ""
 "You need to tell DBUnit about the datasource you are using by setting a "
@@ -803,7 +803,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:432
+#: Testing.xml:433
 #, no-c-format
 msgid ""
 "<![CDATA[<parameter name=\"datasourceJndiName\" value=\"java:/"
@@ -811,70 +811,66 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:434
+#: Testing.xml:435
 #, no-c-format
 msgid ""
 "DBUnitSeamTest has support for MySQL and HSQL - you need to tell it which "
-"database is being used:"
+"database is being used, otherwise it defaults to HSQL:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:439
+#: Testing.xml:440
 #, no-c-format
-msgid "<![CDATA[<parameter name=\"database\" value=\"HSQL\" />]]>"
+msgid "<![CDATA[<parameter name=\"database\" value=\"MYSQL\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:441
+#: Testing.xml:442
 #, no-c-format
 msgid ""
 "It also allows you to insert binary data into the test data set (n.b. this "
-"is untested on Windows). You need to tell it where to locate these resources:"
+"is untested on Windows). You need to tell it where to locate these resources "
+"on your classpath:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:447
+#: Testing.xml:448
 #, no-c-format
 msgid "<![CDATA[<parameter name=\"binaryDir\" value=\"images/\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:449
+#: Testing.xml:450
 #, no-c-format
 msgid ""
-"You <emphasis>must</emphasis> specify these three parameters in your "
-"<literal>testng.xml</literal>."
+"You do not have to configure any of these parameters if you use HSQL and "
+"have no binary imports. However, unless you specify "
+"<literal>datasourceJndiName</literal> in your test configuration, you will "
+"have to call <literal>setDatabaseJndiName()</literal> before your test runs. "
+"If you are not using HSQL or MySQL, you need to override some methods. See "
+"the Javadoc of <literal>DBUnitSeamTest</literal> for more details."
 msgstr ""
 
-#. Tag: para
-#: Testing.xml:454
-#, no-c-format
-msgid ""
-"If you want to use DBUnitSeamTest with another database, you'll need to "
-"implement some methods. Read the javadoc of <literal>AbstractDBUnitSeamTest</"
-"literal> for more."
-msgstr ""
-
 #. Tag: title
-#: Testing.xml:463
+#: Testing.xml:461
 #, no-c-format
 msgid "Integration Testing Seam Mail"
 msgstr ""
 
 #. Tag: caution
-#: Testing.xml:465
+#: Testing.xml:463
 #, no-c-format
 msgid "Warning! This feature is still under development."
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:469
+#: Testing.xml:467
 #, no-c-format
 msgid "It's very easy to integration test your Seam Mail:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:473
+#: Testing.xml:471
 #, no-c-format
 msgid ""
 "<![CDATA[public class MailTest extends SeamTest {\n"
@@ -907,7 +903,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:475
+#: Testing.xml:473
 #, no-c-format
 msgid ""
 "We create a new <literal>FacesRequest</literal> as normal. Inside the "
@@ -919,7 +915,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:484
+#: Testing.xml:482
 #, no-c-format
 msgid ""
 "There is no support for rendering standard JSF components so you can't test "

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/ml-IN/Webservices.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/ml-IN/Webservices.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/ml-IN/Webservices.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-11 07:43+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -955,45 +955,59 @@
 #: Webservices.xml:449
 #, no-c-format
 msgid ""
-"Seam includes an extended unit testing superclass that helps you in creating "
-"unit tests for a RESTful architecture. Extend the <literal>ResourceSeamTest</"
-"literal> class to emulate HTTP requests/response cycles:"
+"Seam includes a unit testing utility class that helps you create unit tests "
+"for a RESTful architecture. Extend the <literal>SeamTest</literal> class as "
+"usual and use the <literal>ResourceRequestEnvironment.ResourceRequest</"
+"literal> to emulate HTTP requests/response cycles:"
 msgstr ""
 
 #. Tag: programlisting
-#: Webservices.xml:454
+#: Webservices.xml:455
 #, no-c-format
 msgid ""
-"<![CDATA[import org.jboss.seam.resteasy.testfwk.ResourceSeamTest;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletResponse;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletRequest;\n"
+"<![CDATA[import org.jboss.seam.mock.ResourceRequestEnvironment;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletRequest;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletResponse;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment."
+"ResourceRequest;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment.Method;\n"
 "\n"
-"public class MyTest extends ResourceSeamTest {\n"
+"public class MyTest extends SeamTest {\n"
 "\n"
-"   @Override\n"
-"   public Map<String, Object> getDefaultHeaders()\n"
-"   {\n"
-"      return new HashMap<String, Object>()\n"
-"      {{\n"
-"            put(\"Accept\", \"text/plain\");\n"
-"      }};\n"
+"   ResourceRequestEnvironment sharedEnvironment;\n"
+"\n"
+"   @BeforeClass\n"
+"   public void prepareSharedEnvironment() throws Exception {\n"
+"       sharedEnvironment = new ResourceRequestEnvironment(this) {\n"
+"            @Override\n"
+"            public Map<String, Object> getDefaultHeaders() {\n"
+"               return new HashMap<String, Object>() {{\n"
+"                   put(\"Accept\", \"text/plain\");\n"
+"               }};\n"
+"            }\n"
+"         };\n"
 "   }\n"
 "\n"
 "   @Test\n"
 "   public void test() throws Exception\n"
 "   {\n"
-"      new ResourceRequest(Method.GET, \"/my/relative/uri)\n"
+"      //Not shared: new ResourceRequest(new ResourceRequestEnvironment"
+"(this), Method.GET, \"/my/relative/uri)\n"
+"\n"
+"      new ResourceRequest(sharedEnvironment, Method.GET, \"/my/relative/"
+"uri)\n"
 "      {\n"
-"\n"
 "         @Override\n"
-"         protected void prepareRequest(MockHttpServletRequest request)\n"
+"         protected void prepareRequest(EnhancedMockHttpServletRequest "
+"request)\n"
 "         {\n"
 "            request.addQueryParameter(\"foo\", \"123\");\n"
 "            request.addHeader(\"Accept-Language\", \"en_US, de\");\n"
 "         }\n"
 "\n"
 "         @Override\n"
-"         protected void onResponse(MockHttpServletResponse response)\n"
+"         protected void onResponse(EnhancedMockHttpServletResponse "
+"response)\n"
 "         {\n"
 "            assert response.getStatus() == 200;\n"
 "            assert response.getContentAsString().equals(\"foobar\");\n"
@@ -1001,40 +1015,28 @@
 "\n"
 "      }.run();\n"
 "   }\n"
-"\n"
 "}]]>"
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:456
+#: Webservices.xml:457
 #, no-c-format
 msgid ""
 "This test only executes local calls, it does not communicate with the "
 "<literal>SeamResourceServlet</literal> through TCP. The mock request is "
 "passed through the Seam servlet and filters and the response is then "
 "available for test assertions. Overriding the <literal>getDefaultHeaders()</"
-"literal> method allows you to set request headers for every test method in "
-"the test class."
+"literal> method in a shared instance of <literal>ResourceRequestEnvironment</"
+"literal> allows you to set request headers for every test method in the test "
+"class."
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:463
+#: Webservices.xml:465
 #, no-c-format
 msgid ""
 "Note that a <literal>ResourceRequest</literal> has to be executed in a "
 "<literal>@Test</literal> method or in a <literal>@BeforeMethod</literal> "
-"callback. You can and should not execute it in any other callback, such as "
-"<literal>@BeforeClass</literal>. (This is an implementation limitation we "
-"will remove in a future update.)"
+"callback. You can not execute it in any other callback, such as "
+"<literal>@BeforeClass</literal>."
 msgstr ""
-
-#. Tag: para
-#: Webservices.xml:470
-#, no-c-format
-msgid ""
-"Also note that the imported mock objects are not the same as the mock "
-"objects you use in other Seam unit tests, which are in the package "
-"<literal>org.jboss.seam.mock</literal>. The <literal>org.jboss.seam.resteasy."
-"testfwk</literal> variations mimic real requests and responses much more "
-"closely."
-msgstr ""

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/mr-IN/Testing.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/mr-IN/Testing.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/mr-IN/Testing.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-05 18:37+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -717,15 +717,15 @@
 #: Testing.xml:390
 #, no-c-format
 msgid ""
-"If you need to insert or clean data in your database before each test you "
+"If you want to insert or clean data in your database before each test you "
 "can use Seam's integration with DBUnit. To do this, extend "
-"<literal>DBUnitSeamTest</literal> rather than SeamTest."
+"<literal>DBUnitSeamTest</literal> rather than <literal>SeamTest</literal>."
 msgstr ""
 
 #. Tag: para
 #: Testing.xml:396
 #, no-c-format
-msgid "You need to provide a dataset for DBUnit."
+msgid "You have to provide a dataset for DBUnit."
 msgstr ""
 
 #. Tag: caution
@@ -760,12 +760,12 @@
 #: Testing.xml:408
 #, no-c-format
 msgid ""
-"and tell Seam about it by overriding <literal>prepareDBUnitOperations()</"
-"literal>:"
+"In your test class, configure your dataset with overriding "
+"<literal>prepareDBUnitOperations()</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:412
+#: Testing.xml:413
 #, no-c-format
 msgid ""
 "<![CDATA[protected void prepareDBUnitOperations() {\n"
@@ -776,7 +776,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:414
+#: Testing.xml:415
 #, no-c-format
 msgid ""
 "<literal>DataSetOperation</literal> defaults to <literal>DatabaseOperation."
@@ -787,7 +787,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:422
+#: Testing.xml:423
 #, no-c-format
 msgid ""
 "If you require extra cleanup after a test method executes, add operations to "
@@ -795,7 +795,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:427
+#: Testing.xml:428
 #, no-c-format
 msgid ""
 "You need to tell DBUnit about the datasource you are using by setting a "
@@ -803,7 +803,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:432
+#: Testing.xml:433
 #, no-c-format
 msgid ""
 "<![CDATA[<parameter name=\"datasourceJndiName\" value=\"java:/"
@@ -811,70 +811,66 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:434
+#: Testing.xml:435
 #, no-c-format
 msgid ""
 "DBUnitSeamTest has support for MySQL and HSQL - you need to tell it which "
-"database is being used:"
+"database is being used, otherwise it defaults to HSQL:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:439
+#: Testing.xml:440
 #, no-c-format
-msgid "<![CDATA[<parameter name=\"database\" value=\"HSQL\" />]]>"
+msgid "<![CDATA[<parameter name=\"database\" value=\"MYSQL\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:441
+#: Testing.xml:442
 #, no-c-format
 msgid ""
 "It also allows you to insert binary data into the test data set (n.b. this "
-"is untested on Windows). You need to tell it where to locate these resources:"
+"is untested on Windows). You need to tell it where to locate these resources "
+"on your classpath:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:447
+#: Testing.xml:448
 #, no-c-format
 msgid "<![CDATA[<parameter name=\"binaryDir\" value=\"images/\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:449
+#: Testing.xml:450
 #, no-c-format
 msgid ""
-"You <emphasis>must</emphasis> specify these three parameters in your "
-"<literal>testng.xml</literal>."
+"You do not have to configure any of these parameters if you use HSQL and "
+"have no binary imports. However, unless you specify "
+"<literal>datasourceJndiName</literal> in your test configuration, you will "
+"have to call <literal>setDatabaseJndiName()</literal> before your test runs. "
+"If you are not using HSQL or MySQL, you need to override some methods. See "
+"the Javadoc of <literal>DBUnitSeamTest</literal> for more details."
 msgstr ""
 
-#. Tag: para
-#: Testing.xml:454
-#, no-c-format
-msgid ""
-"If you want to use DBUnitSeamTest with another database, you'll need to "
-"implement some methods. Read the javadoc of <literal>AbstractDBUnitSeamTest</"
-"literal> for more."
-msgstr ""
-
 #. Tag: title
-#: Testing.xml:463
+#: Testing.xml:461
 #, no-c-format
 msgid "Integration Testing Seam Mail"
 msgstr ""
 
 #. Tag: caution
-#: Testing.xml:465
+#: Testing.xml:463
 #, no-c-format
 msgid "Warning! This feature is still under development."
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:469
+#: Testing.xml:467
 #, no-c-format
 msgid "It's very easy to integration test your Seam Mail:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:473
+#: Testing.xml:471
 #, no-c-format
 msgid ""
 "<![CDATA[public class MailTest extends SeamTest {\n"
@@ -907,7 +903,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:475
+#: Testing.xml:473
 #, no-c-format
 msgid ""
 "We create a new <literal>FacesRequest</literal> as normal. Inside the "
@@ -919,7 +915,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:484
+#: Testing.xml:482
 #, no-c-format
 msgid ""
 "There is no support for rendering standard JSF components so you can't test "

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/mr-IN/Webservices.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/mr-IN/Webservices.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/mr-IN/Webservices.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-11 07:43+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -955,45 +955,59 @@
 #: Webservices.xml:449
 #, no-c-format
 msgid ""
-"Seam includes an extended unit testing superclass that helps you in creating "
-"unit tests for a RESTful architecture. Extend the <literal>ResourceSeamTest</"
-"literal> class to emulate HTTP requests/response cycles:"
+"Seam includes a unit testing utility class that helps you create unit tests "
+"for a RESTful architecture. Extend the <literal>SeamTest</literal> class as "
+"usual and use the <literal>ResourceRequestEnvironment.ResourceRequest</"
+"literal> to emulate HTTP requests/response cycles:"
 msgstr ""
 
 #. Tag: programlisting
-#: Webservices.xml:454
+#: Webservices.xml:455
 #, no-c-format
 msgid ""
-"<![CDATA[import org.jboss.seam.resteasy.testfwk.ResourceSeamTest;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletResponse;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletRequest;\n"
+"<![CDATA[import org.jboss.seam.mock.ResourceRequestEnvironment;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletRequest;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletResponse;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment."
+"ResourceRequest;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment.Method;\n"
 "\n"
-"public class MyTest extends ResourceSeamTest {\n"
+"public class MyTest extends SeamTest {\n"
 "\n"
-"   @Override\n"
-"   public Map<String, Object> getDefaultHeaders()\n"
-"   {\n"
-"      return new HashMap<String, Object>()\n"
-"      {{\n"
-"            put(\"Accept\", \"text/plain\");\n"
-"      }};\n"
+"   ResourceRequestEnvironment sharedEnvironment;\n"
+"\n"
+"   @BeforeClass\n"
+"   public void prepareSharedEnvironment() throws Exception {\n"
+"       sharedEnvironment = new ResourceRequestEnvironment(this) {\n"
+"            @Override\n"
+"            public Map<String, Object> getDefaultHeaders() {\n"
+"               return new HashMap<String, Object>() {{\n"
+"                   put(\"Accept\", \"text/plain\");\n"
+"               }};\n"
+"            }\n"
+"         };\n"
 "   }\n"
 "\n"
 "   @Test\n"
 "   public void test() throws Exception\n"
 "   {\n"
-"      new ResourceRequest(Method.GET, \"/my/relative/uri)\n"
+"      //Not shared: new ResourceRequest(new ResourceRequestEnvironment"
+"(this), Method.GET, \"/my/relative/uri)\n"
+"\n"
+"      new ResourceRequest(sharedEnvironment, Method.GET, \"/my/relative/"
+"uri)\n"
 "      {\n"
-"\n"
 "         @Override\n"
-"         protected void prepareRequest(MockHttpServletRequest request)\n"
+"         protected void prepareRequest(EnhancedMockHttpServletRequest "
+"request)\n"
 "         {\n"
 "            request.addQueryParameter(\"foo\", \"123\");\n"
 "            request.addHeader(\"Accept-Language\", \"en_US, de\");\n"
 "         }\n"
 "\n"
 "         @Override\n"
-"         protected void onResponse(MockHttpServletResponse response)\n"
+"         protected void onResponse(EnhancedMockHttpServletResponse "
+"response)\n"
 "         {\n"
 "            assert response.getStatus() == 200;\n"
 "            assert response.getContentAsString().equals(\"foobar\");\n"
@@ -1001,40 +1015,28 @@
 "\n"
 "      }.run();\n"
 "   }\n"
-"\n"
 "}]]>"
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:456
+#: Webservices.xml:457
 #, no-c-format
 msgid ""
 "This test only executes local calls, it does not communicate with the "
 "<literal>SeamResourceServlet</literal> through TCP. The mock request is "
 "passed through the Seam servlet and filters and the response is then "
 "available for test assertions. Overriding the <literal>getDefaultHeaders()</"
-"literal> method allows you to set request headers for every test method in "
-"the test class."
+"literal> method in a shared instance of <literal>ResourceRequestEnvironment</"
+"literal> allows you to set request headers for every test method in the test "
+"class."
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:463
+#: Webservices.xml:465
 #, no-c-format
 msgid ""
 "Note that a <literal>ResourceRequest</literal> has to be executed in a "
 "<literal>@Test</literal> method or in a <literal>@BeforeMethod</literal> "
-"callback. You can and should not execute it in any other callback, such as "
-"<literal>@BeforeClass</literal>. (This is an implementation limitation we "
-"will remove in a future update.)"
+"callback. You can not execute it in any other callback, such as "
+"<literal>@BeforeClass</literal>."
 msgstr ""
-
-#. Tag: para
-#: Webservices.xml:470
-#, no-c-format
-msgid ""
-"Also note that the imported mock objects are not the same as the mock "
-"objects you use in other Seam unit tests, which are in the package "
-"<literal>org.jboss.seam.mock</literal>. The <literal>org.jboss.seam.resteasy."
-"testfwk</literal> variations mimic real requests and responses much more "
-"closely."
-msgstr ""

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/or-IN/Testing.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/or-IN/Testing.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/or-IN/Testing.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-05 18:37+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -717,15 +717,15 @@
 #: Testing.xml:390
 #, no-c-format
 msgid ""
-"If you need to insert or clean data in your database before each test you "
+"If you want to insert or clean data in your database before each test you "
 "can use Seam's integration with DBUnit. To do this, extend "
-"<literal>DBUnitSeamTest</literal> rather than SeamTest."
+"<literal>DBUnitSeamTest</literal> rather than <literal>SeamTest</literal>."
 msgstr ""
 
 #. Tag: para
 #: Testing.xml:396
 #, no-c-format
-msgid "You need to provide a dataset for DBUnit."
+msgid "You have to provide a dataset for DBUnit."
 msgstr ""
 
 #. Tag: caution
@@ -760,12 +760,12 @@
 #: Testing.xml:408
 #, no-c-format
 msgid ""
-"and tell Seam about it by overriding <literal>prepareDBUnitOperations()</"
-"literal>:"
+"In your test class, configure your dataset with overriding "
+"<literal>prepareDBUnitOperations()</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:412
+#: Testing.xml:413
 #, no-c-format
 msgid ""
 "<![CDATA[protected void prepareDBUnitOperations() {\n"
@@ -776,7 +776,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:414
+#: Testing.xml:415
 #, no-c-format
 msgid ""
 "<literal>DataSetOperation</literal> defaults to <literal>DatabaseOperation."
@@ -787,7 +787,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:422
+#: Testing.xml:423
 #, no-c-format
 msgid ""
 "If you require extra cleanup after a test method executes, add operations to "
@@ -795,7 +795,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:427
+#: Testing.xml:428
 #, no-c-format
 msgid ""
 "You need to tell DBUnit about the datasource you are using by setting a "
@@ -803,7 +803,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:432
+#: Testing.xml:433
 #, no-c-format
 msgid ""
 "<![CDATA[<parameter name=\"datasourceJndiName\" value=\"java:/"
@@ -811,70 +811,66 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:434
+#: Testing.xml:435
 #, no-c-format
 msgid ""
 "DBUnitSeamTest has support for MySQL and HSQL - you need to tell it which "
-"database is being used:"
+"database is being used, otherwise it defaults to HSQL:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:439
+#: Testing.xml:440
 #, no-c-format
-msgid "<![CDATA[<parameter name=\"database\" value=\"HSQL\" />]]>"
+msgid "<![CDATA[<parameter name=\"database\" value=\"MYSQL\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:441
+#: Testing.xml:442
 #, no-c-format
 msgid ""
 "It also allows you to insert binary data into the test data set (n.b. this "
-"is untested on Windows). You need to tell it where to locate these resources:"
+"is untested on Windows). You need to tell it where to locate these resources "
+"on your classpath:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:447
+#: Testing.xml:448
 #, no-c-format
 msgid "<![CDATA[<parameter name=\"binaryDir\" value=\"images/\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:449
+#: Testing.xml:450
 #, no-c-format
 msgid ""
-"You <emphasis>must</emphasis> specify these three parameters in your "
-"<literal>testng.xml</literal>."
+"You do not have to configure any of these parameters if you use HSQL and "
+"have no binary imports. However, unless you specify "
+"<literal>datasourceJndiName</literal> in your test configuration, you will "
+"have to call <literal>setDatabaseJndiName()</literal> before your test runs. "
+"If you are not using HSQL or MySQL, you need to override some methods. See "
+"the Javadoc of <literal>DBUnitSeamTest</literal> for more details."
 msgstr ""
 
-#. Tag: para
-#: Testing.xml:454
-#, no-c-format
-msgid ""
-"If you want to use DBUnitSeamTest with another database, you'll need to "
-"implement some methods. Read the javadoc of <literal>AbstractDBUnitSeamTest</"
-"literal> for more."
-msgstr ""
-
 #. Tag: title
-#: Testing.xml:463
+#: Testing.xml:461
 #, no-c-format
 msgid "Integration Testing Seam Mail"
 msgstr ""
 
 #. Tag: caution
-#: Testing.xml:465
+#: Testing.xml:463
 #, no-c-format
 msgid "Warning! This feature is still under development."
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:469
+#: Testing.xml:467
 #, no-c-format
 msgid "It's very easy to integration test your Seam Mail:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:473
+#: Testing.xml:471
 #, no-c-format
 msgid ""
 "<![CDATA[public class MailTest extends SeamTest {\n"
@@ -907,7 +903,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:475
+#: Testing.xml:473
 #, no-c-format
 msgid ""
 "We create a new <literal>FacesRequest</literal> as normal. Inside the "
@@ -919,7 +915,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:484
+#: Testing.xml:482
 #, no-c-format
 msgid ""
 "There is no support for rendering standard JSF components so you can't test "

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/or-IN/Webservices.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/or-IN/Webservices.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/or-IN/Webservices.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-11 07:43+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -955,45 +955,59 @@
 #: Webservices.xml:449
 #, no-c-format
 msgid ""
-"Seam includes an extended unit testing superclass that helps you in creating "
-"unit tests for a RESTful architecture. Extend the <literal>ResourceSeamTest</"
-"literal> class to emulate HTTP requests/response cycles:"
+"Seam includes a unit testing utility class that helps you create unit tests "
+"for a RESTful architecture. Extend the <literal>SeamTest</literal> class as "
+"usual and use the <literal>ResourceRequestEnvironment.ResourceRequest</"
+"literal> to emulate HTTP requests/response cycles:"
 msgstr ""
 
 #. Tag: programlisting
-#: Webservices.xml:454
+#: Webservices.xml:455
 #, no-c-format
 msgid ""
-"<![CDATA[import org.jboss.seam.resteasy.testfwk.ResourceSeamTest;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletResponse;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletRequest;\n"
+"<![CDATA[import org.jboss.seam.mock.ResourceRequestEnvironment;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletRequest;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletResponse;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment."
+"ResourceRequest;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment.Method;\n"
 "\n"
-"public class MyTest extends ResourceSeamTest {\n"
+"public class MyTest extends SeamTest {\n"
 "\n"
-"   @Override\n"
-"   public Map<String, Object> getDefaultHeaders()\n"
-"   {\n"
-"      return new HashMap<String, Object>()\n"
-"      {{\n"
-"            put(\"Accept\", \"text/plain\");\n"
-"      }};\n"
+"   ResourceRequestEnvironment sharedEnvironment;\n"
+"\n"
+"   @BeforeClass\n"
+"   public void prepareSharedEnvironment() throws Exception {\n"
+"       sharedEnvironment = new ResourceRequestEnvironment(this) {\n"
+"            @Override\n"
+"            public Map<String, Object> getDefaultHeaders() {\n"
+"               return new HashMap<String, Object>() {{\n"
+"                   put(\"Accept\", \"text/plain\");\n"
+"               }};\n"
+"            }\n"
+"         };\n"
 "   }\n"
 "\n"
 "   @Test\n"
 "   public void test() throws Exception\n"
 "   {\n"
-"      new ResourceRequest(Method.GET, \"/my/relative/uri)\n"
+"      //Not shared: new ResourceRequest(new ResourceRequestEnvironment"
+"(this), Method.GET, \"/my/relative/uri)\n"
+"\n"
+"      new ResourceRequest(sharedEnvironment, Method.GET, \"/my/relative/"
+"uri)\n"
 "      {\n"
-"\n"
 "         @Override\n"
-"         protected void prepareRequest(MockHttpServletRequest request)\n"
+"         protected void prepareRequest(EnhancedMockHttpServletRequest "
+"request)\n"
 "         {\n"
 "            request.addQueryParameter(\"foo\", \"123\");\n"
 "            request.addHeader(\"Accept-Language\", \"en_US, de\");\n"
 "         }\n"
 "\n"
 "         @Override\n"
-"         protected void onResponse(MockHttpServletResponse response)\n"
+"         protected void onResponse(EnhancedMockHttpServletResponse "
+"response)\n"
 "         {\n"
 "            assert response.getStatus() == 200;\n"
 "            assert response.getContentAsString().equals(\"foobar\");\n"
@@ -1001,40 +1015,28 @@
 "\n"
 "      }.run();\n"
 "   }\n"
-"\n"
 "}]]>"
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:456
+#: Webservices.xml:457
 #, no-c-format
 msgid ""
 "This test only executes local calls, it does not communicate with the "
 "<literal>SeamResourceServlet</literal> through TCP. The mock request is "
 "passed through the Seam servlet and filters and the response is then "
 "available for test assertions. Overriding the <literal>getDefaultHeaders()</"
-"literal> method allows you to set request headers for every test method in "
-"the test class."
+"literal> method in a shared instance of <literal>ResourceRequestEnvironment</"
+"literal> allows you to set request headers for every test method in the test "
+"class."
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:463
+#: Webservices.xml:465
 #, no-c-format
 msgid ""
 "Note that a <literal>ResourceRequest</literal> has to be executed in a "
 "<literal>@Test</literal> method or in a <literal>@BeforeMethod</literal> "
-"callback. You can and should not execute it in any other callback, such as "
-"<literal>@BeforeClass</literal>. (This is an implementation limitation we "
-"will remove in a future update.)"
+"callback. You can not execute it in any other callback, such as "
+"<literal>@BeforeClass</literal>."
 msgstr ""
-
-#. Tag: para
-#: Webservices.xml:470
-#, no-c-format
-msgid ""
-"Also note that the imported mock objects are not the same as the mock "
-"objects you use in other Seam unit tests, which are in the package "
-"<literal>org.jboss.seam.mock</literal>. The <literal>org.jboss.seam.resteasy."
-"testfwk</literal> variations mimic real requests and responses much more "
-"closely."
-msgstr ""

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pa-IN/Testing.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pa-IN/Testing.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pa-IN/Testing.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-05 18:37+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -717,15 +717,15 @@
 #: Testing.xml:390
 #, no-c-format
 msgid ""
-"If you need to insert or clean data in your database before each test you "
+"If you want to insert or clean data in your database before each test you "
 "can use Seam's integration with DBUnit. To do this, extend "
-"<literal>DBUnitSeamTest</literal> rather than SeamTest."
+"<literal>DBUnitSeamTest</literal> rather than <literal>SeamTest</literal>."
 msgstr ""
 
 #. Tag: para
 #: Testing.xml:396
 #, no-c-format
-msgid "You need to provide a dataset for DBUnit."
+msgid "You have to provide a dataset for DBUnit."
 msgstr ""
 
 #. Tag: caution
@@ -760,12 +760,12 @@
 #: Testing.xml:408
 #, no-c-format
 msgid ""
-"and tell Seam about it by overriding <literal>prepareDBUnitOperations()</"
-"literal>:"
+"In your test class, configure your dataset with overriding "
+"<literal>prepareDBUnitOperations()</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:412
+#: Testing.xml:413
 #, no-c-format
 msgid ""
 "<![CDATA[protected void prepareDBUnitOperations() {\n"
@@ -776,7 +776,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:414
+#: Testing.xml:415
 #, no-c-format
 msgid ""
 "<literal>DataSetOperation</literal> defaults to <literal>DatabaseOperation."
@@ -787,7 +787,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:422
+#: Testing.xml:423
 #, no-c-format
 msgid ""
 "If you require extra cleanup after a test method executes, add operations to "
@@ -795,7 +795,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:427
+#: Testing.xml:428
 #, no-c-format
 msgid ""
 "You need to tell DBUnit about the datasource you are using by setting a "
@@ -803,7 +803,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:432
+#: Testing.xml:433
 #, no-c-format
 msgid ""
 "<![CDATA[<parameter name=\"datasourceJndiName\" value=\"java:/"
@@ -811,70 +811,66 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:434
+#: Testing.xml:435
 #, no-c-format
 msgid ""
 "DBUnitSeamTest has support for MySQL and HSQL - you need to tell it which "
-"database is being used:"
+"database is being used, otherwise it defaults to HSQL:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:439
+#: Testing.xml:440
 #, no-c-format
-msgid "<![CDATA[<parameter name=\"database\" value=\"HSQL\" />]]>"
+msgid "<![CDATA[<parameter name=\"database\" value=\"MYSQL\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:441
+#: Testing.xml:442
 #, no-c-format
 msgid ""
 "It also allows you to insert binary data into the test data set (n.b. this "
-"is untested on Windows). You need to tell it where to locate these resources:"
+"is untested on Windows). You need to tell it where to locate these resources "
+"on your classpath:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:447
+#: Testing.xml:448
 #, no-c-format
 msgid "<![CDATA[<parameter name=\"binaryDir\" value=\"images/\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:449
+#: Testing.xml:450
 #, no-c-format
 msgid ""
-"You <emphasis>must</emphasis> specify these three parameters in your "
-"<literal>testng.xml</literal>."
+"You do not have to configure any of these parameters if you use HSQL and "
+"have no binary imports. However, unless you specify "
+"<literal>datasourceJndiName</literal> in your test configuration, you will "
+"have to call <literal>setDatabaseJndiName()</literal> before your test runs. "
+"If you are not using HSQL or MySQL, you need to override some methods. See "
+"the Javadoc of <literal>DBUnitSeamTest</literal> for more details."
 msgstr ""
 
-#. Tag: para
-#: Testing.xml:454
-#, no-c-format
-msgid ""
-"If you want to use DBUnitSeamTest with another database, you'll need to "
-"implement some methods. Read the javadoc of <literal>AbstractDBUnitSeamTest</"
-"literal> for more."
-msgstr ""
-
 #. Tag: title
-#: Testing.xml:463
+#: Testing.xml:461
 #, no-c-format
 msgid "Integration Testing Seam Mail"
 msgstr ""
 
 #. Tag: caution
-#: Testing.xml:465
+#: Testing.xml:463
 #, no-c-format
 msgid "Warning! This feature is still under development."
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:469
+#: Testing.xml:467
 #, no-c-format
 msgid "It's very easy to integration test your Seam Mail:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:473
+#: Testing.xml:471
 #, no-c-format
 msgid ""
 "<![CDATA[public class MailTest extends SeamTest {\n"
@@ -907,7 +903,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:475
+#: Testing.xml:473
 #, no-c-format
 msgid ""
 "We create a new <literal>FacesRequest</literal> as normal. Inside the "
@@ -919,7 +915,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:484
+#: Testing.xml:482
 #, no-c-format
 msgid ""
 "There is no support for rendering standard JSF components so you can't test "

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pa-IN/Webservices.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pa-IN/Webservices.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pa-IN/Webservices.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-11 07:43+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -955,45 +955,59 @@
 #: Webservices.xml:449
 #, no-c-format
 msgid ""
-"Seam includes an extended unit testing superclass that helps you in creating "
-"unit tests for a RESTful architecture. Extend the <literal>ResourceSeamTest</"
-"literal> class to emulate HTTP requests/response cycles:"
+"Seam includes a unit testing utility class that helps you create unit tests "
+"for a RESTful architecture. Extend the <literal>SeamTest</literal> class as "
+"usual and use the <literal>ResourceRequestEnvironment.ResourceRequest</"
+"literal> to emulate HTTP requests/response cycles:"
 msgstr ""
 
 #. Tag: programlisting
-#: Webservices.xml:454
+#: Webservices.xml:455
 #, no-c-format
 msgid ""
-"<![CDATA[import org.jboss.seam.resteasy.testfwk.ResourceSeamTest;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletResponse;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletRequest;\n"
+"<![CDATA[import org.jboss.seam.mock.ResourceRequestEnvironment;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletRequest;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletResponse;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment."
+"ResourceRequest;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment.Method;\n"
 "\n"
-"public class MyTest extends ResourceSeamTest {\n"
+"public class MyTest extends SeamTest {\n"
 "\n"
-"   @Override\n"
-"   public Map<String, Object> getDefaultHeaders()\n"
-"   {\n"
-"      return new HashMap<String, Object>()\n"
-"      {{\n"
-"            put(\"Accept\", \"text/plain\");\n"
-"      }};\n"
+"   ResourceRequestEnvironment sharedEnvironment;\n"
+"\n"
+"   @BeforeClass\n"
+"   public void prepareSharedEnvironment() throws Exception {\n"
+"       sharedEnvironment = new ResourceRequestEnvironment(this) {\n"
+"            @Override\n"
+"            public Map<String, Object> getDefaultHeaders() {\n"
+"               return new HashMap<String, Object>() {{\n"
+"                   put(\"Accept\", \"text/plain\");\n"
+"               }};\n"
+"            }\n"
+"         };\n"
 "   }\n"
 "\n"
 "   @Test\n"
 "   public void test() throws Exception\n"
 "   {\n"
-"      new ResourceRequest(Method.GET, \"/my/relative/uri)\n"
+"      //Not shared: new ResourceRequest(new ResourceRequestEnvironment"
+"(this), Method.GET, \"/my/relative/uri)\n"
+"\n"
+"      new ResourceRequest(sharedEnvironment, Method.GET, \"/my/relative/"
+"uri)\n"
 "      {\n"
-"\n"
 "         @Override\n"
-"         protected void prepareRequest(MockHttpServletRequest request)\n"
+"         protected void prepareRequest(EnhancedMockHttpServletRequest "
+"request)\n"
 "         {\n"
 "            request.addQueryParameter(\"foo\", \"123\");\n"
 "            request.addHeader(\"Accept-Language\", \"en_US, de\");\n"
 "         }\n"
 "\n"
 "         @Override\n"
-"         protected void onResponse(MockHttpServletResponse response)\n"
+"         protected void onResponse(EnhancedMockHttpServletResponse "
+"response)\n"
 "         {\n"
 "            assert response.getStatus() == 200;\n"
 "            assert response.getContentAsString().equals(\"foobar\");\n"
@@ -1001,40 +1015,28 @@
 "\n"
 "      }.run();\n"
 "   }\n"
-"\n"
 "}]]>"
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:456
+#: Webservices.xml:457
 #, no-c-format
 msgid ""
 "This test only executes local calls, it does not communicate with the "
 "<literal>SeamResourceServlet</literal> through TCP. The mock request is "
 "passed through the Seam servlet and filters and the response is then "
 "available for test assertions. Overriding the <literal>getDefaultHeaders()</"
-"literal> method allows you to set request headers for every test method in "
-"the test class."
+"literal> method in a shared instance of <literal>ResourceRequestEnvironment</"
+"literal> allows you to set request headers for every test method in the test "
+"class."
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:463
+#: Webservices.xml:465
 #, no-c-format
 msgid ""
 "Note that a <literal>ResourceRequest</literal> has to be executed in a "
 "<literal>@Test</literal> method or in a <literal>@BeforeMethod</literal> "
-"callback. You can and should not execute it in any other callback, such as "
-"<literal>@BeforeClass</literal>. (This is an implementation limitation we "
-"will remove in a future update.)"
+"callback. You can not execute it in any other callback, such as "
+"<literal>@BeforeClass</literal>."
 msgstr ""
-
-#. Tag: para
-#: Webservices.xml:470
-#, no-c-format
-msgid ""
-"Also note that the imported mock objects are not the same as the mock "
-"objects you use in other Seam unit tests, which are in the package "
-"<literal>org.jboss.seam.mock</literal>. The <literal>org.jboss.seam.resteasy."
-"testfwk</literal> variations mimic real requests and responses much more "
-"closely."
-msgstr ""

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Annotations.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Annotations.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Annotations.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:47+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Author_Group.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Author_Group.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Author_Group.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:47+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Book_Info.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Book_Info.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Book_Info.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:47+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Cache.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Cache.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Cache.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:47+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/ClusteringAndEJBPassivation.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/ClusteringAndEJBPassivation.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/ClusteringAndEJBPassivation.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:47+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Components.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Components.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Components.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:47+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Concepts.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Concepts.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Concepts.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:47+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Configuration.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Configuration.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Configuration.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:47+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Controls.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Controls.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Controls.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:47+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Conversations.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Conversations.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Conversations.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Dependencies.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Dependencies.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Dependencies.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Drools.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Drools.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Drools.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Elenhancements.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Elenhancements.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Elenhancements.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Events.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Events.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Events.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Excel.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Excel.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Excel.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Feedback.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Feedback.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Feedback.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Framework.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Framework.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Framework.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Getting_Started_With_JBoss_Tools.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Getting_Started_With_JBoss_Tools.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Getting_Started_With_JBoss_Tools.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Gettingstarted.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Gettingstarted.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Gettingstarted.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Glassfish.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Glassfish.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Glassfish.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Groovy.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Groovy.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Groovy.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Guice.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Guice.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Guice.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Gwt.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Gwt.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Gwt.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Hsearch.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Hsearch.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Hsearch.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/I18n.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/I18n.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/I18n.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Itext.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Itext.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Itext.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Jbpm.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Jbpm.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Jbpm.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Jms.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Jms.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Jms.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Mail.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Mail.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Mail.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Performance.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Performance.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Performance.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Persistence.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Persistence.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Persistence.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Preface.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Preface.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Preface.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Remoting.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Remoting.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Remoting.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Revision_History.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Revision_History.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Revision_History.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Rss.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Rss.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Rss.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Security.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Security.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Security.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Spring.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Spring.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Spring.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Testing.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Testing.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Testing.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"
@@ -718,15 +718,15 @@
 #: Testing.xml:390
 #, no-c-format
 msgid ""
-"If you need to insert or clean data in your database before each test you "
+"If you want to insert or clean data in your database before each test you "
 "can use Seam's integration with DBUnit. To do this, extend "
-"<literal>DBUnitSeamTest</literal> rather than SeamTest."
+"<literal>DBUnitSeamTest</literal> rather than <literal>SeamTest</literal>."
 msgstr ""
 
 #. Tag: para
 #: Testing.xml:396
 #, no-c-format
-msgid "You need to provide a dataset for DBUnit."
+msgid "You have to provide a dataset for DBUnit."
 msgstr ""
 
 #. Tag: caution
@@ -761,12 +761,12 @@
 #: Testing.xml:408
 #, no-c-format
 msgid ""
-"and tell Seam about it by overriding <literal>prepareDBUnitOperations()</"
-"literal>:"
+"In your test class, configure your dataset with overriding "
+"<literal>prepareDBUnitOperations()</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:412
+#: Testing.xml:413
 #, no-c-format
 msgid ""
 "<![CDATA[protected void prepareDBUnitOperations() {\n"
@@ -777,7 +777,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:414
+#: Testing.xml:415
 #, no-c-format
 msgid ""
 "<literal>DataSetOperation</literal> defaults to <literal>DatabaseOperation."
@@ -788,7 +788,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:422
+#: Testing.xml:423
 #, no-c-format
 msgid ""
 "If you require extra cleanup after a test method executes, add operations to "
@@ -796,7 +796,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:427
+#: Testing.xml:428
 #, no-c-format
 msgid ""
 "You need to tell DBUnit about the datasource you are using by setting a "
@@ -804,7 +804,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:432
+#: Testing.xml:433
 #, no-c-format
 msgid ""
 "<![CDATA[<parameter name=\"datasourceJndiName\" value=\"java:/"
@@ -812,70 +812,66 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:434
+#: Testing.xml:435
 #, no-c-format
 msgid ""
 "DBUnitSeamTest has support for MySQL and HSQL - you need to tell it which "
-"database is being used:"
+"database is being used, otherwise it defaults to HSQL:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:439
+#: Testing.xml:440
 #, no-c-format
-msgid "<![CDATA[<parameter name=\"database\" value=\"HSQL\" />]]>"
+msgid "<![CDATA[<parameter name=\"database\" value=\"MYSQL\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:441
+#: Testing.xml:442
 #, no-c-format
 msgid ""
 "It also allows you to insert binary data into the test data set (n.b. this "
-"is untested on Windows). You need to tell it where to locate these resources:"
+"is untested on Windows). You need to tell it where to locate these resources "
+"on your classpath:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:447
+#: Testing.xml:448
 #, no-c-format
 msgid "<![CDATA[<parameter name=\"binaryDir\" value=\"images/\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:449
+#: Testing.xml:450
 #, no-c-format
 msgid ""
-"You <emphasis>must</emphasis> specify these three parameters in your "
-"<literal>testng.xml</literal>."
+"You do not have to configure any of these parameters if you use HSQL and "
+"have no binary imports. However, unless you specify "
+"<literal>datasourceJndiName</literal> in your test configuration, you will "
+"have to call <literal>setDatabaseJndiName()</literal> before your test runs. "
+"If you are not using HSQL or MySQL, you need to override some methods. See "
+"the Javadoc of <literal>DBUnitSeamTest</literal> for more details."
 msgstr ""
 
-#. Tag: para
-#: Testing.xml:454
-#, no-c-format
-msgid ""
-"If you want to use DBUnitSeamTest with another database, you'll need to "
-"implement some methods. Read the javadoc of <literal>AbstractDBUnitSeamTest</"
-"literal> for more."
-msgstr ""
-
 #. Tag: title
-#: Testing.xml:463
+#: Testing.xml:461
 #, no-c-format
 msgid "Integration Testing Seam Mail"
 msgstr ""
 
 #. Tag: caution
-#: Testing.xml:465
+#: Testing.xml:463
 #, no-c-format
 msgid "Warning! This feature is still under development."
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:469
+#: Testing.xml:467
 #, no-c-format
 msgid "It's very easy to integration test your Seam Mail:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:473
+#: Testing.xml:471
 #, no-c-format
 msgid ""
 "<![CDATA[public class MailTest extends SeamTest {\n"
@@ -908,7 +904,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:475
+#: Testing.xml:473
 #, no-c-format
 msgid ""
 "We create a new <literal>FacesRequest</literal> as normal. Inside the "
@@ -920,7 +916,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:484
+#: Testing.xml:482
 #, no-c-format
 msgid ""
 "There is no support for rendering standard JSF components so you can't test "

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Text.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Text.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Text.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Tools.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Tools.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Tools.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Tutorial.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Tutorial.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Tutorial.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Validation.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Validation.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Validation.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Weblogic.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Weblogic.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Weblogic.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Webservices.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Webservices.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Webservices.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"
@@ -956,45 +956,59 @@
 #: Webservices.xml:449
 #, no-c-format
 msgid ""
-"Seam includes an extended unit testing superclass that helps you in creating "
-"unit tests for a RESTful architecture. Extend the <literal>ResourceSeamTest</"
-"literal> class to emulate HTTP requests/response cycles:"
+"Seam includes a unit testing utility class that helps you create unit tests "
+"for a RESTful architecture. Extend the <literal>SeamTest</literal> class as "
+"usual and use the <literal>ResourceRequestEnvironment.ResourceRequest</"
+"literal> to emulate HTTP requests/response cycles:"
 msgstr ""
 
 #. Tag: programlisting
-#: Webservices.xml:454
+#: Webservices.xml:455
 #, no-c-format
 msgid ""
-"<![CDATA[import org.jboss.seam.resteasy.testfwk.ResourceSeamTest;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletResponse;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletRequest;\n"
+"<![CDATA[import org.jboss.seam.mock.ResourceRequestEnvironment;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletRequest;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletResponse;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment."
+"ResourceRequest;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment.Method;\n"
 "\n"
-"public class MyTest extends ResourceSeamTest {\n"
+"public class MyTest extends SeamTest {\n"
 "\n"
-"   @Override\n"
-"   public Map<String, Object> getDefaultHeaders()\n"
-"   {\n"
-"      return new HashMap<String, Object>()\n"
-"      {{\n"
-"            put(\"Accept\", \"text/plain\");\n"
-"      }};\n"
+"   ResourceRequestEnvironment sharedEnvironment;\n"
+"\n"
+"   @BeforeClass\n"
+"   public void prepareSharedEnvironment() throws Exception {\n"
+"       sharedEnvironment = new ResourceRequestEnvironment(this) {\n"
+"            @Override\n"
+"            public Map<String, Object> getDefaultHeaders() {\n"
+"               return new HashMap<String, Object>() {{\n"
+"                   put(\"Accept\", \"text/plain\");\n"
+"               }};\n"
+"            }\n"
+"         };\n"
 "   }\n"
 "\n"
 "   @Test\n"
 "   public void test() throws Exception\n"
 "   {\n"
-"      new ResourceRequest(Method.GET, \"/my/relative/uri)\n"
+"      //Not shared: new ResourceRequest(new ResourceRequestEnvironment"
+"(this), Method.GET, \"/my/relative/uri)\n"
+"\n"
+"      new ResourceRequest(sharedEnvironment, Method.GET, \"/my/relative/"
+"uri)\n"
 "      {\n"
-"\n"
 "         @Override\n"
-"         protected void prepareRequest(MockHttpServletRequest request)\n"
+"         protected void prepareRequest(EnhancedMockHttpServletRequest "
+"request)\n"
 "         {\n"
 "            request.addQueryParameter(\"foo\", \"123\");\n"
 "            request.addHeader(\"Accept-Language\", \"en_US, de\");\n"
 "         }\n"
 "\n"
 "         @Override\n"
-"         protected void onResponse(MockHttpServletResponse response)\n"
+"         protected void onResponse(EnhancedMockHttpServletResponse "
+"response)\n"
 "         {\n"
 "            assert response.getStatus() == 200;\n"
 "            assert response.getContentAsString().equals(\"foobar\");\n"
@@ -1002,40 +1016,28 @@
 "\n"
 "      }.run();\n"
 "   }\n"
-"\n"
 "}]]>"
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:456
+#: Webservices.xml:457
 #, no-c-format
 msgid ""
 "This test only executes local calls, it does not communicate with the "
 "<literal>SeamResourceServlet</literal> through TCP. The mock request is "
 "passed through the Seam servlet and filters and the response is then "
 "available for test assertions. Overriding the <literal>getDefaultHeaders()</"
-"literal> method allows you to set request headers for every test method in "
-"the test class."
+"literal> method in a shared instance of <literal>ResourceRequestEnvironment</"
+"literal> allows you to set request headers for every test method in the test "
+"class."
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:463
+#: Webservices.xml:465
 #, no-c-format
 msgid ""
 "Note that a <literal>ResourceRequest</literal> has to be executed in a "
 "<literal>@Test</literal> method or in a <literal>@BeforeMethod</literal> "
-"callback. You can and should not execute it in any other callback, such as "
-"<literal>@BeforeClass</literal>. (This is an implementation limitation we "
-"will remove in a future update.)"
+"callback. You can not execute it in any other callback, such as "
+"<literal>@BeforeClass</literal>."
 msgstr ""
-
-#. Tag: para
-#: Webservices.xml:470
-#, no-c-format
-msgid ""
-"Also note that the imported mock objects are not the same as the mock "
-"objects you use in other Seam unit tests, which are in the package "
-"<literal>org.jboss.seam.mock</literal>. The <literal>org.jboss.seam.resteasy."
-"testfwk</literal> variations mimic real requests and responses much more "
-"closely."
-msgstr ""

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Websphere.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Websphere.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Websphere.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Wicket.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Wicket.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Wicket.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Xml.pot
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Xml.pot	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pot/Xml.pot	2009-07-08 14:44:47 UTC (rev 11262)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-07-07 16:48+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+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"

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pt-BR/Testing.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pt-BR/Testing.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pt-BR/Testing.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-05 18:37+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -717,15 +717,15 @@
 #: Testing.xml:390
 #, no-c-format
 msgid ""
-"If you need to insert or clean data in your database before each test you "
+"If you want to insert or clean data in your database before each test you "
 "can use Seam's integration with DBUnit. To do this, extend "
-"<literal>DBUnitSeamTest</literal> rather than SeamTest."
+"<literal>DBUnitSeamTest</literal> rather than <literal>SeamTest</literal>."
 msgstr ""
 
 #. Tag: para
 #: Testing.xml:396
 #, no-c-format
-msgid "You need to provide a dataset for DBUnit."
+msgid "You have to provide a dataset for DBUnit."
 msgstr ""
 
 #. Tag: caution
@@ -760,12 +760,12 @@
 #: Testing.xml:408
 #, no-c-format
 msgid ""
-"and tell Seam about it by overriding <literal>prepareDBUnitOperations()</"
-"literal>:"
+"In your test class, configure your dataset with overriding "
+"<literal>prepareDBUnitOperations()</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:412
+#: Testing.xml:413
 #, no-c-format
 msgid ""
 "<![CDATA[protected void prepareDBUnitOperations() {\n"
@@ -776,7 +776,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:414
+#: Testing.xml:415
 #, no-c-format
 msgid ""
 "<literal>DataSetOperation</literal> defaults to <literal>DatabaseOperation."
@@ -787,7 +787,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:422
+#: Testing.xml:423
 #, no-c-format
 msgid ""
 "If you require extra cleanup after a test method executes, add operations to "
@@ -795,7 +795,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:427
+#: Testing.xml:428
 #, no-c-format
 msgid ""
 "You need to tell DBUnit about the datasource you are using by setting a "
@@ -803,7 +803,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:432
+#: Testing.xml:433
 #, no-c-format
 msgid ""
 "<![CDATA[<parameter name=\"datasourceJndiName\" value=\"java:/"
@@ -811,70 +811,66 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:434
+#: Testing.xml:435
 #, no-c-format
 msgid ""
 "DBUnitSeamTest has support for MySQL and HSQL - you need to tell it which "
-"database is being used:"
+"database is being used, otherwise it defaults to HSQL:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:439
+#: Testing.xml:440
 #, no-c-format
-msgid "<![CDATA[<parameter name=\"database\" value=\"HSQL\" />]]>"
+msgid "<![CDATA[<parameter name=\"database\" value=\"MYSQL\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:441
+#: Testing.xml:442
 #, no-c-format
 msgid ""
 "It also allows you to insert binary data into the test data set (n.b. this "
-"is untested on Windows). You need to tell it where to locate these resources:"
+"is untested on Windows). You need to tell it where to locate these resources "
+"on your classpath:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:447
+#: Testing.xml:448
 #, no-c-format
 msgid "<![CDATA[<parameter name=\"binaryDir\" value=\"images/\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:449
+#: Testing.xml:450
 #, no-c-format
 msgid ""
-"You <emphasis>must</emphasis> specify these three parameters in your "
-"<literal>testng.xml</literal>."
+"You do not have to configure any of these parameters if you use HSQL and "
+"have no binary imports. However, unless you specify "
+"<literal>datasourceJndiName</literal> in your test configuration, you will "
+"have to call <literal>setDatabaseJndiName()</literal> before your test runs. "
+"If you are not using HSQL or MySQL, you need to override some methods. See "
+"the Javadoc of <literal>DBUnitSeamTest</literal> for more details."
 msgstr ""
 
-#. Tag: para
-#: Testing.xml:454
-#, no-c-format
-msgid ""
-"If you want to use DBUnitSeamTest with another database, you'll need to "
-"implement some methods. Read the javadoc of <literal>AbstractDBUnitSeamTest</"
-"literal> for more."
-msgstr ""
-
 #. Tag: title
-#: Testing.xml:463
+#: Testing.xml:461
 #, no-c-format
 msgid "Integration Testing Seam Mail"
 msgstr ""
 
 #. Tag: caution
-#: Testing.xml:465
+#: Testing.xml:463
 #, no-c-format
 msgid "Warning! This feature is still under development."
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:469
+#: Testing.xml:467
 #, no-c-format
 msgid "It's very easy to integration test your Seam Mail:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:473
+#: Testing.xml:471
 #, no-c-format
 msgid ""
 "<![CDATA[public class MailTest extends SeamTest {\n"
@@ -907,7 +903,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:475
+#: Testing.xml:473
 #, no-c-format
 msgid ""
 "We create a new <literal>FacesRequest</literal> as normal. Inside the "
@@ -919,7 +915,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:484
+#: Testing.xml:482
 #, no-c-format
 msgid ""
 "There is no support for rendering standard JSF components so you can't test "

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/pt-BR/Webservices.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/pt-BR/Webservices.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/pt-BR/Webservices.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-11 07:43+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -955,45 +955,59 @@
 #: Webservices.xml:449
 #, no-c-format
 msgid ""
-"Seam includes an extended unit testing superclass that helps you in creating "
-"unit tests for a RESTful architecture. Extend the <literal>ResourceSeamTest</"
-"literal> class to emulate HTTP requests/response cycles:"
+"Seam includes a unit testing utility class that helps you create unit tests "
+"for a RESTful architecture. Extend the <literal>SeamTest</literal> class as "
+"usual and use the <literal>ResourceRequestEnvironment.ResourceRequest</"
+"literal> to emulate HTTP requests/response cycles:"
 msgstr ""
 
 #. Tag: programlisting
-#: Webservices.xml:454
+#: Webservices.xml:455
 #, no-c-format
 msgid ""
-"<![CDATA[import org.jboss.seam.resteasy.testfwk.ResourceSeamTest;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletResponse;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletRequest;\n"
+"<![CDATA[import org.jboss.seam.mock.ResourceRequestEnvironment;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletRequest;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletResponse;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment."
+"ResourceRequest;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment.Method;\n"
 "\n"
-"public class MyTest extends ResourceSeamTest {\n"
+"public class MyTest extends SeamTest {\n"
 "\n"
-"   @Override\n"
-"   public Map<String, Object> getDefaultHeaders()\n"
-"   {\n"
-"      return new HashMap<String, Object>()\n"
-"      {{\n"
-"            put(\"Accept\", \"text/plain\");\n"
-"      }};\n"
+"   ResourceRequestEnvironment sharedEnvironment;\n"
+"\n"
+"   @BeforeClass\n"
+"   public void prepareSharedEnvironment() throws Exception {\n"
+"       sharedEnvironment = new ResourceRequestEnvironment(this) {\n"
+"            @Override\n"
+"            public Map<String, Object> getDefaultHeaders() {\n"
+"               return new HashMap<String, Object>() {{\n"
+"                   put(\"Accept\", \"text/plain\");\n"
+"               }};\n"
+"            }\n"
+"         };\n"
 "   }\n"
 "\n"
 "   @Test\n"
 "   public void test() throws Exception\n"
 "   {\n"
-"      new ResourceRequest(Method.GET, \"/my/relative/uri)\n"
+"      //Not shared: new ResourceRequest(new ResourceRequestEnvironment"
+"(this), Method.GET, \"/my/relative/uri)\n"
+"\n"
+"      new ResourceRequest(sharedEnvironment, Method.GET, \"/my/relative/"
+"uri)\n"
 "      {\n"
-"\n"
 "         @Override\n"
-"         protected void prepareRequest(MockHttpServletRequest request)\n"
+"         protected void prepareRequest(EnhancedMockHttpServletRequest "
+"request)\n"
 "         {\n"
 "            request.addQueryParameter(\"foo\", \"123\");\n"
 "            request.addHeader(\"Accept-Language\", \"en_US, de\");\n"
 "         }\n"
 "\n"
 "         @Override\n"
-"         protected void onResponse(MockHttpServletResponse response)\n"
+"         protected void onResponse(EnhancedMockHttpServletResponse "
+"response)\n"
 "         {\n"
 "            assert response.getStatus() == 200;\n"
 "            assert response.getContentAsString().equals(\"foobar\");\n"
@@ -1001,40 +1015,28 @@
 "\n"
 "      }.run();\n"
 "   }\n"
-"\n"
 "}]]>"
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:456
+#: Webservices.xml:457
 #, no-c-format
 msgid ""
 "This test only executes local calls, it does not communicate with the "
 "<literal>SeamResourceServlet</literal> through TCP. The mock request is "
 "passed through the Seam servlet and filters and the response is then "
 "available for test assertions. Overriding the <literal>getDefaultHeaders()</"
-"literal> method allows you to set request headers for every test method in "
-"the test class."
+"literal> method in a shared instance of <literal>ResourceRequestEnvironment</"
+"literal> allows you to set request headers for every test method in the test "
+"class."
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:463
+#: Webservices.xml:465
 #, no-c-format
 msgid ""
 "Note that a <literal>ResourceRequest</literal> has to be executed in a "
 "<literal>@Test</literal> method or in a <literal>@BeforeMethod</literal> "
-"callback. You can and should not execute it in any other callback, such as "
-"<literal>@BeforeClass</literal>. (This is an implementation limitation we "
-"will remove in a future update.)"
+"callback. You can not execute it in any other callback, such as "
+"<literal>@BeforeClass</literal>."
 msgstr ""
-
-#. Tag: para
-#: Webservices.xml:470
-#, no-c-format
-msgid ""
-"Also note that the imported mock objects are not the same as the mock "
-"objects you use in other Seam unit tests, which are in the package "
-"<literal>org.jboss.seam.mock</literal>. The <literal>org.jboss.seam.resteasy."
-"testfwk</literal> variations mimic real requests and responses much more "
-"closely."
-msgstr ""

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/ru-RU/Testing.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/ru-RU/Testing.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/ru-RU/Testing.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-05 18:37+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -717,15 +717,15 @@
 #: Testing.xml:390
 #, no-c-format
 msgid ""
-"If you need to insert or clean data in your database before each test you "
+"If you want to insert or clean data in your database before each test you "
 "can use Seam's integration with DBUnit. To do this, extend "
-"<literal>DBUnitSeamTest</literal> rather than SeamTest."
+"<literal>DBUnitSeamTest</literal> rather than <literal>SeamTest</literal>."
 msgstr ""
 
 #. Tag: para
 #: Testing.xml:396
 #, no-c-format
-msgid "You need to provide a dataset for DBUnit."
+msgid "You have to provide a dataset for DBUnit."
 msgstr ""
 
 #. Tag: caution
@@ -760,12 +760,12 @@
 #: Testing.xml:408
 #, no-c-format
 msgid ""
-"and tell Seam about it by overriding <literal>prepareDBUnitOperations()</"
-"literal>:"
+"In your test class, configure your dataset with overriding "
+"<literal>prepareDBUnitOperations()</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:412
+#: Testing.xml:413
 #, no-c-format
 msgid ""
 "<![CDATA[protected void prepareDBUnitOperations() {\n"
@@ -776,7 +776,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:414
+#: Testing.xml:415
 #, no-c-format
 msgid ""
 "<literal>DataSetOperation</literal> defaults to <literal>DatabaseOperation."
@@ -787,7 +787,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:422
+#: Testing.xml:423
 #, no-c-format
 msgid ""
 "If you require extra cleanup after a test method executes, add operations to "
@@ -795,7 +795,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:427
+#: Testing.xml:428
 #, no-c-format
 msgid ""
 "You need to tell DBUnit about the datasource you are using by setting a "
@@ -803,7 +803,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:432
+#: Testing.xml:433
 #, no-c-format
 msgid ""
 "<![CDATA[<parameter name=\"datasourceJndiName\" value=\"java:/"
@@ -811,70 +811,66 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:434
+#: Testing.xml:435
 #, no-c-format
 msgid ""
 "DBUnitSeamTest has support for MySQL and HSQL - you need to tell it which "
-"database is being used:"
+"database is being used, otherwise it defaults to HSQL:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:439
+#: Testing.xml:440
 #, no-c-format
-msgid "<![CDATA[<parameter name=\"database\" value=\"HSQL\" />]]>"
+msgid "<![CDATA[<parameter name=\"database\" value=\"MYSQL\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:441
+#: Testing.xml:442
 #, no-c-format
 msgid ""
 "It also allows you to insert binary data into the test data set (n.b. this "
-"is untested on Windows). You need to tell it where to locate these resources:"
+"is untested on Windows). You need to tell it where to locate these resources "
+"on your classpath:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:447
+#: Testing.xml:448
 #, no-c-format
 msgid "<![CDATA[<parameter name=\"binaryDir\" value=\"images/\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:449
+#: Testing.xml:450
 #, no-c-format
 msgid ""
-"You <emphasis>must</emphasis> specify these three parameters in your "
-"<literal>testng.xml</literal>."
+"You do not have to configure any of these parameters if you use HSQL and "
+"have no binary imports. However, unless you specify "
+"<literal>datasourceJndiName</literal> in your test configuration, you will "
+"have to call <literal>setDatabaseJndiName()</literal> before your test runs. "
+"If you are not using HSQL or MySQL, you need to override some methods. See "
+"the Javadoc of <literal>DBUnitSeamTest</literal> for more details."
 msgstr ""
 
-#. Tag: para
-#: Testing.xml:454
-#, no-c-format
-msgid ""
-"If you want to use DBUnitSeamTest with another database, you'll need to "
-"implement some methods. Read the javadoc of <literal>AbstractDBUnitSeamTest</"
-"literal> for more."
-msgstr ""
-
 #. Tag: title
-#: Testing.xml:463
+#: Testing.xml:461
 #, no-c-format
 msgid "Integration Testing Seam Mail"
 msgstr ""
 
 #. Tag: caution
-#: Testing.xml:465
+#: Testing.xml:463
 #, no-c-format
 msgid "Warning! This feature is still under development."
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:469
+#: Testing.xml:467
 #, no-c-format
 msgid "It's very easy to integration test your Seam Mail:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:473
+#: Testing.xml:471
 #, no-c-format
 msgid ""
 "<![CDATA[public class MailTest extends SeamTest {\n"
@@ -907,7 +903,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:475
+#: Testing.xml:473
 #, no-c-format
 msgid ""
 "We create a new <literal>FacesRequest</literal> as normal. Inside the "
@@ -919,7 +915,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:484
+#: Testing.xml:482
 #, no-c-format
 msgid ""
 "There is no support for rendering standard JSF components so you can't test "

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/ru-RU/Webservices.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/ru-RU/Webservices.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/ru-RU/Webservices.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-11 07:43+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -955,45 +955,59 @@
 #: Webservices.xml:449
 #, no-c-format
 msgid ""
-"Seam includes an extended unit testing superclass that helps you in creating "
-"unit tests for a RESTful architecture. Extend the <literal>ResourceSeamTest</"
-"literal> class to emulate HTTP requests/response cycles:"
+"Seam includes a unit testing utility class that helps you create unit tests "
+"for a RESTful architecture. Extend the <literal>SeamTest</literal> class as "
+"usual and use the <literal>ResourceRequestEnvironment.ResourceRequest</"
+"literal> to emulate HTTP requests/response cycles:"
 msgstr ""
 
 #. Tag: programlisting
-#: Webservices.xml:454
+#: Webservices.xml:455
 #, no-c-format
 msgid ""
-"<![CDATA[import org.jboss.seam.resteasy.testfwk.ResourceSeamTest;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletResponse;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletRequest;\n"
+"<![CDATA[import org.jboss.seam.mock.ResourceRequestEnvironment;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletRequest;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletResponse;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment."
+"ResourceRequest;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment.Method;\n"
 "\n"
-"public class MyTest extends ResourceSeamTest {\n"
+"public class MyTest extends SeamTest {\n"
 "\n"
-"   @Override\n"
-"   public Map<String, Object> getDefaultHeaders()\n"
-"   {\n"
-"      return new HashMap<String, Object>()\n"
-"      {{\n"
-"            put(\"Accept\", \"text/plain\");\n"
-"      }};\n"
+"   ResourceRequestEnvironment sharedEnvironment;\n"
+"\n"
+"   @BeforeClass\n"
+"   public void prepareSharedEnvironment() throws Exception {\n"
+"       sharedEnvironment = new ResourceRequestEnvironment(this) {\n"
+"            @Override\n"
+"            public Map<String, Object> getDefaultHeaders() {\n"
+"               return new HashMap<String, Object>() {{\n"
+"                   put(\"Accept\", \"text/plain\");\n"
+"               }};\n"
+"            }\n"
+"         };\n"
 "   }\n"
 "\n"
 "   @Test\n"
 "   public void test() throws Exception\n"
 "   {\n"
-"      new ResourceRequest(Method.GET, \"/my/relative/uri)\n"
+"      //Not shared: new ResourceRequest(new ResourceRequestEnvironment"
+"(this), Method.GET, \"/my/relative/uri)\n"
+"\n"
+"      new ResourceRequest(sharedEnvironment, Method.GET, \"/my/relative/"
+"uri)\n"
 "      {\n"
-"\n"
 "         @Override\n"
-"         protected void prepareRequest(MockHttpServletRequest request)\n"
+"         protected void prepareRequest(EnhancedMockHttpServletRequest "
+"request)\n"
 "         {\n"
 "            request.addQueryParameter(\"foo\", \"123\");\n"
 "            request.addHeader(\"Accept-Language\", \"en_US, de\");\n"
 "         }\n"
 "\n"
 "         @Override\n"
-"         protected void onResponse(MockHttpServletResponse response)\n"
+"         protected void onResponse(EnhancedMockHttpServletResponse "
+"response)\n"
 "         {\n"
 "            assert response.getStatus() == 200;\n"
 "            assert response.getContentAsString().equals(\"foobar\");\n"
@@ -1001,40 +1015,28 @@
 "\n"
 "      }.run();\n"
 "   }\n"
-"\n"
 "}]]>"
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:456
+#: Webservices.xml:457
 #, no-c-format
 msgid ""
 "This test only executes local calls, it does not communicate with the "
 "<literal>SeamResourceServlet</literal> through TCP. The mock request is "
 "passed through the Seam servlet and filters and the response is then "
 "available for test assertions. Overriding the <literal>getDefaultHeaders()</"
-"literal> method allows you to set request headers for every test method in "
-"the test class."
+"literal> method in a shared instance of <literal>ResourceRequestEnvironment</"
+"literal> allows you to set request headers for every test method in the test "
+"class."
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:463
+#: Webservices.xml:465
 #, no-c-format
 msgid ""
 "Note that a <literal>ResourceRequest</literal> has to be executed in a "
 "<literal>@Test</literal> method or in a <literal>@BeforeMethod</literal> "
-"callback. You can and should not execute it in any other callback, such as "
-"<literal>@BeforeClass</literal>. (This is an implementation limitation we "
-"will remove in a future update.)"
+"callback. You can not execute it in any other callback, such as "
+"<literal>@BeforeClass</literal>."
 msgstr ""
-
-#. Tag: para
-#: Webservices.xml:470
-#, no-c-format
-msgid ""
-"Also note that the imported mock objects are not the same as the mock "
-"objects you use in other Seam unit tests, which are in the package "
-"<literal>org.jboss.seam.mock</literal>. The <literal>org.jboss.seam.resteasy."
-"testfwk</literal> variations mimic real requests and responses much more "
-"closely."
-msgstr ""

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/si-LK/Testing.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/si-LK/Testing.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/si-LK/Testing.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-05 18:37+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -717,15 +717,15 @@
 #: Testing.xml:390
 #, no-c-format
 msgid ""
-"If you need to insert or clean data in your database before each test you "
+"If you want to insert or clean data in your database before each test you "
 "can use Seam's integration with DBUnit. To do this, extend "
-"<literal>DBUnitSeamTest</literal> rather than SeamTest."
+"<literal>DBUnitSeamTest</literal> rather than <literal>SeamTest</literal>."
 msgstr ""
 
 #. Tag: para
 #: Testing.xml:396
 #, no-c-format
-msgid "You need to provide a dataset for DBUnit."
+msgid "You have to provide a dataset for DBUnit."
 msgstr ""
 
 #. Tag: caution
@@ -760,12 +760,12 @@
 #: Testing.xml:408
 #, no-c-format
 msgid ""
-"and tell Seam about it by overriding <literal>prepareDBUnitOperations()</"
-"literal>:"
+"In your test class, configure your dataset with overriding "
+"<literal>prepareDBUnitOperations()</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:412
+#: Testing.xml:413
 #, no-c-format
 msgid ""
 "<![CDATA[protected void prepareDBUnitOperations() {\n"
@@ -776,7 +776,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:414
+#: Testing.xml:415
 #, no-c-format
 msgid ""
 "<literal>DataSetOperation</literal> defaults to <literal>DatabaseOperation."
@@ -787,7 +787,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:422
+#: Testing.xml:423
 #, no-c-format
 msgid ""
 "If you require extra cleanup after a test method executes, add operations to "
@@ -795,7 +795,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:427
+#: Testing.xml:428
 #, no-c-format
 msgid ""
 "You need to tell DBUnit about the datasource you are using by setting a "
@@ -803,7 +803,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:432
+#: Testing.xml:433
 #, no-c-format
 msgid ""
 "<![CDATA[<parameter name=\"datasourceJndiName\" value=\"java:/"
@@ -811,70 +811,66 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:434
+#: Testing.xml:435
 #, no-c-format
 msgid ""
 "DBUnitSeamTest has support for MySQL and HSQL - you need to tell it which "
-"database is being used:"
+"database is being used, otherwise it defaults to HSQL:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:439
+#: Testing.xml:440
 #, no-c-format
-msgid "<![CDATA[<parameter name=\"database\" value=\"HSQL\" />]]>"
+msgid "<![CDATA[<parameter name=\"database\" value=\"MYSQL\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:441
+#: Testing.xml:442
 #, no-c-format
 msgid ""
 "It also allows you to insert binary data into the test data set (n.b. this "
-"is untested on Windows). You need to tell it where to locate these resources:"
+"is untested on Windows). You need to tell it where to locate these resources "
+"on your classpath:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:447
+#: Testing.xml:448
 #, no-c-format
 msgid "<![CDATA[<parameter name=\"binaryDir\" value=\"images/\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:449
+#: Testing.xml:450
 #, no-c-format
 msgid ""
-"You <emphasis>must</emphasis> specify these three parameters in your "
-"<literal>testng.xml</literal>."
+"You do not have to configure any of these parameters if you use HSQL and "
+"have no binary imports. However, unless you specify "
+"<literal>datasourceJndiName</literal> in your test configuration, you will "
+"have to call <literal>setDatabaseJndiName()</literal> before your test runs. "
+"If you are not using HSQL or MySQL, you need to override some methods. See "
+"the Javadoc of <literal>DBUnitSeamTest</literal> for more details."
 msgstr ""
 
-#. Tag: para
-#: Testing.xml:454
-#, no-c-format
-msgid ""
-"If you want to use DBUnitSeamTest with another database, you'll need to "
-"implement some methods. Read the javadoc of <literal>AbstractDBUnitSeamTest</"
-"literal> for more."
-msgstr ""
-
 #. Tag: title
-#: Testing.xml:463
+#: Testing.xml:461
 #, no-c-format
 msgid "Integration Testing Seam Mail"
 msgstr ""
 
 #. Tag: caution
-#: Testing.xml:465
+#: Testing.xml:463
 #, no-c-format
 msgid "Warning! This feature is still under development."
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:469
+#: Testing.xml:467
 #, no-c-format
 msgid "It's very easy to integration test your Seam Mail:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:473
+#: Testing.xml:471
 #, no-c-format
 msgid ""
 "<![CDATA[public class MailTest extends SeamTest {\n"
@@ -907,7 +903,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:475
+#: Testing.xml:473
 #, no-c-format
 msgid ""
 "We create a new <literal>FacesRequest</literal> as normal. Inside the "
@@ -919,7 +915,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:484
+#: Testing.xml:482
 #, no-c-format
 msgid ""
 "There is no support for rendering standard JSF components so you can't test "

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/si-LK/Webservices.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/si-LK/Webservices.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/si-LK/Webservices.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-11 07:43+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -955,45 +955,59 @@
 #: Webservices.xml:449
 #, no-c-format
 msgid ""
-"Seam includes an extended unit testing superclass that helps you in creating "
-"unit tests for a RESTful architecture. Extend the <literal>ResourceSeamTest</"
-"literal> class to emulate HTTP requests/response cycles:"
+"Seam includes a unit testing utility class that helps you create unit tests "
+"for a RESTful architecture. Extend the <literal>SeamTest</literal> class as "
+"usual and use the <literal>ResourceRequestEnvironment.ResourceRequest</"
+"literal> to emulate HTTP requests/response cycles:"
 msgstr ""
 
 #. Tag: programlisting
-#: Webservices.xml:454
+#: Webservices.xml:455
 #, no-c-format
 msgid ""
-"<![CDATA[import org.jboss.seam.resteasy.testfwk.ResourceSeamTest;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletResponse;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletRequest;\n"
+"<![CDATA[import org.jboss.seam.mock.ResourceRequestEnvironment;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletRequest;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletResponse;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment."
+"ResourceRequest;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment.Method;\n"
 "\n"
-"public class MyTest extends ResourceSeamTest {\n"
+"public class MyTest extends SeamTest {\n"
 "\n"
-"   @Override\n"
-"   public Map<String, Object> getDefaultHeaders()\n"
-"   {\n"
-"      return new HashMap<String, Object>()\n"
-"      {{\n"
-"            put(\"Accept\", \"text/plain\");\n"
-"      }};\n"
+"   ResourceRequestEnvironment sharedEnvironment;\n"
+"\n"
+"   @BeforeClass\n"
+"   public void prepareSharedEnvironment() throws Exception {\n"
+"       sharedEnvironment = new ResourceRequestEnvironment(this) {\n"
+"            @Override\n"
+"            public Map<String, Object> getDefaultHeaders() {\n"
+"               return new HashMap<String, Object>() {{\n"
+"                   put(\"Accept\", \"text/plain\");\n"
+"               }};\n"
+"            }\n"
+"         };\n"
 "   }\n"
 "\n"
 "   @Test\n"
 "   public void test() throws Exception\n"
 "   {\n"
-"      new ResourceRequest(Method.GET, \"/my/relative/uri)\n"
+"      //Not shared: new ResourceRequest(new ResourceRequestEnvironment"
+"(this), Method.GET, \"/my/relative/uri)\n"
+"\n"
+"      new ResourceRequest(sharedEnvironment, Method.GET, \"/my/relative/"
+"uri)\n"
 "      {\n"
-"\n"
 "         @Override\n"
-"         protected void prepareRequest(MockHttpServletRequest request)\n"
+"         protected void prepareRequest(EnhancedMockHttpServletRequest "
+"request)\n"
 "         {\n"
 "            request.addQueryParameter(\"foo\", \"123\");\n"
 "            request.addHeader(\"Accept-Language\", \"en_US, de\");\n"
 "         }\n"
 "\n"
 "         @Override\n"
-"         protected void onResponse(MockHttpServletResponse response)\n"
+"         protected void onResponse(EnhancedMockHttpServletResponse "
+"response)\n"
 "         {\n"
 "            assert response.getStatus() == 200;\n"
 "            assert response.getContentAsString().equals(\"foobar\");\n"
@@ -1001,40 +1015,28 @@
 "\n"
 "      }.run();\n"
 "   }\n"
-"\n"
 "}]]>"
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:456
+#: Webservices.xml:457
 #, no-c-format
 msgid ""
 "This test only executes local calls, it does not communicate with the "
 "<literal>SeamResourceServlet</literal> through TCP. The mock request is "
 "passed through the Seam servlet and filters and the response is then "
 "available for test assertions. Overriding the <literal>getDefaultHeaders()</"
-"literal> method allows you to set request headers for every test method in "
-"the test class."
+"literal> method in a shared instance of <literal>ResourceRequestEnvironment</"
+"literal> allows you to set request headers for every test method in the test "
+"class."
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:463
+#: Webservices.xml:465
 #, no-c-format
 msgid ""
 "Note that a <literal>ResourceRequest</literal> has to be executed in a "
 "<literal>@Test</literal> method or in a <literal>@BeforeMethod</literal> "
-"callback. You can and should not execute it in any other callback, such as "
-"<literal>@BeforeClass</literal>. (This is an implementation limitation we "
-"will remove in a future update.)"
+"callback. You can not execute it in any other callback, such as "
+"<literal>@BeforeClass</literal>."
 msgstr ""
-
-#. Tag: para
-#: Webservices.xml:470
-#, no-c-format
-msgid ""
-"Also note that the imported mock objects are not the same as the mock "
-"objects you use in other Seam unit tests, which are in the package "
-"<literal>org.jboss.seam.mock</literal>. The <literal>org.jboss.seam.resteasy."
-"testfwk</literal> variations mimic real requests and responses much more "
-"closely."
-msgstr ""

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/sl-SL/Testing.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/sl-SL/Testing.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/sl-SL/Testing.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-05 18:37+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-21 00:37+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -717,15 +717,15 @@
 #: Testing.xml:390
 #, no-c-format
 msgid ""
-"If you need to insert or clean data in your database before each test you "
+"If you want to insert or clean data in your database before each test you "
 "can use Seam's integration with DBUnit. To do this, extend "
-"<literal>DBUnitSeamTest</literal> rather than SeamTest."
+"<literal>DBUnitSeamTest</literal> rather than <literal>SeamTest</literal>."
 msgstr ""
 
 #. Tag: para
 #: Testing.xml:396
 #, no-c-format
-msgid "You need to provide a dataset for DBUnit."
+msgid "You have to provide a dataset for DBUnit."
 msgstr ""
 
 #. Tag: caution
@@ -760,12 +760,12 @@
 #: Testing.xml:408
 #, no-c-format
 msgid ""
-"and tell Seam about it by overriding <literal>prepareDBUnitOperations()</"
-"literal>:"
+"In your test class, configure your dataset with overriding "
+"<literal>prepareDBUnitOperations()</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:412
+#: Testing.xml:413
 #, no-c-format
 msgid ""
 "<![CDATA[protected void prepareDBUnitOperations() {\n"
@@ -776,7 +776,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:414
+#: Testing.xml:415
 #, no-c-format
 msgid ""
 "<literal>DataSetOperation</literal> defaults to <literal>DatabaseOperation."
@@ -787,7 +787,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:422
+#: Testing.xml:423
 #, no-c-format
 msgid ""
 "If you require extra cleanup after a test method executes, add operations to "
@@ -795,7 +795,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:427
+#: Testing.xml:428
 #, no-c-format
 msgid ""
 "You need to tell DBUnit about the datasource you are using by setting a "
@@ -803,7 +803,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:432
+#: Testing.xml:433
 #, no-c-format
 msgid ""
 "<![CDATA[<parameter name=\"datasourceJndiName\" value=\"java:/"
@@ -811,70 +811,66 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:434
+#: Testing.xml:435
 #, no-c-format
 msgid ""
 "DBUnitSeamTest has support for MySQL and HSQL - you need to tell it which "
-"database is being used:"
+"database is being used, otherwise it defaults to HSQL:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:439
+#: Testing.xml:440
 #, no-c-format
-msgid "<![CDATA[<parameter name=\"database\" value=\"HSQL\" />]]>"
+msgid "<![CDATA[<parameter name=\"database\" value=\"MYSQL\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:441
+#: Testing.xml:442
 #, no-c-format
 msgid ""
 "It also allows you to insert binary data into the test data set (n.b. this "
-"is untested on Windows). You need to tell it where to locate these resources:"
+"is untested on Windows). You need to tell it where to locate these resources "
+"on your classpath:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:447
+#: Testing.xml:448
 #, no-c-format
 msgid "<![CDATA[<parameter name=\"binaryDir\" value=\"images/\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:449
+#: Testing.xml:450
 #, no-c-format
 msgid ""
-"You <emphasis>must</emphasis> specify these three parameters in your "
-"<literal>testng.xml</literal>."
+"You do not have to configure any of these parameters if you use HSQL and "
+"have no binary imports. However, unless you specify "
+"<literal>datasourceJndiName</literal> in your test configuration, you will "
+"have to call <literal>setDatabaseJndiName()</literal> before your test runs. "
+"If you are not using HSQL or MySQL, you need to override some methods. See "
+"the Javadoc of <literal>DBUnitSeamTest</literal> for more details."
 msgstr ""
 
-#. Tag: para
-#: Testing.xml:454
-#, no-c-format
-msgid ""
-"If you want to use DBUnitSeamTest with another database, you'll need to "
-"implement some methods. Read the javadoc of <literal>AbstractDBUnitSeamTest</"
-"literal> for more."
-msgstr ""
-
 #. Tag: title
-#: Testing.xml:463
+#: Testing.xml:461
 #, no-c-format
 msgid "Integration Testing Seam Mail"
 msgstr ""
 
 #. Tag: caution
-#: Testing.xml:465
+#: Testing.xml:463
 #, no-c-format
 msgid "Warning! This feature is still under development."
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:469
+#: Testing.xml:467
 #, no-c-format
 msgid "It's very easy to integration test your Seam Mail:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:473
+#: Testing.xml:471
 #, no-c-format
 msgid ""
 "<![CDATA[public class MailTest extends SeamTest {\n"
@@ -907,7 +903,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:475
+#: Testing.xml:473
 #, no-c-format
 msgid ""
 "We create a new <literal>FacesRequest</literal> as normal. Inside the "
@@ -919,7 +915,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:484
+#: Testing.xml:482
 #, no-c-format
 msgid ""
 "There is no support for rendering standard JSF components so you can't test "

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/sl-SL/Webservices.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/sl-SL/Webservices.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/sl-SL/Webservices.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-11 07:43+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-21 00:37+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -955,45 +955,59 @@
 #: Webservices.xml:449
 #, no-c-format
 msgid ""
-"Seam includes an extended unit testing superclass that helps you in creating "
-"unit tests for a RESTful architecture. Extend the <literal>ResourceSeamTest</"
-"literal> class to emulate HTTP requests/response cycles:"
+"Seam includes a unit testing utility class that helps you create unit tests "
+"for a RESTful architecture. Extend the <literal>SeamTest</literal> class as "
+"usual and use the <literal>ResourceRequestEnvironment.ResourceRequest</"
+"literal> to emulate HTTP requests/response cycles:"
 msgstr ""
 
 #. Tag: programlisting
-#: Webservices.xml:454
+#: Webservices.xml:455
 #, no-c-format
 msgid ""
-"<![CDATA[import org.jboss.seam.resteasy.testfwk.ResourceSeamTest;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletResponse;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletRequest;\n"
+"<![CDATA[import org.jboss.seam.mock.ResourceRequestEnvironment;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletRequest;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletResponse;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment."
+"ResourceRequest;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment.Method;\n"
 "\n"
-"public class MyTest extends ResourceSeamTest {\n"
+"public class MyTest extends SeamTest {\n"
 "\n"
-"   @Override\n"
-"   public Map<String, Object> getDefaultHeaders()\n"
-"   {\n"
-"      return new HashMap<String, Object>()\n"
-"      {{\n"
-"            put(\"Accept\", \"text/plain\");\n"
-"      }};\n"
+"   ResourceRequestEnvironment sharedEnvironment;\n"
+"\n"
+"   @BeforeClass\n"
+"   public void prepareSharedEnvironment() throws Exception {\n"
+"       sharedEnvironment = new ResourceRequestEnvironment(this) {\n"
+"            @Override\n"
+"            public Map<String, Object> getDefaultHeaders() {\n"
+"               return new HashMap<String, Object>() {{\n"
+"                   put(\"Accept\", \"text/plain\");\n"
+"               }};\n"
+"            }\n"
+"         };\n"
 "   }\n"
 "\n"
 "   @Test\n"
 "   public void test() throws Exception\n"
 "   {\n"
-"      new ResourceRequest(Method.GET, \"/my/relative/uri)\n"
+"      //Not shared: new ResourceRequest(new ResourceRequestEnvironment"
+"(this), Method.GET, \"/my/relative/uri)\n"
+"\n"
+"      new ResourceRequest(sharedEnvironment, Method.GET, \"/my/relative/"
+"uri)\n"
 "      {\n"
-"\n"
 "         @Override\n"
-"         protected void prepareRequest(MockHttpServletRequest request)\n"
+"         protected void prepareRequest(EnhancedMockHttpServletRequest "
+"request)\n"
 "         {\n"
 "            request.addQueryParameter(\"foo\", \"123\");\n"
 "            request.addHeader(\"Accept-Language\", \"en_US, de\");\n"
 "         }\n"
 "\n"
 "         @Override\n"
-"         protected void onResponse(MockHttpServletResponse response)\n"
+"         protected void onResponse(EnhancedMockHttpServletResponse "
+"response)\n"
 "         {\n"
 "            assert response.getStatus() == 200;\n"
 "            assert response.getContentAsString().equals(\"foobar\");\n"
@@ -1001,40 +1015,28 @@
 "\n"
 "      }.run();\n"
 "   }\n"
-"\n"
 "}]]>"
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:456
+#: Webservices.xml:457
 #, no-c-format
 msgid ""
 "This test only executes local calls, it does not communicate with the "
 "<literal>SeamResourceServlet</literal> through TCP. The mock request is "
 "passed through the Seam servlet and filters and the response is then "
 "available for test assertions. Overriding the <literal>getDefaultHeaders()</"
-"literal> method allows you to set request headers for every test method in "
-"the test class."
+"literal> method in a shared instance of <literal>ResourceRequestEnvironment</"
+"literal> allows you to set request headers for every test method in the test "
+"class."
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:463
+#: Webservices.xml:465
 #, no-c-format
 msgid ""
 "Note that a <literal>ResourceRequest</literal> has to be executed in a "
 "<literal>@Test</literal> method or in a <literal>@BeforeMethod</literal> "
-"callback. You can and should not execute it in any other callback, such as "
-"<literal>@BeforeClass</literal>. (This is an implementation limitation we "
-"will remove in a future update.)"
+"callback. You can not execute it in any other callback, such as "
+"<literal>@BeforeClass</literal>."
 msgstr ""
-
-#. Tag: para
-#: Webservices.xml:470
-#, no-c-format
-msgid ""
-"Also note that the imported mock objects are not the same as the mock "
-"objects you use in other Seam unit tests, which are in the package "
-"<literal>org.jboss.seam.mock</literal>. The <literal>org.jboss.seam.resteasy."
-"testfwk</literal> variations mimic real requests and responses much more "
-"closely."
-msgstr ""

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/ta-IN/Testing.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/ta-IN/Testing.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/ta-IN/Testing.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-05 18:37+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -717,15 +717,15 @@
 #: Testing.xml:390
 #, no-c-format
 msgid ""
-"If you need to insert or clean data in your database before each test you "
+"If you want to insert or clean data in your database before each test you "
 "can use Seam's integration with DBUnit. To do this, extend "
-"<literal>DBUnitSeamTest</literal> rather than SeamTest."
+"<literal>DBUnitSeamTest</literal> rather than <literal>SeamTest</literal>."
 msgstr ""
 
 #. Tag: para
 #: Testing.xml:396
 #, no-c-format
-msgid "You need to provide a dataset for DBUnit."
+msgid "You have to provide a dataset for DBUnit."
 msgstr ""
 
 #. Tag: caution
@@ -760,12 +760,12 @@
 #: Testing.xml:408
 #, no-c-format
 msgid ""
-"and tell Seam about it by overriding <literal>prepareDBUnitOperations()</"
-"literal>:"
+"In your test class, configure your dataset with overriding "
+"<literal>prepareDBUnitOperations()</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:412
+#: Testing.xml:413
 #, no-c-format
 msgid ""
 "<![CDATA[protected void prepareDBUnitOperations() {\n"
@@ -776,7 +776,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:414
+#: Testing.xml:415
 #, no-c-format
 msgid ""
 "<literal>DataSetOperation</literal> defaults to <literal>DatabaseOperation."
@@ -787,7 +787,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:422
+#: Testing.xml:423
 #, no-c-format
 msgid ""
 "If you require extra cleanup after a test method executes, add operations to "
@@ -795,7 +795,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:427
+#: Testing.xml:428
 #, no-c-format
 msgid ""
 "You need to tell DBUnit about the datasource you are using by setting a "
@@ -803,7 +803,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:432
+#: Testing.xml:433
 #, no-c-format
 msgid ""
 "<![CDATA[<parameter name=\"datasourceJndiName\" value=\"java:/"
@@ -811,70 +811,66 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:434
+#: Testing.xml:435
 #, no-c-format
 msgid ""
 "DBUnitSeamTest has support for MySQL and HSQL - you need to tell it which "
-"database is being used:"
+"database is being used, otherwise it defaults to HSQL:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:439
+#: Testing.xml:440
 #, no-c-format
-msgid "<![CDATA[<parameter name=\"database\" value=\"HSQL\" />]]>"
+msgid "<![CDATA[<parameter name=\"database\" value=\"MYSQL\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:441
+#: Testing.xml:442
 #, no-c-format
 msgid ""
 "It also allows you to insert binary data into the test data set (n.b. this "
-"is untested on Windows). You need to tell it where to locate these resources:"
+"is untested on Windows). You need to tell it where to locate these resources "
+"on your classpath:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:447
+#: Testing.xml:448
 #, no-c-format
 msgid "<![CDATA[<parameter name=\"binaryDir\" value=\"images/\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:449
+#: Testing.xml:450
 #, no-c-format
 msgid ""
-"You <emphasis>must</emphasis> specify these three parameters in your "
-"<literal>testng.xml</literal>."
+"You do not have to configure any of these parameters if you use HSQL and "
+"have no binary imports. However, unless you specify "
+"<literal>datasourceJndiName</literal> in your test configuration, you will "
+"have to call <literal>setDatabaseJndiName()</literal> before your test runs. "
+"If you are not using HSQL or MySQL, you need to override some methods. See "
+"the Javadoc of <literal>DBUnitSeamTest</literal> for more details."
 msgstr ""
 
-#. Tag: para
-#: Testing.xml:454
-#, no-c-format
-msgid ""
-"If you want to use DBUnitSeamTest with another database, you'll need to "
-"implement some methods. Read the javadoc of <literal>AbstractDBUnitSeamTest</"
-"literal> for more."
-msgstr ""
-
 #. Tag: title
-#: Testing.xml:463
+#: Testing.xml:461
 #, no-c-format
 msgid "Integration Testing Seam Mail"
 msgstr ""
 
 #. Tag: caution
-#: Testing.xml:465
+#: Testing.xml:463
 #, no-c-format
 msgid "Warning! This feature is still under development."
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:469
+#: Testing.xml:467
 #, no-c-format
 msgid "It's very easy to integration test your Seam Mail:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:473
+#: Testing.xml:471
 #, no-c-format
 msgid ""
 "<![CDATA[public class MailTest extends SeamTest {\n"
@@ -907,7 +903,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:475
+#: Testing.xml:473
 #, no-c-format
 msgid ""
 "We create a new <literal>FacesRequest</literal> as normal. Inside the "
@@ -919,7 +915,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:484
+#: Testing.xml:482
 #, no-c-format
 msgid ""
 "There is no support for rendering standard JSF components so you can't test "

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/ta-IN/Webservices.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/ta-IN/Webservices.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/ta-IN/Webservices.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-11 07:43+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -955,45 +955,59 @@
 #: Webservices.xml:449
 #, no-c-format
 msgid ""
-"Seam includes an extended unit testing superclass that helps you in creating "
-"unit tests for a RESTful architecture. Extend the <literal>ResourceSeamTest</"
-"literal> class to emulate HTTP requests/response cycles:"
+"Seam includes a unit testing utility class that helps you create unit tests "
+"for a RESTful architecture. Extend the <literal>SeamTest</literal> class as "
+"usual and use the <literal>ResourceRequestEnvironment.ResourceRequest</"
+"literal> to emulate HTTP requests/response cycles:"
 msgstr ""
 
 #. Tag: programlisting
-#: Webservices.xml:454
+#: Webservices.xml:455
 #, no-c-format
 msgid ""
-"<![CDATA[import org.jboss.seam.resteasy.testfwk.ResourceSeamTest;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletResponse;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletRequest;\n"
+"<![CDATA[import org.jboss.seam.mock.ResourceRequestEnvironment;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletRequest;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletResponse;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment."
+"ResourceRequest;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment.Method;\n"
 "\n"
-"public class MyTest extends ResourceSeamTest {\n"
+"public class MyTest extends SeamTest {\n"
 "\n"
-"   @Override\n"
-"   public Map<String, Object> getDefaultHeaders()\n"
-"   {\n"
-"      return new HashMap<String, Object>()\n"
-"      {{\n"
-"            put(\"Accept\", \"text/plain\");\n"
-"      }};\n"
+"   ResourceRequestEnvironment sharedEnvironment;\n"
+"\n"
+"   @BeforeClass\n"
+"   public void prepareSharedEnvironment() throws Exception {\n"
+"       sharedEnvironment = new ResourceRequestEnvironment(this) {\n"
+"            @Override\n"
+"            public Map<String, Object> getDefaultHeaders() {\n"
+"               return new HashMap<String, Object>() {{\n"
+"                   put(\"Accept\", \"text/plain\");\n"
+"               }};\n"
+"            }\n"
+"         };\n"
 "   }\n"
 "\n"
 "   @Test\n"
 "   public void test() throws Exception\n"
 "   {\n"
-"      new ResourceRequest(Method.GET, \"/my/relative/uri)\n"
+"      //Not shared: new ResourceRequest(new ResourceRequestEnvironment"
+"(this), Method.GET, \"/my/relative/uri)\n"
+"\n"
+"      new ResourceRequest(sharedEnvironment, Method.GET, \"/my/relative/"
+"uri)\n"
 "      {\n"
-"\n"
 "         @Override\n"
-"         protected void prepareRequest(MockHttpServletRequest request)\n"
+"         protected void prepareRequest(EnhancedMockHttpServletRequest "
+"request)\n"
 "         {\n"
 "            request.addQueryParameter(\"foo\", \"123\");\n"
 "            request.addHeader(\"Accept-Language\", \"en_US, de\");\n"
 "         }\n"
 "\n"
 "         @Override\n"
-"         protected void onResponse(MockHttpServletResponse response)\n"
+"         protected void onResponse(EnhancedMockHttpServletResponse "
+"response)\n"
 "         {\n"
 "            assert response.getStatus() == 200;\n"
 "            assert response.getContentAsString().equals(\"foobar\");\n"
@@ -1001,40 +1015,28 @@
 "\n"
 "      }.run();\n"
 "   }\n"
-"\n"
 "}]]>"
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:456
+#: Webservices.xml:457
 #, no-c-format
 msgid ""
 "This test only executes local calls, it does not communicate with the "
 "<literal>SeamResourceServlet</literal> through TCP. The mock request is "
 "passed through the Seam servlet and filters and the response is then "
 "available for test assertions. Overriding the <literal>getDefaultHeaders()</"
-"literal> method allows you to set request headers for every test method in "
-"the test class."
+"literal> method in a shared instance of <literal>ResourceRequestEnvironment</"
+"literal> allows you to set request headers for every test method in the test "
+"class."
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:463
+#: Webservices.xml:465
 #, no-c-format
 msgid ""
 "Note that a <literal>ResourceRequest</literal> has to be executed in a "
 "<literal>@Test</literal> method or in a <literal>@BeforeMethod</literal> "
-"callback. You can and should not execute it in any other callback, such as "
-"<literal>@BeforeClass</literal>. (This is an implementation limitation we "
-"will remove in a future update.)"
+"callback. You can not execute it in any other callback, such as "
+"<literal>@BeforeClass</literal>."
 msgstr ""
-
-#. Tag: para
-#: Webservices.xml:470
-#, no-c-format
-msgid ""
-"Also note that the imported mock objects are not the same as the mock "
-"objects you use in other Seam unit tests, which are in the package "
-"<literal>org.jboss.seam.mock</literal>. The <literal>org.jboss.seam.resteasy."
-"testfwk</literal> variations mimic real requests and responses much more "
-"closely."
-msgstr ""

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/te-IN/Testing.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/te-IN/Testing.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/te-IN/Testing.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-05 18:37+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -717,15 +717,15 @@
 #: Testing.xml:390
 #, no-c-format
 msgid ""
-"If you need to insert or clean data in your database before each test you "
+"If you want to insert or clean data in your database before each test you "
 "can use Seam's integration with DBUnit. To do this, extend "
-"<literal>DBUnitSeamTest</literal> rather than SeamTest."
+"<literal>DBUnitSeamTest</literal> rather than <literal>SeamTest</literal>."
 msgstr ""
 
 #. Tag: para
 #: Testing.xml:396
 #, no-c-format
-msgid "You need to provide a dataset for DBUnit."
+msgid "You have to provide a dataset for DBUnit."
 msgstr ""
 
 #. Tag: caution
@@ -760,12 +760,12 @@
 #: Testing.xml:408
 #, no-c-format
 msgid ""
-"and tell Seam about it by overriding <literal>prepareDBUnitOperations()</"
-"literal>:"
+"In your test class, configure your dataset with overriding "
+"<literal>prepareDBUnitOperations()</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:412
+#: Testing.xml:413
 #, no-c-format
 msgid ""
 "<![CDATA[protected void prepareDBUnitOperations() {\n"
@@ -776,7 +776,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:414
+#: Testing.xml:415
 #, no-c-format
 msgid ""
 "<literal>DataSetOperation</literal> defaults to <literal>DatabaseOperation."
@@ -787,7 +787,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:422
+#: Testing.xml:423
 #, no-c-format
 msgid ""
 "If you require extra cleanup after a test method executes, add operations to "
@@ -795,7 +795,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:427
+#: Testing.xml:428
 #, no-c-format
 msgid ""
 "You need to tell DBUnit about the datasource you are using by setting a "
@@ -803,7 +803,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:432
+#: Testing.xml:433
 #, no-c-format
 msgid ""
 "<![CDATA[<parameter name=\"datasourceJndiName\" value=\"java:/"
@@ -811,70 +811,66 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:434
+#: Testing.xml:435
 #, no-c-format
 msgid ""
 "DBUnitSeamTest has support for MySQL and HSQL - you need to tell it which "
-"database is being used:"
+"database is being used, otherwise it defaults to HSQL:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:439
+#: Testing.xml:440
 #, no-c-format
-msgid "<![CDATA[<parameter name=\"database\" value=\"HSQL\" />]]>"
+msgid "<![CDATA[<parameter name=\"database\" value=\"MYSQL\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:441
+#: Testing.xml:442
 #, no-c-format
 msgid ""
 "It also allows you to insert binary data into the test data set (n.b. this "
-"is untested on Windows). You need to tell it where to locate these resources:"
+"is untested on Windows). You need to tell it where to locate these resources "
+"on your classpath:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:447
+#: Testing.xml:448
 #, no-c-format
 msgid "<![CDATA[<parameter name=\"binaryDir\" value=\"images/\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:449
+#: Testing.xml:450
 #, no-c-format
 msgid ""
-"You <emphasis>must</emphasis> specify these three parameters in your "
-"<literal>testng.xml</literal>."
+"You do not have to configure any of these parameters if you use HSQL and "
+"have no binary imports. However, unless you specify "
+"<literal>datasourceJndiName</literal> in your test configuration, you will "
+"have to call <literal>setDatabaseJndiName()</literal> before your test runs. "
+"If you are not using HSQL or MySQL, you need to override some methods. See "
+"the Javadoc of <literal>DBUnitSeamTest</literal> for more details."
 msgstr ""
 
-#. Tag: para
-#: Testing.xml:454
-#, no-c-format
-msgid ""
-"If you want to use DBUnitSeamTest with another database, you'll need to "
-"implement some methods. Read the javadoc of <literal>AbstractDBUnitSeamTest</"
-"literal> for more."
-msgstr ""
-
 #. Tag: title
-#: Testing.xml:463
+#: Testing.xml:461
 #, no-c-format
 msgid "Integration Testing Seam Mail"
 msgstr ""
 
 #. Tag: caution
-#: Testing.xml:465
+#: Testing.xml:463
 #, no-c-format
 msgid "Warning! This feature is still under development."
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:469
+#: Testing.xml:467
 #, no-c-format
 msgid "It's very easy to integration test your Seam Mail:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:473
+#: Testing.xml:471
 #, no-c-format
 msgid ""
 "<![CDATA[public class MailTest extends SeamTest {\n"
@@ -907,7 +903,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:475
+#: Testing.xml:473
 #, no-c-format
 msgid ""
 "We create a new <literal>FacesRequest</literal> as normal. Inside the "
@@ -919,7 +915,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:484
+#: Testing.xml:482
 #, no-c-format
 msgid ""
 "There is no support for rendering standard JSF components so you can't test "

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/te-IN/Webservices.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/te-IN/Webservices.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/te-IN/Webservices.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-11 07:43+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -955,45 +955,59 @@
 #: Webservices.xml:449
 #, no-c-format
 msgid ""
-"Seam includes an extended unit testing superclass that helps you in creating "
-"unit tests for a RESTful architecture. Extend the <literal>ResourceSeamTest</"
-"literal> class to emulate HTTP requests/response cycles:"
+"Seam includes a unit testing utility class that helps you create unit tests "
+"for a RESTful architecture. Extend the <literal>SeamTest</literal> class as "
+"usual and use the <literal>ResourceRequestEnvironment.ResourceRequest</"
+"literal> to emulate HTTP requests/response cycles:"
 msgstr ""
 
 #. Tag: programlisting
-#: Webservices.xml:454
+#: Webservices.xml:455
 #, no-c-format
 msgid ""
-"<![CDATA[import org.jboss.seam.resteasy.testfwk.ResourceSeamTest;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletResponse;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletRequest;\n"
+"<![CDATA[import org.jboss.seam.mock.ResourceRequestEnvironment;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletRequest;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletResponse;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment."
+"ResourceRequest;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment.Method;\n"
 "\n"
-"public class MyTest extends ResourceSeamTest {\n"
+"public class MyTest extends SeamTest {\n"
 "\n"
-"   @Override\n"
-"   public Map<String, Object> getDefaultHeaders()\n"
-"   {\n"
-"      return new HashMap<String, Object>()\n"
-"      {{\n"
-"            put(\"Accept\", \"text/plain\");\n"
-"      }};\n"
+"   ResourceRequestEnvironment sharedEnvironment;\n"
+"\n"
+"   @BeforeClass\n"
+"   public void prepareSharedEnvironment() throws Exception {\n"
+"       sharedEnvironment = new ResourceRequestEnvironment(this) {\n"
+"            @Override\n"
+"            public Map<String, Object> getDefaultHeaders() {\n"
+"               return new HashMap<String, Object>() {{\n"
+"                   put(\"Accept\", \"text/plain\");\n"
+"               }};\n"
+"            }\n"
+"         };\n"
 "   }\n"
 "\n"
 "   @Test\n"
 "   public void test() throws Exception\n"
 "   {\n"
-"      new ResourceRequest(Method.GET, \"/my/relative/uri)\n"
+"      //Not shared: new ResourceRequest(new ResourceRequestEnvironment"
+"(this), Method.GET, \"/my/relative/uri)\n"
+"\n"
+"      new ResourceRequest(sharedEnvironment, Method.GET, \"/my/relative/"
+"uri)\n"
 "      {\n"
-"\n"
 "         @Override\n"
-"         protected void prepareRequest(MockHttpServletRequest request)\n"
+"         protected void prepareRequest(EnhancedMockHttpServletRequest "
+"request)\n"
 "         {\n"
 "            request.addQueryParameter(\"foo\", \"123\");\n"
 "            request.addHeader(\"Accept-Language\", \"en_US, de\");\n"
 "         }\n"
 "\n"
 "         @Override\n"
-"         protected void onResponse(MockHttpServletResponse response)\n"
+"         protected void onResponse(EnhancedMockHttpServletResponse "
+"response)\n"
 "         {\n"
 "            assert response.getStatus() == 200;\n"
 "            assert response.getContentAsString().equals(\"foobar\");\n"
@@ -1001,40 +1015,28 @@
 "\n"
 "      }.run();\n"
 "   }\n"
-"\n"
 "}]]>"
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:456
+#: Webservices.xml:457
 #, no-c-format
 msgid ""
 "This test only executes local calls, it does not communicate with the "
 "<literal>SeamResourceServlet</literal> through TCP. The mock request is "
 "passed through the Seam servlet and filters and the response is then "
 "available for test assertions. Overriding the <literal>getDefaultHeaders()</"
-"literal> method allows you to set request headers for every test method in "
-"the test class."
+"literal> method in a shared instance of <literal>ResourceRequestEnvironment</"
+"literal> allows you to set request headers for every test method in the test "
+"class."
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:463
+#: Webservices.xml:465
 #, no-c-format
 msgid ""
 "Note that a <literal>ResourceRequest</literal> has to be executed in a "
 "<literal>@Test</literal> method or in a <literal>@BeforeMethod</literal> "
-"callback. You can and should not execute it in any other callback, such as "
-"<literal>@BeforeClass</literal>. (This is an implementation limitation we "
-"will remove in a future update.)"
+"callback. You can not execute it in any other callback, such as "
+"<literal>@BeforeClass</literal>."
 msgstr ""
-
-#. Tag: para
-#: Webservices.xml:470
-#, no-c-format
-msgid ""
-"Also note that the imported mock objects are not the same as the mock "
-"objects you use in other Seam unit tests, which are in the package "
-"<literal>org.jboss.seam.mock</literal>. The <literal>org.jboss.seam.resteasy."
-"testfwk</literal> variations mimic real requests and responses much more "
-"closely."
-msgstr ""

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/zh-CN/Testing.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/zh-CN/Testing.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/zh-CN/Testing.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-05 18:37+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -717,15 +717,15 @@
 #: Testing.xml:390
 #, no-c-format
 msgid ""
-"If you need to insert or clean data in your database before each test you "
+"If you want to insert or clean data in your database before each test you "
 "can use Seam's integration with DBUnit. To do this, extend "
-"<literal>DBUnitSeamTest</literal> rather than SeamTest."
+"<literal>DBUnitSeamTest</literal> rather than <literal>SeamTest</literal>."
 msgstr ""
 
 #. Tag: para
 #: Testing.xml:396
 #, no-c-format
-msgid "You need to provide a dataset for DBUnit."
+msgid "You have to provide a dataset for DBUnit."
 msgstr ""
 
 #. Tag: caution
@@ -760,12 +760,12 @@
 #: Testing.xml:408
 #, no-c-format
 msgid ""
-"and tell Seam about it by overriding <literal>prepareDBUnitOperations()</"
-"literal>:"
+"In your test class, configure your dataset with overriding "
+"<literal>prepareDBUnitOperations()</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:412
+#: Testing.xml:413
 #, no-c-format
 msgid ""
 "<![CDATA[protected void prepareDBUnitOperations() {\n"
@@ -776,7 +776,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:414
+#: Testing.xml:415
 #, no-c-format
 msgid ""
 "<literal>DataSetOperation</literal> defaults to <literal>DatabaseOperation."
@@ -787,7 +787,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:422
+#: Testing.xml:423
 #, no-c-format
 msgid ""
 "If you require extra cleanup after a test method executes, add operations to "
@@ -795,7 +795,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:427
+#: Testing.xml:428
 #, no-c-format
 msgid ""
 "You need to tell DBUnit about the datasource you are using by setting a "
@@ -803,7 +803,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:432
+#: Testing.xml:433
 #, no-c-format
 msgid ""
 "<![CDATA[<parameter name=\"datasourceJndiName\" value=\"java:/"
@@ -811,70 +811,66 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:434
+#: Testing.xml:435
 #, no-c-format
 msgid ""
 "DBUnitSeamTest has support for MySQL and HSQL - you need to tell it which "
-"database is being used:"
+"database is being used, otherwise it defaults to HSQL:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:439
+#: Testing.xml:440
 #, no-c-format
-msgid "<![CDATA[<parameter name=\"database\" value=\"HSQL\" />]]>"
+msgid "<![CDATA[<parameter name=\"database\" value=\"MYSQL\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:441
+#: Testing.xml:442
 #, no-c-format
 msgid ""
 "It also allows you to insert binary data into the test data set (n.b. this "
-"is untested on Windows). You need to tell it where to locate these resources:"
+"is untested on Windows). You need to tell it where to locate these resources "
+"on your classpath:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:447
+#: Testing.xml:448
 #, no-c-format
 msgid "<![CDATA[<parameter name=\"binaryDir\" value=\"images/\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:449
+#: Testing.xml:450
 #, no-c-format
 msgid ""
-"You <emphasis>must</emphasis> specify these three parameters in your "
-"<literal>testng.xml</literal>."
+"You do not have to configure any of these parameters if you use HSQL and "
+"have no binary imports. However, unless you specify "
+"<literal>datasourceJndiName</literal> in your test configuration, you will "
+"have to call <literal>setDatabaseJndiName()</literal> before your test runs. "
+"If you are not using HSQL or MySQL, you need to override some methods. See "
+"the Javadoc of <literal>DBUnitSeamTest</literal> for more details."
 msgstr ""
 
-#. Tag: para
-#: Testing.xml:454
-#, no-c-format
-msgid ""
-"If you want to use DBUnitSeamTest with another database, you'll need to "
-"implement some methods. Read the javadoc of <literal>AbstractDBUnitSeamTest</"
-"literal> for more."
-msgstr ""
-
 #. Tag: title
-#: Testing.xml:463
+#: Testing.xml:461
 #, no-c-format
 msgid "Integration Testing Seam Mail"
 msgstr ""
 
 #. Tag: caution
-#: Testing.xml:465
+#: Testing.xml:463
 #, no-c-format
 msgid "Warning! This feature is still under development."
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:469
+#: Testing.xml:467
 #, no-c-format
 msgid "It's very easy to integration test your Seam Mail:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:473
+#: Testing.xml:471
 #, no-c-format
 msgid ""
 "<![CDATA[public class MailTest extends SeamTest {\n"
@@ -907,7 +903,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:475
+#: Testing.xml:473
 #, no-c-format
 msgid ""
 "We create a new <literal>FacesRequest</literal> as normal. Inside the "
@@ -919,7 +915,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:484
+#: Testing.xml:482
 #, no-c-format
 msgid ""
 "There is no support for rendering standard JSF components so you can't test "

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/zh-CN/Webservices.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/zh-CN/Webservices.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/zh-CN/Webservices.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-11 07:43+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -955,45 +955,59 @@
 #: Webservices.xml:449
 #, no-c-format
 msgid ""
-"Seam includes an extended unit testing superclass that helps you in creating "
-"unit tests for a RESTful architecture. Extend the <literal>ResourceSeamTest</"
-"literal> class to emulate HTTP requests/response cycles:"
+"Seam includes a unit testing utility class that helps you create unit tests "
+"for a RESTful architecture. Extend the <literal>SeamTest</literal> class as "
+"usual and use the <literal>ResourceRequestEnvironment.ResourceRequest</"
+"literal> to emulate HTTP requests/response cycles:"
 msgstr ""
 
 #. Tag: programlisting
-#: Webservices.xml:454
+#: Webservices.xml:455
 #, no-c-format
 msgid ""
-"<![CDATA[import org.jboss.seam.resteasy.testfwk.ResourceSeamTest;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletResponse;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletRequest;\n"
+"<![CDATA[import org.jboss.seam.mock.ResourceRequestEnvironment;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletRequest;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletResponse;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment."
+"ResourceRequest;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment.Method;\n"
 "\n"
-"public class MyTest extends ResourceSeamTest {\n"
+"public class MyTest extends SeamTest {\n"
 "\n"
-"   @Override\n"
-"   public Map<String, Object> getDefaultHeaders()\n"
-"   {\n"
-"      return new HashMap<String, Object>()\n"
-"      {{\n"
-"            put(\"Accept\", \"text/plain\");\n"
-"      }};\n"
+"   ResourceRequestEnvironment sharedEnvironment;\n"
+"\n"
+"   @BeforeClass\n"
+"   public void prepareSharedEnvironment() throws Exception {\n"
+"       sharedEnvironment = new ResourceRequestEnvironment(this) {\n"
+"            @Override\n"
+"            public Map<String, Object> getDefaultHeaders() {\n"
+"               return new HashMap<String, Object>() {{\n"
+"                   put(\"Accept\", \"text/plain\");\n"
+"               }};\n"
+"            }\n"
+"         };\n"
 "   }\n"
 "\n"
 "   @Test\n"
 "   public void test() throws Exception\n"
 "   {\n"
-"      new ResourceRequest(Method.GET, \"/my/relative/uri)\n"
+"      //Not shared: new ResourceRequest(new ResourceRequestEnvironment"
+"(this), Method.GET, \"/my/relative/uri)\n"
+"\n"
+"      new ResourceRequest(sharedEnvironment, Method.GET, \"/my/relative/"
+"uri)\n"
 "      {\n"
-"\n"
 "         @Override\n"
-"         protected void prepareRequest(MockHttpServletRequest request)\n"
+"         protected void prepareRequest(EnhancedMockHttpServletRequest "
+"request)\n"
 "         {\n"
 "            request.addQueryParameter(\"foo\", \"123\");\n"
 "            request.addHeader(\"Accept-Language\", \"en_US, de\");\n"
 "         }\n"
 "\n"
 "         @Override\n"
-"         protected void onResponse(MockHttpServletResponse response)\n"
+"         protected void onResponse(EnhancedMockHttpServletResponse "
+"response)\n"
 "         {\n"
 "            assert response.getStatus() == 200;\n"
 "            assert response.getContentAsString().equals(\"foobar\");\n"
@@ -1001,40 +1015,28 @@
 "\n"
 "      }.run();\n"
 "   }\n"
-"\n"
 "}]]>"
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:456
+#: Webservices.xml:457
 #, no-c-format
 msgid ""
 "This test only executes local calls, it does not communicate with the "
 "<literal>SeamResourceServlet</literal> through TCP. The mock request is "
 "passed through the Seam servlet and filters and the response is then "
 "available for test assertions. Overriding the <literal>getDefaultHeaders()</"
-"literal> method allows you to set request headers for every test method in "
-"the test class."
+"literal> method in a shared instance of <literal>ResourceRequestEnvironment</"
+"literal> allows you to set request headers for every test method in the test "
+"class."
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:463
+#: Webservices.xml:465
 #, no-c-format
 msgid ""
 "Note that a <literal>ResourceRequest</literal> has to be executed in a "
 "<literal>@Test</literal> method or in a <literal>@BeforeMethod</literal> "
-"callback. You can and should not execute it in any other callback, such as "
-"<literal>@BeforeClass</literal>. (This is an implementation limitation we "
-"will remove in a future update.)"
+"callback. You can not execute it in any other callback, such as "
+"<literal>@BeforeClass</literal>."
 msgstr ""
-
-#. Tag: para
-#: Webservices.xml:470
-#, no-c-format
-msgid ""
-"Also note that the imported mock objects are not the same as the mock "
-"objects you use in other Seam unit tests, which are in the package "
-"<literal>org.jboss.seam.mock</literal>. The <literal>org.jboss.seam.resteasy."
-"testfwk</literal> variations mimic real requests and responses much more "
-"closely."
-msgstr ""

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/zh-TW/Testing.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/zh-TW/Testing.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/zh-TW/Testing.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-05 18:37+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -717,15 +717,15 @@
 #: Testing.xml:390
 #, no-c-format
 msgid ""
-"If you need to insert or clean data in your database before each test you "
+"If you want to insert or clean data in your database before each test you "
 "can use Seam's integration with DBUnit. To do this, extend "
-"<literal>DBUnitSeamTest</literal> rather than SeamTest."
+"<literal>DBUnitSeamTest</literal> rather than <literal>SeamTest</literal>."
 msgstr ""
 
 #. Tag: para
 #: Testing.xml:396
 #, no-c-format
-msgid "You need to provide a dataset for DBUnit."
+msgid "You have to provide a dataset for DBUnit."
 msgstr ""
 
 #. Tag: caution
@@ -760,12 +760,12 @@
 #: Testing.xml:408
 #, no-c-format
 msgid ""
-"and tell Seam about it by overriding <literal>prepareDBUnitOperations()</"
-"literal>:"
+"In your test class, configure your dataset with overriding "
+"<literal>prepareDBUnitOperations()</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:412
+#: Testing.xml:413
 #, no-c-format
 msgid ""
 "<![CDATA[protected void prepareDBUnitOperations() {\n"
@@ -776,7 +776,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:414
+#: Testing.xml:415
 #, no-c-format
 msgid ""
 "<literal>DataSetOperation</literal> defaults to <literal>DatabaseOperation."
@@ -787,7 +787,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:422
+#: Testing.xml:423
 #, no-c-format
 msgid ""
 "If you require extra cleanup after a test method executes, add operations to "
@@ -795,7 +795,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:427
+#: Testing.xml:428
 #, no-c-format
 msgid ""
 "You need to tell DBUnit about the datasource you are using by setting a "
@@ -803,7 +803,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:432
+#: Testing.xml:433
 #, no-c-format
 msgid ""
 "<![CDATA[<parameter name=\"datasourceJndiName\" value=\"java:/"
@@ -811,70 +811,66 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:434
+#: Testing.xml:435
 #, no-c-format
 msgid ""
 "DBUnitSeamTest has support for MySQL and HSQL - you need to tell it which "
-"database is being used:"
+"database is being used, otherwise it defaults to HSQL:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:439
+#: Testing.xml:440
 #, no-c-format
-msgid "<![CDATA[<parameter name=\"database\" value=\"HSQL\" />]]>"
+msgid "<![CDATA[<parameter name=\"database\" value=\"MYSQL\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:441
+#: Testing.xml:442
 #, no-c-format
 msgid ""
 "It also allows you to insert binary data into the test data set (n.b. this "
-"is untested on Windows). You need to tell it where to locate these resources:"
+"is untested on Windows). You need to tell it where to locate these resources "
+"on your classpath:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:447
+#: Testing.xml:448
 #, no-c-format
 msgid "<![CDATA[<parameter name=\"binaryDir\" value=\"images/\" />]]>"
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:449
+#: Testing.xml:450
 #, no-c-format
 msgid ""
-"You <emphasis>must</emphasis> specify these three parameters in your "
-"<literal>testng.xml</literal>."
+"You do not have to configure any of these parameters if you use HSQL and "
+"have no binary imports. However, unless you specify "
+"<literal>datasourceJndiName</literal> in your test configuration, you will "
+"have to call <literal>setDatabaseJndiName()</literal> before your test runs. "
+"If you are not using HSQL or MySQL, you need to override some methods. See "
+"the Javadoc of <literal>DBUnitSeamTest</literal> for more details."
 msgstr ""
 
-#. Tag: para
-#: Testing.xml:454
-#, no-c-format
-msgid ""
-"If you want to use DBUnitSeamTest with another database, you'll need to "
-"implement some methods. Read the javadoc of <literal>AbstractDBUnitSeamTest</"
-"literal> for more."
-msgstr ""
-
 #. Tag: title
-#: Testing.xml:463
+#: Testing.xml:461
 #, no-c-format
 msgid "Integration Testing Seam Mail"
 msgstr ""
 
 #. Tag: caution
-#: Testing.xml:465
+#: Testing.xml:463
 #, no-c-format
 msgid "Warning! This feature is still under development."
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:469
+#: Testing.xml:467
 #, no-c-format
 msgid "It's very easy to integration test your Seam Mail:"
 msgstr ""
 
 #. Tag: programlisting
-#: Testing.xml:473
+#: Testing.xml:471
 #, no-c-format
 msgid ""
 "<![CDATA[public class MailTest extends SeamTest {\n"
@@ -907,7 +903,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:475
+#: Testing.xml:473
 #, no-c-format
 msgid ""
 "We create a new <literal>FacesRequest</literal> as normal. Inside the "
@@ -919,7 +915,7 @@
 msgstr ""
 
 #. Tag: para
-#: Testing.xml:484
+#: Testing.xml:482
 #, no-c-format
 msgid ""
 "There is no support for rendering standard JSF components so you can't test "

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/zh-TW/Webservices.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/zh-TW/Webservices.po	2009-07-08 14:40:45 UTC (rev 11261)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/zh-TW/Webservices.po	2009-07-08 14:44:47 UTC (rev 11262)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-06-11 07:43+0000\n"
+"POT-Creation-Date: 2009-07-08 14:32+0000\n"
 "PO-Revision-Date: 2008-04-04 01:24+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -955,45 +955,59 @@
 #: Webservices.xml:449
 #, no-c-format
 msgid ""
-"Seam includes an extended unit testing superclass that helps you in creating "
-"unit tests for a RESTful architecture. Extend the <literal>ResourceSeamTest</"
-"literal> class to emulate HTTP requests/response cycles:"
+"Seam includes a unit testing utility class that helps you create unit tests "
+"for a RESTful architecture. Extend the <literal>SeamTest</literal> class as "
+"usual and use the <literal>ResourceRequestEnvironment.ResourceRequest</"
+"literal> to emulate HTTP requests/response cycles:"
 msgstr ""
 
 #. Tag: programlisting
-#: Webservices.xml:454
+#: Webservices.xml:455
 #, no-c-format
 msgid ""
-"<![CDATA[import org.jboss.seam.resteasy.testfwk.ResourceSeamTest;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletResponse;\n"
-"import org.jboss.seam.resteasy.testfwk.MockHttpServletRequest;\n"
+"<![CDATA[import org.jboss.seam.mock.ResourceRequestEnvironment;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletRequest;\n"
+"import org.jboss.seam.mock.EnhancedMockHttpServletResponse;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment."
+"ResourceRequest;\n"
+"import static org.jboss.seam.mock.ResourceRequestEnvironment.Method;\n"
 "\n"
-"public class MyTest extends ResourceSeamTest {\n"
+"public class MyTest extends SeamTest {\n"
 "\n"
-"   @Override\n"
-"   public Map<String, Object> getDefaultHeaders()\n"
-"   {\n"
-"      return new HashMap<String, Object>()\n"
-"      {{\n"
-"            put(\"Accept\", \"text/plain\");\n"
-"      }};\n"
+"   ResourceRequestEnvironment sharedEnvironment;\n"
+"\n"
+"   @BeforeClass\n"
+"   public void prepareSharedEnvironment() throws Exception {\n"
+"       sharedEnvironment = new ResourceRequestEnvironment(this) {\n"
+"            @Override\n"
+"            public Map<String, Object> getDefaultHeaders() {\n"
+"               return new HashMap<String, Object>() {{\n"
+"                   put(\"Accept\", \"text/plain\");\n"
+"               }};\n"
+"            }\n"
+"         };\n"
 "   }\n"
 "\n"
 "   @Test\n"
 "   public void test() throws Exception\n"
 "   {\n"
-"      new ResourceRequest(Method.GET, \"/my/relative/uri)\n"
+"      //Not shared: new ResourceRequest(new ResourceRequestEnvironment"
+"(this), Method.GET, \"/my/relative/uri)\n"
+"\n"
+"      new ResourceRequest(sharedEnvironment, Method.GET, \"/my/relative/"
+"uri)\n"
 "      {\n"
-"\n"
 "         @Override\n"
-"         protected void prepareRequest(MockHttpServletRequest request)\n"
+"         protected void prepareRequest(EnhancedMockHttpServletRequest "
+"request)\n"
 "         {\n"
 "            request.addQueryParameter(\"foo\", \"123\");\n"
 "            request.addHeader(\"Accept-Language\", \"en_US, de\");\n"
 "         }\n"
 "\n"
 "         @Override\n"
-"         protected void onResponse(MockHttpServletResponse response)\n"
+"         protected void onResponse(EnhancedMockHttpServletResponse "
+"response)\n"
 "         {\n"
 "            assert response.getStatus() == 200;\n"
 "            assert response.getContentAsString().equals(\"foobar\");\n"
@@ -1001,40 +1015,28 @@
 "\n"
 "      }.run();\n"
 "   }\n"
-"\n"
 "}]]>"
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:456
+#: Webservices.xml:457
 #, no-c-format
 msgid ""
 "This test only executes local calls, it does not communicate with the "
 "<literal>SeamResourceServlet</literal> through TCP. The mock request is "
 "passed through the Seam servlet and filters and the response is then "
 "available for test assertions. Overriding the <literal>getDefaultHeaders()</"
-"literal> method allows you to set request headers for every test method in "
-"the test class."
+"literal> method in a shared instance of <literal>ResourceRequestEnvironment</"
+"literal> allows you to set request headers for every test method in the test "
+"class."
 msgstr ""
 
 #. Tag: para
-#: Webservices.xml:463
+#: Webservices.xml:465
 #, no-c-format
 msgid ""
 "Note that a <literal>ResourceRequest</literal> has to be executed in a "
 "<literal>@Test</literal> method or in a <literal>@BeforeMethod</literal> "
-"callback. You can and should not execute it in any other callback, such as "
-"<literal>@BeforeClass</literal>. (This is an implementation limitation we "
-"will remove in a future update.)"
+"callback. You can not execute it in any other callback, such as "
+"<literal>@BeforeClass</literal>."
 msgstr ""
-
-#. Tag: para
-#: Webservices.xml:470
-#, no-c-format
-msgid ""
-"Also note that the imported mock objects are not the same as the mock "
-"objects you use in other Seam unit tests, which are in the package "
-"<literal>org.jboss.seam.mock</literal>. The <literal>org.jboss.seam.resteasy."
-"testfwk</literal> variations mimic real requests and responses much more "
-"closely."
-msgstr ""




More information about the seam-commits mailing list