You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2006/07/25 01:50:26 UTC

svn commit: r425231 - in /incubator/roller/branches/roller_3.0/web/WEB-INF/velocity: deprecated/weblog.vm weblog.vm

Author: agilliland
Date: Mon Jul 24 16:50:25 2006
New Revision: 425231

URL: http://svn.apache.org/viewvc?rev=425231&view=rev
Log:
we don't need to replace the old trackback auto discovery macro, it's still valid.  let's just move it from the old deprecated weblog.vm into the new weblog.vm .

Modified:
    incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/weblog.vm
    incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/weblog.vm

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/weblog.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/weblog.vm?rev=425231&r1=425230&r2=425231&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/weblog.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/weblog.vm Mon Jul 24 16:50:25 2006
@@ -361,28 +361,6 @@
 #end
 
 
-#**
- * Display a trackback auto-discovery comment for a WeblogEntry.
- **#
-#macro( showTrackbackAutodiscovery $entry )
-<!--
-<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/"
-         xmlns:dc="http://purl.org/dc/elements/1.1/">
-<rdf:Description
-    rdf:about="$url.entry($entry.anchor)"
-    trackback:ping="$url.trackback($entry.anchor)"
-    dc:title="$entry.title"
-    dc:identifier="$url.entry($entry.anchor)"
-    dc:subject="$entry.category.name"
-    dc:description="$entry.title"
-    dc:creator="$entry.creator.userName"
-    dc:date="$entry.pubTime" />
-</rdf:RDF>
--->
-#end
-
-
 ## ======================================================================== 
 ## Search form and results macros 
 ## ======================================================================== 

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/weblog.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/weblog.vm?rev=425231&r1=425230&r2=425231&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/weblog.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/weblog.vm Mon Jul 24 16:50:25 2006
@@ -71,19 +71,19 @@
 #end
 
 
-#** 
-Show trackback discovery code for one weblog entry, appears as an HTML comment.
-*#
-#macro(showTrackbackAutodiscoveryRDF $entry)
+#**
+ * Display a trackback auto-discovery RDF comment for a WeblogEntry.
+ **#
+#macro( showTrackbackAutodiscovery $entry )
 <!--
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
          xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/"
          xmlns:dc="http://purl.org/dc/elements/1.1/">
 <rdf:Description
-    rdf:about="$entry.permalink"
-    trackback:ping="$entry.permalink"
+    rdf:about="$url.entry($entry.anchor)"
+    trackback:ping="$url.trackback($entry.anchor)"
     dc:title="$entry.title"
-    dc:identifier="$entry.permalink"
+    dc:identifier="$url.entry($entry.anchor)"
     dc:subject="$entry.category.name"
     dc:description="$entry.title"
     dc:creator="$entry.creator.userName"