Author: olamy
Date: Thu Oct 27 18:11:13 2011
New Revision: 1189907
URL: http://svn.apache.org/viewvc?rev=1189907&view=rev
Log:
use apt plugin from myfaces to generate taglib file
Modified:
archiva/trunk/.gitignore
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/UploadAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/CopyPasteSnippetTag.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/DependencyTreeTag.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/GroupIdLinkTag.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/legacyArtifactPath.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/dependencyTree.jspf
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/projectMetadata.jspf
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/basicReport.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/statisticsReport.jsp
Modified: archiva/trunk/.gitignore
URL:
http://svn.apache.org/viewvc/archiva/trunk/.gitignore?rev=1189907&r1=1189906&r2=1189907&view=diff
==============================================================================
--- archiva/trunk/.gitignore (original)
+++ archiva/trunk/.gitignore Thu Oct 27 18:11:13 2011
@@ -17,3 +17,4 @@ archiva-modules/archiva-web/archiva-weba
*.iws
.DS_Store
.extract
+archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tld/
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1189907&r1=1189906&r2=1189907&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Thu Oct 27
18:11:13 2011
@@ -164,10 +164,12 @@
<groupId>opensymphony</groupId>
<artifactId>sitemesh</artifactId>
</dependency>
+ <!--
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
</dependency>
+ -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
@@ -549,6 +551,16 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
+
+ <!-- taglib annotation plugin -->
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts-annotations</artifactId>
+ <version>1.0.5</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+
</dependencies>
<build>
<resources>
@@ -657,7 +669,7 @@
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
+ <artifactId>jetty-maven-plugin</artifactId>
<version>${jettyVersion}</version>
<configuration>
<webAppConfig>
@@ -745,10 +757,44 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.myfaces.tobago</groupId>
+ <artifactId>maven-apt-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.myfaces.tobago</groupId>
+ <artifactId>maven-apt-plugin</artifactId>
+ <version>1.0.38</version>
+ <configuration>
+
<A>uri=/archiva-web-tag,tlibVersion=2.2.3,jspVersion=2.0,shortName=archiva,displayName=Archiva
Taglib,
+ outFile=${basedir}/src/main/webapp/WEB-INF/tld/web-tags.tld,
+ description=Archiva taglibs.,
+ outTemplatesDir=${basedir}/target
+ </A>
+ <resourceTargetPath>target</resourceTargetPath>
+ <fork>true</fork>
+ <force>true</force>
+ <nocompile>true</nocompile>
+ <showWarnings>true</showWarnings>
+
<factory>org.apache.struts.annotations.taglib.apt.TLDAnnotationProcessorFactory</factory>
+ <includes>
+ <include>org/apache/archiva/web/tags/*Tag.java</include>
+ </includes>
+ </configuration>
+
+ </plugin>
+ <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/UploadAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/UploadAction.java?rev=1189907&r1=1189906&r2=1189907&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/UploadAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/UploadAction.java
Thu Oct 27 18:11:13 2011
@@ -53,6 +53,7 @@ import org.apache.archiva.repository.met
import org.apache.archiva.repository.metadata.RepositoryMetadataWriter;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
+import org.apache.taglibs.standard.tlv.JstlBaseTLV;
import org.codehaus.plexus.taskqueue.TaskQueueException;
import org.codehaus.plexus.util.IOUtil;
import org.springframework.context.annotation.Scope;
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/CopyPasteSnippetTag.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/CopyPasteSnippetTag.java?rev=1189907&r1=1189906&r2=1189907&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/CopyPasteSnippetTag.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/CopyPasteSnippetTag.java
Thu Oct 27 18:11:13 2011
@@ -22,6 +22,8 @@ package org.apache.archiva.web.tags;
import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.web.util.ContextUtils;
import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.struts2.views.annotations.StrutsTag;
+import org.apache.struts2.views.annotations.StrutsTagAttribute;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -36,6 +38,7 @@ import java.io.IOException;
*
* @version $Id$
*/
+@StrutsTag(name = "copy-paste-snippet", tldBodyContent = "empty", tldTagClass
= "org.apache.archiva.web.tags.CopyPasteSnippetTag", description = "Render a
copy paste snippet for the provided object")
public class CopyPasteSnippetTag
extends TagSupport
{
@@ -111,11 +114,13 @@ public class CopyPasteSnippetTag
return super.doEndTag();
}
+ @StrutsTagAttribute(description = "The Object to Render", type = "String",
defaultValue = "", required = true, rtexprvalue = true)
public void setObject( Object object )
{
this.object = object;
}
+ @StrutsTagAttribute(description = "The wrapper type to use, can be 'pre'
or 'toggle'", type = "String", defaultValue = "", required = false, rtexprvalue
= true)
public void setWrapper( String wrapper )
{
this.wrapper = wrapper;
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/DependencyTreeTag.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/DependencyTreeTag.java?rev=1189907&r1=1189906&r2=1189907&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/DependencyTreeTag.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/DependencyTreeTag.java
Thu Oct 27 18:11:13 2011
@@ -24,6 +24,8 @@ import org.apache.commons.collections.It
import org.apache.commons.lang.StringUtils;
import org.apache.archiva.common.ArchivaException;
import org.apache.archiva.web.tags.DependencyTree.TreeEntry;
+import org.apache.struts2.views.annotations.StrutsTag;
+import org.apache.struts2.views.annotations.StrutsTagAttribute;
import org.springframework.beans.BeansException;
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -54,6 +56,7 @@ import javax.servlet.jsp.tagext.TryCatch
*
* @version $Id$
*/
+@StrutsTag(name = "dependency-tree", tldBodyContent = "JSP", tldTagClass =
"org.apache.archiva.web.tags.DependencyTreeTag", description = "Render a
dependency tree for the provided project.")
public class DependencyTreeTag
extends TagSupport
implements IterationTag, TryCatchFinally
@@ -173,26 +176,31 @@ public class DependencyTreeTag
super.release();
}
+ @StrutsTagAttribute(description = "The artifactId", type = "String",
defaultValue = "", required = true, rtexprvalue = true)
public void setArtifactId( String artifactId )
{
this.artifactId = artifactId;
}
+ @StrutsTagAttribute(description = "The groupId", type = "String",
defaultValue = "", required = true, rtexprvalue = true)
public void setGroupId( String groupId )
{
this.groupId = groupId;
}
+ @StrutsTagAttribute(description = "The variable name for the node.", type
= "String", defaultValue = "", required = false, rtexprvalue = true)
public void setNodevar( String nodevar )
{
this.nodevar = nodevar;
}
+ @StrutsTagAttribute(description = "The version", type = "String",
defaultValue = "", required = true, rtexprvalue = true)
public void setVersion( String version )
{
this.version = version;
}
+ @StrutsTagAttribute(description = "The version of the project model. Used
to verify the dependency graph for generic snapshots not yet in the repo.",
type = "String", defaultValue = "", required = false, rtexprvalue = true)
public void setModelVersion( String modelVersion )
{
this.modelVersion = modelVersion;
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/GroupIdLinkTag.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/GroupIdLinkTag.java?rev=1189907&r1=1189906&r2=1189907&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/GroupIdLinkTag.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/GroupIdLinkTag.java
Thu Oct 27 18:11:13 2011
@@ -25,6 +25,9 @@ import org.apache.struts2.components.Com
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.JspException;
+
+import org.apache.struts2.views.annotations.StrutsTag;
+import org.apache.struts2.views.annotations.StrutsTagAttribute;
import org.apache.struts2.views.jsp.ComponentTagSupport;
/**
@@ -32,6 +35,7 @@ import org.apache.struts2.views.jsp.Comp
*
* @version $Id$
*/
+@StrutsTag(name = "groupIdLink", tldBodyContent = "empty", tldTagClass =
"org.apache.archiva.web.tags.GroupIdLinkTag", description = "Render a groupId
as a set of Links")
public class GroupIdLinkTag
extends ComponentTagSupport
{
@@ -78,11 +82,13 @@ public class GroupIdLinkTag
var = exprTool.optionalString( "var", var_, "" );
}
+ @StrutsTagAttribute(description = "The GroupID String", type = "String",
defaultValue = "", required = true, rtexprvalue = true)
public void setVar( String value )
{
this.var_ = value;
}
+ @StrutsTagAttribute(description = "Boolean indicating if 'top' link should
be created or not.", type = "String", defaultValue = "", required = false,
rtexprvalue = true)
public void setIncludeTop( boolean includeTop )
{
this.includeTop = includeTop;
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/legacyArtifactPath.jsp
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/legacyArtifactPath.jsp?rev=1189907&r1=1189906&r2=1189907&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/legacyArtifactPath.jsp
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/legacyArtifactPath.jsp
Thu Oct 27 18:11:13 2011
@@ -21,7 +21,7 @@
<%@ taglib prefix="s" uri="/struts-tags" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
<%@ taglib prefix="redback"
uri="http://plexus.codehaus.org/redback/taglib-1.0"; %>
-<%@ taglib prefix="archiva" uri="/WEB-INF/taglib.tld" %>
+<%@ taglib prefix="archiva" uri="/WEB-INF/tld/web-tags.tld" %>
<html>
<head>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp?rev=1189907&r1=1189906&r2=1189907&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp
Thu Oct 27 18:11:13 2011
@@ -21,7 +21,7 @@
<%@ taglib prefix="s" uri="/struts-tags"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<%@ taglib prefix="redback"
uri="http://plexus.codehaus.org/redback/taglib-1.0"; %>
-<%@ taglib prefix="archiva" uri="/WEB-INF/taglib.tld" %>
+<%@ taglib prefix="archiva" uri="/WEB-INF/tld/web-tags.tld" %>
<html>
<head>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp?rev=1189907&r1=1189906&r2=1189907&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp
Thu Oct 27 18:11:13 2011
@@ -22,7 +22,7 @@
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"; %>
<%@ taglib prefix="redback"
uri="http://plexus.codehaus.org/redback/taglib-1.0"; %>
-<%@ taglib prefix="archiva" uri="/WEB-INF/taglib.tld" %>
+<%@ taglib prefix="archiva" uri="/WEB-INF/tld/web-tags.tld" %>
<html>
<head>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp?rev=1189907&r1=1189906&r2=1189907&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
Thu Oct 27 18:11:13 2011
@@ -22,7 +22,7 @@
<%@ taglib prefix="s" uri="/struts-tags" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
<%@ taglib prefix="redback"
uri="http://plexus.codehaus.org/redback/taglib-1.0"; %>
-<%@ taglib prefix="archiva" uri="/WEB-INF/taglib.tld" %>
+<%@ taglib prefix="archiva" uri="/WEB-INF/tld/web-tags.tld" %>
<html>
<head>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp?rev=1189907&r1=1189906&r2=1189907&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp
Thu Oct 27 18:11:13 2011
@@ -22,7 +22,7 @@
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"; %>
<%@ taglib prefix="redback"
uri="http://plexus.codehaus.org/redback/taglib-1.0"; %>
-<%@ taglib prefix="archiva" uri="/WEB-INF/taglib.tld" %>
+<%@ taglib prefix="archiva" uri="/WEB-INF/tld/web-tags.tld" %>
<html>
<head>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp?rev=1189907&r1=1189906&r2=1189907&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp
Thu Oct 27 18:11:13 2011
@@ -22,7 +22,7 @@
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"; %>
<%@ taglib prefix="redback"
uri="http://plexus.codehaus.org/redback/taglib-1.0"; %>
-<%@ taglib prefix="archiva" uri="/WEB-INF/taglib.tld" %>
+<%@ taglib prefix="archiva" uri="/WEB-INF/tld/web-tags.tld" %>
<html>
<head>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp?rev=1189907&r1=1189906&r2=1189907&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp
Thu Oct 27 18:11:13 2011
@@ -20,7 +20,7 @@
<%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
-<%@ taglib prefix="archiva" uri="/WEB-INF/taglib.tld" %>
+<%@ taglib prefix="archiva" uri="/WEB-INF/tld/web-tags.tld" %>
<%@ taglib prefix="redback"
uri="http://plexus.codehaus.org/redback/taglib-1.0"; %>
<html>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf?rev=1189907&r1=1189906&r2=1189907&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf
Thu Oct 27 18:11:13 2011
@@ -20,7 +20,7 @@
<%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
-<%@ taglib prefix="archiva" uri="/WEB-INF/taglib.tld" %>
+<%@ taglib prefix="archiva" uri="/WEB-INF/tld/web-tags.tld" %>
<p>
<archiva:groupIdLink var="${groupId}" includeTop="true" />
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/dependencyTree.jspf
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/dependencyTree.jspf?rev=1189907&r1=1189906&r2=1189907&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/dependencyTree.jspf
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/dependencyTree.jspf
Thu Oct 27 18:11:13 2011
@@ -19,7 +19,7 @@
<%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
-<%@ taglib prefix="archiva" uri="/WEB-INF/taglib.tld" %>
+<%@ taglib prefix="archiva" uri="/WEB-INF/tld/web-tags.tld" %>
<archiva:dependency-tree groupId="${groupId}" artifactId="${artifactId}"
version="${version}"
modelVersion="${model.version}" nodevar="node">
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/projectMetadata.jspf
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/projectMetadata.jspf?rev=1189907&r1=1189906&r2=1189907&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/projectMetadata.jspf
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/projectMetadata.jspf
Thu Oct 27 18:11:13 2011
@@ -20,7 +20,7 @@
<%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
-<%@ taglib prefix="archiva" uri="/WEB-INF/taglib.tld" %>
+<%@ taglib prefix="archiva" uri="/WEB-INF/tld/web-tags.tld" %>
<div>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/basicReport.jsp
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/basicReport.jsp?rev=1189907&r1=1189906&r2=1189907&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/basicReport.jsp
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/basicReport.jsp
Thu Oct 27 18:11:13 2011
@@ -20,7 +20,7 @@
<%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
-<%@ taglib prefix="archiva" uri="/WEB-INF/taglib.tld" %>
+<%@ taglib prefix="archiva" uri="/WEB-INF/tld/web-tags.tld" %>
<html>
<head>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/statisticsReport.jsp
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/statisticsReport.jsp?rev=1189907&r1=1189906&r2=1189907&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/statisticsReport.jsp
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/statisticsReport.jsp
Thu Oct 27 18:11:13 2011
@@ -19,7 +19,7 @@
<%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
-<%@ taglib prefix="archiva" uri="/WEB-INF/taglib.tld" %>
+<%@ taglib prefix="archiva" uri="/WEB-INF/tld/web-tags.tld" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
<html>
