[jboss-svn-commits] JBL Code SVN: r34921 - in labs/jbossforums/trunk: forums and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Aug 27 05:59:05 EDT 2010
Author: sviluppatorefico
Date: 2010-08-27 05:59:04 -0400 (Fri, 27 Aug 2010)
New Revision: 34921
Added:
labs/jbossforums/trunk/forums/src/resources/portal-forums-ha-as5-ear/
labs/jbossforums/trunk/forums/src/resources/portal-forums-ha-as5-ear/META-INF/
labs/jbossforums/trunk/forums/src/resources/portal-forums-ha-as5-ear/META-INF/application.xml
labs/jbossforums/trunk/forums/src/resources/portal-forums-ha-as5-ear/META-INF/jboss-app.xml
labs/jbossforums/trunk/forums/src/resources/portal-forums-ha-as5-ear/META-INF/security-config.xml
labs/jbossforums/trunk/forums/src/resources/portal-forums-ha-as5-ear/jboss-service.xml
labs/jbossforums/trunk/forums/src/resources/portal-forums-uif-ha-as5-jar/
labs/jbossforums/trunk/forums/src/resources/portal-forums-uif-ha-as5-jar/META-INF/
labs/jbossforums/trunk/forums/src/resources/portal-forums-uif-ha-as5-jar/META-INF/persistence.xml
Modified:
labs/jbossforums/trunk/authz-jaae-plugin/build.xml
labs/jbossforums/trunk/forums/build.xml
Log:
added the cluster management for jboss 5
Modified: labs/jbossforums/trunk/authz-jaae-plugin/build.xml
===================================================================
--- labs/jbossforums/trunk/authz-jaae-plugin/build.xml 2010-08-27 09:52:15 UTC (rev 34920)
+++ labs/jbossforums/trunk/authz-jaae-plugin/build.xml 2010-08-27 09:59:04 UTC (rev 34921)
@@ -154,7 +154,7 @@
<fileset dir="${jbportal.lib}" includes="portal-core-lib.jar"/>
<fileset dir="${jbportal.lib}" includes="portal-forums-lib.jar"/>
<!-- include the forums-ui.jar -->
- <fileset dir="${forums.lib}" includes="*.jar" excludes="portal-forums-uif.jar,portal-forums-uif-ha.jar,portal-forums-uif-ha-jbp.jar"/>
+ <fileset dir="${forums.lib}" includes="*.jar" excludes="portal-forums-uif.jar,portal-forums-uif-ha.jar,portal-forums-uif-ha-jbp.jar,portal-forums-uif-ha-as5.jar"/>
<!-- include jexl libs -->
<fileset dir="${jakarta-commons-jexl.lib}" includes="*.jar"/>
<!-- include jaae libs -->
@@ -176,6 +176,9 @@
<copy todir="${forums.root}/resources/portal-forums-ha-jbp-ear">
<fileset dir="${build.lib}" includes="portal-forums-authz-plugin.sar"/>
</copy>
+ <copy todir="${forums.root}/resources/portal-forums-ha-as5-ear">
+ <fileset dir="${build.lib}" includes="portal-forums-authz-plugin.sar"/>
+ </copy>
<!-- end patch 5 feb 2008 -->
<jar jarfile="${forums.lib}/jboss-forums.ear">
<fileset dir="${forums.root}/resources/portal-forums-ear" includes="**/*"/>
@@ -190,6 +193,10 @@
<jar jarfile="${forums.lib}/ha-jbp/jboss-forums.ear">
<fileset dir="${forums.root}/resources/portal-forums-ha-jbp-ear" includes="**/*"/>
</jar>
+ <mkdir dir="${forums.lib}/ha-as5/"/>
+ <jar jarfile="${forums.lib}/ha-as5/jboss-forums.ear">
+ <fileset dir="${forums.root}/resources/portal-forums-ha-as5-ear" includes="**/*"/>
+ </jar>
<!-- end patch 5 feb 2008 -->
<!-- end patch 7 apr 2007 -->
Modified: labs/jbossforums/trunk/forums/build.xml
===================================================================
--- labs/jbossforums/trunk/forums/build.xml 2010-08-27 09:52:15 UTC (rev 34920)
+++ labs/jbossforums/trunk/forums/build.xml 2010-08-27 09:59:04 UTC (rev 34921)
@@ -237,6 +237,11 @@
<fileset dir="${build.classes}" excludes="org/jboss/portlet/forums/auth/*"/>
<fileset dir="${build.resources}/portal-forums-uif-ha-jbp-jar" includes="**/*"/>
</jar>
+
+ <jar jarfile="${build.lib}/portal-forums-uif-ha-as5.jar">
+ <fileset dir="${build.classes}" excludes="org/jboss/portlet/forums/auth/*"/>
+ <fileset dir="${build.resources}/portal-forums-uif-ha-as5-jar" includes="**/*"/>
+ </jar>
<!-- portal-forums.war -->
<jar jarfile="${build.lib}/portal-forums.war" manifest="${build.etc}/portal-forums-war.mf">
@@ -321,6 +326,22 @@
<jar jarfile="${build.lib}/ha-jbp/jboss-forums.ear">
<fileset dir="${build.resources}/portal-forums-ha-jbp-ear" includes="**/*"/>
</jar>
+
+ <!-- Luca Stancapiano - 26 ago 2010 - portal-forums-ha-as5.ear -->
+ <copy todir="${build.resources}/portal-forums-ha-as5-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.sar,portal-forums-authz-plugin.sar,portal-forums-uif-ha-as5.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"/>
+ <fileset dir="${sun.portlet.lib}" includes="jsf-portlet.jar" />
+ <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>
+ <mkdir dir="${build.lib}/ha-as5/"/>
+ <jar jarfile="${build.lib}/ha-as5/jboss-forums.ear">
+ <fileset dir="${build.resources}/portal-forums-ha-as5-ear" includes="**/*"/>
+ </jar>
</target>
<target name="explode" depends="init">
@@ -330,6 +351,8 @@
<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" />
+ <mkdir dir="${build.resources}/ha-as5/"/>
+ <explode file="${build.lib}/ha-as5/jboss-forums.ear" todir="${build.resources}/ha-as5" />
</target>
<!-- ================================================================== -->
@@ -423,6 +446,26 @@
<require file="${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>
+
+ <!--
+ | Deploy the ha-as5 application
+ -->
+ <target name="deploy-ha-as5" description="Deploy ha as5." depends="output">
+
+ <!-- TEMPORARILY COPIED HERE, NEEDS TO BE REDONE -->
+ <!-- Luca Stancapiano - 26 ago 2010 - portal-forums-ha-as5.ear -->
+ <copy todir="${build.resources}/portal-forums-ha-as5-ear">
+ <fileset dir="${jakarta.lucene.root}/lib" includes="lucene.jar"/>
+ <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}/ha-as5/jboss-forums.ear">
+ <fileset dir="${build.resources}/portal-forums-ha-as5-ear" includes="**/*"/>
+ </jar>
+
+ <require file="${jboss.home}/server/${portal.deploy.dir}/deploy"/>
+ <copy file="${build.lib}/ha-as5/jboss-forums.ear" todir="${jboss.home}/server/${portal.deploy.dir}/deploy"/>
+ </target>
<!--
| Undeploy the application
@@ -432,22 +475,6 @@
<delete file="${jboss.home}/server/${portal.deploy.dir}/deploy/portal-forums.ear"/>
</target>
- <!--
- | Luca Stancapiano - 8 feb 2008 - Undeploy the ha application
- -->
- <target name="undeploy-ha" description="Undeploy ha." depends="init">
- <require file="${jboss.home}/server/${portal.deploy.dir}/deploy"/>
- <delete file="${jboss.home}/server/${portal.deploy.dir}/deploy/portal-forums-ha.ear"/>
- </target>
-
- <!--
- | Luca Stancapiano - 8 feb 2008 - Undeploy the ha-jbp application
- -->
- <target name="undeploy-ha-jbp" description="Undeploy ha jbp." depends="init">
- <require file="${jboss.home}/server/${portal.deploy.dir}/deploy"/>
- <delete file="${jboss.home}/server/${portal.deploy.dir}/deploy/portal-forums-ha-jbp.ear"/>
- </target>
-
<target name="test" depends="init">
<property name="build.testlog" value="${module.output}/log"/>
@@ -493,6 +520,7 @@
<pathelement location="${build.resources}/portal-forums-sar"/>
<pathelement location="${build.resources}/portal-forums-ha-sar"/>
<pathelement location="${build.resources}/portal-forums-ha-jbp-sar"/>
+ <pathelement location="${build.resources}/portal-forums-ha-as5-sar"/>
<!-- Luca Stancapiano - 8 feb 2008 - end patch -->
<pathelement location="${build.resources}/test"/>
<pathelement location="${jboss.home}/lib/dom4j.jar"/>
Added: labs/jbossforums/trunk/forums/src/resources/portal-forums-ha-as5-ear/META-INF/application.xml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-ha-as5-ear/META-INF/application.xml (rev 0)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-ha-as5-ear/META-INF/application.xml 2010-08-27 09:59:04 UTC (rev 34921)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application>
+ <display-name>JBoss Forums</display-name>
+ <module>
+ <java>portal-forums-ui.jar</java>
+ </module>
+ <module>
+ <java>jsf-facelets.jar</java>
+ </module>
+ <module>
+ <java>commons-collections.jar</java>
+ </module>
+ <module>
+ <java>commons-beanutils.jar</java>
+ </module>
+ <module>
+ <java>commons-digester-1.7-brew.jar</java>
+ </module>
+ <module>
+ <java>commons-codec.jar</java>
+ </module>
+ <module>
+ <java>jsf-example.jar</java>
+ </module>
+ <module>
+ <java>portletbridge-api.jar</java>
+ </module>
+ <module>
+ <java>portletbridge-impl.jar</java>
+ </module>
+ <module>
+ <java>portal-jems-lib.jar</java>
+ </module>
+ <module>
+ <java>portal-common-lib.jar</java>
+ </module>
+ <module>
+ <java>portal-identity-lib.jar</java>
+ </module>
+ <module>
+ <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-->
+ </web>
+ </module>
+ <module>
+ <ejb>
+ portal-forums-uif-ha-as5.jar
+ </ejb>
+ </module>
+</application>
Property changes on: labs/jbossforums/trunk/forums/src/resources/portal-forums-ha-as5-ear/META-INF/application.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: labs/jbossforums/trunk/forums/src/resources/portal-forums-ha-as5-ear/META-INF/jboss-app.xml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-ha-as5-ear/META-INF/jboss-app.xml (rev 0)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-ha-as5-ear/META-INF/jboss-app.xml 2010-08-27 09:59:04 UTC (rev 34921)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-app>
+<!--
+ <loader-repository>
+ forums.jboss.com:loader=jboss-forums-ha-sar
+ <loader-repository-config>
+ java2ParentDelegation=false
+ </loader-repository-config>
+ </loader-repository>
+ -->
+ <module>
+ <java>portal-forums-ui.jar</java>
+ </module>
+ <module>
+ <service>portal-forums-ha.sar</service>
+ </module>
+ <module>
+ <service>portal-forums-authz-plugin.sar</service>
+ </module>
+ <module>
+ <service>jboss-service.xml</service>
+ </module>
+</jboss-app>
Property changes on: labs/jbossforums/trunk/forums/src/resources/portal-forums-ha-as5-ear/META-INF/jboss-app.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: labs/jbossforums/trunk/forums/src/resources/portal-forums-ha-as5-ear/META-INF/security-config.xml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-ha-as5-ear/META-INF/security-config.xml (rev 0)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-ha-as5-ear/META-INF/security-config.xml 2010-08-27 09:59:04 UTC (rev 34921)
@@ -0,0 +1,37 @@
+<?xml version='1.0'?>
+<!DOCTYPE policy PUBLIC
+ "-//JBoss//DTD JBOSS Security Config 3.0//EN"
+ "http://www.jboss.org/j2ee/dtd/security_config.dtd">
+
+<!-- The JAAS login configuration file for the java:/jaas/jbossweb-form-auth
+security domain used by the security-spec test case
+-->
+<!--<policy>
+ <application-policy name="forums">
+ <authentication>
+ <login-module code="org.jboss.portal.identity.auth.IdentityLoginModule" flag="required">
+ <module-option name="unauthenticatedIdentity">guest</module-option>
+ <module-option name="hashAlgorithm">MD5</module-option>
+ <module-option name="hashEncoding">HEX</module-option>
+ <module-option name="userModuleJNDIName">java:/portal/UserModule</module-option>
+ <module-option name="additionalRole">Authenticated</module-option>
+ <module-option name="password-stacking">useFirstPass</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+</policy>-->
+<policy>
+ <application-policy name="forums">
+ <authentication>
+<login-module code="org.jboss.portal.identity.auth.IdentityLoginModule" flag="required">
+ <module-option name="unauthenticatedIdentity">guest</module-option>
+ <module-option name="userModuleJNDIName">java:/portal/UserModule</module-option>
+ <module-option name="roleModuleJNDIName">java:/portal/RoleModule</module-option>
+ <module-option name="userProfileModuleJNDIName">java:/portal/UserProfileModule</module-option>
+ <module-option name="membershipModuleJNDIName">java:/portal/MembershipModule</module-option>
+ <module-option name="additionalRole">Authenticated</module-option>
+ <module-option name="password-stacking">useFirstPass</module-option>
+</login-module>
+</authentication>
+</application-policy>
+</policy>
Property changes on: labs/jbossforums/trunk/forums/src/resources/portal-forums-ha-as5-ear/META-INF/security-config.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: labs/jbossforums/trunk/forums/src/resources/portal-forums-ha-as5-ear/jboss-service.xml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-ha-as5-ear/jboss-service.xml (rev 0)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-ha-as5-ear/jboss-service.xml 2010-08-27 09:59:04 UTC (rev 34921)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+ <!-- hooking in a login module for the standalone version of JSF Forums -->
+ <!-- The custom JAAS login configuration that installs
+ a Configuration capable of dynamically updating the
+ config settings
+ -->
+ <mbean code="org.jboss.security.auth.login.DynamicLoginConfig"
+ name="jboss.security.tests:service=LoginConfig">
+ <attribute name="AuthConfig">META-INF/security-config.xml</attribute>
+ <depends optional-attribute-name="LoginConfigService">
+ jboss.security:service=XMLLoginConfig
+ </depends>
+ <depends optional-attribute-name="SecurityManagerService">
+ jboss.security:service=JaasSecurityManager
+ </depends>
+ </mbean>
+</server>
Property changes on: labs/jbossforums/trunk/forums/src/resources/portal-forums-ha-as5-ear/jboss-service.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: labs/jbossforums/trunk/forums/src/resources/portal-forums-uif-ha-as5-jar/META-INF/persistence.xml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-uif-ha-as5-jar/META-INF/persistence.xml (rev 0)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-uif-ha-as5-jar/META-INF/persistence.xml 2010-08-27 09:59:04 UTC (rev 34921)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence version="1.0"
+ xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
+ <persistence-unit name="default">
+ <jta-data-source>java:@portal.datasource.name@</jta-data-source>
+ <properties>
+ <property name="hibernate.show_sql" value="false" />
+ <property name="hibernate.format_sql" value="false" />
+ <property name="hibernate.c3p0.min_size" value="5" />
+ <property name="hibernate.c3p0.max_size" value="20" />
+ <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.region.factory_class"
+ value="org.hibernate.cache.jbc2.JndiMultiplexedJBossCacheRegionFactory"/>
+ <property name="hibernate.cache.region.jbc2.cachefactory" value="java:CacheManager"/>
+ <property name="hibernate.cache.use_second_level_cache"
+ value="true" />
+ <property name="hibernate.generate_statistics" value="true" />
+ <property name="hibernate.cache.use_structured_entries"
+ value="true" />
+
+ </properties>
+ </persistence-unit>
+</persistence>
Property changes on: labs/jbossforums/trunk/forums/src/resources/portal-forums-uif-ha-as5-jar/META-INF/persistence.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
More information about the jboss-svn-commits
mailing list