[seam-commits] Seam SVN: r8535 - in trunk/examples/wiki/src/etc: META-INF and 1 other directories.

[seam-commits at lists.jboss.org]

Author: christian.bauer at jboss.com
Date: 2008-07-29 21:32:57 -0400 (Tue, 29 Jul 2008)
New Revision: 8535

Modified:
   trunk/examples/wiki/src/etc/META-INF/components-dev.xml
   trunk/examples/wiki/src/etc/META-INF/persistence-test-war.xml
   trunk/examples/wiki/src/etc/WEB-INF/components.xml
   trunk/examples/wiki/src/etc/wiki-test-ds.xml
Log:
Undo botched commit

Modified: trunk/examples/wiki/src/etc/META-INF/components-dev.xml
===================================================================
--- trunk/examples/wiki/src/etc/META-INF/components-dev.xml	2008-07-30 01:21:14 UTC (rev 8534)
+++ trunk/examples/wiki/src/etc/META-INF/components-dev.xml	2008-07-30 01:32:57 UTC (rev 8535)
@@ -32,7 +32,7 @@
     </component>
 
     <!-- Mailserver for notification messages -->
-    <mail:mail-session host="mail.bluewin.ch" port="25" ssl="false" tls="false"/>
+    <mail:mail-session host="localhost" port="25" ssl="false" tls="false"/>
 
     <!-- Maximum size of file uploads -->
     <!-- If you are using MySQL, don't forget their magic stuff:
@@ -65,10 +65,11 @@
             <value>META-INF/testdata/ForumData.dbunit.xml</value>
             <value>META-INF/testdata/KnowledgeBase.dbunit.xml</value>
             <value>META-INF/testdata/FAQData.dbunit.xml</value>
-            <value>META-INF/testdata/Testing.dbunit.xml</value>
+            <!--<value>META-INF/testdata/Testing.dbunit.xml</value>-->
         </property>
     </component>
 
+    <!--
     <resteasy:application-config
             strip-seam-resource-path="true"
             resource-path-prefix="/restv1">
@@ -83,23 +84,7 @@
         </resteasy:language-mappings>
 
     </resteasy:application-config>
-
-    <!--
-xml : application/xml,
-         html : text/html,
-         txt : text/plain
-
- en : en-US
-
-
-    <resteasy:application-config
-        scan-providers="false"
-        scan-resources="false"
-        use-builtin-providers="true">
-        <resteasy:resource-class-names>
-            <value>org.jboss.seam.wiki.service.UserResource</value>
-        </resteasy:resource-class-names>
-    </resteasy:application-config>
     -->
 
+
 </components>

Modified: trunk/examples/wiki/src/etc/META-INF/persistence-test-war.xml
===================================================================
--- trunk/examples/wiki/src/etc/META-INF/persistence-test-war.xml	2008-07-30 01:21:14 UTC (rev 8534)
+++ trunk/examples/wiki/src/etc/META-INF/persistence-test-war.xml	2008-07-30 01:32:57 UTC (rev 8535)
@@ -7,15 +7,15 @@
 
     <persistence-unit name="wiki" transaction-type="JTA">
         <provider>org.hibernate.ejb.HibernatePersistence</provider>
-        <jta-data-source>java:/wikiTestDatasourceMysql</jta-data-source>
+        <jta-data-source>java:/wikiTestDatasource</jta-data-source>
         <properties>
 
             <!-- MySQL also requires changes to AllTests.tng.xml and wiki-test-ds.xml
             -->
+            <!--
             <property name="hibernate.dialect" value="org.jboss.seam.wiki.util.WikiMySQL5HibernateDialect"/>
-            <!--
+            -->
             <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
-            -->
 
             <property name="hibernate.transaction.manager_lookup_class"
                       value="org.hibernate.transaction.JBossTransactionManagerLookup"/>

Modified: trunk/examples/wiki/src/etc/WEB-INF/components.xml
===================================================================
--- trunk/examples/wiki/src/etc/WEB-INF/components.xml	2008-07-30 01:21:14 UTC (rev 8534)
+++ trunk/examples/wiki/src/etc/WEB-INF/components.xml	2008-07-30 01:32:57 UTC (rev 8535)
@@ -106,7 +106,9 @@
             <value>default</value>
             <value>sfwkorg</value>
             <value>inrelationto</value>
+            <!--
             <value>openremote</value>
+            -->
         </property>
     </component>
 

Modified: trunk/examples/wiki/src/etc/wiki-test-ds.xml
===================================================================
--- trunk/examples/wiki/src/etc/wiki-test-ds.xml	2008-07-30 01:21:14 UTC (rev 8534)
+++ trunk/examples/wiki/src/etc/wiki-test-ds.xml	2008-07-30 01:32:57 UTC (rev 8535)
@@ -26,7 +26,6 @@
     -->
 
     <!-- MySQL also requires changes to persistence-test.xml and AllTests.tng.xml
-    -->
     <local-tx-datasource>
         <jndi-name>wikiTestDatasourceMysql</jndi-name>
         <connection-url>jdbc:mysql://localhost/test_1?characterEncoding=UTF-8</connection-url>
@@ -34,6 +33,7 @@
         <user-name>test</user-name>
         <password></password>
     </local-tx-datasource>
+    -->
 
 </datasources>