Author: roy.russo(a)jboss.com Date: 2007-02-12 13:35:57 -0500 (Mon, 12 Feb 2007) New Revision: 6225 Modified: trunk/build/build.xml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml Log: portal-admin portlet stub Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2007-02-12 18:16:53 UTC (rev 6224) +++ trunk/build/build.xml 2007-02-12 18:35:57 UTC (rev 6225) @@ -43,7 +43,7 @@ <!--+====================================================================+--> <target name="init" unless="init.disable" depends="_buildmagic:init"> - </target> + </target> <!--+====================================================================+--> @@ -70,7 +70,7 @@ <!-- Module name(s) & version --> <property name="module.version" - value="${version.major}.${version.minor}.${version.revision}${version.tag}"/> + value="${version.major}.${version.minor}.${version.revision}${version.tag}"/> <!-- ========= --> <!-- Libraries --> @@ -133,13 +133,14 @@ <module name="core-samples"/> <module name="wsrp"/> <module name="registration"/> - <module name="workflow"/> + <module name="workflow"/> + <module name="core-admin"/> <!-- Module groups --> <group name="portal"> <include - modules="common, test, api, faces, jems, server, security, identity, search, format, portlet, portlet-federation, theme, workflow, cms, bridge, samples, registration, wsrp, core, core-cms, core-management, core-samples"/> + modules="common, test, api, faces, jems, server, security, identity, search, format, portlet, portlet-federation, theme, workflow, cms, bridge, samples, registration, wsrp, core, core-cms, core-management, core-samples, core-admin"/> </group> <group name="cms"> @@ -202,8 +203,8 @@ <!--+====================================================================+--> <target name="output" - description="Generate all target output." - depends="init"> + description="Generate all target output." + depends="init"> <!-- Add module specific elements here. --> </target> @@ -214,7 +215,7 @@ <!--+====================================================================+--> <target name="docs"> - <ant antfile="build-targets.xml" target="_default:docs"/> + <ant antfile="build-targets.xml" target="_default:docs"/> <!-- Add module specific elements here. --> </target> @@ -223,12 +224,12 @@ <!--+====================================================================+--> <target name="release" - description="Builds the default release structure." - depends="modules-most, output"/> + description="Builds the default release structure." + depends="modules-most, output"/> <target name="release-full" - description="Builds the full release structure." - depends="modules-all, release"/> + description="Builds the full release structure." + depends="modules-all, release"/> <!--+====================================================================+--> <!--| Misc. |--> @@ -237,26 +238,26 @@ <!--+====================================================================+--> <target name="clean" depends="createthirdparty, modules-clean, _buildmagic:clean" - description="Cleans up most generated files."> + description="Cleans up most generated files."> <!-- Add module specific elements here. --> </target> <target name="clobber" depends="_buildmagic:clobber, clean, modules-clobber" - description="Cleans up all generated files."> + description="Cleans up all generated files."> <!-- Add module specific elements here. --> </target> <target name="main" depends="most" - description="Executes the default target (most)."/> + description="Executes the default target (most)."/> <target name="all" depends="createthirdparty, modules-all" - description="Executes all modules and builds everything."/> + description="Executes all modules and builds everything."/> <target name="most" depends="createthirdparty, modules-most" - description="Executes all modules and builds most everything."/> + description="Executes all modules and builds most everything."/> <target name="help" depends="_buildmagic:help:build" - description="Show this help message."/> + description="Show this help message."/> <!-- @@ -272,23 +273,23 @@ <!--</target>--> <target name="deploy" - description="Deploy." - depends="main"> + description="Deploy." + depends="main"> <require file="${jboss.home}/server/${portal.deploy.dir}"/> <copy file="../core/output/lib/jboss-portal.sar" todir="${jboss.home}/server/${portal.deploy.dir}" - overwrite="true"/> + overwrite="true"/> </target> <target name="undeploy" - description="Undeploy." - depends="init"> + description="Undeploy." + depends="init"> <require file="${jboss.home}/server/${portal.deploy.dir}"/> <delete file="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar"/> </target> <target name="exploded-deploy" - description="Deploy exploded sar." - depends="main"> + description="Deploy exploded sar." + depends="main"> <require file="${jboss.home}/server/${portal.deploy.dir}"/> <delete dir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal-exploded.sar"/> <mkdir dir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal-exploded.sar"/> @@ -361,20 +362,20 @@ <!-- then generate a new libraries.ent file and include it in --> <!-- the build --> <target name="createthirdparty" unless="inhibit.downloads" - depends="check.inhibit.downloads"> - <ant antfile="build-thirdparty.xml" target="generate-lib-file"/> - </target> + depends="check.inhibit.downloads"> + <ant antfile="build-thirdparty.xml" target="generate-lib-file"/> + </target> <!-- check if thirdparty libraries are to be downloaded --> <target name="check.inhibit.downloads"> - <condition property="inhibit.downloads"> - <or> - <uptodate property="dependencies.current" - srcfile="build-thirdparty.xml" - targetfile="../thirdparty/libraries.ent"/> - <istrue value="${nodownload}"/> - </or> - </condition> - </target> + <condition property="inhibit.downloads"> + <or> + <uptodate property="dependencies.current" + srcfile="build-thirdparty.xml" + targetfile="../thirdparty/libraries.ent"/> + <istrue value="${nodownload}"/> + </or> + </condition> + </target> </project> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2007-02-12 18:16:53 UTC (rev 6224) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2007-02-12 18:35:57 UTC (rev 6225) @@ -31,7 +31,7 @@ <description>Administration portlet for portal pages administration</description> <portlet-name>AdminPortlet</portlet-name> <display-name>Portal Admin Portlet</display-name> - <portlet-class>org.apache.myfaces.portlet.MyFacesGenericPortlet</portlet-class> + <portlet-class>org.jboss.portal.core.admin.AdminPortlet</portlet-class> <expiration-cache>-1</expiration-cache> <supports> <mime-type>text/html</mime-type>