Author: julien(a)jboss.com Date: 2007-08-14 05:46:27 -0400 (Tue, 14 Aug 2007) New Revision: 7910 Removed: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/common/ branches/JBoss_Portal_Branch_2_6/common/ Modified: branches/JBoss_Portal_Branch_2_6/api/build.xml branches/JBoss_Portal_Branch_2_6/bridge/build.xml 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/jboss-portal.ipr branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/bridge/bridge.iml branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/cms/cms.iml branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core-admin/core-admin.iml branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core-cms/core-cms.iml branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core-management/core-management.iml branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core-samples/core-samples.iml branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core-wsrp/core-wsrp.iml 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/faces/faces.iml branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/format/format.iml branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/identity/identity.iml branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/jems/jems.iml branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/migration/migration.iml branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet-federation/portlet-federation.iml branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet-server/portlet-server.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/registration/registration.iml branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/security/security.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/test/test.iml 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/widget/widget.iml branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/workflow/workflow.iml branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/wsrp/wsrp.iml branches/JBoss_Portal_Branch_2_6/cms/build.xml branches/JBoss_Portal_Branch_2_6/core-admin/build.xml branches/JBoss_Portal_Branch_2_6/core-cms/build.xml branches/JBoss_Portal_Branch_2_6/core-management/build.xml branches/JBoss_Portal_Branch_2_6/core-samples/build.xml branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml branches/JBoss_Portal_Branch_2_6/core/build.xml branches/JBoss_Portal_Branch_2_6/faces/build.xml branches/JBoss_Portal_Branch_2_6/format/build.xml branches/JBoss_Portal_Branch_2_6/identity/build.xml branches/JBoss_Portal_Branch_2_6/jems/build.xml branches/JBoss_Portal_Branch_2_6/migration/build.xml branches/JBoss_Portal_Branch_2_6/portlet-federation/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/registration/build.xml branches/JBoss_Portal_Branch_2_6/search/build.xml branches/JBoss_Portal_Branch_2_6/security/build.xml branches/JBoss_Portal_Branch_2_6/server/build.xml branches/JBoss_Portal_Branch_2_6/test/build.xml branches/JBoss_Portal_Branch_2_6/testsuite/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/web/build.xml branches/JBoss_Portal_Branch_2_6/widget/build.xml branches/JBoss_Portal_Branch_2_6/workflow/build.xml branches/JBoss_Portal_Branch_2_6/wsrp/build.xml Log: removed common module and use portal common module binary from repository Modified: branches/JBoss_Portal_Branch_2_6/api/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/api/build.xml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/api/build.xml 2007-08-14 09:46:27 UTC (rev 7910) @@ -94,7 +94,6 @@ <!-- Configure modules --> <call target="configure-modules"/> <path id="dependentmodule.classpath"> - <path refid="jboss.portal-common.classpath"/> </path> <!--+=======================================+--> Modified: branches/JBoss_Portal_Branch_2_6/bridge/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/bridge/build.xml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/bridge/build.xml 2007-08-14 09:46:27 UTC (rev 7910) @@ -85,6 +85,7 @@ <!-- Configure thirdparty libraries --> &libraries; <path id="library.classpath"> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="jbossas/core.libs.classpath"/> <path refid="apache.log4j.classpath"/> <path refid="sun.servlet.classpath"/> @@ -99,7 +100,6 @@ <call target="configure-modules"/> <path id="dependentmodule.classpath"> <path refid="jboss.portlet-api.classpath"/> - <path refid="jboss.portal-common.classpath"/> <path refid="jboss.portal-jems.classpath"/> <path refid="jboss.portal-server.classpath"/> <path refid="jboss.portal-portlet.classpath"/> Modified: branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2007-08-14 09:46:27 UTC (rev 7910) @@ -47,6 +47,8 @@ are pushed to the http://repository.jboss.com site. --> + <componentref name="jboss-portal/modules/common" version="1.0.0-SNAPSHOT"/> + <componentref name="antlr" version="2.7.6.ga"/> <componentref name="apache-ant" version="1.6.5"/> <componentref name="jackrabbit" version="1.1.1"/> Modified: branches/JBoss_Portal_Branch_2_6/build/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/build.xml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/build/build.xml 2007-08-14 09:46:27 UTC (rev 7910) @@ -111,7 +111,6 @@ <!-- Modules --> - <module name="common"/> <module name="test"/> <module name="web"/> <module name="jems"/> @@ -144,15 +143,15 @@ <group name="portal"> <include - modules="common, 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, 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"/> </group> <group name="cms"> - <include modules="common, test, web, jems, workflow, cms"/> + <include modules="test, web, jems, workflow, cms"/> </group> <group name="security"> - <include modules="common, test, web, jems, security"/> + <include modules="test, web, jems, security"/> </group> <group name="default"> @@ -337,9 +336,6 @@ <classpath> <fileset dir="../thirdparty" includes="**/*.jar"/> </classpath> - <packageset dir="../common/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> <packageset dir="../web/src/main"> <exclude name="org/jboss/portal/test/**"/> </packageset> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/jboss-portal.ipr =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/jboss-portal.ipr 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/jboss-portal.ipr 2007-08-14 09:46:27 UTC (rev 7910) @@ -256,12 +256,12 @@ <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/bridge/bridge.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/bridge/bridge.iml" /> <module fileurl="file://$PROJECT_DIR$/build/build.iml" filepath="$PROJECT_DIR$/build/build.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/cms/cms.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/cms/cms.iml" /> - <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/common/common.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/common/common.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/core/core.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/core/core.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-admin/core-admin.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-admin/core-admin.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-cms/core-cms.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-cms/core-cms.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-management/core-management.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-management/core-management.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-samples/core-samples.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-samples/core-samples.iml" /> + <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-wsrp/core-wsrp.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-wsrp/core-wsrp.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/faces/faces.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/faces/faces.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/format/format.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/format/format.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/identity/identity.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/identity/identity.iml" /> @@ -269,6 +269,7 @@ <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/migration/migration.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/migration/migration.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/portlet/portlet.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/portlet/portlet.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/portlet-federation/portlet-federation.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/portlet-federation/portlet-federation.iml" /> + <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/portlet-server/portlet-server.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/portlet-server/portlet-server.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/registration/registration.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/registration/registration.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/search/search.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/search/search.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/security/security.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/security/security.iml" /> @@ -278,6 +279,7 @@ <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/theme/theme.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/theme/theme.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/thirdparty/thirdparty.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/thirdparty/thirdparty.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/tools/tools.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/tools/tools.iml" /> + <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/web/web.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/web/web.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/widget/widget.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/widget/widget.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/workflow/workflow.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/workflow/workflow.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/wsrp/wsrp.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/wsrp/wsrp.iml" /> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/bridge/bridge.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/bridge/bridge.iml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/bridge/bridge.iml 2007-08-14 09:46:27 UTC (rev 7910) @@ -11,7 +11,6 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="server" /> - <orderEntry type="module" module-name="common" /> <orderEntry type="module-library"> <library> <CLASSES> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/cms/cms.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/cms/cms.iml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/cms/cms.iml 2007-08-14 09:46:27 UTC (rev 7910) @@ -10,7 +10,6 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="common" /> <orderEntry type="module-library"> <library> <CLASSES> 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-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core/core.iml 2007-08-14 09:46:27 UTC (rev 7910) @@ -14,7 +14,6 @@ <orderEntry type="module" module-name="server" /> <orderEntry type="module" module-name="portlet" /> <orderEntry type="module" module-name="format" /> - <orderEntry type="module" module-name="common" /> <orderEntry type="module-library"> <library> <CLASSES> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core-admin/core-admin.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core-admin/core-admin.iml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core-admin/core-admin.iml 2007-08-14 09:46:27 UTC (rev 7910) @@ -67,7 +67,6 @@ <orderEntry type="module" module-name="core" /> <orderEntry type="module" module-name="identity" /> <orderEntry type="module" module-name="portlet" /> - <orderEntry type="module" module-name="common" /> <orderEntry type="module" module-name="theme" /> <orderEntry type="module" module-name="api" /> <orderEntry type="module" module-name="security" /> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core-cms/core-cms.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core-cms/core-cms.iml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core-cms/core-cms.iml 2007-08-14 09:46:27 UTC (rev 7910) @@ -52,7 +52,6 @@ </orderEntry> <orderEntry type="module" module-name="portlet" /> <orderEntry type="module" module-name="identity" /> - <orderEntry type="module" module-name="common" /> <orderEntry type="module" module-name="theme" /> <orderEntry type="module" module-name="core-admin" /> <orderEntry type="module" module-name="jems" /> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core-management/core-management.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core-management/core-management.iml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core-management/core-management.iml 2007-08-14 09:46:27 UTC (rev 7910) @@ -11,7 +11,6 @@ <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="core" /> <orderEntry type="module" module-name="portlet" /> - <orderEntry type="module" module-name="common" /> <orderEntry type="module" module-name="jems" /> <orderEntry type="module-library"> <library> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core-samples/core-samples.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core-samples/core-samples.iml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core-samples/core-samples.iml 2007-08-14 09:46:27 UTC (rev 7910) @@ -14,7 +14,6 @@ <orderEntry type="module" module-name="portlet" /> <orderEntry type="module" module-name="api" /> <orderEntry type="module" module-name="identity" /> - <orderEntry type="module" module-name="common" /> <orderEntry type="module-library"> <library> <CLASSES> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core-wsrp/core-wsrp.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core-wsrp/core-wsrp.iml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core-wsrp/core-wsrp.iml 2007-08-14 09:46:27 UTC (rev 7910) @@ -9,7 +9,6 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="common" /> <orderEntry type="module" module-name="portlet" /> <orderEntry type="module" module-name="wsrp" /> <orderEntry type="module-library"> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/faces/faces.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/faces/faces.iml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/faces/faces.iml 2007-08-14 09:46:27 UTC (rev 7910) @@ -37,7 +37,6 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="common" /> <orderEntry type="module-library"> <library> <CLASSES> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/format/format.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/format/format.iml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/format/format.iml 2007-08-14 09:46:27 UTC (rev 7910) @@ -13,7 +13,6 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="common" /> <orderEntry type="module-library"> <library> <CLASSES> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/identity/identity.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/identity/identity.iml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/identity/identity.iml 2007-08-14 09:46:27 UTC (rev 7910) @@ -10,7 +10,6 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="common" /> <orderEntry type="module" module-name="test" /> <orderEntry type="module-library"> <library> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/jems/jems.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/jems/jems.iml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/jems/jems.iml 2007-08-14 09:46:27 UTC (rev 7910) @@ -10,7 +10,6 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="common" /> <orderEntry type="module" module-name="test" /> <orderEntry type="module-library"> <library> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/migration/migration.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/migration/migration.iml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/migration/migration.iml 2007-08-14 09:46:27 UTC (rev 7910) @@ -10,7 +10,6 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="common" /> <orderEntry type="module" module-name="core" /> <orderEntry type="module" module-name="server" /> <orderEntry type="module" module-name="portlet" /> 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-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet/portlet.iml 2007-08-14 09:46:27 UTC (rev 7910) @@ -20,7 +20,6 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="common" /> <orderEntry type="module" module-name="security" /> <orderEntry type="module-library"> <library> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet-federation/portlet-federation.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet-federation/portlet-federation.iml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet-federation/portlet-federation.iml 2007-08-14 09:46:27 UTC (rev 7910) @@ -11,7 +11,6 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="portlet" /> - <orderEntry type="module" module-name="common" /> <orderEntry type="module-library"> <library> <CLASSES> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet-server/portlet-server.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet-server/portlet-server.iml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet-server/portlet-server.iml 2007-08-14 09:46:27 UTC (rev 7910) @@ -22,7 +22,6 @@ </orderEntry> <orderEntry type="module" module-name="security" /> <orderEntry type="module" module-name="api" /> - <orderEntry type="module" module-name="common" /> <orderEntry type="module-library"> <library> <CLASSES> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/registration/registration.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/registration/registration.iml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/registration/registration.iml 2007-08-14 09:46:27 UTC (rev 7910) @@ -9,7 +9,6 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="common" /> <orderEntry type="module" module-name="jems" /> <orderEntry type="module-library"> <library> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/security/security.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/security/security.iml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/security/security.iml 2007-08-14 09:46:27 UTC (rev 7910) @@ -10,7 +10,6 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="common" /> <orderEntry type="module" module-name="server" /> <orderEntry type="module" module-name="api" /> <orderEntry type="module-library"> 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-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/server/server.iml 2007-08-14 09:46:27 UTC (rev 7910) @@ -10,7 +10,6 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="common" /> <orderEntry type="module-library"> <library> <CLASSES> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/test/test.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/test/test.iml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/test/test.iml 2007-08-14 09:46:27 UTC (rev 7910) @@ -10,7 +10,6 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="common" /> <orderEntry type="module-library"> <library> <CLASSES> 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-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/theme/theme.iml 2007-08-14 09:46:27 UTC (rev 7910) @@ -10,7 +10,6 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="common" /> <orderEntry type="module" module-name="server" /> <orderEntry type="module-library"> <library> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/widget/widget.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/widget/widget.iml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/widget/widget.iml 2007-08-14 09:46:27 UTC (rev 7910) @@ -10,7 +10,6 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="portlet" /> - <orderEntry type="module" module-name="common" /> <orderEntry type="module" module-name="jems" /> <orderEntry type="module-library"> <library> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/workflow/workflow.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/workflow/workflow.iml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/workflow/workflow.iml 2007-08-14 09:46:27 UTC (rev 7910) @@ -9,7 +9,6 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="common" /> <orderEntry type="module" module-name="jems" /> <orderEntry type="module-library"> <library> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/wsrp/wsrp.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/wsrp/wsrp.iml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/wsrp/wsrp.iml 2007-08-14 09:46:27 UTC (rev 7910) @@ -14,7 +14,6 @@ <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="server" /> <orderEntry type="module" module-name="portlet" /> - <orderEntry type="module" module-name="common" /> <orderEntry type="module-library"> <library> <CLASSES> Modified: branches/JBoss_Portal_Branch_2_6/cms/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/build.xml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/cms/build.xml 2007-08-14 09:46:27 UTC (rev 7910) @@ -88,6 +88,7 @@ <!-- Configure thirdparty libraries --> &libraries; <path id="library.classpath"> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="apache.logging.classpath"/> <path refid="apache.xerces.classpath"/> <path refid="apache.log4j.classpath"/> @@ -126,7 +127,6 @@ <call target="configure-modules"/> <path id="dependentmodule.classpath"> <path refid="jboss.portal-server.classpath"/> - <path refid="jboss.portal-common.classpath"/> <path refid="jboss.portal-jems.classpath"/> <path refid="jboss.portal-test.classpath"/> <path refid="jboss.portal-search.classpath"/> @@ -243,7 +243,7 @@ <!-- add dependencies --> <!-- <fileset dir="${jboss.portal-core.lib}" includes="portal-core-lib.jar"/> - <fileset dir="${jboss.portal-common.lib}" includes="portal-common-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"/> @@ -375,7 +375,7 @@ <path refid="asm.asm.classpath"/> <path refid="cglib.cglib.classpath"/> <path refid="apache.httpclient.classpath"/> - <path refid="jboss.portal-common.classpath"/> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="jboss.portal-test.classpath"/> <path refid="jboss.portal-server.classpath"/> <path refid="jboss.portal-jems.classpath"/> @@ -472,7 +472,7 @@ <path refid="asm.asm.classpath"/> <path refid="cglib.cglib.classpath"/> <path refid="apache.httpclient.classpath"/> - <path refid="jboss.portal-common.classpath"/> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="jboss.portal-test.classpath"/> <path refid="jboss.portal-search.classpath"/> <path refid="jboss.portal-server.classpath"/> Modified: branches/JBoss_Portal_Branch_2_6/core/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/build.xml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/core/build.xml 2007-08-14 09:46:27 UTC (rev 7910) @@ -87,6 +87,7 @@ &libraries; <path id="library.classpath"> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="jboss.jbossxb.classpath"/> <path refid="jboss.cache.classpath"/> <path refid="jbossas/core.libs.classpath"/> @@ -121,7 +122,6 @@ <call target="configure-modules"/> <path id="dependentmodule.classpath"> <path refid="jboss.portal-format.classpath"/> - <path refid="jboss.portal-common.classpath"/> <path refid="jboss.portal-web.classpath"/> <path refid="jboss.portal-server.classpath"/> <path refid="jboss.portal-registration.classpath"/> @@ -229,7 +229,7 @@ <path refid="jboss.serialization.classpath"/> <path refid="beanshell.beanshell.classpath"/> <path refid="hibernate.classpath"/> - <path refid="jboss.portal-common.classpath"/> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="jboss.portal-server.classpath"/> <path refid="jboss.portal-portlet.classpath"/> <path refid="jboss.portal-portlet-server.classpath"/> @@ -319,7 +319,7 @@ <fileset dir="${build.lib}" includes="portal-core-lib.jar"/> <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-common.root}/lib" includes="portal-common-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-bridge.root}/lib" includes="portal-bridge-lib.jar"/> <fileset dir="${jboss.portal-server.root}/lib" includes="portal-server-lib.jar"/> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/build.xml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/core-admin/build.xml 2007-08-14 09:46:27 UTC (rev 7910) @@ -87,6 +87,7 @@ &libraries; <path id="library.classpath"> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="jboss.jbossxb.classpath"/> <path refid="jboss.cache.classpath"/> <path refid="jbossas/core.libs.classpath"/> @@ -103,7 +104,6 @@ <call target="configure-modules"/> <path id="dependentmodule.classpath"> <path refid="jboss.portal-format.classpath"/> - <path refid="jboss.portal-common.classpath"/> <path refid="jboss.portal-faces.classpath"/> <path refid="jboss.portal-bridge.classpath"/> <path refid="jboss.portal-server.classpath"/> Modified: branches/JBoss_Portal_Branch_2_6/core-cms/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/build.xml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/core-cms/build.xml 2007-08-14 09:46:27 UTC (rev 7910) @@ -87,6 +87,7 @@ &libraries; <path id="library.classpath"> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="jboss.jbossxb.classpath"/> <path refid="jboss.cache.classpath"/> <path refid="jbossas/core.libs.classpath"/> @@ -120,7 +121,6 @@ <!-- Configure modules --> <call target="configure-modules"/> <path id="dependentmodule.classpath"> - <path refid="jboss.portal-common.classpath"/> <path refid="jboss.portal-cms.classpath"/> <path refid="jboss.portal-server.classpath"/> <path refid="jboss.portal-search.classpath"/> Modified: branches/JBoss_Portal_Branch_2_6/core-management/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-management/build.xml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/core-management/build.xml 2007-08-14 09:46:27 UTC (rev 7910) @@ -87,6 +87,7 @@ &libraries; <path id="library.classpath"> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="jboss.jbossxb.classpath"/> <path refid="jboss.cache.classpath"/> <path refid="jbossas/core.libs.classpath"/> @@ -119,7 +120,6 @@ <!-- Configure modules --> <call target="configure-modules"/> <path id="dependentmodule.classpath"> - <path refid="jboss.portal-common.classpath"/> <path refid="jboss.portal-server.classpath"/> <path refid="jboss.portal-portlet.classpath"/> <path refid="jboss.portal-jems.classpath"/> Modified: branches/JBoss_Portal_Branch_2_6/core-samples/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-samples/build.xml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/core-samples/build.xml 2007-08-14 09:46:27 UTC (rev 7910) @@ -87,6 +87,7 @@ &libraries; <path id="library.classpath"> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="jboss.jbossxb.classpath"/> <path refid="jboss.cache.classpath"/> <path refid="jbossas/core.libs.classpath"/> @@ -117,7 +118,6 @@ <!-- Configure modules --> <call target="configure-modules"/> <path id="dependentmodule.classpath"> - <path refid="jboss.portal-common.classpath"/> <path refid="jboss.portal-theme.classpath"/> <path refid="jboss.portal-core.classpath"/> <path refid="jboss.portal-format.classpath"/> Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml 2007-08-14 09:46:27 UTC (rev 7910) @@ -87,6 +87,7 @@ &libraries; <path id="library.classpath"> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="jboss.jbossxb.classpath"/> <path refid="jboss.cache.classpath"/> <path refid="jbossas/core.libs.classpath"/> @@ -104,7 +105,6 @@ <call target="configure-modules"/> <path id="dependentmodule.classpath"> <path refid="jboss.portal-wsrp.classpath"/> - <path refid="jboss.portal-common.classpath"/> <path refid="jboss.portal-faces.classpath"/> <path refid="jboss.portal-bridge.classpath"/> <path refid="jboss.portal-server.classpath"/> Modified: branches/JBoss_Portal_Branch_2_6/faces/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/faces/build.xml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/faces/build.xml 2007-08-14 09:46:27 UTC (rev 7910) @@ -88,6 +88,7 @@ <!-- Configure thirdparty libraries --> &libraries; <path id="library.classpath"> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="sun.servlet.classpath"/> <path refid="apache.myfaces.classpath"/> <path refid="facelets.facelets.classpath"/> @@ -101,7 +102,6 @@ <call target="configure-modules"/> <path id="dependentmodule.classpath"> <path refid="jboss.portlet-api.classpath"/> - <path refid="jboss.portal-common.classpath"/> <path refid="jboss.portal-portlet.classpath"/> <path refid="jboss.portal-server.classpath"/> <path refid="jboss.portal-bridge.classpath"/> @@ -168,7 +168,7 @@ <mkdir dir="${build.resources}/portal-faces-war/WEB-INF/lib"/> <copy todir="${build.resources}/portal-faces-war/WEB-INF/lib"> <fileset dir="${build.lib}" includes="portal-faces-lib.jar"/> - <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/> + <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar"/> </copy> <jar jarfile="${build.lib}/portal-faces.war"> <fileset dir="${build.resources}/portal-faces-war"/> Modified: branches/JBoss_Portal_Branch_2_6/format/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/format/build.xml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/format/build.xml 2007-08-14 09:46:27 UTC (rev 7910) @@ -88,6 +88,7 @@ <!-- Configure thirdparty libraries --> &libraries; <path id="library.classpath"> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="jbossas/core.libs.classpath"/> <path refid="oswego.concurrent.classpath"/> <path refid="apache.log4j.classpath"/> @@ -100,7 +101,6 @@ <!-- Configure modules --> <call target="configure-modules"/> <path id="dependentmodule.classpath"> - <path refid="jboss.portal-common.classpath"/> </path> <!--+=======================================+--> Modified: branches/JBoss_Portal_Branch_2_6/identity/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/identity/build.xml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/identity/build.xml 2007-08-14 09:46:27 UTC (rev 7910) @@ -89,6 +89,7 @@ <!-- Configure thirdparty libraries --> &libraries; <path id="library.classpath"> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="sun.servlet.classpath"/> <path refid="jboss.microcontainer.classpath"/> <path refid="jboss.jbossxb.classpath"/> @@ -110,7 +111,6 @@ <call target="configure-modules"/> <path id="dependentmodule.classpath"> <path refid="jboss.portal-test.classpath"/> - <path refid="jboss.portal-common.classpath"/> <path refid="jboss.portal-jems.classpath"/> <path refid="jboss.portal-core.classpath"/> </path> @@ -391,7 +391,7 @@ <path refid="apache.logging.classpath"/> <path refid="cglib.cglib.classpath"/> <path refid="jboss.portal-test.classpath"/> - <path refid="jboss.portal-common.classpath"/> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="jboss.portal-jems.classpath"/> <path refid="sun.jaf.classpath"/> </x-classpath> @@ -455,7 +455,7 @@ <path refid="apache.logging.classpath"/> <path refid="cglib.cglib.classpath"/> <path refid="jboss.portal-test.classpath"/> - <path refid="jboss.portal-common.classpath"/> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="jboss.portal-jems.classpath"/> <path refid="sleepycat.sleepycat.classpath"/> <path refid="sun.jaf.classpath"/> @@ -521,7 +521,7 @@ <path refid="apache.logging.classpath"/> <path refid="cglib.cglib.classpath"/> <path refid="jboss.portal-test.classpath"/> - <path refid="jboss.portal-common.classpath"/> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="jboss.portal-jems.classpath"/> <path refid="sleepycat.sleepycat.classpath"/> <path refid="sun.jaf.classpath"/> Modified: branches/JBoss_Portal_Branch_2_6/jems/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/jems/build.xml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/jems/build.xml 2007-08-14 09:46:27 UTC (rev 7910) @@ -88,6 +88,7 @@ <!-- Configure thirdparty libraries --> &libraries; <path id="library.classpath"> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="beanshell.beanshell.classpath"/> <path refid="jboss.cache.classpath"/> <path refid="jbossas/core.libs.classpath"/> @@ -98,7 +99,6 @@ <!-- Configure modules --> <call target="configure-modules"/> <path id="dependentmodule.classpath"> - <path refid="jboss.portal-common.classpath"/> <path refid="jboss.portal-test.classpath"/> </path> @@ -171,7 +171,7 @@ <jar jarfile="${build.lib}/pojo-service.sar"> <fileset dir="${build.classes}"/> <fileset dir="${build.resources}/pojo-service-sar"/> - <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/> + <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar"/> </jar> </target> Modified: branches/JBoss_Portal_Branch_2_6/migration/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/migration/build.xml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/migration/build.xml 2007-08-14 09:46:27 UTC (rev 7910) @@ -85,6 +85,7 @@ <!-- Configure thirdparty libraries --> &libraries; <path id="library.classpath"> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="jboss.cache.classpath"/> <path refid="jbossas/core.libs.classpath"/> <path refid="hibernate.hibernate.classpath"/> @@ -111,7 +112,6 @@ <path id="dependentmodule.classpath"> <path refid="jboss.portal-core.classpath"/> <path refid="jboss.portal-format.classpath"/> - <path refid="jboss.portal-common.classpath"/> <path refid="jboss.portal-faces.classpath"/> <path refid="jboss.portal-cms.classpath"/> <path refid="jboss.portal-server.classpath"/> Modified: branches/JBoss_Portal_Branch_2_6/portlet/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/build.xml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/portlet/build.xml 2007-08-14 09:46:27 UTC (rev 7910) @@ -88,6 +88,7 @@ <!-- Configure thirdparty libraries --> &libraries; <path id="library.classpath"> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="dom4j.dom4j.classpath"/> <path refid="jboss.jbossxb.classpath"/> <path refid="jboss.serialization.classpath"/> @@ -107,7 +108,6 @@ <!-- Configure modules --> <call target="configure-modules"/> <path id="dependentmodule.classpath"> - <path refid="jboss.portal-common.classpath"/> <path refid="jboss.portal-web.classpath"/> <path refid="jboss.portlet-api.classpath"/> <path refid="jboss.portal-test.classpath"/> Modified: branches/JBoss_Portal_Branch_2_6/portlet-federation/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet-federation/build.xml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/portlet-federation/build.xml 2007-08-14 09:46:27 UTC (rev 7910) @@ -88,6 +88,7 @@ <!-- Configure thirdparty libraries --> &libraries; <path id="library.classpath"> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="dom4j.dom4j.classpath"/> <path refid="jboss.jbossxb.classpath"/> <path refid="jboss.microcontainer.classpath"/> @@ -108,7 +109,6 @@ <!-- Configure modules --> <call target="configure-modules"/> <path id="dependentmodule.classpath"> - <path refid="jboss.portal-common.classpath"/> <path refid="jboss.portal-jems.classpath"/> <path refid="jboss.portal-server.classpath"/> <path refid="jboss.portal-portlet.classpath"/> Modified: branches/JBoss_Portal_Branch_2_6/portlet-server/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet-server/build.xml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/portlet-server/build.xml 2007-08-14 09:46:27 UTC (rev 7910) @@ -88,6 +88,7 @@ <!-- Configure thirdparty libraries --> &libraries; <path id="library.classpath"> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="dom4j.dom4j.classpath"/> <path refid="jboss.jbossxb.classpath"/> <path refid="jboss.serialization.classpath"/> @@ -107,7 +108,6 @@ <!-- Configure modules --> <call target="configure-modules"/> <path id="dependentmodule.classpath"> - <path refid="jboss.portal-common.classpath"/> <path refid="jboss.portal-web.classpath"/> <path refid="jboss.portal-jems.classpath"/> <path refid="jboss.portal-security.classpath"/> @@ -176,7 +176,7 @@ <!-- TCK sar --> <!-- <copy todir="${build.resources}/tck-sar"> - <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/> + <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.portlet-api.root}/lib" includes="portlet-api-lib.jar"/> <fileset dir="${jboss.portlet-api.root}/lib" includes="portal-api-lib.jar"/> @@ -196,7 +196,7 @@ <fileset dir="${build.resources}/test-war"/> </jar> <copy todir="${build.resources}/test-sar"> - <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/> + <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar"/> <fileset dir="${jboss.portal-test.lib}" includes="portal-test-lib.jar"/> <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/> <fileset dir="${jboss.portal-server.root}/lib" includes="portal-server-lib.jar"/> @@ -219,7 +219,7 @@ <jar jarfile="${build.lib}/test-info.sar"> <fileset dir="${junit.junit.lib}" includes="junit.jar"/> <fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/> - <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-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-server.root}/lib" includes="portal-server-lib.jar"/> <fileset dir="${jboss.portal-server.root}/lib" includes="portal-server-test-lib.jar"/> Modified: branches/JBoss_Portal_Branch_2_6/registration/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/registration/build.xml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/registration/build.xml 2007-08-14 09:46:27 UTC (rev 7910) @@ -89,6 +89,7 @@ <!-- Configure thirdparty libraries --> &libraries; <path id="library.classpath"> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="junit.junit.classpath"/> <path refid="oswego.concurrent.classpath"/> <path refid="jbossas/core.libs.classpath"/> @@ -97,7 +98,6 @@ <!-- Configure modules --> <call target="configure-modules"/> <path id="dependentmodule.classpath"> - <path refid="jboss.portal-common.classpath"/> <path refid="jboss.portal-jems.classpath"/> </path> Modified: branches/JBoss_Portal_Branch_2_6/search/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/search/build.xml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/search/build.xml 2007-08-14 09:46:27 UTC (rev 7910) @@ -65,6 +65,7 @@ <!-- Configure thirdparty libraries --> &libraries; <path id="library.classpath"> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="jbossas/core.libs.classpath"/> <path refid="apache.lucene.classpath"/> <path refid="junit.junit.classpath"/> @@ -74,7 +75,6 @@ <!-- Configure modules --> <call target="configure-modules"/> <path id="dependentmodule.classpath"> - <path refid="jboss.portal-common.classpath"/> <path refid="jboss.portal-jems.classpath"/> <path refid="jboss.portal-identity.classpath"/> <path refid="jboss.portlet-api.classpath"/> Modified: branches/JBoss_Portal_Branch_2_6/security/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/security/build.xml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/security/build.xml 2007-08-14 09:46:27 UTC (rev 7910) @@ -88,6 +88,7 @@ <!-- Configure thirdparty libraries --> &libraries; <path id="library.classpath"> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="oswego.concurrent.classpath"/> <path refid="jbossas/core.libs.classpath"/> <path refid="junit.junit.classpath"/> @@ -98,7 +99,6 @@ <!-- Configure modules --> <call target="configure-modules"/> <path id="dependentmodule.classpath"> - <path refid="jboss.portal-common.classpath"/> <path refid="jboss.portal-jems.classpath"/> </path> Modified: branches/JBoss_Portal_Branch_2_6/server/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/server/build.xml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/server/build.xml 2007-08-14 09:46:27 UTC (rev 7910) @@ -90,6 +90,7 @@ <echo message="${xdoclet.xdoclet.lib}"/> <echo message="${sun.servlet.lib}"/> <path id="library.classpath"> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="dom4j.dom4j.classpath"/> <path refid="oswego.concurrent.classpath"/> <path refid="jbossas/core.libs.classpath"/> @@ -112,7 +113,6 @@ <!-- Configure modules --> <call target="configure-modules"/> <path id="dependentmodule.classpath"> - <path refid="jboss.portal-common.classpath"/> <path refid="jboss.portal-web.classpath"/> <path refid="jboss.portal-jems.classpath"/> <path refid="jboss.portal-test.classpath"/> @@ -171,7 +171,7 @@ </jar> <copy todir="${build.resources}/portal-server-sar"> - <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-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="${build.lib}/" includes="portal-server-lib.jar"/> </copy> @@ -196,7 +196,7 @@ <jar jarfile="${build.lib}/test-parameters.sar"> <fileset dir="${junit.junit.lib}" includes="junit.jar"/> <fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/> - <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-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="${build.lib}" includes="test-agent.war"/> @@ -218,7 +218,7 @@ <jar jarfile="${build.lib}/test-servlet.sar"> <fileset dir="${junit.junit.lib}" includes="junit.jar"/> <fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/> - <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-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-jems.root}/lib" includes="portal-jems-lib.jar"/> <fileset dir="${build.lib}" includes="test-agent.war"/> @@ -234,7 +234,7 @@ <jar jarfile="${build.lib}/test-charset.sar"> <fileset dir="${junit.junit.lib}" includes="junit.jar"/> <fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/> - <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-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-jems.root}/lib" includes="portal-jems-lib.jar"/> <fileset dir="${build.lib}" includes="test-agent.war"/> @@ -247,7 +247,7 @@ <jar jarfile="${build.lib}/test-response.sar"> <fileset dir="${junit.junit.lib}" includes="junit.jar"/> <fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/> - <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-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="${build.lib}" includes="test-agent.war"/> Modified: branches/JBoss_Portal_Branch_2_6/test/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/build.xml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/test/build.xml 2007-08-14 09:46:27 UTC (rev 7910) @@ -85,6 +85,7 @@ <!-- Configure thirdparty libraries --> &libraries; <path id="library.classpath"> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="dom4j.dom4j.classpath"/> <path refid="jbossas/core.libs.classpath"/> <path refid="jboss.microcontainer.classpath"/> @@ -103,7 +104,6 @@ <!-- Configure modules --> <call target="configure-modules"/> <path id="dependentmodule.classpath"> - <path refid="jboss.portal-common.classpath"/> </path> <!--+=======================================+--> @@ -242,7 +242,7 @@ <!-- --> <jar jarfile="${build.lib}/portal-test.sar"> - <!--<fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>--> + <!--<fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar"/>--> <fileset dir="${build.resources}/portal-test-sar"/> <!--<fileset dir="${junit.junit.lib}" includes="junit.jar"/>--> <fileset dir="${build.lib}" includes="portal-test-agent-lib.jar"/> Modified: branches/JBoss_Portal_Branch_2_6/testsuite/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/testsuite/build.xml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/testsuite/build.xml 2007-08-14 09:46:27 UTC (rev 7910) @@ -119,9 +119,6 @@ <sequential> <antcall target="agent-deploy"/> <antcall target="internal-test-module"> - <param name="module" value="common"/> - </antcall> - <antcall target="internal-test-module"> <param name="module" value="cms"/> </antcall> <antcall target="internal-test-module"> @@ -185,8 +182,6 @@ <fileset dir="../cms" includes="output/tests/TEST-*.xml,output/tests/TEST-*.txt"/> <fileset dir="../core" includes="output/tests/*.log"/> <fileset dir="../core" includes="output/tests/TEST-*.xml,output/tests/TEST-*.txt"/> - <fileset dir="../common" includes="*.log"/> - <fileset dir="../common" includes="output/tests/TEST-*.xml,output/tests/TEST-*.txt"/> <fileset dir="../format" includes="*.log"/> <fileset dir="../format" includes="output/tests/TEST-*.xml,output/tests/TEST-*.txt"/> <fileset dir="../faces" includes="*.log"/> @@ -231,4 +226,4 @@ e.g. ant -Dmodule=portlet test-module"/> </target> -</project> \ No newline at end of file +</project> Modified: branches/JBoss_Portal_Branch_2_6/theme/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/theme/build.xml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/theme/build.xml 2007-08-14 09:46:27 UTC (rev 7910) @@ -90,6 +90,7 @@ <echo message="${xdoclet.xdoclet.lib}"/> <echo message="${sun.servlet.lib}"/> <path id="library.classpath"> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="oswego.concurrent.classpath"/> <path refid="jboss.jbossxb.classpath"/> <path refid="jbossas/core.libs.classpath"/> @@ -108,7 +109,6 @@ <call target="configure-modules"/> <path id="dependentmodule.classpath"> <path refid="jboss.portlet-api.classpath"/> - <path refid="jboss.portal-common.classpath"/> <path refid="jboss.portal-web.classpath"/> <path refid="jboss.portal-jems.classpath"/> <path refid="jboss.portal-server.classpath"/> @@ -231,7 +231,7 @@ <jar jarfile="${build.lib}/theme-test.sar"> <fileset dir="${build.lib}" includes="theme-test.war"/> <fileset dir="${build.resources}/test/theme-test-sar"/> - <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/> + <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"/> @@ -272,7 +272,7 @@ <path refid="jetty.jetty.classpath"/> <path refid="sun.servlet.classpath"/> <path refid="sun.jaf.classpath"/> - <path refid="jboss.portal-common.classpath"/> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="jboss.portal-server.classpath"/> <path refid="jboss.portal-jems.classpath"/> <path refid="jboss.portal-theme.classpath"/> @@ -328,7 +328,7 @@ <path refid="jetty.jetty.classpath"/> <path refid="sun.servlet.classpath"/> <path refid="sun.jaf.classpath"/> - <path refid="jboss.portal-common.classpath"/> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="jboss.portal-server.classpath"/> <path refid="jboss.portal-jems.classpath"/> <path refid="jboss.portal-test.classpath"/> 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-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/tools/etc/buildfragments/modules.ent 2007-08-14 09:46:27 UTC (rev 7910) @@ -2,13 +2,6 @@ <target name="configure-modules" unless="configure-modules.disabled"> - <!-- common --> - <property name="jboss.portal-common.root" value="${project.root}/common/output"/> - <property name="jboss.portal-common.lib" value="${jboss.portal-common.root}/lib"/> - <path id="jboss.portal-common.classpath"> - <pathelement path="${jboss.portal-common.lib}/portal-common-lib.jar"/> - </path> - <!-- web --> <property name="jboss.portal-web.root" value="${project.root}/web/output"/> <property name="jboss.portal-web.lib" value="${jboss.portal-web.root}/lib"/> Modified: branches/JBoss_Portal_Branch_2_6/web/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/web/build.xml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/web/build.xml 2007-08-14 09:46:27 UTC (rev 7910) @@ -88,6 +88,7 @@ <!-- Configure thirdparty libraries --> &libraries; <path id="library.classpath"> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="sun.servlet.classpath"/> <path refid="apache.log4j.classpath"/> <path refid="junit.junit.classpath"/> @@ -96,7 +97,6 @@ <!-- Configure modules --> <call target="configure-modules"/> <path id="dependentmodule.classpath"> - <path refid="jboss.portal-common.classpath"/> </path> <!--+=======================================+--> Modified: branches/JBoss_Portal_Branch_2_6/widget/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/widget/build.xml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/widget/build.xml 2007-08-14 09:46:27 UTC (rev 7910) @@ -88,6 +88,7 @@ <!-- Configure thirdparty libraries --> &libraries; <path id="library.classpath"> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="jbossas/core.libs.classpath"/> <path refid="jboss/backport.concurrent.classpath"/> <path refid="apache.log4j.classpath"/> @@ -98,7 +99,6 @@ <call target="configure-modules"/> <path id="dependentmodule.classpath"> <path refid="jboss.portlet-api.classpath"/> - <path refid="jboss.portal-common.classpath"/> <path refid="jboss.portal-jems.classpath"/> <path refid="jboss.portal-server.classpath"/> <path refid="jboss.portal-portlet.classpath"/> @@ -285,7 +285,7 @@ <path refid="apache.logging.classpath"/> <path refid="cglib.cglib.classpath"/> <path refid="jboss.portal-test.classpath"/> - <path refid="jboss.portal-common.classpath"/> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="jboss.portal-jems.classpath"/> <path refid="sun.jaf.classpath"/> </x-classpath> Modified: branches/JBoss_Portal_Branch_2_6/workflow/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/workflow/build.xml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/workflow/build.xml 2007-08-14 09:46:27 UTC (rev 7910) @@ -88,6 +88,7 @@ <!-- Configure thirdparty libraries --> &libraries; <path id="library.classpath"> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="apache.logging.classpath"/> <path refid="apache.log4j.classpath"/> <path refid="apache.collections.classpath"/> @@ -116,7 +117,6 @@ <!-- Configure modules --> <call target="configure-modules"/> <path id="dependentmodule.classpath"> - <path refid="jboss.portal-common.classpath"/> <path refid="jboss.portal-jems.classpath"/> <path refid="jboss.portal-identity.classpath"/> </path> Modified: branches/JBoss_Portal_Branch_2_6/wsrp/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/build.xml 2007-08-13 22:41:49 UTC (rev 7909) +++ branches/JBoss_Portal_Branch_2_6/wsrp/build.xml 2007-08-14 09:46:27 UTC (rev 7910) @@ -106,6 +106,7 @@ <!-- Configure thirdparty libraries --> &libraries; <path id="library.classpath"> + <path refid="jboss.portal/modules/common.classpath"/> <path refid="oswego.concurrent.classpath"/> <path refid="apache.log4j.classpath"/> <path refid="junit.junit.classpath"/> @@ -134,7 +135,6 @@ <call target="configure-modules"/> <path id="dependentmodule.classpath"> - <path refid="jboss.portal-common.classpath"/> <path refid="jboss.portal-jems.classpath"/> <path refid="jboss.portal-server.classpath"/> <path refid="jboss.portal-core.classpath"/>