Author: julien(a)jboss.com Date: 2008-03-05 10:59:48 -0500 (Wed, 05 Mar 2008) New Revision: 10211 Added: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/admin/index.jsp Removed: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/admin/admin.jsp Modified: modules/portlet/trunk/build/distrib/distrib.xml modules/portlet/trunk/portal/pom.xml modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/eventdebug.jsp modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp Log: worked on the distrib building Modified: modules/portlet/trunk/build/distrib/distrib.xml =================================================================== --- modules/portlet/trunk/build/distrib/distrib.xml 2008-03-05 13:41:55 UTC (rev 10210) +++ modules/portlet/trunk/build/distrib/distrib.xml 2008-03-05 15:59:48 UTC (rev 10211) @@ -36,24 +36,15 @@ </target> <!-- Build JBoss Portlet Container (currently only builds docs as maven build is assumed --> - <target name="build" depends="doc.build"/> + <target name="build"/> - <!-- Build JBoss Portlet Container documentation --> - <target name="doc.build" unless="no-doc"> -<!-- - <sequential> - <ant dir="${src.docs.dir}/user-guide" antfile="build.xml"/> - </sequential> ---> - </target> - <!-- Package the different distributions --> <target name="package"> <!-- Create the output directory --> <mkdir dir="output"/> - <antcall target="package-src"/> + <!--<antcall target="package-src"/>--> <antcall target="package-jboss42"/> <antcall target="package-tomcat60"/> </target> @@ -77,45 +68,76 @@ <!-- | JBoss Portlet Container binary distribution for AS 4.2.x --> - <target name="package-jboss42" description="package AS binary" if="JBOSS_4_2_HOME"> - <copy todir="${pc.build.bin.as42}"> - <fileset dir="${JBOSS_4_2_HOME}" includes="**/*"/> - </copy> + <target name="package-jboss42" description="package AS binary" if="JBOSS_4_2_PATH"> + + <!-- --> + <unzip src="${JBOSS_4_2_PATH}" dest="${pc.build.bin.as42}"> + <mapper type="regexp" from="^[^\/]*\/(.*)$$" to="\1"/> + </unzip> + + <!-- --> <antcall target="__package-binary"> <param name="bin.dir" value="${pc.build.bin.as42}"/> <param name="deploy.dir" value="${pc.build.bin.as42}/server/default/deploy"/> + <param name="samples.dir" value="${pc.build.bin.as42}/server/default/deploy/samples"/> </antcall> + + <!-- Simple portal --> <copy todir="${pc.build.bin.as42}/server/default/deploy/simple-portal"> <fileset dir="${source.dir}/portal/target/portlet-portal-${maven.version}-simple-portal-jboss42.dir/simple-portal"/> </copy> + + <!-- Taglib integration --> <copy todir="${pc.build.bin.as42}" overwrite="true"> <fileset dir="jboss-4.2"/> </copy> + + +<!-- + <tar destfile="output/${demo.release.name.jboss42}.tar.gz" compression="gzip"> + <tarfileset prefix="${demo.release.name.jboss42}" filemode="775" dir="output/${demo.release.name.jboss42}"/> + </tar> +--> + +<!-- <antcall target="__zip"> <param name="release.name" value="${demo.release.name.jboss42}"/> </antcall> +--> </target> <!-- | JBoss Portlet Container binary distribution for Tomcat 6.x --> - <target name="package-tomcat60" description="package Tomcat binary" if="TOMCAT_6_0_HOME"> - <copy todir="${pc.build.bin.tomcat6}"> - <fileset dir="${TOMCAT_6_0_HOME}" includes="**/*"/> - </copy> + <target name="package-tomcat60" description="package Tomcat binary" if="TOMCAT_6_0_PATH"> + + <!-- --> + <unzip src="${TOMCAT_6_0_PATH}" dest="${pc.build.bin.tomcat6}"> + <mapper type="regexp" from="^[^\/]*\/(.*)$$" to="\1"/> + </unzip> + + <!-- --> <antcall target="__package-binary"> <param name="bin.dir" value="${pc.build.bin.tomcat6}"/> <param name="deploy.dir" value="${pc.build.bin.tomcat6}/webapps"/> + <param name="samples.dir" value="${pc.build.bin.tomcat6}/webapps"/> </antcall> + + <!-- --> <copy todir="${pc.build.bin.tomcat6}/lib"> <fileset dir="${source.dir}/portal/target/portlet-portal-${maven.version}-simple-portal-tomcat60.dir/simple-portal/lib" includes="**/*.jar"/> </copy> <jar file="${pc.build.bin.tomcat6}/webapps/simple-portal.war"> <fileset dir="${source.dir}/portal/target/portlet-portal-${maven.version}-simple-portal-tomcat60.dir/simple-portal/simple-portal.war" includes="**"/> </jar> + + + <!-- <antcall target="__zip"> <param name="release.name" value="${demo.release.name.tomcat60}"/> + <param name="server.path" value="${TOMCAT_6_0_PATH}"/> </antcall> +--> </target> <!-- @@ -126,7 +148,6 @@ <param name="todir" value="${bin.dir}"/> </antcall> <antcall target="__package-bundled-binary"> - <param name="deploy.dir" value="${deploy.dir}"/> </antcall> </target> @@ -141,7 +162,7 @@ </target> <target name="__package-bundled-binary" unless="bin-alone"> - <copy todir="${bin.dir}/samples"> + <copy todir="${samples.dir}"> <fileset dir="${source.dir}/samples/target" includes="*.war"/> </copy> </target> @@ -155,15 +176,15 @@ </target> <target name="__package-doc" unless="no-doc"> -<!-- <sequential> - <mkdir dir="${todir}"/> sam + <mkdir dir="${todir}"/> <mkdir dir="${todir}/user-guide"/> <copy todir="${todir}/user-guide"> - <fileset dir="${src.docs.dir}/user-guide/build/en/"/> + <fileset dir="${src.docs.dir}/user-guide/target/docbook" includes="html_single/**"/> + <fileset dir="${src.docs.dir}/user-guide/target/docbook" includes="html/**"/> + <fileset dir="${src.docs.dir}/user-guide/target/docbook/pdf" includes="*.pdf"/> </copy> </sequential> ---> </target> <target name="__zip" unless="no-zip"> @@ -177,25 +198,25 @@ <property environment="env"/> <!--If properties are not in command line check if they are set in env--> - <condition property="JBOSS_4_2_HOME" value="${env.JBOSS_4_2_HOME}"> + <condition property="JBOSS_4_2_PATH" value="${env.JBOSS_4_2_PATH}"> <and> - <isset property="env.JBOSS_4_2_HOME"/> + <isset property="env.JBOSS_4_2_PATH"/> <not> - <isset property="JBOSS_4_2_HOME"/> + <isset property="JBOSS_4_2_PATH"/> </not> </and> </condition> - <condition property="TOMCAT_6_0_HOME" value="${env.TOMCAT_6_0_HOME}"> + <condition property="TOMCAT_6_0_PATH" value="${env.TOMCAT_6_0_PATH}"> <and> - <isset property="env.TOMCAT_6_0_HOME"/> + <isset property="env.TOMCAT_6_0_PATH"/> <not> - <isset property="TOMCAT_6_0_HOME"/> + <isset property="TOMCAT_6_0_PATH"/> </not> </and> </condition> - <echo message="Set JBOSS_4_2_HOME and/or TOMCAT_6_0_HOME variables for binary distributions:"/> - <echo message="JBoss AS 4.2.x home: ${JBOSS_4_2_HOME}"/> - <echo message="Tomcat 6.x home: ${TOMCAT_6_0_HOME}"/> + <echo message="Set JBOSS_4_2_PATH and/or TOMCAT_6_0_PATH variables for binary distributions:"/> + <echo message="JBoss AS 4.2.x path: ${JBOSS_4_2_PATH}"/> + <echo message="Tomcat 6.x path: ${TOMCAT_6_0_PATH}"/> </target> </project> Modified: modules/portlet/trunk/portal/pom.xml =================================================================== --- modules/portlet/trunk/portal/pom.xml 2008-03-05 13:41:55 UTC (rev 10210) +++ modules/portlet/trunk/portal/pom.xml 2008-03-05 15:59:48 UTC (rev 10211) @@ -196,6 +196,15 @@ <descriptor>src/assemble/simple-portal-tomcat60.xml</descriptor> </descriptors> </configuration> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>attached</goal> + </goals> + </execution> + </executions> </plugin> </plugins> Deleted: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/admin/admin.jsp =================================================================== --- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/admin/admin.jsp 2008-03-05 13:41:55 UTC (rev 10210) +++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/admin/admin.jsp 2008-03-05 15:59:48 UTC (rev 10211) @@ -1,14 +0,0 @@ -<%@ page contentType="text/html" %> -<%@ page language="java" %> -<%@ taglib prefix="jbp" tagdir="/WEB-INF/tags/portal" %> -<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %> -<%@ page isELIgnored="false" %> - -<%@ include file="/layouts/header.jsp" %> - -<portal:page> - - <jbp:portlet name="AdminPortlet" applicationName="simple-portal"/> - -</portal:page> -<%@ include file="/layouts/footer.jsp" %> \ No newline at end of file Copied: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/admin/index.jsp (from rev 10194, modules/portlet/trunk/portal/src/main/resources/simple-portal-war/admin/admin.jsp) =================================================================== --- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/admin/index.jsp (rev 0) +++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/admin/index.jsp 2008-03-05 15:59:48 UTC (rev 10211) @@ -0,0 +1,14 @@ +<%@ page contentType="text/html" %> +<%@ page language="java" %> +<%@ taglib prefix="jbp" tagdir="/WEB-INF/tags/portal" %> +<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %> +<%@ page isELIgnored="false" %> + +<%@ include file="/layouts/header.jsp" %> + +<portal:page> + + <jbp:portlet name="AdminPortlet" applicationName="simple-portal"/> + +</portal:page> +<%@ include file="/layouts/footer.jsp" %> \ No newline at end of file Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/eventdebug.jsp =================================================================== --- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/eventdebug.jsp 2008-03-05 13:41:55 UTC (rev 10210) +++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/eventdebug.jsp 2008-03-05 15:59:48 UTC (rev 10211) @@ -1,6 +1,6 @@ <%@ page contentType="text/html" %> <%@ page language="java" %> -<%@ taglib prefix="jbp" tagdir="/WEB-INF/tags/portal" %> +<%@ taglib prefix="xportal" tagdir="/WEB-INF/tags/portal" %> <%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %> <%@ page isELIgnored="false" %> @@ -9,15 +9,15 @@ <portal:page> - <jbp:layout1> + <xportal:2columns> <jsp:attribute name="leftcol"> - <jbp:portlet name="portletA" applicationName="samples-eventdebug-portlet" id="portlet-A"/> + <xportal:portlet name="portletA" applicationName="samples-eventdebug-portlet" id="portlet-A"/> </jsp:attribute> <jsp:attribute name="rightcol"> - <jbp:portlet name="portletB" applicationName="samples-eventdebug-portlet" id="portlet-B"/> - <jbp:portlet name="portletC" applicationName="samples-eventdebug-portlet" id="portlet-C"/> + <xportal:portlet name="portletB" applicationName="samples-eventdebug-portlet" id="portlet-B"/> + <xportal:portlet name="portletC" applicationName="samples-eventdebug-portlet" id="portlet-C"/> </jsp:attribute> - </jbp:layout1> + </xportal:2columns> </portal:page> <%@ include file="/layouts/footer.jsp" %> \ No newline at end of file Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp =================================================================== --- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp 2008-03-05 13:41:55 UTC (rev 10210) +++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp 2008-03-05 15:59:48 UTC (rev 10211) @@ -12,11 +12,9 @@ <div class="nav full-width"> <ul> <li> - <a href="${pageContext.request.contextPath}/demo/home.jsp" class="${fn:substringAfter(pageContext.request.servletPath, 'demo/') == 'home.jsp' ? 'selected' : ''}">Home</a> </li> - <li> - + <li> <a href="${pageContext.request.contextPath}/demo/wikipedia.jsp" class="${fn:substringAfter(pageContext.request.servletPath, 'demo/') == 'wikipedia.jsp' ? 'selected' : ''}">Wikipedia</a> </li> <li>