[jboss-svn-commits] JBL Code SVN: r34590 - in labs/jbossforums/branches/forums130P27: cache-plugin and 7 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Aug 8 15:51:05 EDT 2010
Author: sviluppatorefico
Date: 2010-08-08 15:51:04 -0400 (Sun, 08 Aug 2010)
New Revision: 34590
Modified:
labs/jbossforums/branches/forums130P27/authz-jaae-plugin/build.xml
labs/jbossforums/branches/forums130P27/cache-plugin/build.xml
labs/jbossforums/branches/forums130P27/cache-plugin/src/main/org/jboss/portlet/forums/util/cache/JMXTreeCacheProvider.java
labs/jbossforums/branches/forums130P27/forums/build.xml
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-ear/META-INF/application.xml
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-jbp-ear/META-INF/application.xml
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-jbp-ear/META-INF/jboss-app.xml
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-jbp-sar/conf/hibernate/setup.txt
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-sar/conf/hibernate/setup.txt
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-uif-ha-jbp-jar/META-INF/persistence.xml
Log:
compatibility supported with clustered jboss 4.2.3.GA and 4.3
Modified: labs/jbossforums/branches/forums130P27/authz-jaae-plugin/build.xml
===================================================================
--- labs/jbossforums/branches/forums130P27/authz-jaae-plugin/build.xml 2010-08-08 17:06:46 UTC (rev 34589)
+++ labs/jbossforums/branches/forums130P27/authz-jaae-plugin/build.xml 2010-08-08 19:51:04 UTC (rev 34590)
@@ -181,10 +181,12 @@
</jar>
<!-- Luca Stancapiano - 5 feb 2008 - this plugin is also inside new clustered
versions of JBossForums as libraries -->
- <jar jarfile="${forums.lib}/jboss-forums-ha.ear">
+ <mkdir dir="${forums.lib}/ha/"/>
+ <jar jarfile="${forums.lib}/ha/jboss-forums.ear">
<fileset dir="${forums.root}/resources/portal-forums-ha-ear" includes="**/*"/>
</jar>
- <jar jarfile="${forums.lib}/jboss-forums-ha-jbp.ear">
+ <mkdir dir="${forums.lib}/ha-jbp/"/>
+ <jar jarfile="${forums.lib}/ha-jbp/jboss-forums.ear">
<fileset dir="${forums.root}/resources/portal-forums-ha-jbp-ear" includes="**/*"/>
</jar>
<!-- end patch 5 feb 2008 -->
Modified: labs/jbossforums/branches/forums130P27/cache-plugin/build.xml
===================================================================
--- labs/jbossforums/branches/forums130P27/cache-plugin/build.xml 2010-08-08 17:06:46 UTC (rev 34589)
+++ labs/jbossforums/branches/forums130P27/cache-plugin/build.xml 2010-08-08 19:51:04 UTC (rev 34590)
@@ -157,11 +157,12 @@
</jar>
<!-- Luca Stancapiano - 30 gen 2008 - I added theese six
- rows to achieve complete create for jboss-forums-ha.ear -->
+ rows to achieve complete create for ha/jboss-forums.ear -->
<copy todir="${forums.root}/resources/portal-forums-ha-ear">
<fileset dir="${build.lib}" includes="portal-forums-cache-plugin.sar"/>
</copy>
- <jar jarfile="${forums.lib}/jboss-forums-ha.ear">
+ <mkdir dir="${forums.lib}/ha/"/>
+ <jar jarfile="${forums.lib}/ha/jboss-forums.ear">
<fileset dir="${forums.root}/resources/portal-forums-ha-ear" includes="**/*"/>
</jar>
Modified: labs/jbossforums/branches/forums130P27/cache-plugin/src/main/org/jboss/portlet/forums/util/cache/JMXTreeCacheProvider.java
===================================================================
--- labs/jbossforums/branches/forums130P27/cache-plugin/src/main/org/jboss/portlet/forums/util/cache/JMXTreeCacheProvider.java 2010-08-08 17:06:46 UTC (rev 34589)
+++ labs/jbossforums/branches/forums130P27/cache-plugin/src/main/org/jboss/portlet/forums/util/cache/JMXTreeCacheProvider.java 2010-08-08 19:51:04 UTC (rev 34590)
@@ -56,7 +56,7 @@
{
try
{
- String objectNameAsString = properties.getProperty("hibernate.cache.object_name");
+ String objectNameAsString = properties.getProperty("cache.object_name");
log.debug("Uses tree cache provider with object name " + objectNameAsString);
//
Modified: labs/jbossforums/branches/forums130P27/forums/build.xml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/build.xml 2010-08-08 17:06:46 UTC (rev 34589)
+++ labs/jbossforums/branches/forums130P27/forums/build.xml 2010-08-08 19:51:04 UTC (rev 34590)
@@ -292,7 +292,8 @@
<!-- Luca Stancapiano - 8 feb 2008 - portal-forums-ha.ear -->
<copy todir="${build.resources}/portal-forums-ha-ear">
- <!--fileset dir="${jakarta.lucene.root}/lib" includes="lucene.jar"/-->
+ <fileset dir="${jakarta.lucene.root}/lib" includes="lucene.jar"/>
+ <fileset dir="${jboss.hibernate.lib}" includes="hibernate-commons-annotations.jar"/>
<fileset dir="${build.lib}" includes="portal-forums.war,portal-forums-ui.jar,portal-forums-ha.sar,portal-forums-authz-plugin.sar,portal-forums-uif-ha.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"/>
@@ -300,13 +301,15 @@
<fileset dir="${portlet.lib}" includes="portlet-api.jar" />
<fileset dir="${jbportal.lib}" includes="portletbridge-api.jar,portletbridge-impl.jar,portal-jems-lib.jar,portal-common-lib.jar,portal-identity-lib.jar" />
</copy>
- <jar jarfile="${build.lib}/jboss-forums-ha.ear">
+ <mkdir dir="${build.lib}/ha/"/>
+ <jar jarfile="${build.lib}/ha/jboss-forums.ear">
<fileset dir="${build.resources}/portal-forums-ha-ear" includes="**/*"/>
</jar>
<!-- Luca Stancapiano - 8 feb 2008 - portal-forums-ha-jbp.ear -->
<copy todir="${build.resources}/portal-forums-ha-jbp-ear">
<!--fileset dir="${jakarta.lucene.root}/lib" includes="lucene.jar"/-->
+ <fileset dir="${jboss.hibernate.lib}" includes="hibernate-commons-annotations.jar"/>
<fileset dir="${build.lib}" includes="portal-forums.war,portal-forums-ui.jar,portal-forums-ha-jbp.sar,portal-forums-authz-plugin.sar,portal-forums-uif-ha-jbp.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"/>
@@ -314,7 +317,8 @@
<fileset dir="${portlet.lib}" includes="portlet-api.jar" />
<fileset dir="${jbportal.lib}" includes="portletbridge-api.jar,portletbridge-impl.jar,portal-jems-lib.jar,portal-common-lib.jar,portal-identity-lib.jar" />
</copy>
- <jar jarfile="${build.lib}/jboss-forums-ha-jbp.ear">
+ <mkdir dir="${forums.lib}/ha-jbp/"/>
+ <jar jarfile="${build.lib}/ha-jbp/jboss-forums.ear">
<fileset dir="${build.resources}/portal-forums-ha-jbp-ear" includes="**/*"/>
</jar>
</target>
@@ -322,8 +326,10 @@
<target name="explode" depends="init">
<explode file="${build.lib}/jboss-forums.ear" todir="${build.resources}" />
<!-- Luca Stancapiano - 8 feb 2008 - exploded ha modules -->
- <explode file="${build.lib}/jboss-forums-ha.ear" todir="${build.resources}" />
- <explode file="${build.lib}/jboss-forums-ha-jbp.ear" todir="${build.resources}" />
+ <mkdir dir="${build.resources}/ha/"/>
+ <explode file="${build.lib}/ha/jboss-forums.ear" todir="${build.resources}/ha" />
+ <mkdir dir="${build.resources}/ha-jbp/"/>
+ <explode file="${build.lib}/ha-jbp/jboss-forums.ear" todir="${build.resources}/ha-jbp" />
</target>
<!-- ================================================================== -->
@@ -390,12 +396,12 @@
<fileset dir="${build.lib}" includes="portal-forums.war,portal-forums-ui.jar,portal-forums-ha.sar,portal-forums-authz-plugin.sar"/>
<fileset dir="${jbportal.root}/../facelets/lib" includes="jsf-facelets.jar,el-api.jar,el-ri.jar"/>
</copy>
- <jar jarfile="${build.lib}/jboss-forums-ha.ear">
+ <jar jarfile="${build.lib}/ha/jboss-forums.ear">
<fileset dir="${build.resources}/portal-forums-ha-ear" includes="**/*"/>
</jar>
<require file="${jboss.home}/server/${portal.deploy.dir}/deploy"/>
- <copy file="${build.lib}/jboss-forums.ear" todir="${jboss.home}/server/${portal.deploy.dir}/deploy"/>
+ <copy file="${build.lib}/ha/jboss-forums.ear" todir="${jboss.home}/server/${portal.deploy.dir}/deploy"/>
</target>
<!--
@@ -410,12 +416,12 @@
<fileset dir="${build.lib}" includes="portal-forums.war,portal-forums-ui.jar,portal-forums-ha-jbp.sar,portal-forums-authz-plugin.sar"/>
<fileset dir="${jbportal.root}/../facelets/lib" includes="jsf-facelets.jar,el-api.jar,el-ri.jar"/>
</copy>
- <jar jarfile="${build.lib}/jboss-forums-ha-jbp.ear">
+ <jar jarfile="${build.lib}/ha-jbp/jboss-forums.ear">
<fileset dir="${build.resources}/portal-forums-ha-jbp-ear" includes="**/*"/>
</jar>
<require file="${jboss.home}/server/${portal.deploy.dir}/deploy"/>
- <copy file="${build.lib}/jboss-forums.ear" todir="${jboss.home}/server/${portal.deploy.dir}/deploy"/>
+ <copy file="${build.lib}/ha-jbp/jboss-forums.ear" todir="${jboss.home}/server/${portal.deploy.dir}/deploy"/>
</target>
<!--
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-ear/META-INF/application.xml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-ear/META-INF/application.xml 2010-08-08 17:06:46 UTC (rev 34589)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-ear/META-INF/application.xml 2010-08-08 19:51:04 UTC (rev 34590)
@@ -41,6 +41,12 @@
<java>portlet-api.jar</java>
</module>
<module>
+ <java>lucene.jar</java>
+ </module>
+ <module>
+ <java>hibernate-commons-annotations.jar</java>
+ </module>
+ <module>
<web>
<web-uri>portal-forums.war</web-uri>
<!--context-root>/forums</context-root-->
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-jbp-ear/META-INF/application.xml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-jbp-ear/META-INF/application.xml 2010-08-08 17:06:46 UTC (rev 34589)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-jbp-ear/META-INF/application.xml 2010-08-08 19:51:04 UTC (rev 34590)
@@ -41,6 +41,9 @@
<java>portlet-api.jar</java>
</module>
<module>
+ <java>hibernate-commons-annotations.jar</java>
+ </module>
+ <module>
<web>
<web-uri>portal-forums.war</web-uri>
<!--context-root>/forums</context-root-->
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-jbp-ear/META-INF/jboss-app.xml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-jbp-ear/META-INF/jboss-app.xml 2010-08-08 17:06:46 UTC (rev 34589)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-jbp-ear/META-INF/jboss-app.xml 2010-08-08 19:51:04 UTC (rev 34590)
@@ -2,7 +2,7 @@
<jboss-app>
<!--
<loader-repository>
- forums.jboss.com:loader=jboss-forums-ha-sar
+ forums.jboss.com:loader=jboss-forums-ha-jbp-sar
<loader-repository-config>
java2ParentDelegation=false
</loader-repository-config>
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-jbp-sar/conf/hibernate/setup.txt
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-jbp-sar/conf/hibernate/setup.txt 2010-08-08 17:06:46 UTC (rev 34589)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-jbp-sar/conf/hibernate/setup.txt 2010-08-08 19:51:04 UTC (rev 34590)
@@ -68,6 +68,6 @@
//
Session.persist(cat);
Session.flush();
- //Session.persist(forum1);
- //Session.persist(forum2);
+ Session.persist(forum1);
+ Session.persist(forum2);
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-sar/conf/hibernate/setup.txt
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-sar/conf/hibernate/setup.txt 2010-08-08 17:06:46 UTC (rev 34589)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-sar/conf/hibernate/setup.txt 2010-08-08 19:51:04 UTC (rev 34590)
@@ -68,5 +68,5 @@
//
Session.persist(cat);
//Session.flush();
- //Session.persist(forum1);
- //Session.persist(forum2);
+ Session.persist(forum1);
+ Session.persist(forum2);
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-uif-ha-jbp-jar/META-INF/persistence.xml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-uif-ha-jbp-jar/META-INF/persistence.xml 2010-08-08 17:06:46 UTC (rev 34589)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-uif-ha-jbp-jar/META-INF/persistence.xml 2010-08-08 19:51:04 UTC (rev 34590)
@@ -13,7 +13,7 @@
<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.jboss.hibernate.jbc.cacheprovider.JmxBoundTreeCacheProvider" />
- <property name="treecache.mbean.object_name" value="portal:service=TreeCache,type=hibernate" />
+ <property name="hibernate.treecache.mbean.object_name" value="portal:service=TreeCache,type=hibernate" />
<property name="hibernate.cache.use_query_cache" value="true" />
<property name="hibernate.cache.use_second_level_cache"
value="true" />
More information about the jboss-svn-commits
mailing list