Author: bdaw Date: 2008-02-27 04:35:20 -0500 (Wed, 27 Feb 2008) New Revision: 10134 Added: modules/portlet/trunk/portlet/src/main/resources/META-INF/ modules/portlet/trunk/portlet/src/main/resources/META-INF/portlet.tld modules/portlet/trunk/portlet/src/main/resources/META-INF/portlet_2_0.tld modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portleturl/PortletURLModeTestCase.java Removed: modules/portlet/trunk/portlet/src/main/resources/org/ Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/StateAwareResponseImpl.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/taglib/GenerateURLTag.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr286/taglib/ActionURL286Tag.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr286/taglib/GenerateURL286Tag.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr286/taglib/RenderURL286Tag.java modules/portlet/trunk/test/src/test/build.xml Log: - package taglib tlds in portlet jar - fix state propagation after action - fix taglib parameters - make setting JBOSS_4_2_1_HOME and TOMCAT_6_0_HOME not nessesary when -Dmaven.test.skip=true is present Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/StateAwareResponseImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/StateAwareResponseImpl.java 2008-02-27 06:45:24 UTC (rev 10133) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/StateAwareResponseImpl.java 2008-02-27 09:35:20 UTC (rev 10134) @@ -358,10 +358,10 @@ protected PortletParameterMap navigationalState = new PortletParameterMap(preq.navigationInfo); /** The new window state requested. */ - protected org.jboss.portal.WindowState windowState; + protected org.jboss.portal.WindowState windowState = new org.jboss.portal.WindowState(preq.getWindowState().toString()); /** The new mode requested. */ - protected Mode mode; + protected Mode mode = new Mode(preq.getPortletMode().toString()); protected PortletInvocationResponse getResponse() { Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/taglib/GenerateURLTag.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/taglib/GenerateURLTag.java 2008-02-27 06:45:24 UTC (rev 10133) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/taglib/GenerateURLTag.java 2008-02-27 09:35:20 UTC (rev 10134) @@ -141,7 +141,7 @@ * * @return Returns the parameters. */ - private Map getURLParameters() + protected Map getURLParameters() { Map urlParameters = new HashMap(parameters.size()); Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr286/taglib/ActionURL286Tag.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr286/taglib/ActionURL286Tag.java 2008-02-27 06:45:24 UTC (rev 10133) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr286/taglib/ActionURL286Tag.java 2008-02-27 09:35:20 UTC (rev 10134) @@ -73,6 +73,8 @@ setCopyCurrentRenderParameters(newPortletURL); + removeTagParametersWithEmptyValue(newPortletURL); + setName(newPortletURL); return newPortletURL; Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr286/taglib/GenerateURL286Tag.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr286/taglib/GenerateURL286Tag.java 2008-02-27 06:45:24 UTC (rev 10133) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr286/taglib/GenerateURL286Tag.java 2008-02-27 09:35:20 UTC (rev 10134) @@ -34,6 +34,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Enumeration; +import java.util.LinkedList; +import java.util.Arrays; import java.io.StringWriter; /** @@ -75,10 +77,62 @@ //default is false if (copyCurrentRenderParameters != null && copyCurrentRenderParameters.equalsIgnoreCase("true")) { - portletURL.setParameters(getPortletRequest().getPrivateParameterMap()); + // Parameters values specified in tag need to be pre-pended + + Map<String, String[]> parameters = portletURL.getParameterMap(); + + Map<String, String[]> privateParams = getPortletRequest().getPrivateParameterMap(); + + for(String name : privateParams.keySet()) + { + + if (!parameters.containsKey(name)) + { + parameters.put(name, privateParams.get(name)); + } + else + { + String[] val1 = parameters.get(name); + String[] val2 = privateParams.get(name); + String[] newVal = new String[val1.length + val2.length]; + + for (int i = 0; i < val1.length; i++) + { + newVal[i] = val1[i]; + } + for (int i = 0; i < val2.length; i++) + { + newVal[val1.length + i] = val2[i]; + } + parameters.put(name, newVal); + } + } + + portletURL.setParameters(parameters); } } + protected void removeTagParametersWithEmptyValue(PortletURL portletURL) + { + // Introduced in jsr 286 - the empty param tag value removes the parameter + + Map<String, String[]> parameters = portletURL.getParameterMap(); + + Map<String, String[]> tagParams = getURLParameters(); + + for (String name : tagParams.keySet()) + { + String[] values = tagParams.get(name); + if (values.length > 0 && values[values.length - 1].equals("")) + { + parameters.remove(name); + } + } + + portletURL.setParameters(parameters); + + } + protected boolean isEscapeXml() { Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr286/taglib/RenderURL286Tag.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr286/taglib/RenderURL286Tag.java 2008-02-27 06:45:24 UTC (rev 10133) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr286/taglib/RenderURL286Tag.java 2008-02-27 09:35:20 UTC (rev 10134) @@ -54,6 +54,8 @@ setCopyCurrentRenderParameters(newPortletURL); + removeTagParametersWithEmptyValue(newPortletURL); + return newPortletURL; } } Copied: modules/portlet/trunk/portlet/src/main/resources/META-INF/portlet.tld (from rev 10119, modules/portlet/trunk/portlet/src/main/resources/org/jboss/portal/portlet/portlet.tld) =================================================================== --- modules/portlet/trunk/portlet/src/main/resources/META-INF/portlet.tld (rev 0) +++ modules/portlet/trunk/portlet/src/main/resources/META-INF/portlet.tld 2008-02-27 09:35:20 UTC (rev 10134) @@ -0,0 +1,106 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd"> +<taglib> + + <tlib-version>1.0</tlib-version> + <jsp-version>1.2</jsp-version> + <short-name>portlet</short-name> + + <uri>http://java.sun.com/portlet</uri> + + <tag> + + <name>param</name> + <tag-class>org.jboss.portal.portlet.impl.jsr168.taglib.URLParameterTag</tag-class> + <body-content>empty</body-content> + + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + + </attribute> + <attribute> + <name>value</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + + </attribute> + + </tag> + <tag> + + <name>renderURL</name> + <tag-class>org.jboss.portal.portlet.impl.jsr168.taglib.RenderURLTag</tag-class> + <tei-class>org.jboss.portal.portlet.impl.jsr168.taglib.GenerateURLTagTEI</tei-class> + <body-content>JSP</body-content> + + <attribute> + <name>portletMode</name> + <rtexprvalue>true</rtexprvalue> + + </attribute> + <attribute> + <name>secure</name> + <rtexprvalue>true</rtexprvalue> + + </attribute> + <attribute> + <name>var</name> + <rtexprvalue>true</rtexprvalue> + + </attribute> + <attribute> + <name>windowState</name> + <rtexprvalue>true</rtexprvalue> + + </attribute> + + </tag> + <tag> + + <name>defineObjects</name> + <tag-class>org.jboss.portal.portlet.impl.jsr168.taglib.DefineObjectsTag</tag-class> + <tei-class>org.jboss.portal.portlet.impl.jsr168.taglib.DefineObjectsTagTEI</tei-class> + <body-content>empty</body-content> + + </tag> + <tag> + + <name>actionURL</name> + <tag-class>org.jboss.portal.portlet.impl.jsr168.taglib.ActionURLTag</tag-class> + <tei-class>org.jboss.portal.portlet.impl.jsr168.taglib.GenerateURLTagTEI</tei-class> + <body-content>JSP</body-content> + + <attribute> + <name>portletMode</name> + <rtexprvalue>true</rtexprvalue> + + </attribute> + <attribute> + <name>secure</name> + <rtexprvalue>true</rtexprvalue> + + </attribute> + <attribute> + <name>var</name> + <rtexprvalue>true</rtexprvalue> + + </attribute> + <attribute> + <name>windowState</name> + <rtexprvalue>true</rtexprvalue> + + </attribute> + + </tag> + <tag> + + <name>namespace</name> + <tag-class>org.jboss.portal.portlet.impl.jsr168.taglib.NamespaceTag</tag-class> + <body-content>empty</body-content> + + </tag> + +</taglib> Copied: modules/portlet/trunk/portlet/src/main/resources/META-INF/portlet_2_0.tld (from rev 10119, modules/portlet/trunk/portlet/src/main/resources/org/jboss/portal/portlet/portlet_2_0.tld) =================================================================== --- modules/portlet/trunk/portlet/src/main/resources/META-INF/portlet_2_0.tld (rev 0) +++ modules/portlet/trunk/portlet/src/main/resources/META-INF/portlet_2_0.tld 2008-02-27 09:35:20 UTC (rev 10134) @@ -0,0 +1,188 @@ +<?xml version="1.0" encoding="UTF-8"?> + + <taglib xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + version="2.0"> + + <description>Portlet 2.0 Tag Library</description> + <display-name>Portlet 2.0 Tags</display-name> + <tlib-version>2.0</tlib-version> + <short-name>portlet</short-name> + <uri>http://java.sun.com/portlet_2_0</uri> + + <tag> + + <name>param</name> + <tag-class>org.jboss.portal.portlet.impl.jsr286.taglib.URLParameter286Tag</tag-class> + <body-content>empty</body-content> + + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + + </attribute> + <attribute> + <name>value</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + + </attribute> + + </tag> + <tag> + + <name>property</name> + <tag-class>org.jboss.portal.portlet.impl.jsr286.taglib.URLProperty286Tag</tag-class> + <body-content>empty</body-content> + + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + + </attribute> + <attribute> + <name>value</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + + </attribute> + + </tag> + <tag> + + <name>renderURL</name> + <tag-class>org.jboss.portal.portlet.impl.jsr286.taglib.RenderURL286Tag</tag-class> + <tei-class>org.jboss.portal.portlet.impl.jsr286.taglib.GenerateURL286TagTEI</tei-class> + <body-content>JSP</body-content> + + <attribute> + <name>portletMode</name> + <rtexprvalue>true</rtexprvalue> + + </attribute> + <attribute> + <name>secure</name> + <rtexprvalue>true</rtexprvalue> + + </attribute> + <attribute> + <name>var</name> + <rtexprvalue>true</rtexprvalue> + + </attribute> + <attribute> + <name>windowState</name> + <rtexprvalue>true</rtexprvalue> + + </attribute> + <attribute> + <name>escapeXml</name> + <rtexprvalue>true</rtexprvalue> + + </attribute> + <attribute> + <name>copyCurrentRenderParameters</name> + <rtexprvalue>true</rtexprvalue> + + </attribute> + + </tag> + <tag> + + <name>defineObjects</name> + <tag-class>org.jboss.portal.portlet.impl.jsr286.taglib.DefineObjects286Tag</tag-class> + <tei-class>org.jboss.portal.portlet.impl.jsr286.taglib.DefineObjects286TagTEI</tei-class> + <body-content>empty</body-content> + + </tag> + <tag> + + <name>actionURL</name> + <tag-class>org.jboss.portal.portlet.impl.jsr286.taglib.ActionURL286Tag</tag-class> + <tei-class>org.jboss.portal.portlet.impl.jsr286.taglib.GenerateURL286TagTEI</tei-class> + <body-content>JSP</body-content> + + <attribute> + <name>portletMode</name> + <rtexprvalue>true</rtexprvalue> + + </attribute> + <attribute> + <name>secure</name> + <rtexprvalue>true</rtexprvalue> + + </attribute> + <attribute> + <name>var</name> + <rtexprvalue>true</rtexprvalue> + + </attribute> + <attribute> + <name>windowState</name> + <rtexprvalue>true</rtexprvalue> + + </attribute> + <attribute> + <name>escapeXml</name> + <rtexprvalue>true</rtexprvalue> + + </attribute> + <attribute> + <name>copyCurrentRenderParameters</name> + <rtexprvalue>true</rtexprvalue> + + </attribute> + <attribute> + <name>name</name> + <rtexprvalue>true</rtexprvalue> + + </attribute> + + + </tag> + <tag> + + <name>resourceURL</name> + <tag-class>org.jboss.portal.portlet.impl.jsr286.taglib.ResourceURL286Tag</tag-class> + <tei-class>org.jboss.portal.portlet.impl.jsr286.taglib.ResourceURL286TagTEI</tei-class> + <body-content>JSP</body-content> + + <attribute> + <name>secure</name> + <rtexprvalue>true</rtexprvalue> + + </attribute> + <attribute> + <name>var</name> + <rtexprvalue>true</rtexprvalue> + + </attribute> + <attribute> + <name>escapeXml</name> + <rtexprvalue>true</rtexprvalue> + + </attribute> + <attribute> + <name>cacheability</name> + <rtexprvalue>true</rtexprvalue> + + </attribute> + <attribute> + <name>id</name> + <rtexprvalue>true</rtexprvalue> + + </attribute> + + </tag> + <tag> + + <name>namespace</name> + <tag-class>org.jboss.portal.portlet.impl.jsr286.taglib.Namespace286Tag</tag-class> + <body-content>empty</body-content> + + </tag> + +</taglib> Added: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portleturl/PortletURLModeTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portleturl/PortletURLModeTestCase.java (rev 0) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portleturl/PortletURLModeTestCase.java 2008-02-27 09:35:20 UTC (rev 10134) @@ -0,0 +1,100 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.portal.test.portlet.jsr286.tck.portleturl; + +import org.jboss.portal.unit.annotations.TestCase; +import org.jboss.portal.unit.PortletTestCase; +import org.jboss.portal.unit.PortletTestContext; +import org.jboss.portal.unit.actions.PortletRenderTestAction; +import org.jboss.portal.unit.actions.PortletActionTestAction; +import org.jboss.portal.test.portlet.framework.UTP1; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; +import static org.jboss.unit.api.Assert.assertEquals; + +import javax.portlet.Portlet; +import javax.portlet.RenderRequest; +import javax.portlet.RenderResponse; +import javax.portlet.PortletURL; +import javax.portlet.PortletMode; +import javax.portlet.PortletModeException; +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +@TestCase +public class PortletURLModeTestCase +{ + private int actionCount = 0; + + public PortletURLModeTestCase(PortletTestCase seq) + { + seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction() + { + protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) + { + PortletURL url = response.createActionURL(); + + //set some render parameters to test + try + { + url.setPortletMode(PortletMode.EDIT); + } + catch (PortletModeException e) + { + throw new IllegalStateException("Edit mode in test not supported"); + } + + return new InvokeGetResponse(url.toString()); + } + }); + + seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction() + { + protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) + { + assertEquals(request.getPortletMode(), PortletMode.EDIT); + actionCount++; + } + }); + + seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction() + { + protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) + { + + assertEquals(request.getPortletMode(), PortletMode.EDIT); + assertEquals(1, actionCount); + + return new EndTestResponse(); + } + }); + + + } +} + Modified: modules/portlet/trunk/test/src/test/build.xml =================================================================== --- modules/portlet/trunk/test/src/test/build.xml 2008-02-27 06:45:24 UTC (rev 10133) +++ modules/portlet/trunk/test/src/test/build.xml 2008-02-27 09:35:20 UTC (rev 10134) @@ -1,8 +1,12 @@ <?xml version="1.0"?> <project name="portlet-integration-test"> - <target name="tests" depends="prepare_env, evaluate_properties" unless="maven.test.skip"> + <target name="tests" unless="maven.test.skip"> + <antcall target="__tests"/> + </target> + <target name="__tests" depends="prepare_env, evaluate_properties" > + <echo message="compile classpath: ${compile_classpath}"/> <echo message="runtime classpath: ${runtime_classpath}"/> <echo message="test classpath: ${test_classpath}"/> @@ -302,11 +306,11 @@ <!-- JSR 168 TLD --> <zipfileset src="${dependency.portal-portlet.jar}" - includes="org/jboss/portal/portlet/portlet.tld" + includes="META-INF/portlet.tld" fullpath="META-INF/portlet.tld"/> <zipfileset src="${dependency.portal-portlet.jar}" - includes="org/jboss/portal/portlet/portlet_2_0.tld" + includes="META-INF/portlet_2_0.tld" fullpath="META-INF/portlet_2_0.tld"/> </jar> @@ -505,6 +509,7 @@ <configuration home="${test.jboss-4.2.tempdir}"> <property name="cargo.servlet.port" value="8080"/> <property name="cargo.logging" value="high"/> + <!--<property name="cargo.jvmargs" value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/>--> <deployable type="war" file="${test.temp.lib}/jboss-4.2/portlet-test.war"/> </configuration> </cargo> @@ -712,11 +717,12 @@ <property name="tck" value="${target}/tck"/> <property name="tck-jboss" value="${tck}/jboss42"/> + <property name="tck-tomcat" value="${tck}/tomcat6"/> <mkdir dir="${tck}"/> <mkdir dir="${tck-jboss}"/> - <!--<mkdir dir="${tck}/jboss42"/>--> + <mkdir dir="${tck-tomcat}"/> <!--<mkdir dir="${tck}/tomcat6"/>--> @@ -771,7 +777,7 @@ <path location="${dependency.portal-common-portal.jar}"/> <path location="${dependency.portal-portlet.jar}"/> <path location="${dependency.portal-web.jar}"/> - <path location="${dependency.jsr168api.jar}"/> + <!--<path location="${dependency.jsr168api.jar}"/>--> <path location="${dependency.jaxb-api.jar}"/> <path location="${dependency.jboss-unit.jar}"/> @@ -781,6 +787,73 @@ </copy> + <!--TOMCAT--> + + <copy todir="${tck-tomcat}/portlet-tck-war"> + <fileset dir="${target}/test-classes/portlet-tck-war"/> + </copy> + <copy todir="${tck-tomcat}/portlet-tck-war"> + <fileset dir="${target}/test-classes/tomcat-6.0/portlet-tck-war"/> + </copy> + + <copy todir="${tck-tomcat}/portlet-tck-war/WEB-INF/lib" flatten="true"> + + <!-- --> + <fileset dir="${target}" includes="portlet-test-lib.jar"/> + + <!-- --> + <path refid="mc.portal-common"/> + + <path refid="mc.portal-portlet-controller"/> + + <!-- Remote plugin --> + <path refid="mc.jboss-remoting"/> + <path refid="mc.portal-test-generic"/> + + <!-- MC 2.0.0.Beta4 --> + <path refid="mc.trove"/> + <path refid="mc.xerces"/> + <path refid="mc.javassist"/> + <path refid="mc.jboss_common_core"/> + <path refid="mc.jboss_vfs"/> + <path refid="mc.jboss_xb"/> + <path refid="mc.jboss_aop"/> + <path refid="mc.jboss_microcontainer"/> + + + </copy> + + <mkdir dir="${tck-tomcat}/tck-portal"/> + + <jar jarfile="${tck-tomcat}/tck-portal/portlet-tck.war"> + <fileset dir="${tck-tomcat}/portlet-tck-war"/> + </jar> + + <copy todir="${tck-tomcat}/tck-portal" flatten="true"> + + <!--Stuff from shared classpath--> + <path location="${dependency.log4j.jar}"/> + <path location="${dependency.concurrent.jar}"/> + <path location="${dependency.activation.jar}"/> + <path location="${dependency.jaxb-api.jar}"/> + + <path refid="mc.jboss_common_logging_spi"/> + <path refid="mc.jboss_common_logging_jdk"/> + + <path location="${dependency.portal-common.jar}"/> + <path location="${dependency.portal-common-portal.jar}"/> + <path location="${dependency.portal-portlet.jar}"/> + <path location="${dependency.portal-web.jar}"/> + <!--<path location="${dependency.jsr168api.jar}"/>--> + + <path location="${dependency.jboss-unit.jar}"/> + <path location="${dependency.jboss-unit-remote.jar}"/> + <path location="${dependency.portal-test.jar}"/> + + </copy> + + + <delete file="${target}/portlet-test-lib.jar"/> </target>