aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2011-11-21 22:07:56 +0000
committerOlivier Lamy <olamy@apache.org>2011-11-21 22:07:56 +0000
commit5a959588b3fe82a95c3b6e8d3ef0beba90daded9 (patch)
treeaee88f91d7fff1fab758134f67dde3bdd0710396
parent8b0e861e980711b62bc078426621ed13c00822f1 (diff)
downloadarchiva-5a959588b3fe82a95c3b6e8d3ef0beba90daded9.tar.gz
archiva-5a959588b3fe82a95c3b6e8d3ef0beba90daded9.zip
remove use of apt plugin as fail on windauze
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1204726 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--.gitignore1
-rw-r--r--archiva-modules/archiva-web/archiva-webapp/pom.xml34
-rw-r--r--archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tld/web-tags.tld83
3 files changed, 83 insertions, 35 deletions
diff --git a/.gitignore b/.gitignore
index c3383de5f..12aa07fa0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,3 @@ archiva-modules/archiva-web/archiva-webapp-test/cargo-installs/
*.iws
.DS_Store
.extract
-archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tld/
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 1bcac2698..a42909dd1 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -763,44 +763,10 @@
</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>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tld/web-tags.tld b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tld/web-tags.tld
new file mode 100644
index 000000000..1006dd1ba
--- /dev/null
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tld/web-tags.tld
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd">
+ <description><![CDATA[Archiva taglibs.]]></description>
+ <display-name>Archiva Taglib</display-name>
+ <tlib-version>2.2.3</tlib-version>
+ <short-name>archiva</short-name>
+ <uri>/archiva-web-tag</uri>
+ <tag>
+ <description><![CDATA[Render a copy paste snippet for the provided object]]></description>
+ <name>copy-paste-snippet</name>
+ <tag-class>org.apache.archiva.web.tags.CopyPasteSnippetTag</tag-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <description><![CDATA[The Object to Render]]></description>
+ <name>object</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[The wrapper type to use, can be 'pre' or 'toggle']]></description>
+ <name>wrapper</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <dynamic-attributes>false</dynamic-attributes>
+ </tag>
+ <tag>
+ <description><![CDATA[Render a dependency tree for the provided project.]]></description>
+ <name>dependency-tree</name>
+ <tag-class>org.apache.archiva.web.tags.DependencyTreeTag</tag-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <description><![CDATA[The artifactId]]></description>
+ <name>artifactId</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[The groupId]]></description>
+ <name>groupId</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[The version of the project model. Used to verify the dependency graph for generic snapshots not yet in the repo.]]></description>
+ <name>modelVersion</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[The variable name for the node.]]></description>
+ <name>nodevar</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[The version]]></description>
+ <name>version</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <dynamic-attributes>false</dynamic-attributes>
+ </tag>
+ <tag>
+ <description><![CDATA[Render a groupId as a set of Links]]></description>
+ <name>groupIdLink</name>
+ <tag-class>org.apache.archiva.web.tags.GroupIdLinkTag</tag-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <description><![CDATA[Boolean indicating if 'top' link should be created or not.]]></description>
+ <name>includeTop</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description><![CDATA[The GroupID String]]></description>
+ <name>var</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <dynamic-attributes>false</dynamic-attributes>
+ </tag>
+</taglib>