You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2009/05/08 11:34:02 UTC
svn commit: r772903 - in /portals/jetspeed-2/portal/trunk:
components/jetspeed-deploy-tools/
components/jetspeed-deploy-tools/src/main/java/org/apache/jetspeed/tools/deploy/
jetspeed-portal-resources/src/main/resources/tld/
maven/jetspeed-deploy-maven-...
Author: ate
Date: Fri May 8 09:34:01 2009
New Revision: 772903
URL: http://svn.apache.org/viewvc?rev=772903&view=rev
Log:
JS2-996: Inject the new Portlet 2.0 tlds in the target web archive during the deployment of a portlet application
See: http://issues.apache.org/jira/browse/JS2-996
Added:
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/tld/portlet.tld (with props)
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/tld/portlet_2_0.tld (with props)
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/src/main/java/org/apache/jetspeed/tools/deploy/JetspeedDeploy.java
portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/src/main/java/org/apache/jetspeed/tools/deploy/JetspeedWebApplicationRewriter.java
portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/src/main/java/org/apache/jetspeed/tools/deploy/JetspeedWebApplicationRewriter2_3.java
portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/src/main/java/org/apache/jetspeed/tools/deploy/JetspeedWebApplicationRewriter2_4.java
portals/jetspeed-2/portal/trunk/maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/pom.xml?rev=772903&r1=772902&r2=772903&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/pom.xml Fri May 8 09:34:01 2009
@@ -65,7 +65,7 @@
<resources>
<resource>
<path>tld</path>
- <include>portlet.tld</include>
+ <include>portlet*.tld</include>
</resource>
</resources>
</unpack>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/src/main/java/org/apache/jetspeed/tools/deploy/JetspeedDeploy.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/src/main/java/org/apache/jetspeed/tools/deploy/JetspeedDeploy.java?rev=772903&r1=772902&r2=772903&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/src/main/java/org/apache/jetspeed/tools/deploy/JetspeedDeploy.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/src/main/java/org/apache/jetspeed/tools/deploy/JetspeedDeploy.java Fri May 8 09:34:01 2009
@@ -23,6 +23,7 @@
import java.io.File;
import java.nio.channels.FileChannel;
import java.util.Enumeration;
+import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.jar.JarOutputStream;
import java.util.zip.ZipEntry;
@@ -119,12 +120,13 @@
Document portletXml = null;
Document contextXml = null;
boolean taglibFound = false;
+ boolean taglib2Found = false;
ZipEntry src;
InputStream source;
- Enumeration zipEntries = jin.entries();
+ Enumeration<JarEntry> zipEntries = jin.entries();
while (zipEntries.hasMoreElements())
{
- src = (ZipEntry) zipEntries.nextElement();
+ src = zipEntries.nextElement();
source = jin.getInputStream(src);
try
{
@@ -157,6 +159,11 @@
System.out.println("Warning: WEB-INF/tld/portlet.tld already provided, won't be replaced.");
taglibFound = true;
}
+ else if ("WEB-INF/tld/portlet_2_0.tld".equals(target))
+ {
+ System.out.println("Warning: WEB-INF/tld/portlet_2_0.tld already provided, won't be replaced.");
+ taglib2Found = true;
+ }
addFile(target, source, jout, src.getTime());
}
}
@@ -211,6 +218,28 @@
}
}
}
+ if (!taglib2Found)
+ {
+ System.out.println("Attempting to add portlet_2_0.tld to war...");
+ InputStream is = this.getClass().getResourceAsStream("/org/apache/jetspeed/tools/deploy/portlet_2_0.tld");
+ if (is == null)
+ {
+ System.out.println("Failed to find portlet_2_0.tld in classpath");
+ }
+ else
+ {
+ System.out.println("Adding portlet_2_0.tld to war...");
+
+ try
+ {
+ addFile("WEB-INF/tld/portlet_2_0.tld", is, jout, 0);
+ }
+ finally
+ {
+ is.close();
+ }
+ }
+ }
jout.close();
jin.close();
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/src/main/java/org/apache/jetspeed/tools/deploy/JetspeedWebApplicationRewriter.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/src/main/java/org/apache/jetspeed/tools/deploy/JetspeedWebApplicationRewriter.java?rev=772903&r1=772902&r2=772903&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/src/main/java/org/apache/jetspeed/tools/deploy/JetspeedWebApplicationRewriter.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/src/main/java/org/apache/jetspeed/tools/deploy/JetspeedWebApplicationRewriter.java Fri May 8 09:34:01 2009
@@ -102,6 +102,7 @@
private String portletApplication;
private boolean changed = false;
private boolean portletTaglibAdded = false;
+ private boolean portlet20TaglibAdded = false;
private XPath xpath;
@@ -153,6 +154,7 @@
Object jetspeedServlet =xpath.evaluate(getJetspeedServletXPath(), document, XPathConstants.NODE);
Object jetspeedServletMapping = xpath.evaluate(getJetspeedServletMappingXPath(), document, XPathConstants.NODE);
Object portletTaglib = xpath.evaluate(getPortletTagLibXPath(), document, XPathConstants.NODE);
+ Object portlet20Taglib = xpath.evaluate(getPortlet20TagLibXPath(), document, XPathConstants.NODE);
if (!document.hasChildNodes())
{
@@ -173,11 +175,11 @@
Element jetspeedServletElement = (Element)((Element)jetspeedServlet).getParentNode();
if (null == xpath.evaluate(prefix+"init-param/"+prefix+"param-name[contains(child::text(), \"contextName\")]",jetspeedServletElement, XPathConstants.NODE))
{
- insertContextNameParam((Element)jetspeedServletElement);
+ insertContextNameParam(jetspeedServletElement);
}
if (null == xpath.evaluate(prefix+"load-on-startup", jetspeedServletElement, XPathConstants.NODE))
{
- insertLoadOnStartup((Element) jetspeedServletElement);
+ insertLoadOnStartup(jetspeedServletElement);
}
}
}
@@ -194,6 +196,13 @@
changed = true;
portletTaglibAdded = true;
}
+ if(portlet20Taglib == null)
+ {
+ insertPortlet20TagLib(root);
+ changed = true;
+ portlet20TaglibAdded = true;
+ }
+
}
catch (Exception e)
{
@@ -290,6 +299,14 @@
return portletTaglibAdded;
}
+ /**
+ * @return Returns the portletTaglibAdded.
+ */
+ public boolean isPortlet20TaglibAdded()
+ {
+ return portlet20TaglibAdded;
+ }
+
protected XPath getXPath()
{
return xpath;
@@ -320,6 +337,14 @@
protected abstract String getPortletTagLibXPath();
/**
+ * Returns the portlet 2.0 taglib xpath.
+ * The returned path must contain the namespace prefix.
+ *
+ * @return portlet 2.0 taglib xpath
+ */
+ protected abstract String getPortlet20TagLibXPath();
+
+ /**
* Inserts the jetspeed servlet into web.xml
*
* @param root
@@ -342,4 +367,12 @@
* @throws Exception
*/
protected abstract void insertPortletTagLib(Element root) throws Exception;
+
+ /**
+ * Inserts the portlet 2.0 taglib into web.xml
+ *
+ * @param root
+ * @throws Exception
+ */
+ protected abstract void insertPortlet20TagLib(Element root) throws Exception;
}
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/src/main/java/org/apache/jetspeed/tools/deploy/JetspeedWebApplicationRewriter2_3.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/src/main/java/org/apache/jetspeed/tools/deploy/JetspeedWebApplicationRewriter2_3.java?rev=772903&r1=772902&r2=772903&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/src/main/java/org/apache/jetspeed/tools/deploy/JetspeedWebApplicationRewriter2_3.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/src/main/java/org/apache/jetspeed/tools/deploy/JetspeedWebApplicationRewriter2_3.java Fri May 8 09:34:01 2009
@@ -33,6 +33,7 @@
public static final String JETSPEED_SERVLET_XPATH = "/js:web-app/js:servlet/js:servlet-name[contains(child::text(), \"JetspeedContainer\")]";
public static final String JETSPEED_SERVLET_MAPPING_XPATH = "/js:web-app/js:servlet-mapping/js:servlet-name[contains(child::text(), \"JetspeedContainer\")]";
public static final String PORTLET_TAGLIB_XPATH = "/js:web-app/js:taglib/js:taglib-uri[contains(child::text(), \"http://java.sun.com/portlet\")]";
+ public static final String PORTLET20_TAGLIB_XPATH = "/js:web-app/js:taglib/js:taglib-uri[contains(child::text(), \"http://java.sun.com/portlet_2_0\")]";
protected static final String[] ELEMENTS_BEFORE_SERVLET = new String[]{"icon", "display-name", "description",
"distributable", "context-param", "filter", "filter-mapping", "listener", "servlet"};
@@ -86,6 +87,16 @@
}
/**
+ * Returns the portlet 2.0 taglib xpath.
+ *
+ * @return portlet 2.0 taglib xpath
+ */
+ protected String getPortlet20TagLibXPath()
+ {
+ return PORTLET20_TAGLIB_XPATH.replace("js:", getNamespacePrefix());
+ }
+
+ /**
* Inserts the jetspeed servlet into web.xml
*
* @param root
@@ -103,9 +114,9 @@
servletDesc.setTextContent(JETSPEED_SERVLET_DESCRIPTION);
Element servletClass = root.getOwnerDocument().createElementNS(namespace, "servlet-class");
servletClass.setTextContent(JETSPEED_SERVLET_CLASS);
- jetspeedServletElement.appendChild(servletDesc);
- jetspeedServletElement.appendChild(servletDspName);
jetspeedServletElement.appendChild(servletName);
+ jetspeedServletElement.appendChild(servletDspName);
+ jetspeedServletElement.appendChild(servletDesc);
jetspeedServletElement.appendChild(servletClass);
insertContextNameParam(jetspeedServletElement);
insertLoadOnStartup(jetspeedServletElement);
@@ -154,4 +165,25 @@
insertElementCorrectly(root, taglib, ELEMENTS_BEFORE_TAGLIB_MAPPING);
}
+
+ /**
+ * Inserts the portlet 2.0 taglib into web.xml
+ *
+ * @param root
+ * @throws Exception
+ */
+ protected void insertPortlet20TagLib(Element root) throws Exception
+ {
+ String namespace = root.getNamespaceURI();
+ Element taglib = root.getOwnerDocument().createElementNS(namespace, "taglib");
+ Element taguri = root.getOwnerDocument().createElementNS(namespace, "taglib-uri");
+ taguri.setTextContent("http://java.sun.com/portlet_2_0");
+ Element taglocation = root.getOwnerDocument().createElementNS(namespace, "taglib-location");
+ taglocation.setTextContent("/WEB-INF/tld/portlet_2_0.tld");
+
+ taglib.appendChild(taguri);
+ taglib.appendChild(taglocation);
+
+ insertElementCorrectly(root, taglib, ELEMENTS_BEFORE_TAGLIB_MAPPING);
+ }
}
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/src/main/java/org/apache/jetspeed/tools/deploy/JetspeedWebApplicationRewriter2_4.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/src/main/java/org/apache/jetspeed/tools/deploy/JetspeedWebApplicationRewriter2_4.java?rev=772903&r1=772902&r2=772903&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/src/main/java/org/apache/jetspeed/tools/deploy/JetspeedWebApplicationRewriter2_4.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/src/main/java/org/apache/jetspeed/tools/deploy/JetspeedWebApplicationRewriter2_4.java Fri May 8 09:34:01 2009
@@ -33,6 +33,7 @@
public static final String JETSPEED_SERVLET_MAPPING_XPATH = "/js:web-app/js:servlet-mapping/js:servlet-name[contains(child::text(), \"JetspeedContainer\")]";
public static final String JSP_CONFIG_XPATH = "/js:web-app/js:jsp-config";
public static final String PORTLET_TAGLIB_XPATH = "/js:web-app/js:jsp-config/js:taglib/js:taglib-uri[contains(child::text(), \"http://java.sun.com/portlet\")]";
+ public static final String PORTLET20_TAGLIB_XPATH = "/js:web-app/js:jsp-config/js:taglib/js:taglib-uri[contains(child::text(), \"http://java.sun.com/portlet_2_0\")]";
protected static final String[] ELEMENTS_BEFORE_SERVLET = new String[]{"description", "display-name", "icon",
"distributable", "context-param", "filter", "filter-mapping", "listener", "servlet"};
@@ -87,6 +88,16 @@
}
/**
+ * Returns the portlet 2.0 taglib xpath.
+ *
+ * @return portlet 2.0 taglib xpath
+ */
+ protected String getPortlet20TagLibXPath()
+ {
+ return PORTLET20_TAGLIB_XPATH.replace("js:", getNamespacePrefix());
+ }
+
+ /**
* Inserts the jetspeed servlet into web.xml
*
* @param root
@@ -161,4 +172,31 @@
insertElementCorrectly(jspConfig, taglib, ELEMENTS_BEFORE_TAGLIB_MAPPING);
}
+
+ /**
+ * Inserts the portlet 2.0 taglib into web.xml
+ *
+ * @param root
+ * @throws Exception
+ */
+ protected void insertPortlet20TagLib(Element root) throws Exception
+ {
+ String namespace = root.getNamespaceURI();
+ Element jspConfig = (Element)getXPath().evaluate(JSP_CONFIG_XPATH, root.getOwnerDocument(), XPathConstants.NODE);
+ if (jspConfig == null)
+ {
+ jspConfig = root.getOwnerDocument().createElementNS(namespace,"jsp-config");
+ insertElementCorrectly(root, jspConfig, ELEMENTS_BEFORE_JSP_CONFIG);
+ }
+ Element taglib = root.getOwnerDocument().createElementNS(namespace, "taglib");
+ Element taguri = root.getOwnerDocument().createElementNS(namespace, "taglib-uri");
+ taguri.setTextContent("http://java.sun.com/portlet_2_0");
+ Element taglocation = root.getOwnerDocument().createElementNS(namespace, "taglib-location");
+ taglocation.setTextContent("/WEB-INF/tld/portlet_2_0.tld");
+
+ taglib.appendChild(taguri);
+ taglib.appendChild(taglocation);
+
+ insertElementCorrectly(jspConfig, taglib, ELEMENTS_BEFORE_TAGLIB_MAPPING);
+ }
}
Added: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/tld/portlet.tld
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/tld/portlet.tld?rev=772903&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/tld/portlet.tld (added)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/tld/portlet.tld Fri May 8 09:34:01 2009
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE taglib PUBLIC
+ "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+ "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_2.dtd">
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied.
+
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<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>defineObjects</name>
+ <tag-class>org.apache.pluto.tags.DefineObjectsTag168</tag-class>
+ <tei-class>org.apache.pluto.tags.DefineObjectsTag168$TEI</tei-class>
+ <body-content>empty</body-content>
+ </tag>
+ <tag>
+ <name>param</name>
+ <tag-class>org.apache.pluto.tags.ParamTag</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>actionURL</name>
+ <tag-class>org.apache.pluto.tags.ActionURLTag168</tag-class>
+ <tei-class>org.apache.pluto.tags.PortletURLTag168$TEI</tei-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <name>windowState</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>portletMode</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>secure</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>var</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
+ <name>renderURL</name>
+ <tag-class>org.apache.pluto.tags.RenderURLTag168</tag-class>
+ <tei-class>org.apache.pluto.tags.PortletURLTag168$TEI</tei-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <name>windowState</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>portletMode</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>secure</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>var</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
+ <name>namespace</name>
+ <tag-class>org.apache.pluto.tags.NamespaceTag</tag-class>
+ <body-content>empty</body-content>
+ </tag>
+</taglib>
\ No newline at end of file
Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/tld/portlet.tld
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/tld/portlet.tld
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/tld/portlet.tld
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/tld/portlet_2_0.tld
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/tld/portlet_2_0.tld?rev=772903&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/tld/portlet_2_0.tld (added)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/tld/portlet_2_0.tld Fri May 8 09:34:01 2009
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE taglib PUBLIC
+ "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+ "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<taglib>
+ <tlib-version>2.0</tlib-version>
+ <jsp-version>1.2</jsp-version>
+ <short-name>portlet_2_0</short-name>
+ <uri>http://java.sun.com/portlet_2_0</uri>
+ <description>Pluto Tag Library</description>
+ <tag>
+ <name>defineObjects</name>
+ <tag-class>org.apache.pluto.tags.DefineObjectsTag286</tag-class>
+ <tei-class>org.apache.pluto.tags.DefineObjectsTag286$TEI</tei-class>
+ <body-content>empty</body-content>
+ </tag>
+ <tag>
+ <name>param</name>
+ <tag-class>org.apache.pluto.tags.ParamTag</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.apache.pluto.tags.PropertyTag</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>actionURL</name>
+ <tag-class>org.apache.pluto.tags.ActionURLTag286</tag-class>
+ <tei-class>org.apache.pluto.tags.PortletURLTag168$TEI</tei-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <name>windowState</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>portletMode</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>var</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>secure</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>copyCurrentRenderParameters</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>escapeXml</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>name</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
+ <name>renderURL</name>
+ <tag-class>org.apache.pluto.tags.RenderURLTag286</tag-class>
+ <tei-class>org.apache.pluto.tags.PortletURLTag168$TEI</tei-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <name>windowState</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>portletMode</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>secure</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>var</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>copyCurrentRenderParameters</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>escapeXml</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
+ <name>resourceURL</name>
+ <tag-class>org.apache.pluto.tags.ResourceURLTag286</tag-class>
+ <tei-class>org.apache.pluto.tags.BaseURLTag$TEI</tei-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <name>var</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>secure</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>escapeXml</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>id</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>cacheability</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
+ <name>namespace</name>
+ <tag-class>org.apache.pluto.tags.NamespaceTag</tag-class>
+ <body-content>empty</body-content>
+ </tag>
+</taglib>
Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/tld/portlet_2_0.tld
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/tld/portlet_2_0.tld
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/tld/portlet_2_0.tld
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: portals/jetspeed-2/portal/trunk/maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java?rev=772903&r1=772902&r2=772903&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java (original)
+++ portals/jetspeed-2/portal/trunk/maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java Fri May 8 09:34:01 2009
@@ -123,7 +123,7 @@
private Boolean infusionStripLoggers;
/**
- * @parameter expression="2.3"
+ * @parameter
*/
private String infusionForcedVersion;
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org