[portal-commits] JBoss Portal SVN: r7924 - in branches/JBoss_Portal_Branch_2_6: build and 12 other directories.

Author: julien(a)jboss.com Date: 2007-08-14 11:25:43 -0400 (Tue, 14 Aug 2007) New Revision: 7924 Removed: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/web/ branches/JBoss_Portal_Branch_2_6/web/ Modified: branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml branches/JBoss_Portal_Branch_2_6/build/build.xml branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core/core.iml branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet/portlet.iml branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/server/server.iml branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/theme/theme.iml branches/JBoss_Portal_Branch_2_6/core/build.xml branches/JBoss_Portal_Branch_2_6/portlet-server/build.xml branches/JBoss_Portal_Branch_2_6/portlet/build.xml branches/JBoss_Portal_Branch_2_6/server/build.xml branches/JBoss_Portal_Branch_2_6/theme/build.xml branches/JBoss_Portal_Branch_2_6/tools/etc/buildfragments/modules.ent branches/JBoss_Portal_Branch_2_6/wsrp/build.xml Log: update 2.6 to use the portal web binary Modified: branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2007-08-14 13:48:34 UTC (rev 7923) +++ branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2007-08-14 15:25:43 UTC (rev 7924) @@ -48,6 +48,7 @@ --> <componentref name="jboss-portal/modules/common" version="1.0.0-SNAPSHOT"/> + <componentref name="jboss-portal/modules/web" version="1.0.0-SNAPSHOT"/> <componentref name="antlr" version="2.7.6.ga"/> <componentref name="apache-ant" version="1.6.5"/> Modified: branches/JBoss_Portal_Branch_2_6/build/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/build.xml 2007-08-14 13:48:34 UTC (rev 7923) +++ branches/JBoss_Portal_Branch_2_6/build/build.xml 2007-08-14 15:25:43 UTC (rev 7924) @@ -112,7 +112,6 @@ <!-- Modules --> <module name="test"/> - <module name="web"/> <module name="jems"/> <module name="security"/> <module name="faces"/> @@ -143,15 +142,15 @@ <group name="portal"> <include - modules="test, api, web, jems, server, security, identity, search, format, portlet, portlet-server, bridge, faces, portlet-federation, theme, workflow, cms, registration, core, wsrp, core-admin, core-cms, core-management, core-samples, widget"/> + modules="test, api, jems, server, security, identity, search, format, portlet, portlet-server, bridge, faces, portlet-federation, theme, workflow, cms, registration, core, wsrp, core-admin, core-cms, core-management, core-samples, widget"/> </group> <group name="cms"> - <include modules="test, web, jems, workflow, cms"/> + <include modules="test, jems, workflow, cms"/> </group> <group name="security"> - <include modules="test, web, jems, security"/> + <include modules="test, jems, security"/> </group> <group name="default"> @@ -336,9 +335,6 @@ <classpath> <fileset dir="../thirdparty" includes="**/*.jar"/> </classpath> - <packageset dir="../web/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> <packageset dir="../server/src/main"> <exclude name="org/jboss/portal/test/**"/> </packageset> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core/core.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core/core.iml 2007-08-14 13:48:34 UTC (rev 7923) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core/core.iml 2007-08-14 15:25:43 UTC (rev 7924) @@ -268,7 +268,6 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="web" /> <orderEntryProperties /> </component> <component name="VcsManagerConfiguration"> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet/portlet.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet/portlet.iml 2007-08-14 13:48:34 UTC (rev 7923) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet/portlet.iml 2007-08-14 15:25:43 UTC (rev 7924) @@ -141,7 +141,6 @@ </orderEntry> <orderEntry type="module" module-name="jems" /> <orderEntry type="module" module-name="api" /> - <orderEntry type="module" module-name="web" /> <orderEntryProperties /> </component> <component name="VcsManagerConfiguration"> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/server/server.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/server/server.iml 2007-08-14 13:48:34 UTC (rev 7923) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/server/server.iml 2007-08-14 15:25:43 UTC (rev 7924) @@ -93,7 +93,6 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="web" /> <orderEntryProperties /> </component> <component name="VcsManagerConfiguration"> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/theme/theme.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/theme/theme.iml 2007-08-14 13:48:34 UTC (rev 7923) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/theme/theme.iml 2007-08-14 15:25:43 UTC (rev 7924) @@ -95,7 +95,6 @@ </library> </orderEntry> <orderEntry type="module" module-name="jems" /> - <orderEntry type="module" module-name="web" /> <orderEntry type="module" module-name="test" /> <orderEntryProperties /> </component> Modified: branches/JBoss_Portal_Branch_2_6/core/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/build.xml 2007-08-14 13:48:34 UTC (rev 7923) +++ branches/JBoss_Portal_Branch_2_6/core/build.xml 2007-08-14 15:25:43 UTC (rev 7924) @@ -88,6 +88,7 @@ <path id="library.classpath"> <path refid="jboss.portal/modules/common.classpath"/> + <path refid="jboss.portal/modules/web.classpath"/> <path refid="jboss.jbossxb.classpath"/> <path refid="jboss.cache.classpath"/> <path refid="jbossas/core.libs.classpath"/> @@ -122,7 +123,6 @@ <call target="configure-modules"/> <path id="dependentmodule.classpath"> <path refid="jboss.portal-format.classpath"/> - <path refid="jboss.portal-web.classpath"/> <path refid="jboss.portal-server.classpath"/> <path refid="jboss.portal-registration.classpath"/> <path refid="jboss.portal-portlet.classpath"/> @@ -320,7 +320,7 @@ <fileset dir="${build.lib}" includes="jboss-portlet-api-lib.jar"/> <fileset dir="${jboss.portal-format.root}/lib" includes="portal-format-lib.jar"/> <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar"/> - <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/> + <fileset dir="${jboss.portal/modules/web.lib}" includes="portal-web-lib.jar"/> <fileset dir="${jboss.portal-bridge.root}/lib" includes="portal-bridge-lib.jar"/> <fileset dir="${jboss.portal-server.root}/lib" includes="portal-server-lib.jar"/> <fileset dir="${jboss.portal-portlet.root}/lib" includes="portal-portlet-lib.jar"/> Modified: branches/JBoss_Portal_Branch_2_6/portlet/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/build.xml 2007-08-14 13:48:34 UTC (rev 7923) +++ branches/JBoss_Portal_Branch_2_6/portlet/build.xml 2007-08-14 15:25:43 UTC (rev 7924) @@ -89,6 +89,7 @@ &libraries; <path id="library.classpath"> <path refid="jboss.portal/modules/common.classpath"/> + <path refid="jboss.portal/modules/web.classpath"/> <path refid="dom4j.dom4j.classpath"/> <path refid="jboss.jbossxb.classpath"/> <path refid="jboss.serialization.classpath"/> @@ -108,7 +109,6 @@ <!-- Configure modules --> <call target="configure-modules"/> <path id="dependentmodule.classpath"> - <path refid="jboss.portal-web.classpath"/> <path refid="jboss.portlet-api.classpath"/> <path refid="jboss.portal-test.classpath"/> </path> Modified: branches/JBoss_Portal_Branch_2_6/portlet-server/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet-server/build.xml 2007-08-14 13:48:34 UTC (rev 7923) +++ branches/JBoss_Portal_Branch_2_6/portlet-server/build.xml 2007-08-14 15:25:43 UTC (rev 7924) @@ -89,6 +89,7 @@ &libraries; <path id="library.classpath"> <path refid="jboss.portal/modules/common.classpath"/> + <path refid="jboss.portal/modules/web.classpath"/> <path refid="dom4j.dom4j.classpath"/> <path refid="jboss.jbossxb.classpath"/> <path refid="jboss.serialization.classpath"/> @@ -108,7 +109,6 @@ <!-- Configure modules --> <call target="configure-modules"/> <path id="dependentmodule.classpath"> - <path refid="jboss.portal-web.classpath"/> <path refid="jboss.portal-jems.classpath"/> <path refid="jboss.portal-security.classpath"/> <path refid="jboss.portal-server.classpath"/> @@ -204,10 +204,10 @@ <fileset dir="${jboss.portal-security.root}/lib" includes="portal-security-lib.jar"/> <fileset dir="${jboss.portal-portlet.root}/lib" includes="portal-portlet-lib.jar"/> <fileset dir="${jboss.portal-portlet.root}/lib" includes="portal-portlet-test-framework-lib.jar"/> - <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/> + <fileset dir="${jboss.portal/modules/web.lib}" includes="portal-web-lib.jar"/> <fileset dir="${jboss.portlet-api.root}/lib" includes="portlet-api-lib.jar"/> <fileset dir="${jboss.portlet-api.root}/lib" includes="portal-api-lib.jar"/> - <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/> + <fileset dir="${jboss.portal/modules/web.lib}" includes="portal-web-lib.jar"/> <fileset dir="${junit.junit.lib}" includes="junit.jar"/> <fileset dir="${build.lib}" includes="portal-portlet-server-lib.jar"/> <fileset dir="${build.lib}" includes="test.war"/> @@ -231,7 +231,7 @@ <fileset dir="${jboss.portal-portlet.root}/lib" includes="portal-portlet-test-framework-lib.jar"/> <fileset dir="${jboss.portal-portlet.root}/lib" includes="test-info.jar"/> <fileset dir="${jboss.portal-portlet.root}/lib" includes="test-info.war"/> - <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/> + <fileset dir="${jboss.portal/modules/web.lib}" includes="portal-web-lib.jar"/> <fileset dir="${jboss.portal-server.lib}" includes="test-agent.war"/> <fileset dir="${build.lib}" includes="portal-portlet-server-lib.jar"/> <fileset dir="${build.resources}/test/info/test-info-sar"/> Modified: branches/JBoss_Portal_Branch_2_6/server/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/server/build.xml 2007-08-14 13:48:34 UTC (rev 7923) +++ branches/JBoss_Portal_Branch_2_6/server/build.xml 2007-08-14 15:25:43 UTC (rev 7924) @@ -91,6 +91,7 @@ <echo message="${sun.servlet.lib}"/> <path id="library.classpath"> <path refid="jboss.portal/modules/common.classpath"/> + <path refid="jboss.portal/modules/web.classpath"/> <path refid="dom4j.dom4j.classpath"/> <path refid="oswego.concurrent.classpath"/> <path refid="jbossas/core.libs.classpath"/> @@ -113,7 +114,7 @@ <!-- Configure modules --> <call target="configure-modules"/> <path id="dependentmodule.classpath"> - <path refid="jboss.portal-web.classpath"/> + <path refid="jboss.portal-jems.classpath"/> <path refid="jboss.portal-test.classpath"/> </path> @@ -198,7 +199,7 @@ <fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/> <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar"/> <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/> - <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/> + <fileset dir="${jboss.portal/modules/web.lib}" includes="portal-web-lib.jar"/> <fileset dir="${build.lib}" includes="test-agent.war"/> <fileset dir="${build.lib}" includes="portal-server-lib.jar"/> <fileset dir="${build.lib}" includes="portal-server-test-lib.jar"/> @@ -219,7 +220,7 @@ <fileset dir="${junit.junit.lib}" includes="junit.jar"/> <fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/> <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar"/> - <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/> + <fileset dir="${jboss.portal/modules/web.lib}" includes="portal-web-lib.jar"/> <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/> <fileset dir="${build.lib}" includes="test-agent.war"/> <fileset dir="${build.lib}" includes="portal-server-lib.jar"/> @@ -235,7 +236,7 @@ <fileset dir="${junit.junit.lib}" includes="junit.jar"/> <fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/> <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar"/> - <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/> + <fileset dir="${jboss.portal/modules/web.lib}" includes="portal-web-lib.jar"/> <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/> <fileset dir="${build.lib}" includes="test-agent.war"/> <fileset dir="${build.lib}" includes="portal-server-lib.jar"/> @@ -249,7 +250,7 @@ <fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/> <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar"/> <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/> - <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/> + <fileset dir="${jboss.portal/modules/web.lib}" includes="portal-web-lib.jar"/> <fileset dir="${build.lib}" includes="test-agent.war"/> <fileset dir="${build.lib}" includes="portal-server-lib.jar"/> <fileset dir="${build.lib}" includes="portal-server-test-lib.jar"/> Modified: branches/JBoss_Portal_Branch_2_6/theme/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/theme/build.xml 2007-08-14 13:48:34 UTC (rev 7923) +++ branches/JBoss_Portal_Branch_2_6/theme/build.xml 2007-08-14 15:25:43 UTC (rev 7924) @@ -91,6 +91,7 @@ <echo message="${sun.servlet.lib}"/> <path id="library.classpath"> <path refid="jboss.portal/modules/common.classpath"/> + <path refid="jboss.portal/modules/web.classpath"/> <path refid="oswego.concurrent.classpath"/> <path refid="jboss.jbossxb.classpath"/> <path refid="jbossas/core.libs.classpath"/> @@ -109,7 +110,6 @@ <call target="configure-modules"/> <path id="dependentmodule.classpath"> <path refid="jboss.portlet-api.classpath"/> - <path refid="jboss.portal-web.classpath"/> <path refid="jboss.portal-jems.classpath"/> <path refid="jboss.portal-server.classpath"/> <path refid="jboss.portal-portlet.classpath"/> @@ -234,7 +234,7 @@ <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar"/> <fileset dir="${jboss.portal-server.root}/lib" includes="portal-server-lib.jar"/> <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/> - <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/> + <fileset dir="${jboss.portal/modules/web.lib}" includes="portal-web-lib.jar"/> <fileset dir="${jboss.portlet-api.root}/lib" includes="portal-api-lib.jar"/> <fileset dir="${jboss.portal-theme.root}/lib" includes="portal-theme-lib.jar"/> <fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/> Modified: branches/JBoss_Portal_Branch_2_6/tools/etc/buildfragments/modules.ent =================================================================== --- branches/JBoss_Portal_Branch_2_6/tools/etc/buildfragments/modules.ent 2007-08-14 13:48:34 UTC (rev 7923) +++ branches/JBoss_Portal_Branch_2_6/tools/etc/buildfragments/modules.ent 2007-08-14 15:25:43 UTC (rev 7924) @@ -2,13 +2,6 @@ <target name="configure-modules" unless="configure-modules.disabled"> - <!-- web --> - <property name="jboss.portal-web.root" value="${project.root}/web/output"/> - <property name="jboss.portal-web.lib" value="${jboss.portal-web.root}/lib"/> - <path id="jboss.portal-web.classpath"> - <pathelement path="${jboss.portal-web.lib}/portal-web-lib.jar"/> - </path> - <!-- test --> <property name="jboss.portal-test.root" value="${project.root}/test/output"/> <property name="jboss.portal-test.lib" value="${jboss.portal-test.root}/lib"/> Modified: branches/JBoss_Portal_Branch_2_6/wsrp/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/build.xml 2007-08-14 13:48:34 UTC (rev 7923) +++ branches/JBoss_Portal_Branch_2_6/wsrp/build.xml 2007-08-14 15:25:43 UTC (rev 7924) @@ -487,7 +487,7 @@ includes="portal-portlet-lib.jar, portal-portlet-test-lib.jar"/> <fileset dir="${jboss.portal-portlet-server.root}/lib" includes="portal-portlet-server-lib.jar"/> - <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/> + <fileset dir="${jboss.portal/modules/web.lib}" includes="portal-web-lib.jar"/> <fileset dir="${jboss.portal-portlet-federation.root}/lib" includes="portal-portlet-federation-lib.jar"/> <fileset dir="${jboss.portal-registration.root}/lib" includes="portal-registration-lib.jar"/> <fileset dir="${jboss.portal-test.lib}" includes="portal-test-lib.jar"/> @@ -548,7 +548,7 @@ <fileset dir="${jboss.portlet-api.root}/lib" includes="portal-api-lib.jar"/> <fileset dir="${jboss.portal-portlet.root}/lib" includes="portal-portlet-lib.jar"/> <fileset dir="${jboss.portal-portlet-server.root}/lib" includes="portal-portlet-server-lib.jar"/> - <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/> + <fileset dir="${jboss.portal/modules/web.lib}" includes="portal-web-lib.jar"/> <fileset dir="${jboss.portal-portlet-federation.root}/lib" includes="portal-portlet-federation-lib.jar"/> <fileset dir="${jboss.portal-registration.root}/lib" includes="portal-registration-lib.jar"/> <fileset dir="${jboss.portal-test.lib}" includes="portal-test-lib.jar"/>