Author: bdaw Date: 2007-08-27 19:16:46 -0400 (Mon, 27 Aug 2007) New Revision: 8061 Removed: branches/JBoss_Portal_Branch_2_6/identity/ 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/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/search/build.xml branches/JBoss_Portal_Branch_2_6/tools/etc/buildfragments/modules.ent branches/JBoss_Portal_Branch_2_6/workflow/build.xml Log: detach identity module from the build Modified: branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2007-08-27 22:08:13 UTC (rev 8060) +++ branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2007-08-27 23:16:46 UTC (rev 8061) @@ -50,6 +50,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="jboss-portal/modules/test" version="1.0.0-SNAPSHOT"/> + <componentref name="jboss-portal/modules/identity" 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-27 22:08:13 UTC (rev 8060) +++ branches/JBoss_Portal_Branch_2_6/build/build.xml 2007-08-27 23:16:46 UTC (rev 8061) @@ -116,7 +116,6 @@ <module name="faces"/> <module name="api"/> <module name="server"/> - <module name="identity"/> <module name="portlet"/> <module name="portlet-server"/> <module name="portlet-federation"/> @@ -141,7 +140,7 @@ <group name="portal"> <include - modules="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"/> + modules="api, jems, server, security, 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"> @@ -351,9 +350,6 @@ <packageset dir="../jems/src/main"> <exclude name="org/jboss/portal/test/**"/> </packageset> - <packageset dir="../identity/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> <packageset dir="../bridge/src/main"> <exclude name="org/jboss/portal/test/**"/> </packageset> Modified: branches/JBoss_Portal_Branch_2_6/cms/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/build.xml 2007-08-27 22:08:13 UTC (rev 8060) +++ branches/JBoss_Portal_Branch_2_6/cms/build.xml 2007-08-27 23:16:46 UTC (rev 8061) @@ -131,7 +131,7 @@ <path refid="jboss.portal-jems.classpath"/> <path refid="jboss.portal-search.classpath"/> <!-- fine grained security integration --> - <path refid="jboss.portal-identity.classpath"/> + <path refid="jboss.portal/modules/identity.classpath"/> <path refid="jboss.portal-security.classpath"/> <!-- clustered testcases related --> <path refid="jboss.portal-portlet.classpath"/> @@ -251,7 +251,7 @@ <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-identity.lib}" includes="portal-identity-lib.jar"/> + <fileset dir="${jboss.portal/modules/identity.lib}" includes="portal-identity-lib.jar"/> <fileset dir="${jboss.portal-workflow.lib}" includes="portal-workflow-lib.jar"/> <fileset dir="${jboss.portal-portlet.lib}" includes="portal-portlet-testframework-lib.jar"/> </jar> @@ -488,7 +488,7 @@ <path refid="jboss.cache.classpath"/> <path refid="jgroups.jgroups.classpath"/> <!-- fine grained security integration --> - <path refid="jboss.portal-identity.classpath"/> + <path refid="jjboss.portal/modules/identity.classpath"/> <path refid="jboss.portal-security.classpath"/> <!-- workflow integration --> <path refid="jbpm.jaronly.classpath"/> Modified: branches/JBoss_Portal_Branch_2_6/core/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/build.xml 2007-08-27 22:08:13 UTC (rev 8060) +++ branches/JBoss_Portal_Branch_2_6/core/build.xml 2007-08-27 23:16:46 UTC (rev 8061) @@ -132,7 +132,7 @@ <path refid="jboss.portal-portlet-server.classpath"/> <path refid="jboss.portal-jems.classpath"/> <path refid="jboss.portal-portlet-federation.classpath"/> - <path refid="jboss.portal-identity.classpath"/> + <path refid="jboss.portal/modules/identity.classpath"/> <path refid="jboss.portal-jems.classpath"/> <path refid="jboss.portlet-api.classpath"/> <path refid="jboss.portal-theme.classpath"/> @@ -236,7 +236,7 @@ <path refid="jboss.portal-server.classpath"/> <path refid="jboss.portal-portlet.classpath"/> <path refid="jboss.portal-portlet-server.classpath"/> - <path refid="jboss.portal-identity.classpath"/> + <path refid="jboss.portal/modules/identity.classpath"/> <path refid="jboss.portal-security.classpath"/> <path refid="jboss.portlet-api.classpath"/> <path refid="jboss.portal-jems.classpath"/> @@ -316,7 +316,7 @@ </copy> <!-- hibernate configuration for identity --> <copy todir="${build.resources}/jboss-portal/conf/hibernate/user"> - <fileset dir="${jboss.portal-identity.root}/resources/hibernate" includes="domain.hbm.xml"/> + <fileset dir="${jboss.portal/modules/identity.root}/resources/" includes="domain.hbm.xml"/> </copy> <copy todir="${build.resources}/jboss-portal/lib"> <fileset dir="${build.lib}" includes="portal-core-lib.jar"/> @@ -335,7 +335,7 @@ <fileset dir="${jboss.portal-theme.root}/lib" includes="portal-theme-lib.jar"/> <fileset dir="${jboss.portal-security.root}/lib" includes="portal-security-lib.jar"/> <fileset dir="${jboss.portal-search.root}/lib" includes="portal-search-lib.jar"/> - <fileset dir="${jboss.portal-identity.root}/lib" includes="portal-identity-lib.jar"/> + <fileset dir="${jboss.portal/modules/identity.root}/lib" includes="portal-identity-lib.jar"/> <fileset dir="${jboss.portal-registration.root}/lib" includes="portal-registration-lib.jar"/> <fileset dir="${ehcache.ehcache.lib}" includes="ehcache.jar"/> <fileset dir="${apache.collections.lib}" includes="commons-collections.jar"/> @@ -349,7 +349,7 @@ <!--dtd--> <copy todir="${build.resources}/jboss-portal/dtd"> - <fileset dir="${jboss.portal-identity.root}/resources/dtd" includes="*.dtd"/> + <fileset dir="${jboss.portal/modules/identity.root}/resources/dtd" includes="*.dtd"/> </copy> </target> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/build.xml 2007-08-27 22:08:13 UTC (rev 8060) +++ branches/JBoss_Portal_Branch_2_6/core-admin/build.xml 2007-08-27 23:16:46 UTC (rev 8061) @@ -112,7 +112,7 @@ <path refid="jboss.portal-portlet.classpath"/> <path refid="jboss.portal-jems.classpath"/> <path refid="jboss.portal-portlet-federation.classpath"/> - <path refid="jboss.portal-identity.classpath"/> + <path refid="jboss.portal/modules/identity.classpath"/> <path refid="jboss.portlet-api.classpath"/> <path refid="jboss.portal-theme.classpath"/> <path refid="jboss.portal-security.classpath"/> Modified: branches/JBoss_Portal_Branch_2_6/core-cms/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/build.xml 2007-08-27 22:08:13 UTC (rev 8060) +++ branches/JBoss_Portal_Branch_2_6/core-cms/build.xml 2007-08-27 23:16:46 UTC (rev 8061) @@ -127,7 +127,7 @@ <path refid="jboss.portal-search.classpath"/> <path refid="jboss.portal-portlet.classpath"/> <path refid="jboss.portal-jems.classpath"/> - <path refid="jboss.portal-identity.classpath"/> + <path refid="jboss.portal/modules/identity.classpath"/> <path refid="jboss.portlet-api.classpath"/> <path refid="jboss.portal-security.classpath"/> <path refid="jboss.portal-theme.classpath"/> Modified: branches/JBoss_Portal_Branch_2_6/core-management/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-management/build.xml 2007-08-27 22:08:13 UTC (rev 8060) +++ branches/JBoss_Portal_Branch_2_6/core-management/build.xml 2007-08-27 23:16:46 UTC (rev 8061) @@ -125,7 +125,7 @@ <path refid="jboss.portal-portlet.classpath"/> <path refid="jboss.portal-jems.classpath"/> <path refid="jboss.portal-portlet-federation.classpath"/> - <path refid="jboss.portal-identity.classpath"/> + <path refid="jboss.portal/modules/identity.classpath"/> <path refid="jboss.portal-security.classpath"/> <path refid="jboss.portal-core.classpath"/> </path> Modified: branches/JBoss_Portal_Branch_2_6/core-samples/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-samples/build.xml 2007-08-27 22:08:13 UTC (rev 8060) +++ branches/JBoss_Portal_Branch_2_6/core-samples/build.xml 2007-08-27 23:16:46 UTC (rev 8061) @@ -121,7 +121,7 @@ <path refid="jboss.portal-theme.classpath"/> <path refid="jboss.portal-core.classpath"/> <path refid="jboss.portal-format.classpath"/> - <path refid="jboss.portal-identity.classpath"/> + <path refid="jboss.portal/modules/identity.classpath"/> <path refid="jboss.portal-portlet.classpath"/> <path refid="jboss.portlet-api.classpath"/> </path> Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml 2007-08-27 22:08:13 UTC (rev 8060) +++ branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml 2007-08-27 23:16:46 UTC (rev 8061) @@ -113,7 +113,7 @@ <path refid="jboss.portal-portlet.classpath"/> <path refid="jboss.portal-jems.classpath"/> <path refid="jboss.portal-portlet-federation.classpath"/> - <path refid="jboss.portal-identity.classpath"/> + <path refid="jboss.portal/modules/identity.classpath"/> <path refid="jboss.portlet-api.classpath"/> <path refid="jboss.portal-theme.classpath"/> <path refid="jboss.portal-security.classpath"/> Modified: branches/JBoss_Portal_Branch_2_6/search/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/search/build.xml 2007-08-27 22:08:13 UTC (rev 8060) +++ branches/JBoss_Portal_Branch_2_6/search/build.xml 2007-08-27 23:16:46 UTC (rev 8061) @@ -76,7 +76,7 @@ <call target="configure-modules"/> <path id="dependentmodule.classpath"> <path refid="jboss.portal-jems.classpath"/> - <path refid="jboss.portal-identity.classpath"/> + <path refid="jboss.portal/modules/identity.classpath"/> <path refid="jboss.portlet-api.classpath"/> </path> 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-27 22:08:13 UTC (rev 8060) +++ branches/JBoss_Portal_Branch_2_6/tools/etc/buildfragments/modules.ent 2007-08-27 23:16:46 UTC (rev 8061) @@ -157,13 +157,6 @@ <pathelement path="${jboss.portal-security.lib}/portal-security-test-lib.jar"/> </path> - <!-- identity --> - <property name="jboss.portal-identity.root" value="${project.root}/identity/output"/> - <property name="jboss.portal-identity.lib" value="${jboss.portal-identity.root}/lib"/> - <path id="jboss.portal-identity.classpath"> - <pathelement path="${jboss.portal-identity.lib}/portal-identity-lib.jar"/> - </path> - <!-- workflow --> <property name="jboss.portal-workflow.root" value="${project.root}/workflow/output"/> <property name="jboss.portal-workflow.lib" value="${jboss.portal-workflow.root}/lib"/> Modified: branches/JBoss_Portal_Branch_2_6/workflow/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/workflow/build.xml 2007-08-27 22:08:13 UTC (rev 8060) +++ branches/JBoss_Portal_Branch_2_6/workflow/build.xml 2007-08-27 23:16:46 UTC (rev 8061) @@ -118,7 +118,7 @@ <call target="configure-modules"/> <path id="dependentmodule.classpath"> <path refid="jboss.portal-jems.classpath"/> - <path refid="jboss.portal-identity.classpath"/> + <path refid="jboss.portal/modules/identity.classpath"/> </path>