From 5b9f93dbe9c45b6104f27e93b792acedfabda08b Mon Sep 17 00:00:00 2001
From: Brett Porter <brett@apache.org>
Date: Tue, 12 Apr 2011 15:36:18 +0000
Subject: [PATCH] [MRM-1111] use default template and caching mechanism now.
 Old templates were omitting any text from hyperlinks.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1091473 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/resources/struts.properties      |  1 +
 .../main/webapp/template/xhtml/a-close.ftl    |  1 -
 .../src/main/webapp/template/xhtml/a.ftl      | 22 -------------------
 .../webapp/template/xhtml/actionerror.ftl     |  7 ------
 .../webapp/template/xhtml/actionmessage.ftl   |  7 ------
 .../src/main/webapp/template/xhtml/hidden.ftl | 15 -------------
 6 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 archiva-modules/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/a-close.ftl
 delete mode 100644 archiva-modules/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/a.ftl
 delete mode 100644 archiva-modules/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/actionerror.ftl
 delete mode 100644 archiva-modules/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/actionmessage.ftl
 delete mode 100644 archiva-modules/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/hidden.ftl

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
index 4355f60b2..bc06a20de 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
@@ -21,6 +21,7 @@
 struts.mapper.class = org.apache.maven.archiva.web.mapper.RepositoryActionMapper
 struts.objectFactory =  org.codehaus.plexus.spring.Struts2PlexusInSpringObjectFactory
 struts.url.includeParams = none
+struts.freemarker.templatesCache=true
 
 #struts.devMode = true
 struts.configuration.xml.reload=true
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/a-close.ftl b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/a-close.ftl
deleted file mode 100644
index 706f1f49f..000000000
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/a-close.ftl
+++ /dev/null
@@ -1 +0,0 @@
-</a><#rt/>
\ No newline at end of file
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/a.ftl b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/a.ftl
deleted file mode 100644
index 1b41b312f..000000000
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/a.ftl
+++ /dev/null
@@ -1,22 +0,0 @@
-<a<#rt/>
-<#if parameters.id?if_exists != "">
- id="${parameters.id?html}"<#rt/>
-</#if>
-<#if parameters.href?if_exists != "">
- href="${parameters.href}"<#rt/>
-</#if>
-<#if parameters.tabindex?exists>
- tabindex="${parameters.tabindex?html}"<#rt/>
-</#if>
-<#if parameters.cssClass?exists>
- class="${parameters.cssClass?html}"<#rt/>
-</#if>
-<#if parameters.cssStyle?exists>
- style="${parameters.cssStyle?html}"<#rt/>
-</#if>
-<#if parameters.title?exists>
- title="${parameters.title?html}"<#rt/>
-</#if>
-<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
-<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
-><#rt/>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/actionerror.ftl b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/actionerror.ftl
deleted file mode 100644
index 74c313652..000000000
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/actionerror.ftl
+++ /dev/null
@@ -1,7 +0,0 @@
-<#if (actionErrors?exists && actionErrors?size > 0)>
-	<ul>
-	<#list actionErrors as error>
-		<li><span class="errorMessage">${error}</span></li>
-	</#list>
-	</ul>
-</#if>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/actionmessage.ftl b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/actionmessage.ftl
deleted file mode 100644
index 384b75558..000000000
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/actionmessage.ftl
+++ /dev/null
@@ -1,7 +0,0 @@
-<#if (actionMessages?exists && actionMessages?size > 0)>
-	<ul>
-		<#list actionMessages as message>
-			<li><span class="actionMessage">${message}</span></li>
-		</#list>
-	</ul>
-</#if>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/hidden.ftl b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/hidden.ftl
deleted file mode 100644
index 2755cb3fe..000000000
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/hidden.ftl
+++ /dev/null
@@ -1,15 +0,0 @@
-<input type="hidden"<#rt/>
- name="${parameters.name?default("")?html}"<#rt/>
-<#if parameters.nameValue?exists>
- value="<@s.property value="parameters.nameValue"/>"<#rt/>
-</#if>
-<#if parameters.id?exists>
- id="${parameters.id?html}"<#rt/>
-</#if>
-<#if parameters.cssClass?exists>
- class="${parameters.cssClass?html}"<#rt/>
-</#if>
-<#if parameters.cssStyle?exists>
- style="${parameters.cssStyle?html}"<#rt/>
-</#if>
-/>
-- 
2.39.5