Author: thomas.heute(a)jboss.com
Date: 2007-10-29 09:44:24 -0400 (Mon, 29 Oct 2007)
New Revision: 8791
Modified:
branches/JBoss_Portal_Branch_2_6/cms/build.xml
branches/JBoss_Portal_Branch_2_6/core-cms/build.xml
Log:
Put back jgroups lib which is only available in 'all'
Modified: branches/JBoss_Portal_Branch_2_6/cms/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/cms/build.xml 2007-10-29 11:25:02 UTC (rev 8790)
+++ branches/JBoss_Portal_Branch_2_6/cms/build.xml 2007-10-29 13:44:24 UTC (rev 8791)
@@ -115,8 +115,8 @@
<!-- cms optimization integration -->
<path refid="jgroups.jgroups.classpath"/>
<path refid="sun.servlet.classpath"/>
- <!-- jbpm integration -->
- <path refid="jbpm.jaronly.classpath"/>
+ <!-- jbpm integration -->
+ <path refid="jbpm.jaronly.classpath"/>
</path>
<path id="javac.classpath">
@@ -132,11 +132,11 @@
<path refid="jboss.portal-jems.classpath"/>
<path refid="jboss.portal-search.classpath"/>
<!-- fine grained security integration -->
- <path refid="jboss.portal-security.classpath"/>
+ <path refid="jboss.portal-security.classpath"/>
<!-- clustered testcases related -->
- <path refid="jboss.portal-api.classpath"/>
- <!-- workflow integration -->
- <path refid="jboss.portal-workflow.classpath"/>
+ <path refid="jboss.portal-api.classpath"/>
+ <!-- workflow integration -->
+ <path refid="jboss.portal-workflow.classpath"/>
</path>
@@ -202,9 +202,11 @@
<fileset dir="${jackrabbit.jackrabbit.lib}"
includes="jackrabbit-index-filters.jar"/>
<fileset dir="${nekohtml.nekohtml.lib}"
includes="nekohtml.jar"/>
-
+
<!-- cms optimization integration -->
<fileset dir="${jackrabbit.jackrabbit.lib}"
includes="jackrabbit-core.jar"/>
+ <fileset dir="${jgroups.jgroups.lib}"
includes="jgroups.jar"/>
+
<fileset dir="${slf4j.slf4j.lib}"
includes="slf4j-log4j12.jar"/>
</jar>
@@ -227,24 +229,26 @@
<fileset dir="${apache.collections.root}/lib"
includes="commons-collections.jar"/>
<fileset dir="${apache.lucene.root}/lib"
includes="lucene.jar"/>
- <!-- cms optimization integration -->
- <fileset dir="${jackrabbit.jackrabbit.lib}"
includes="jackrabbit-core.jar"/>
+ <!-- cms optimization integration -->
+ <fileset dir="${jackrabbit.jackrabbit.lib}"
includes="jackrabbit-core.jar"/>
+ <fileset dir="${jgroups.jgroups.lib}"
includes="jgroups.jar"/>
+
<fileset dir="${slf4j.slf4j.lib}"
includes="slf4j-log4j12.jar"/>
- <!-- add the jboss-service.xml and hibernate configuration -->
- <fileset dir="${build.resources}/test/cms/clustering/sar"/>
-
- <!-- add dependencies -->
- <!--
- <fileset dir="${jboss.portal-core.lib}"
includes="portal-core-lib.jar"/>
- <fileset dir="${jboss.portal/modules/common.lib}"
includes="portal-common-lib.jar"/>
- <fileset dir="${jboss.portal-jems.lib}"
includes="portal-jems-lib.jar"/>
- <fileset dir="${jboss.portal-server.lib}"
includes="portal-server-lib.jar"/>
- <fileset dir="${jboss.portal-portlet.lib}"
includes="portal-portlet-lib.jar"/>
- <fileset dir="${jboss.portlet-api.lib}"
includes="portal-api-lib.jar"/>
- <fileset dir="${jboss.portal-security.lib}"
includes="portal-security-lib.jar"/>
- -->
- <fileset dir="${jboss.portal-core-cms.lib}"
includes="portal-core-cms-lib.jar"/>
+ <!-- add the jboss-service.xml and hibernate configuration -->
+ <fileset dir="${build.resources}/test/cms/clustering/sar"/>
+
+ <!-- add dependencies -->
+ <!--
+ <fileset dir="${jboss.portal-core.lib}"
includes="portal-core-lib.jar"/>
+ <fileset dir="${jboss.portal/modules/common.lib}"
includes="portal-common-lib.jar"/>
+ <fileset dir="${jboss.portal-jems.lib}"
includes="portal-jems-lib.jar"/>
+ <fileset dir="${jboss.portal-server.lib}"
includes="portal-server-lib.jar"/>
+ <fileset dir="${jboss.portal-portlet.lib}"
includes="portal-portlet-lib.jar"/>
+ <fileset dir="${jboss.portlet-api.lib}"
includes="portal-api-lib.jar"/>
+ <fileset dir="${jboss.portal-security.lib}"
includes="portal-security-lib.jar"/>
+ -->
+ <fileset dir="${jboss.portal-core-cms.lib}"
includes="portal-core-cms-lib.jar"/>
<fileset dir="${jboss.portal/modules/identity.lib}"
includes="portal-identity-lib.jar"/>
<fileset dir="${jboss.portal/modules/identity.lib}"
includes="portal-identity-sso-lib.jar"/>
<fileset dir="${jboss.portal-workflow.lib}"
includes="portal-workflow-lib.jar"/>
@@ -258,25 +262,23 @@
<target name="deploy-tests"
description="Deploy."
depends="output">
+
+ <!-- deploying the test datasources -->
+ <copy
file="${build.resources}/test/cms/clustering/datasource/ports01-ds.xml"
todir="${jboss.home}/server/ports-01/deploy" overwrite="true"/>
+ <copy
file="${build.resources}/test/cms/clustering/datasource/ports02-ds.xml"
todir="${jboss.home}/server/ports-02/deploy" overwrite="true"/>
- <!-- deploying the test datasources -->
- <copy
file="${build.resources}/test/cms/clustering/datasource/ports01-ds.xml"
- todir="${jboss.home}/server/ports-01/deploy"
overwrite="true"/>
- <copy
file="${build.resources}/test/cms/clustering/datasource/ports02-ds.xml"
- todir="${jboss.home}/server/ports-02/deploy"
overwrite="true"/>
-
<!-- install test sars needed for the testsuite framework -->
<!--
<copy file="${jboss.portal-portlet.lib}/test.sar"
todir="${jboss.home}/server/ports-01/deploy"/>
<copy file="${jboss.portal-portlet.lib}/test.sar"
todir="${jboss.home}/server/ports-02/deploy"/>
-->
-
- <!--
- <copy file="${jboss.portal-test.lib}/portal-test.sar"
todir="${jboss.home}/server/ports-01/deploy"/>
- <copy file="${jboss.portal-test.lib}/portal-test.sar"
todir="${jboss.home}/server/ports-02/deploy"/>
- -->
-
- <copy file="${build.lib}/test-cms-cluster.sar"
todir="${jboss.home}/server/ports-01/deploy"/>
+
+ <!--
+ <copy file="${jboss.portal-test.lib}/portal-test.sar"
todir="${jboss.home}/server/ports-01/deploy"/>
+ <copy file="${jboss.portal-test.lib}/portal-test.sar"
todir="${jboss.home}/server/ports-02/deploy"/>
+ -->
+
+ <copy file="${build.lib}/test-cms-cluster.sar"
todir="${jboss.home}/server/ports-01/deploy"/>
<copy file="${build.lib}/test-cms-cluster.sar"
todir="${jboss.home}/server/ports-02/deploy"/>
</target>
@@ -284,16 +286,16 @@
description="UnDeploy."
depends="output">
<!-- install test sars needed for the testsuite framework -->
- <!--
- <delete file="${jboss.home}/server/ports-01/deploy/test.sar"/>
- <delete file="${jboss.home}/server/ports-02/deploy/test.sar"/>
- -->
- <!--
- <delete
file="${jboss.home}/server/ports-01/deploy/portal-test.sar"/>
- <delete
file="${jboss.home}/server/ports-02/deploy/portal-test.sar"/>
- -->
-
- <delete
file="${jboss.home}/server/ports-01/deploy/test-cms-cluster.sar"/>
+ <!--
+ <delete file="${jboss.home}/server/ports-01/deploy/test.sar"/>
+ <delete file="${jboss.home}/server/ports-02/deploy/test.sar"/>
+ -->
+ <!--
+ <delete file="${jboss.home}/server/ports-01/deploy/portal-test.sar"/>
+ <delete
file="${jboss.home}/server/ports-02/deploy/portal-test.sar"/>
+ -->
+
+ <delete
file="${jboss.home}/server/ports-01/deploy/test-cms-cluster.sar"/>
<delete
file="${jboss.home}/server/ports-02/deploy/test-cms-cluster.sar"/>
</target>
@@ -395,11 +397,11 @@
<jvmarg value="-Xdebug"/>
<jvmarg
value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/>
-->
- <!--
- prefer IPv4 when running test with jdk1.5 on linux.
- This supposedly is a java bug as per jgroups page.
- -->
- <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
+ <!--
+ prefer IPv4 when running test with jdk1.5 on linux.
+ This supposedly is a java bug as per jgroups page.
+ -->
+ <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
</x-sysproperty>
<x-test>
<!-- general cms setup related tests -->
@@ -425,15 +427,15 @@
<test todir="${test.reports}"
name="org.jboss.portal.test.cms.commands.TestFolderCreate"/>
<test todir="${test.reports}"
name="org.jboss.portal.test.cms.commands.TestFolderDelete"/>
<test todir="${test.reports}"
name="org.jboss.portal.test.cms.commands.TestFolderGet"/>
- <test todir="${test.reports}"
name="org.jboss.portal.test.cms.commands.TestFolderUpdate"/>
+ <test todir="${test.reports}"
name="org.jboss.portal.test.cms.commands.TestFolderUpdate"/>
- <!-- cms fine grained security related tests -->
- <test todir="${test.reports}"
name="org.jboss.portal.test.cms.security.TestReadAccess"/>
+ <!-- cms fine grained security related tests -->
+ <test todir="${test.reports}"
name="org.jboss.portal.test.cms.security.TestReadAccess"/>
<test todir="${test.reports}"
name="org.jboss.portal.test.cms.security.TestWriteAccess"/>
- <test todir="${test.reports}"
name="org.jboss.portal.test.cms.security.TestManageAccess"/>
-
- <!-- cms workflow related tests -->
- <test todir="${test.reports}"
name="org.jboss.portal.test.cms.workflow.TestApprovedPublish"/>
+ <test todir="${test.reports}"
name="org.jboss.portal.test.cms.security.TestManageAccess"/>
+
+ <!-- cms workflow related tests -->
+ <test todir="${test.reports}"
name="org.jboss.portal.test.cms.workflow.TestApprovedPublish"/>
<test todir="${test.reports}"
name="org.jboss.portal.test.cms.workflow.TestDeniedPublish"/>
</x-test>
<x-classpath>
@@ -477,11 +479,11 @@
<path refid="nekohtml.nekohtml.classpath"/>
<path refid="jboss.cache.classpath"/>
<path refid="jgroups.jgroups.classpath"/>
- <!-- fine grained security integration -->
- <path refid="jboss.portal/modules/identity.classpath"/>
+ <!-- fine grained security integration -->
+ <path refid="jboss.portal/modules/identity.classpath"/>
<path refid="jboss.portal-security.classpath"/>
- <!-- workflow integration -->
- <path refid="jbpm.jaronly.classpath"/>
+ <!-- workflow integration -->
+ <path refid="jbpm.jaronly.classpath"/>
<path refid="beanshell.beanshell.classpath"/>
<path refid="jboss.portal-workflow.classpath"/>
</x-classpath>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/build.xml 2007-10-29 11:25:02 UTC (rev
8790)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/build.xml 2007-10-29 13:44:24 UTC (rev
8791)
@@ -262,6 +262,7 @@
<!-- cms optimization integration - this contains a clustered cache enabled
version -->
<fileset dir="${jackrabbit.jackrabbit.lib}"
includes="jackrabbit-core.jar"/>
+ <fileset dir="${jgroups.jgroups.lib}"
includes="jgroups.jar"/>
<fileset dir="${slf4j.slf4j.lib}"
includes="slf4j-log4j12.jar"/>
</copy>
Show replies by date