You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2011/11/21 23:07:57 UTC

svn commit: r1204726 - in /archiva/trunk: ./ archiva-modules/archiva-web/archiva-webapp/ archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tld/

Author: olamy
Date: Mon Nov 21 22:07:56 2011
New Revision: 1204726

URL: http://svn.apache.org/viewvc?rev=1204726&view=rev
Log:
remove use of apt plugin as fail on windauze

Added:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tld/
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tld/web-tags.tld   (with props)
Modified:
    archiva/trunk/.gitignore
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml

Modified: archiva/trunk/.gitignore
URL: http://svn.apache.org/viewvc/archiva/trunk/.gitignore?rev=1204726&r1=1204725&r2=1204726&view=diff
==============================================================================
--- archiva/trunk/.gitignore (original)
+++ archiva/trunk/.gitignore Mon Nov 21 22:07:56 2011
@@ -16,4 +16,3 @@ 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=1204726&r1=1204725&r2=1204726&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Mon Nov 21 22:07:56 2011
@@ -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>

Added: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tld/web-tags.tld
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tld/web-tags.tld?rev=1204726&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tld/web-tags.tld (added)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tld/web-tags.tld Mon Nov 21 22:07:56 2011
@@ -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>

Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tld/web-tags.tld
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tld/web-tags.tld
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision