[jboss-svn-commits] JBL Code SVN: r34594 - in labs/jbossforums/trunk/forums: src/resources/portal-forums-ear/META-INF and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Aug 8 19:35:19 EDT 2010
Author: sviluppatorefico
Date: 2010-08-08 19:35:19 -0400 (Sun, 08 Aug 2010)
New Revision: 34594
Modified:
labs/jbossforums/trunk/forums/build.xml
labs/jbossforums/trunk/forums/src/resources/portal-forums-ear/META-INF/application.xml
labs/jbossforums/trunk/forums/src/resources/portal-forums-uif-jar/META-INF/persistence.xml
labs/jbossforums/trunk/forums/src/resources/portal-forums-war/WEB-INF/web.xml
Log:
porting from 2.4 servlet to 2.5.
deleted ehcache. We will use the default caching inside hibernate for default configuration.
All is compliant with jboss 4.2, 4.3 and 5.1
Modified: labs/jbossforums/trunk/forums/build.xml
===================================================================
--- labs/jbossforums/trunk/forums/build.xml 2010-08-08 23:20:04 UTC (rev 34593)
+++ labs/jbossforums/trunk/forums/build.xml 2010-08-08 23:35:19 UTC (rev 34594)
@@ -258,7 +258,7 @@
<copy todir="${build.resources}/portal-forums-ear">
<!--fileset dir="${jakarta.lucene.root}/lib" includes="lucene.jar"/-->
<fileset dir="${jboss.hibernate.search.root}/lib" includes="lucene-core.jar,hibernate-search.jar"/>
- <fileset dir="${jboss.hibernate.lib}" includes="hibernate-commons-annotations.jar,ejb3-persistence.jar,ehcache.jar"/>
+ <fileset dir="${jboss.hibernate.lib}" includes="hibernate-commons-annotations.jar,ejb3-persistence.jar"/>
<fileset dir="${build.lib}" includes="portal-forums.war,portal-forums-ui.jar,portal-forums.sar,portal-forums-authz-plugin.sar,portal-forums-uif.jar"/>
<fileset dir="${facelets.lib}" includes="jsf-facelets.jar,jsf-example.jar"/>
<fileset dir="${jakarta.commons.lib}" includes="commons-beanutils.jar,commons-codec.jar,commons-collections.jar,commons-digester-1.7-brew.jar"/>
Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-ear/META-INF/application.xml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-ear/META-INF/application.xml 2010-08-08 23:20:04 UTC (rev 34593)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-ear/META-INF/application.xml 2010-08-08 23:35:19 UTC (rev 34594)
@@ -52,9 +52,6 @@
<java>portal-identity-lib.jar</java>
</module>
<module>
- <java>ehcache.jar</java>
- </module>
- <module>
<java>portlet-api.jar</java>
</module>
<module>
Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-uif-jar/META-INF/persistence.xml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-uif-jar/META-INF/persistence.xml 2010-08-08 23:20:04 UTC (rev 34593)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-uif-jar/META-INF/persistence.xml 2010-08-08 23:35:19 UTC (rev 34594)
@@ -12,7 +12,7 @@
<property name="hibernate.c3p0.timeout" value="300" />
<property name="hibernate.c3p0.max_statements" value="50" />
<property name="hibernate.c3p0.idle_test_period" value="3000" />
- <property name="hibernate.cache.provider_class" value="org.hibernate.cache.EhCacheProvider" />
+ <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider" />
<property name="hibernate.cache.use_query_cache" value="true" />
<property name="hibernate.cache.use_second_level_cache"
value="true" />
Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/WEB-INF/web.xml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/WEB-INF/web.xml 2010-08-08 23:20:04 UTC (rev 34593)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/WEB-INF/web.xml 2010-08-08 23:35:19 UTC (rev 34594)
@@ -1,24 +1,15 @@
-<?xml version="1.0"?>
-<!--
-<!DOCTYPE web-app PUBLIC
- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
--->
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-version="2.4">
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
<context-param>
- <param-name>javax.faces.CONFIG_FILES</param-name>
- <param-value>
- /WEB-INF/forums-config.xml
- </param-value>
<description>
Comma separated list of URIs of (additional) faces config files.
(e.g. /WEB-INF/my-config.xml)
See JSF 1.0 PRD2, 10.3.2
</description>
+ <param-name>javax.faces.CONFIG_FILES</param-name>
+ <param-value>
+ /WEB-INF/forums-config.xml
+ </param-value>
</context-param>
<!-- <context-param>
@@ -49,30 +40,30 @@
It must contain a path to Forums Servlet where Forums are deployed.
</description>
</context-param>-->
- <context-param>
+ <context-param>
+ <description>
+ This parameter is used to create proper links in portal environment.
+ It must contain a path to a portlet window where Forums are deployed.
+ </description>
<param-name>org.jboss.forums.feeds.URL</param-name>
<param-value>/portal/portal/default/forums/JBossForumsWindow?action=1</param-value>
- <description>
- This parameter is used to create proper links in portal environment.
- It must contain a path to a portlet window where Forums are deployed.
- </description>
</context-param>
- <context-param>
+ <context-param>
+ <description>
+ This parameter is used to create proper links in portal environment.
+ It must contain a path to a portlet window where Forums are deployed.
+ </description>
<param-name>org.jboss.forums.feeds.URL_TYPE</param-name>
<param-value>p</param-value>
- <description>
- This parameter is used to create proper links in portal environment.
- It must contain a path to a portlet window where Forums are deployed.
- </description>
</context-param>
<context-param>
- <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
- <param-value>server</param-value>
<description>
State saving method: "client" or "server" (= default)
See JSF Specification 2.5.2
</description>
+ <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+ <param-value>server</param-value>
</context-param>
<!-- facelets integration -->
More information about the jboss-svn-commits
mailing list