Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use new tld uri from redback 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1198761 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2011-11-07 14:58:16 +00:00
parent 4521696d10
commit 1952006041
11 changed files with 61 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
archiva-modules/archiva-web/archiva-webapp/pom.xml
View File

@ -946,7 +946,7 @@
</artifactItems> </artifactItems>
</configuration> </configuration>
</execution> </execution>
<!-- redefine to override exclude configuration (and add back struts-security.xml --> <!-- redefine to override exclude configuration (and add back struts-security.xml ) -->
<execution> <execution>
<id>unpack-redback-war</id> <id>unpack-redback-war</id>
<goals> <goals>
@ -1060,6 +1060,56 @@
<id>tdev</id> <id>tdev</id>
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<!-- redefine to skip its execution in Tomcat -->
<execution>
<id>copy</id>
<phase>process-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<skip>true</skip>
<artifactItems>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>archiva-applet</artifactId>
<version>${project.version}</version>
<outputDirectory>src/main/webapp</outputDirectory>
<destFileName>archiva-applet.jar</destFileName>
</artifactItem>
</artifactItems>
</configuration>
</execution>
<!--
redefine to override exclude configuration (and exlude back struts-security.xml :-)
tomcat plugin 2.0 has a better support of war overlay
-->
<execution>
<id>unpack-redback-war</id>
<goals>
<goal>unpack</goal>
</goals>
<phase>compile</phase>
<configuration>
<artifactItems combine.self="override">
<artifactItem>
<groupId>org.codehaus.redback</groupId>
<artifactId>redback-struts2-content</artifactId>
<version>${redback.version}</version>
<type>war</type>
<overWrite>false</overWrite>
<outputDirectory>${basedir}/src/main/webapp</outputDirectory>
<excludes>**/web.xml,**/struts*.jar,**/sitemesh*.jar,**/struts-security.xml</excludes>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>org.apache.tomcat.maven</groupId> <groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat6-maven-plugin</artifactId> <artifactId>tomcat6-maven-plugin</artifactId>

2
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRemoteRepository.jsp
View File

@ -20,7 +20,7 @@
<%@ page contentType="text/html; charset=UTF-8" %> <%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="s" uri="/struts-tags" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ 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="redback" uri="/redback/taglib-1.0" %>
<html> <html>
<head> <head>

2
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/legacyArtifactPath.jsp
View File

@ -20,7 +20,7 @@
<%@ page contentType="text/html; charset=UTF-8" %> <%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="s" uri="/struts-tags" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ 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="redback" uri="/redback/taglib-1.0" %>
<%@ taglib prefix="archiva" uri="/WEB-INF/tld/web-tags.tld" %> <%@ taglib prefix="archiva" uri="/WEB-INF/tld/web-tags.tld" %>
<html> <html>

2
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp
View File

@ -20,7 +20,7 @@
<%@ page contentType="text/html; charset=UTF-8" %> <%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags"%> <%@ taglib prefix="s" uri="/struts-tags"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@ 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="redback" uri="/redback/taglib-1.0" %>
<%@ taglib prefix="archiva" uri="/WEB-INF/tld/web-tags.tld" %> <%@ taglib prefix="archiva" uri="/WEB-INF/tld/web-tags.tld" %>
<html> <html>

2
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp
View File

@ -21,7 +21,7 @@
<%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="s" uri="/struts-tags" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ 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="redback" uri="/redback/taglib-1.0" %>
<%@ taglib prefix="archiva" uri="/WEB-INF/tld/web-tags.tld" %> <%@ taglib prefix="archiva" uri="/WEB-INF/tld/web-tags.tld" %>
<html> <html>

2
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
View File

@ -21,7 +21,7 @@
<%@ page contentType="text/html; charset=UTF-8" %> <%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="s" uri="/struts-tags" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ 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="redback" uri="/redback/taglib-1.0" %>
<%@ taglib prefix="archiva" uri="/WEB-INF/tld/web-tags.tld" %> <%@ taglib prefix="archiva" uri="/WEB-INF/tld/web-tags.tld" %>
<html> <html>

2
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp
View File

@ -21,7 +21,7 @@
<%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="s" uri="/struts-tags" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ 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="redback" uri="/redback/taglib-1.0" %>
<%@ taglib prefix="archiva" uri="/WEB-INF/tld/web-tags.tld" %> <%@ taglib prefix="archiva" uri="/WEB-INF/tld/web-tags.tld" %>
<html> <html>

2
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp
View File

@ -21,7 +21,7 @@
<%@ taglib prefix="s" uri="/struts-tags"%> <%@ taglib prefix="s" uri="/struts-tags"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ 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="redback" uri="/redback/taglib-1.0" %>
<%@ taglib prefix="archiva" uri="/WEB-INF/tld/web-tags.tld" %> <%@ taglib prefix="archiva" uri="/WEB-INF/tld/web-tags.tld" %>
<html> <html>

2
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp
View File

@ -21,7 +21,7 @@
<%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="s" uri="/struts-tags" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="archiva" uri="/WEB-INF/tld/web-tags.tld" %> <%@ taglib prefix="archiva" uri="/WEB-INF/tld/web-tags.tld" %>
<%@ taglib prefix="redback" uri="http://plexus.codehaus.org/redback/taglib-1.0" %> <%@ taglib prefix="redback" uri="/redback/taglib-1.0" %>
<html> <html>
<head> <head>

2
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
View File

@ -24,7 +24,7 @@
<%@ taglib uri="/struts-tags" prefix="s" %> <%@ taglib uri="/struts-tags" prefix="s" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %> <%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
<%@ taglib prefix="redback" uri="http://plexus.codehaus.org/redback/taglib-1.0" %> <%@ taglib prefix="redback" uri="/redback/taglib-1.0" %>
<%@ page import="java.util.Calendar" %> <%@ page import="java.util.Calendar" %>
<html> <html>

2
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
View File

@ -22,7 +22,7 @@
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %> <%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
<%@ taglib prefix="archiva" uri="/WEB-INF/tld/web-tags.tld" %> <%@ taglib prefix="archiva" uri="/WEB-INF/tld/web-tags.tld" %>
<%@ taglib prefix="redback" uri="http://plexus.codehaus.org/redback/taglib-1.0" %> <%@ taglib prefix="redback" uri="/redback/taglib-1.0" %>
<html> <html>
<head> <head>