[jboss-cvs] jboss-seam/examples/wiki/src/etc/META-INF ...
Christian Bauer
christian at hibernate.org
Tue Dec 18 23:29:21 EST 2007
User: cbauer
Date: 07/12/18 23:29:21
Modified: examples/wiki/src/etc/META-INF persistence-dev-war.xml
persistence-test-war.xml persistence-prod-war.xml
wiki.taglib.xml
Added: examples/wiki/src/etc/META-INF components-dev.xml
components-prod.xml
Log:
Major rewrite of the most of the application
Revision Changes Path
1.14 +9 -4 jboss-seam/examples/wiki/src/etc/META-INF/persistence-dev-war.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: persistence-dev-war.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/etc/META-INF/persistence-dev-war.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- persistence-dev-war.xml 12 Oct 2007 16:31:26 -0000 1.13
+++ persistence-dev-war.xml 19 Dec 2007 04:29:21 -0000 1.14
@@ -7,12 +7,15 @@
<persistence-unit name="wiki" transaction-type="JTA">
<provider>org.hibernate.ejb.HibernatePersistence</provider>
+
<jta-data-source>java:/wikiDatasource</jta-data-source>
<properties>
- <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
+
<property name="hibernate.transaction.manager_lookup_class"
value="org.hibernate.transaction.JBossTransactionManagerLookup"/>
+ <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
+
<!-- Automatic schema export and drop -->
<property name="hibernate.hbm2ddl.auto" value="create-drop"/>
<!--
@@ -44,6 +47,7 @@
<property name="hibernate.cache.use_query_cache" value="false"/>
<property name="hibernate.cache.use_second_level_cache" value="false"/>
+ <!-- TODO
<property name="hibernate.ejb.classcache.org.jboss.seam.wiki.core.preferences.WikiPreferenceValue"
value="read-write, WikiPreference"/>
@@ -62,14 +66,15 @@
<property name="hibernate.ejb.classcache.org.jboss.seam.wiki.core.model.User"
value="read-write, WikiUser"/>
- <property name="hibernate.ejb.classcache.org.jboss.seam.wiki.core.model.Comment"
+ <property name="hibernate.ejb.classcache.org.jboss.seam.wiki.core.model.WikiComment"
value="nonstrict-read-write, WikiComment"/>
+ -->
<!-- Nested Set handling through special Hibernate event listeners -->
<property name="hibernate.ejb.event.post-insert"
- value="org.jboss.seam.wiki.core.nestedset.NestedSetPostInsertEventListener"/>
+ value="org.jboss.seam.wiki.core.nestedset.listener.NestedSetPostInsertEventListener"/>
<property name="hibernate.ejb.event.post-delete"
- value="org.jboss.seam.wiki.core.nestedset.NestedSetPostDeleteEventListener"/>
+ value="org.jboss.seam.wiki.core.nestedset.listener.NestedSetPostDeleteEventListener"/>
</properties>
</persistence-unit>
1.10 +10 -8 jboss-seam/examples/wiki/src/etc/META-INF/persistence-test-war.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: persistence-test-war.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/etc/META-INF/persistence-test-war.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- persistence-test-war.xml 24 Sep 2007 08:23:20 -0000 1.9
+++ persistence-test-war.xml 19 Dec 2007 04:29:21 -0000 1.10
@@ -10,10 +10,10 @@
<jta-data-source>java:/wikiTestDatasource</jta-data-source>
<properties>
- <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
<!--
- <property name="hibernate.dialect" value="org.hibernate.dialect.MySQLInnoDBDialect"/>
+ <property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5InnoDBDialect"/>
-->
+ <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
<property name="hibernate.transaction.manager_lookup_class"
value="org.hibernate.transaction.JBossTransactionManagerLookup"/>
@@ -22,7 +22,7 @@
<property name="jboss.entity.manager.factory.jndi.name" value="java:/entityManagerFactories/wiki"/>
<!-- Automatic schema export and drop -->
- <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+ <property name="hibernate.hbm2ddl.auto" value="create"/>
<!-- Logging -->
<property name="hibernate.show_sql" value="false"/>
@@ -47,9 +47,10 @@
<!-- Enable EHCache and register the JMX monitoring MBean -->
<property name="hibernate.cache.provider_class" value="org.jboss.seam.wiki.util.MonitoringEHCacheProvider"/>
- <property name="hibernate.cache.use_query_cache" value="true"/>
- <property name="hibernate.cache.use_second_level_cache" value="true"/>
+ <property name="hibernate.cache.use_query_cache" value="false"/>
+ <property name="hibernate.cache.use_second_level_cache" value="false"/>
+ <!--
<property name="hibernate.ejb.classcache.org.jboss.seam.wiki.core.preferences.WikiPreferenceValue"
value="read-write, WikiPreference"/>
@@ -68,14 +69,15 @@
<property name="hibernate.ejb.classcache.org.jboss.seam.wiki.core.model.User"
value="read-write, WikiUser"/>
- <property name="hibernate.ejb.classcache.org.jboss.seam.wiki.core.model.Comment"
+ <property name="hibernate.ejb.classcache.org.jboss.seam.wiki.core.model.WikiComment"
value="nonstrict-read-write, WikiComment"/>
+ -->
<!-- Nested Set handling through special Hibernate event listeners -->
<property name="hibernate.ejb.event.post-insert"
- value="org.jboss.seam.wiki.core.nestedset.NestedSetPostInsertEventListener"/>
+ value="org.jboss.seam.wiki.core.nestedset.listener.NestedSetPostInsertEventListener"/>
<property name="hibernate.ejb.event.post-delete"
- value="org.jboss.seam.wiki.core.nestedset.NestedSetPostDeleteEventListener"/>
+ value="org.jboss.seam.wiki.core.nestedset.listener.NestedSetPostDeleteEventListener"/>
<!--
<property name="hibernate.ejb.event.flush-entity"
value="org.jboss.seam.wiki.core.nestedset.NestedSetFlushEntityEventListener"/>
1.12 +6 -4 jboss-seam/examples/wiki/src/etc/META-INF/persistence-prod-war.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: persistence-prod-war.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/etc/META-INF/persistence-prod-war.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- persistence-prod-war.xml 25 Sep 2007 14:30:44 -0000 1.11
+++ persistence-prod-war.xml 19 Dec 2007 04:29:21 -0000 1.12
@@ -36,9 +36,10 @@
<!-- Enable EHCache and register the JMX monitoring MBean -->
<property name="hibernate.cache.provider_class" value="org.jboss.seam.wiki.util.MonitoringEHCacheProvider"/>
- <property name="hibernate.cache.use_query_cache" value="true"/>
- <property name="hibernate.cache.use_second_level_cache" value="true"/>
+ <property name="hibernate.cache.use_query_cache" value="false"/>
+ <property name="hibernate.cache.use_second_level_cache" value="false"/>
+ <!-- TODO:
<property name="hibernate.ejb.classcache.org.jboss.seam.wiki.core.preferences.WikiPreferenceValue"
value="read-write, WikiPreference"/>
@@ -59,12 +60,13 @@
<property name="hibernate.ejb.classcache.org.jboss.seam.wiki.core.model.Comment"
value="nonstrict-read-write, WikiComment"/>
+ -->
<!-- Nested Set handling through special Hibernate event listeners -->
<property name="hibernate.ejb.event.post-insert"
- value="org.jboss.seam.wiki.core.nestedset.NestedSetPostInsertEventListener"/>
+ value="org.jboss.seam.wiki.core.nestedset.listener.NestedSetPostInsertEventListener"/>
<property name="hibernate.ejb.event.post-delete"
- value="org.jboss.seam.wiki.core.nestedset.NestedSetPostDeleteEventListener"/>
+ value="org.jboss.seam.wiki.core.nestedset.listener.NestedSetPostDeleteEventListener"/>
</properties>
</persistence-unit>
1.22 +10 -52 jboss-seam/examples/wiki/src/etc/META-INF/wiki.taglib.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: wiki.taglib.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/etc/META-INF/wiki.taglib.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- wiki.taglib.xml 9 Nov 2007 15:08:25 -0000 1.21
+++ wiki.taglib.xml 19 Dec 2007 04:29:21 -0000 1.22
@@ -7,51 +7,33 @@
<namespace>http://jboss.com/products/seam/wiki</namespace>
<function>
- <function-name>renderPlainURL</function-name>
- <function-class>org.jboss.seam.wiki.util.WikiUtil</function-class>
- <function-signature>java.lang.String renderPlainURL(org.jboss.seam.wiki.core.model.Node)</function-signature>
- </function>
-
- <function>
- <function-name>renderURL</function-name>
- <function-class>org.jboss.seam.wiki.util.WikiUtil</function-class>
- <function-signature>java.lang.String renderURL(org.jboss.seam.wiki.core.model.Node)</function-signature>
- </function>
-
- <function>
- <function-name>renderCommentURL</function-name>
- <function-class>org.jboss.seam.wiki.util.WikiUtil</function-class>
- <function-signature>java.lang.String renderURL(org.jboss.seam.wiki.core.model.Node,org.jboss.seam.wiki.core.model.Comment)</function-signature>
- </function>
-
- <function>
- <function-name>renderPermLink</function-name>
+ <function-name>generateRandomNumber</function-name>
<function-class>org.jboss.seam.wiki.util.WikiUtil</function-class>
- <function-signature>java.lang.String renderPermLink(org.jboss.seam.wiki.core.model.Node)</function-signature>
+ <function-signature>int generateRandomNumber()</function-signature>
</function>
<function>
- <function-name>renderCommentPermLink</function-name>
+ <function-name>renderPlainURL</function-name>
<function-class>org.jboss.seam.wiki.util.WikiUtil</function-class>
- <function-signature>java.lang.String renderPermLink(org.jboss.seam.wiki.core.model.Node,org.jboss.seam.wiki.core.model.Comment)</function-signature>
+ <function-signature>java.lang.String renderPlainURL(org.jboss.seam.wiki.core.model.WikiNode)</function-signature>
</function>
<function>
- <function-name>renderWikiLink</function-name>
+ <function-name>renderURL</function-name>
<function-class>org.jboss.seam.wiki.util.WikiUtil</function-class>
- <function-signature>java.lang.String renderWikiLink(org.jboss.seam.wiki.core.model.Node)</function-signature>
+ <function-signature>java.lang.String renderURL(org.jboss.seam.wiki.core.model.WikiNode)</function-signature>
</function>
<function>
- <function-name>renderCommentWikiLink</function-name>
+ <function-name>renderPermURL</function-name>
<function-class>org.jboss.seam.wiki.util.WikiUtil</function-class>
- <function-signature>java.lang.String renderWikiLink(org.jboss.seam.wiki.core.model.Node,org.jboss.seam.wiki.core.model.Comment)</function-signature>
+ <function-signature>java.lang.String renderPermURL(org.jboss.seam.wiki.core.model.WikiNode)</function-signature>
</function>
<function>
- <function-name>renderHomeURL</function-name>
+ <function-name>renderWikiURL</function-name>
<function-class>org.jboss.seam.wiki.util.WikiUtil</function-class>
- <function-signature>java.lang.String renderHomeURL(org.jboss.seam.wiki.core.model.User)</function-signature>
+ <function-signature>java.lang.String renderWikiURL(org.jboss.seam.wiki.core.model.WikiNode)</function-signature>
</function>
<function>
@@ -61,30 +43,6 @@
</function>
<function>
- <function-name>isDocument</function-name>
- <function-class>org.jboss.seam.wiki.util.WikiUtil</function-class>
- <function-signature>boolean isDocument(org.jboss.seam.wiki.core.model.Node)</function-signature>
- </function>
-
- <function>
- <function-name>isDirectory</function-name>
- <function-class>org.jboss.seam.wiki.util.WikiUtil</function-class>
- <function-signature>boolean isDirectory(org.jboss.seam.wiki.core.model.Node)</function-signature>
- </function>
-
- <function>
- <function-name>isFile</function-name>
- <function-class>org.jboss.seam.wiki.util.WikiUtil</function-class>
- <function-signature>boolean isFile(org.jboss.seam.wiki.core.model.Node)</function-signature>
- </function>
-
- <function>
- <function-name>getType</function-name>
- <function-class>org.jboss.seam.wiki.util.WikiUtil</function-class>
- <function-signature>java.lang.String getType(org.jboss.seam.wiki.core.model.Node)</function-signature>
- </function>
-
- <function>
<function-name>truncateString</function-name>
<function-class>org.jboss.seam.wiki.util.WikiUtil</function-class>
<function-signature>java.lang.String truncateString(java.lang.String,int,java.lang.String)</function-signature>
1.1 date: 2007/12/19 04:29:21; author: cbauer; state: Exp;jboss-seam/examples/wiki/src/etc/META-INF/components-dev.xml
Index: components-dev.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<components xmlns="http://jboss.com/products/seam/components"
xmlns:core="http://jboss.com/products/seam/core"
xmlns:persistence="http://jboss.com/products/seam/persistence"
xmlns:security="http://jboss.com/products/seam/security"
xmlns:drools="http://jboss.com/products/seam/drools"
xmlns:web="http://jboss.com/products/seam/web"
xmlns:mail="http://jboss.com/products/seam/mail"
xmlns:transaction="http://jboss.com/products/seam/transaction"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd
http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd
http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd
http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.0.xsd
http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.0.xsd
http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.0.xsd
http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.0.xsd
http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd">
<!-- Some DBUnit datasets we use in unit testing - let's also use them in dev mode when the app is deployed -->
<component name="dbunitImporter" class="org.jboss.seam.wiki.util.DBUnitImporter" scope="APPLICATION" auto-create="true">
<property name="database">hsql</property>
<property name="datasourceJndiName">java:/wikiDatasource</property>
<property name="binaryDir">META-INF/testbinaries</property>
<property name="datasets">
<value>META-INF/testdata/WikiBaseData.dbunit.xml</value>
<value>META-INF/testdata/HelpDocuments.dbunit.xml</value>
<value>META-INF/testdata/DocumentFeedEntries.dbunit.xml</value>
<value>META-INF/testdata/UploadData.dbunit.xml</value>
<value>META-INF/testdata/BlogData.dbunit.xml</value>
<value>META-INF/testdata/ForumData.dbunit.xml</value>
</property>
</component>
</components>
1.1 date: 2007/12/19 04:29:21; author: cbauer; state: Exp;jboss-seam/examples/wiki/src/etc/META-INF/components-prod.xml
Index: components-prod.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<components xmlns="http://jboss.com/products/seam/components"
xmlns:core="http://jboss.com/products/seam/core"
xmlns:persistence="http://jboss.com/products/seam/persistence"
xmlns:security="http://jboss.com/products/seam/security"
xmlns:drools="http://jboss.com/products/seam/drools"
xmlns:web="http://jboss.com/products/seam/web"
xmlns:mail="http://jboss.com/products/seam/mail"
xmlns:transaction="http://jboss.com/products/seam/transaction"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd
http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd
http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd
http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.0.xsd
http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.0.xsd
http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.0.xsd
http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.0.xsd
http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd">
</components>
More information about the jboss-cvs-commits
mailing list