jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mets...@apache.org
Subject svn commit: r1154731 - in /incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH: ChangeLog etc/jspwiki.tld etc/oscache.tld src/com/ecyrd/jspwiki/Release.java
Date Sun, 07 Aug 2011 17:17:30 GMT
Author: metskem
Date: Sun Aug  7 17:17:30 2011
New Revision: 1154731

URL: http://svn.apache.org/viewvc?rev=1154731&view=rev
Log:
2011-08-07  Harry Metske <metskem@apache.org>
        * 2.8.5-svn-7
        * fixed JSPWIKI-699 (JBoss complaining about jspwiki.tld and oscache.tld).

Modified:
    incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
    incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/jspwiki.tld
    incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/oscache.tld
    incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java

Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog?rev=1154731&r1=1154730&r2=1154731&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog Sun Aug  7 17:17:30 2011
@@ -1,3 +1,9 @@
+2011-08-07  Harry Metske <metskem@apache.org>
+
+        * 2.8.5-svn-7
+        
+        * fixed JSPWIKI-699 (JBoss complaining about jspwiki.tld and oscache.tld).
+        
 2011-04-03  Harry Metske <metskem@apache.org>
 
         * 2.8.5-svn-6

Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/jspwiki.tld
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/jspwiki.tld?rev=1154731&r1=1154730&r2=1154731&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/jspwiki.tld (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/jspwiki.tld Sun Aug  7 17:17:30 2011
@@ -621,16 +621,6 @@
   </tag>
 
   <tag>
-    <name>RSSUserlandLink</name>
-    <tagclass>com.ecyrd.jspwiki.tags.RSSCoffeeCupLinkTag</tagclass>
-    <bodycontent>empty</bodycontent>
-    <attribute>
-       <name>title</name>
-       <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
     <name>SearchResultIterator</name>
     <tagclass>com.ecyrd.jspwiki.tags.SearchResultIteratorTag</tagclass>
     <teiclass>com.ecyrd.jspwiki.tags.SearchResultIteratorInfo</teiclass>

Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/oscache.tld
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/oscache.tld?rev=1154731&r1=1154730&r2=1154731&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/oscache.tld (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/oscache.tld Sun Aug  7 17:17:30 2011
@@ -1,111 +1,152 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
-   "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
 
 <taglib>
-	<tlibversion>1.5</tlibversion>
-	<jspversion>1.1</jspversion>
-	<shortname>oscache</shortname>
-	<info>OSCache - see http://www.opensymphony.com/oscache</info>
-
-	<tag>
-		<name>cache</name>
-		<tagclass>com.opensymphony.module.oscache.web.tag.CacheTag</tagclass>
-		<bodycontent>JSP</bodycontent>
-		<info>A tag to cache post-processed JSP contents</info>
-
-		<attribute>
-			<name>time</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-		<attribute>
-			<name>duration</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-		<attribute>
-			<name>refreshpolicyclass</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-		<attribute>
-			<name>refreshpolicyparam</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-		<attribute>
-			<name>scope</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-		<attribute>
-			<name>refresh</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-		<attribute>
-			<name>key</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-		<attribute>
-			<name>language</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-		<attribute>
-			<name>encoding</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-	</tag>
-
-	<tag>
-		<name>usecached</name>
-		<tagclass>com.opensymphony.module.oscache.web.tag.UseCachedTag</tagclass>
-		<info>A tag to tell the cache to use the cached version</info>
-
-		<attribute>
-			<name>use</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-	</tag>
-
-	<tag>
-		<name>flush</name>
-		<tagclass>com.opensymphony.module.oscache.web.tag.FlushTag</tagclass>
-		<info>A tag to flush the cache</info>
-
-		<attribute>
-			<name>scope</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>key</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>language</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>pattern</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-	</tag>
+    <tlib-version>1.6</tlib-version>
+    <jsp-version>1.2</jsp-version>
+    <short-name>oscache</short-name>
+    <uri>http://www.opensymphony.com/oscache</uri>
+    <display-name>OSCache Tag Library</display-name>
+    <description>OSCache - see http://www.opensymphony.com/oscache</description>
+
+    <tag>
+        <name>cache</name>
+        <tag-class>com.opensymphony.oscache.web.tag.CacheTag</tag-class>
+        <body-content>JSP</body-content>
+        <description>A tag to cache post-processed JSP contents</description>
+
+        <attribute>
+            <name>time</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+
+        <attribute>
+            <name>duration</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+
+        <attribute>
+            <name>cron</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+
+        <attribute>
+            <name>refreshpolicyclass</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+
+        <attribute>
+            <name>refreshpolicyparam</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+
+        <attribute>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+
+        <attribute>
+            <name>refresh</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+
+        <attribute>
+            <name>mode</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+
+        <attribute>
+            <name>key</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+
+        <attribute>
+            <name>groups</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+
+        <attribute>
+            <name>language</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <name>usecached</name>
+        <tag-class>com.opensymphony.oscache.web.tag.UseCachedTag</tag-class>
+        <description>A tag to tell the cache to use the cached version</description>
+
+        <attribute>
+            <name>use</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <name>flush</name>
+        <tag-class>com.opensymphony.oscache.web.tag.FlushTag</tag-class>
+        <description>A tag to flush the cache</description>
+
+        <attribute>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>key</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>group</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>language</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>pattern</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <name>addgroup</name>
+        <tag-class>com.opensymphony.oscache.web.tag.GroupTag</tag-class>
+        <description>A tag to add a group to an ancestor cache tag</description>
+        <attribute>
+            <name>group</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <name>addgroups</name>
+        <tag-class>com.opensymphony.oscache.web.tag.GroupsTag</tag-class>
+        <description>A tag to add a comma-delimited list of groups to an ancestor cache
tag</description>
+        <attribute>
+            <name>groups</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+    
 </taglib>

Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java?rev=1154731&r1=1154730&r2=1154731&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java Sun Aug
 7 17:17:30 2011
@@ -77,7 +77,7 @@ public final class Release
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "6";
+    public static final String     BUILD         = "7";
     
     /**
      *  This is the generic version string you should use



Mime
View raw message