Author: chris.laprun(a)jboss.com Date: 2007-06-26 19:21:11 -0400 (Tue, 26 Jun 2007) New Revision: 7570 Modified: trunk/core-samples/build.xml trunk/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml Log: - Fixed deploy and undeploy tasks. - Fixed incorrect portlet class reference. Modified: trunk/core-samples/build.xml =================================================================== --- trunk/core-samples/build.xml 2007-06-26 23:19:16 UTC (rev 7569) +++ trunk/core-samples/build.xml 2007-06-26 23:21:11 UTC (rev 7570) @@ -160,7 +160,7 @@ classname="org.jboss.portal.common.ant.Explode" classpathref="explode.task.classpath"/> </target> - + <!--+====================================================================+--> <!--| Compile |--> <!--| |--> @@ -238,7 +238,7 @@ </target> <!-- Build the portal-basic-samples.sar --> - <target name="output" depends="artifacts"> + <target name="output" depends="artifacts"> <implode dir="${build.resources}/portal-basic-samples.sar" tofile="${build.lib}/portal-basic-samples.sar"/> @@ -297,17 +297,27 @@ description="Deploy." depends="output"> <require file="${jboss.home}/server/${portal.deploy.dir}"/> - <copy file="${build.lib}/portal-samples.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> + <copy file="${build.lib}/portal-basic-samples.sar" todir="${jboss.home}/server/${portal.deploy.dir}" + overwrite="true"/> + <copy file="${build.lib}/portal-jsp-samples.war" todir="${jboss.home}/server/${portal.deploy.dir}" + overwrite="true"/> + <copy file="${build.lib}/portal-news-samples.war" todir="${jboss.home}/server/${portal.deploy.dir}" + overwrite="true"/> + <copy file="${build.lib}/portal-weather-samples.war" todir="${jboss.home}/server/${portal.deploy.dir}" + overwrite="true"/> </target> - + <!-- - | Undeploy the application - --> + | Undeploy the application + --> <target name="undeploy" description="Undeploy." depends="init"> <require file="${jboss.home}/server/${portal.deploy.dir}"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-samples.sar"/> + <delete file="${build.lib}/portal-basic-samples.sar"/> + <delete file="${build.lib}/portal-jsp-samples.war"/> + <delete file="${build.lib}/portal-news-samples.war"/> + <delete file="${build.lib}/portal-weather-samples.war"/> </target> <target name="tests" depends="init, _buildmagic:configure:deployment"> Modified: trunk/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml =================================================================== --- trunk/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml 2007-06-26 23:19:16 UTC (rev 7569) +++ trunk/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml 2007-06-26 23:21:11 UTC (rev 7570) @@ -31,7 +31,7 @@ <description>Event Portlet</description> <portlet-name>EventPortlet</portlet-name> <display-name>Event Portlet</display-name> - <portlet-class>org.jboss.samples.portlet.event.EventPortlet</portlet-class> + <portlet-class>org.jboss.portal.core.samples.basic.event.EventPortlet</portlet-class> <supports> <mime-type>text/html</mime-type> <portlet-mode>VIEW</portlet-mode>