use a more traditional taglib location, makes eclipse happier

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@719566 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/taglib.tld b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/taglib.tld
deleted file mode 100644 (file)
index af5e7e9..0000000
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/taglib.tld
+++ /dev/null
@@ -1,154 +0,0 @@
-<?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>2.2.3</tlib-version>
-   <jsp-version>1.2</jsp-version>
-   <short-name>ArchivaTaglib</short-name>
-
-   <uri>http://archiva.apache.org</uri>
-
-   <display-name>Archiva Taglib</display-name>
-   <description><![CDATA[Archiva JSP Taglib]]></description>
-
-   <tag>
-
-      <name>groupIdLink</name>
-      <tag-class>org.apache.maven.archiva.web.tags.GroupIdLinkTag</tag-class>
-      <body-content>empty</body-content>
-      <description><![CDATA[Render a groupId as a set of Links]]></description>
-
-      <attribute>
-        <name>var</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-        
-        <description><![CDATA[The GroupID String]]></description>
-      </attribute>
-      
-      <attribute>
-        <name>includeTop</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-        
-        <description><![CDATA[Boolean indicating if 'top' link should be created or not.]]></description>
-      </attribute>
-      
-   </tag>
-
-   <tag>
-
-      <name>downloadArtifact</name>
-      <tag-class>org.apache.maven.archiva.web.tags.DownloadArtifactTag</tag-class>
-      <body-content>empty</body-content>
-      <description><![CDATA[Render a a set of download links for an artifact]]></description>
-
-      <attribute>
-        <name>groupId</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-        
-        <description><![CDATA[The GroupID String]]></description>
-      </attribute>
-      
-      <attribute>
-        <name>artifactId</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-        
-        <description><![CDATA[The ArtifactID String]]></description>
-      </attribute>
-      
-      <attribute>
-        <name>version</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-        
-        <description><![CDATA[The Version String]]></description>
-      </attribute>
-      
-      <attribute>
-        <name>mini</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-        
-        <description><![CDATA[Boolean indicating if the download link is to be generated in mini format instead.]]></description>
-      </attribute>
-      
-   </tag>
-
-   <tag>
-
-      <name>copy-paste-snippet</name>
-      <tag-class>org.apache.maven.archiva.web.tags.CopyPasteSnippetTag</tag-class>
-      <body-content>empty</body-content>
-      <description><![CDATA[Render a copy paste snippet for the provided object]]></description>
-
-      <attribute>
-        <name>object</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-        
-        <description><![CDATA[The Object to Render]]></description>
-      </attribute>
-      
-      <attribute>
-        <name>wrapper</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-        
-        <description><![CDATA[The wrapper type to use, can be 'pre' or 'toggle']]></description>
-      </attribute>
-   </tag>
-   
-   <tag>
-   
-      <name>dependency-tree</name>
-      <tag-class>org.apache.maven.archiva.web.tags.DependencyTreeTag</tag-class>
-      <body-content>JSP</body-content>
-      <description><![CDATA[Render a dependency tree for the provided project.]]></description>
-
-      <attribute>
-        <name>groupId</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-        
-        <description><![CDATA[The groupId]]></description>
-      </attribute>
-      
-      <attribute>
-        <name>artifactId</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-        
-        <description><![CDATA[The artifactId]]></description>
-      </attribute>
-
-      <attribute>
-        <name>version</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-        
-        <description><![CDATA[The version]]></description>
-      </attribute>
-
-      <attribute>
-        <name>modelVersion</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-
-        <description><![CDATA[The version of the project model. Used to verify the dependency graph for generic snapshots not yet in the repo.]]></description>
-      </attribute>
-
-      <attribute>
-        <name>nodevar</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-        
-        <description><![CDATA[The variable name for the node.]]></description>
-      </attribute>
-
-   </tag>
-   
-</taglib>
\ No newline at end of file

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmAddRepository.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmAddRepository.jsp
index f2d3a2f50b6bbe45c7acb68c386f6ab61d7c9363..90580d7ec7fb6fc6827dbaa0d7ad2b5d6bb06a46 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmAddRepository.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmAddRepository.jsp
@@ -37,7 +37,12 @@
   </div>
   
   <p>
-    Are you sure you want to ${action == 'addRepository' ? 'add' : 'update'} the following managed repository?
+    Are you sure you want to 
+    <c:choose>
+      <c:when test="${action == 'addRepository'}">add</c:when>
+      <c:otherwise>update</c:otherwise>
+    </c:choose>
+    the following managed repository?
   </p>
 
   <div class="infobox">

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/database.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/database.jsp
index 3cabac2c4e0ec074358c7f6fcfd718194de58358..71e0b02720ba5dbddfe1df8ab5b99ed4f7dbebb3 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/database.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/database.jsp
@@ -21,7 +21,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="http://archiva.apache.org" %>
+<%@ taglib prefix="archiva"   uri="/WEB-INF/taglib.tld" %>
 
 <html>
 <head>

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/legacyArtifactPath.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/legacyArtifactPath.jsp
index 2d75e9d942262cdc9d8c49441d0ab328e3bdc6f0..932e9bc04e60fd34d74b78710a5e5dfc1107efe7 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/legacyArtifactPath.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/legacyArtifactPath.jsp
@@ -20,7 +20,7 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>\r
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>\r
 <%@ taglib prefix="redback" uri="http://plexus.codehaus.org/redback/taglib-1.0" %>\r
-<%@ taglib prefix="archiva" uri="http://archiva.apache.org" %>\r
+<%@ taglib prefix="archiva"   uri="/WEB-INF/taglib.tld" %>\r
 \r
 <html>\r
 <head>\r

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp
index fedb6a332337e44262948b257d343718b03ee986..3df32b92bb57df089b2cb766914f47e0e70ef548 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp
@@ -20,7 +20,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="http://archiva.apache.org"%>
+<%@ taglib prefix="archiva"   uri="/WEB-INF/taglib.tld" %>
 
 <html>
 <head>

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp
index 3047accf43b51b6de029bc1b104e6ee8a5d27482..613330a5b018cfb8e4095e74061cd654f48c3456 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp
@@ -21,7 +21,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="http://archiva.apache.org" %>
+<%@ taglib prefix="archiva"   uri="/WEB-INF/taglib.tld" %>
 
 <html>
 <head>

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
index 3834f209754b5ca39f38597c7f14cda65fdebf29..e73cc37110c3972faa65e0bda4c2974817fb9485 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
@@ -20,7 +20,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="http://archiva.apache.org" %>
+<%@ taglib prefix="archiva"   uri="/WEB-INF/taglib.tld" %>
 
 <html>
 <head>

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp
index 404d40fedcaddfa6615aeb01512ecd4fc508ab78..cabdbe11fb530446ef707a5d0f20fad4fcce46ca 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp
@@ -21,7 +21,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="http://archiva.apache.org" %>
+<%@ taglib prefix="archiva"   uri="/WEB-INF/taglib.tld" %>
 
 <html>
 <head>

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp
index 2c08f498eae8719f29f1640cfa3e24e44f75fa5b..8ef32977e4ddee158be1c333d0b97938f8244fe4 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp
@@ -21,7 +21,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="http://archiva.apache.org"%>
+<%@ taglib prefix="archiva"   uri="/WEB-INF/taglib.tld" %>
 
 <html>
 <head>

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/artifact/dependencyTree.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/artifact/dependencyTree.jsp
index 1af5188d683645985e7a49ef339c79b0613a41dd..6622c3484905de64863243ae90c0df98888a6a2b 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/artifact/dependencyTree.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/artifact/dependencyTree.jsp
@@ -19,7 +19,7 @@
 
 <%@ taglib prefix="page" uri="http://www.opensymphony.com/sitemesh/page" %>
 <%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
-<%@ taglib prefix="archiva" uri="http://archiva.apache.org" %>
+<%@ taglib prefix="archiva"   uri="/WEB-INF/taglib.tld" %>
 
 <archiva:dependency-tree groupId="${groupId}" artifactId="${artifactId}" version="${version}"
                          modelVersion="${model.version}">

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp
index aebffbe2f1e14d0631e49ab19f0fdc816c24d3aa..2387ea736a76831dcb6b9b8d266f30d5d642c82f 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp
@@ -19,7 +19,7 @@
 
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="archiva" uri="http://archiva.apache.org" %>
+<%@ taglib prefix="archiva"   uri="/WEB-INF/taglib.tld" %>
 <%@ taglib prefix="redback" uri="http://plexus.codehaus.org/redback/taglib-1.0"  %>
 
 <html>

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseArtifact.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseArtifact.jsp
index 14cc95b2230e28aa1f4f5f037f2879218d43ef37..8cc91c0ca4ddcc4e0bbdd9f40f8903d033aaff0c 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseArtifact.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseArtifact.jsp
@@ -19,7 +19,7 @@
 
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="archiva" uri="http://archiva.apache.org" %>
+<%@ taglib prefix="archiva"   uri="/WEB-INF/taglib.tld" %>
 
 <html>
 <head>

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseGroup.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseGroup.jsp
index c81d5cf0e1f8145ffee49823859fea4f6292e7de..113d558154d8abcaf203e9a2d470a3dd569d5550 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseGroup.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseGroup.jsp
@@ -19,7 +19,7 @@
 
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="archiva" uri="http://archiva.apache.org" %>
+<%@ taglib prefix="archiva"   uri="/WEB-INF/taglib.tld" %>
 
 <html>
 <head>

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/artifactDecorator.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/artifactDecorator.jsp
index 0a25e92826ceff49b823c8d5d3b7adb03fb0e1c5..037bd6e921cc3294d24b06cd93d7a574fd3793ed 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/artifactDecorator.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/artifactDecorator.jsp
@@ -23,7 +23,7 @@
 <%@ 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="my"        tagdir="/WEB-INF/tags" %>
-<%@ taglib prefix="archiva"   uri="http://archiva.apache.org" %>
+<%@ taglib prefix="archiva"   uri="/WEB-INF/taglib.tld" %>
 
 <page:applyDecorator name="default">
 

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf
index ece904e1b36f576220f1651b2abb9427f9eb68d9..fae9f6eed1f10a8cf477f9c1f06799fb23122d7f 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf
@@ -19,7 +19,7 @@
 
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="archiva" uri="http://archiva.apache.org" %>
+<%@ taglib prefix="archiva"   uri="/WEB-INF/taglib.tld" %>
 
 <p>
   <archiva:groupIdLink var="${model.groupId}" includeTop="true" />

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/dependencyTree.jspf b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/dependencyTree.jspf
index cd70504bde89319c4a7cf4f23596d97981003a82..45d8ea2f790c090fd0a170bb32c43815427bf77d 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/dependencyTree.jspf
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/dependencyTree.jspf
@@ -20,7 +20,7 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
-<%@ taglib prefix="archiva" uri="http://archiva.apache.org" %>
+<%@ taglib prefix="archiva"   uri="/WEB-INF/taglib.tld" %>
 
 <archiva:dependency-tree groupId="${groupId}" artifactId="${artifactId}" version="${version}" />
 

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/basicReport.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/basicReport.jsp
index a9592975395c80a2addbd68b9d560bb24e8d7af3..04224d4a1a4f53b1cbb6051d678e42921c09e861 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/basicReport.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/basicReport.jsp
@@ -19,7 +19,7 @@
 
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="archiva" uri="http://archiva.apache.org" %>
+<%@ taglib prefix="archiva"   uri="/WEB-INF/taglib.tld" %>
 
 <html>
 <head>

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/statisticsReport.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/statisticsReport.jsp
index d2ef79e4e78979221cc023263682e572c09546d0..5e052473ede3c0969ec9234eee01089dc171ed61 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/statisticsReport.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/statisticsReport.jsp
@@ -18,7 +18,7 @@
   --%>
 
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="archiva" uri="http://archiva.apache.org" %>
+<%@ taglib prefix="archiva"   uri="/WEB-INF/taglib.tld" %>
 <%@ taglib prefix="s" uri="/struts-tags" %>
 
 <html>

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
index ace10b9d84f9c43f45dd7be8a49dd39e7f0bc53b..e7b3e9600f7f7af71c31efc961bcfa0d47808054 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
@@ -20,7 +20,7 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
-<%@ taglib prefix="archiva" uri="http://archiva.apache.org" %>
+<%@ taglib prefix="archiva"   uri="/WEB-INF/taglib.tld" %>
 <%@ taglib prefix="redback" uri="http://plexus.codehaus.org/redback/taglib-1.0" %>
 
 <html>
@@ -119,13 +119,13 @@
       <%-- POSTPONED to 1.0-alpha-2
       <redback:ifAnyAuthorized permissions="archiva-access-reports">
         <c:set var="url">
-             <s:url action="showArtifactReports">
-               <s:param name="groupId" value="%{groupId}"/>
-               <s:param name="artifactId" value="%{artifactId}"/>
-               <s:param name="version" value="%{version}"/>
-             </s:url>
-           </c:set>
-           <my:currentWWUrl url="${url}">Reports</my:currentWWUrl>
+          <s:url action="showArtifactReports">
+            <s:param name="groupId" value="%{groupId}"/>
+            <s:param name="artifactId" value="%{artifactId}"/>
+            <s:param name="version" value="%{version}"/>
+          </s:url>
+        </c:set>
+        <my:currentWWUrl url="${url}">Reports</my:currentWWUrl>
       </redback:ifAnyAuthorized>
         --%>
       

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/taglib.tld b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/taglib.tld
new file mode 100644 (file)
index 0000000..3208908
--- /dev/null
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/taglib.tld
@@ -0,0 +1,154 @@
+<?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>2.2.3</tlib-version>
+   <jsp-version>1.2</jsp-version>
+   <short-name>archiva</short-name>
+
+   <uri>/WEB-INF/taglib.tld</uri>
+
+   <display-name>Archiva Taglib</display-name>
+   <description><![CDATA[Archiva JSP Taglib]]></description>
+
+   <tag>
+
+      <name>groupIdLink</name>
+      <tag-class>org.apache.maven.archiva.web.tags.GroupIdLinkTag</tag-class>
+      <body-content>empty</body-content>
+      <description><![CDATA[Render a groupId as a set of Links]]></description>
+
+      <attribute>
+        <name>var</name>
+        <required>true</required>
+        <rtexprvalue>true</rtexprvalue>
+        
+        <description><![CDATA[The GroupID String]]></description>
+      </attribute>
+      
+      <attribute>
+        <name>includeTop</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+        
+        <description><![CDATA[Boolean indicating if 'top' link should be created or not.]]></description>
+      </attribute>
+      
+   </tag>
+
+   <tag>
+
+      <name>downloadArtifact</name>
+      <tag-class>org.apache.maven.archiva.web.tags.DownloadArtifactTag</tag-class>
+      <body-content>empty</body-content>
+      <description><![CDATA[Render a a set of download links for an artifact]]></description>
+
+      <attribute>
+        <name>groupId</name>
+        <required>true</required>
+        <rtexprvalue>true</rtexprvalue>
+        
+        <description><![CDATA[The GroupID String]]></description>
+      </attribute>
+      
+      <attribute>
+        <name>artifactId</name>
+        <required>true</required>
+        <rtexprvalue>true</rtexprvalue>
+        
+        <description><![CDATA[The ArtifactID String]]></description>
+      </attribute>
+      
+      <attribute>
+        <name>version</name>
+        <required>true</required>
+        <rtexprvalue>true</rtexprvalue>
+        
+        <description><![CDATA[The Version String]]></description>
+      </attribute>
+      
+      <attribute>
+        <name>mini</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+        
+        <description><![CDATA[Boolean indicating if the download link is to be generated in mini format instead.]]></description>
+      </attribute>
+      
+   </tag>
+
+   <tag>
+
+      <name>copy-paste-snippet</name>
+      <tag-class>org.apache.maven.archiva.web.tags.CopyPasteSnippetTag</tag-class>
+      <body-content>empty</body-content>
+      <description><![CDATA[Render a copy paste snippet for the provided object]]></description>
+
+      <attribute>
+        <name>object</name>
+        <required>true</required>
+        <rtexprvalue>true</rtexprvalue>
+        
+        <description><![CDATA[The Object to Render]]></description>
+      </attribute>
+      
+      <attribute>
+        <name>wrapper</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+        
+        <description><![CDATA[The wrapper type to use, can be 'pre' or 'toggle']]></description>
+      </attribute>
+   </tag>
+   
+   <tag>
+   
+      <name>dependency-tree</name>
+      <tag-class>org.apache.maven.archiva.web.tags.DependencyTreeTag</tag-class>
+      <body-content>JSP</body-content>
+      <description><![CDATA[Render a dependency tree for the provided project.]]></description>
+
+      <attribute>
+        <name>groupId</name>
+        <required>true</required>
+        <rtexprvalue>true</rtexprvalue>
+        
+        <description><![CDATA[The groupId]]></description>
+      </attribute>
+      
+      <attribute>
+        <name>artifactId</name>
+        <required>true</required>
+        <rtexprvalue>true</rtexprvalue>
+        
+        <description><![CDATA[The artifactId]]></description>
+      </attribute>
+
+      <attribute>
+        <name>version</name>
+        <required>true</required>
+        <rtexprvalue>true</rtexprvalue>
+        
+        <description><![CDATA[The version]]></description>
+      </attribute>
+
+      <attribute>
+        <name>modelVersion</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+
+        <description><![CDATA[The version of the project model. Used to verify the dependency graph for generic snapshots not yet in the repo.]]></description>
+      </attribute>
+
+      <attribute>
+        <name>nodevar</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+        
+        <description><![CDATA[The variable name for the node.]]></description>
+      </attribute>
+
+   </tag>
+   
+</taglib>
\ No newline at end of file

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/showArtifactLink.tag b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/showArtifactLink.tag
index 38408a4667930c595f5395d525c2097cdfd3b721..a5327a1a3ba33e5bd48498a9d96a60311d6b0ab7 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/showArtifactLink.tag
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/showArtifactLink.tag
@@ -19,7 +19,7 @@
 
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib prefix="archiva" uri="http://archiva.apache.org" %>
+<%@ taglib prefix="archiva"   uri="/WEB-INF/taglib.tld" %>
 
 <%@ attribute name="groupId" required="true" %>
 <%@ attribute name="artifactId" %>