Author: adc
Date: Sun Dec 8 15:39:18 2013
New Revision: 1549042
URL: http://svn.apache.org/r1549042
Log:
Added some missing files
Added:
steve/site/trunk/lib/STeVeSiteDotiacFilter.pm
steve/site/trunk/lib/cms-tools-r1195124.jar
steve/site/trunk/lib/release-tools-1.0-SNAPSHOT-jar-with-dependencies.jar
steve/site/trunk/lib/swizzle-jirareport-1.6.2-SNAPSHOT-dep.jar
Modified:
steve/site/trunk/lib/view.pm
Added: steve/site/trunk/lib/STeVeSiteDotiacFilter.pm
URL:
http://svn.apache.org/viewvc/steve/site/trunk/lib/STeVeSiteDotiacFilter.pm?rev=1549042&view=auto
==============================================================================
--- steve/site/trunk/lib/STeVeSiteDotiacFilter.pm (added)
+++ steve/site/trunk/lib/STeVeSiteDotiacFilter.pm Sun Dec 8 15:39:18 2013
@@ -0,0 +1,66 @@
+package STeVeSiteDotiacFilter;
+use strict;
+use warnings;
+use Text::Markdown qw( markdown );
+use Dotiac::DTL::Value;
+use Dotiac::DTL::Filter;
+
+sub import {
+ *Dotiac::DTL::Filter::markdown = \&markdown_filter;
+}
+
+sub markdown_filter {
+ my $value = shift;
+
+ # Use raw value rather than escape (by calling repr() rather than
+ # string()) so that we can embed html in our .mdtext documents.
+ my $raw = $value->repr;
+
+ $raw =~ s,\(/\),<IMG class="emoticon"
src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif"
height="16" width="16" align="absmiddle" alt="" border="0">,g;
+ $raw =~ s,\(x\),<IMG class="emoticon"
src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif"
height="16" width="16" align="absmiddle" alt="" border="0">,g;
+
+
+ my $start = "{{{{{";
+ my $end = "}}}}}";
+
+ $raw =~ s,(^|\n){,$start,g;
+ $raw =~ s,(^|\n)},$end,g;
+
+ my $html = markdown($raw);
+
+ $html =~ s,$start([a-z0-9-]+),<div class="$1">,g;
+ $html =~ s,$end,</div>,g;
+
+ $html =~ s,<li><p>,<li>,g;
+ $html =~ s,</p></li>,</li>,g;
+
+
+ # Blindly mark return value as safe.
+ my $retval = Dotiac::DTL::Value->safe($html);
+
+ return $retval;
+}
+
+1;
+
+__END__
+
+=head1 LICENSE
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership. The
+ ASF licenses this file to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance with the
+ License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ License for the specific language governing permissions and limitations
+ under the License.
+
+=cut
+
Added: steve/site/trunk/lib/cms-tools-r1195124.jar
URL:
http://svn.apache.org/viewvc/steve/site/trunk/lib/cms-tools-r1195124.jar?rev=1549042&view=auto
==============================================================================
Files steve/site/trunk/lib/cms-tools-r1195124.jar (added) and
steve/site/trunk/lib/cms-tools-r1195124.jar Sun Dec 8 15:39:18 2013 differ
Added: steve/site/trunk/lib/release-tools-1.0-SNAPSHOT-jar-with-dependencies.jar
URL:
http://svn.apache.org/viewvc/steve/site/trunk/lib/release-tools-1.0-SNAPSHOT-jar-with-dependencies.jar?rev=1549042&view=auto
==============================================================================
Files steve/site/trunk/lib/release-tools-1.0-SNAPSHOT-jar-with-dependencies.jar
(added) and
steve/site/trunk/lib/release-tools-1.0-SNAPSHOT-jar-with-dependencies.jar Sun
Dec 8 15:39:18 2013 differ
Added: steve/site/trunk/lib/swizzle-jirareport-1.6.2-SNAPSHOT-dep.jar
URL:
http://svn.apache.org/viewvc/steve/site/trunk/lib/swizzle-jirareport-1.6.2-SNAPSHOT-dep.jar?rev=1549042&view=auto
==============================================================================
Files steve/site/trunk/lib/swizzle-jirareport-1.6.2-SNAPSHOT-dep.jar (added)
and steve/site/trunk/lib/swizzle-jirareport-1.6.2-SNAPSHOT-dep.jar Sun Dec 8
15:39:18 2013 differ
Modified: steve/site/trunk/lib/view.pm
URL:
http://svn.apache.org/viewvc/steve/site/trunk/lib/view.pm?rev=1549042&r1=1549041&r2=1549042&view=diff
==============================================================================
--- steve/site/trunk/lib/view.pm (original)
+++ steve/site/trunk/lib/view.pm Sun Dec 8 15:39:18 2013
@@ -34,6 +34,7 @@ use warnings;
use Carp;
use Dotiac::DTL;
use ASF::Util qw( read_text_file );
+use STeVeSiteDotiacFilter;
use Data::Dumper;
use LWP::Simple;
@@ -105,25 +106,6 @@ sub basic {
$args{content} =~ s/{include:$include}/$text/g;
}
- if ($args{headers}{version}) {
- my $url =
"http://repository.apache.org/content/groups/snapshots/org/apache/openejb/apache-tomee/$args{headers}{version}-SNAPSHOT/maven-metadata.xml";
- my $_ = get($url);
- s/\n| //g;
- my ($timestamp, $buildNumber) =
m,<timestamp>(.*)</timestamp>.*<buildNumber>(.*)</buildNumber>.*,;
- $args{headers}{build} = "$timestamp-$buildNumber";
-
- $args{changelog} = `java -jar
lib/release-tools-1.0-SNAPSHOT-jar-with-dependencies.jar releasenotes
-DtomeeVersion=$args{headers}{version}
-DopenejbVersion=$args{headers}{oversion}`;
- print $args{changelog};
- }
-
- if ($args{headers}{oversion}) {
- my $url =
"http://repository.apache.org/content/groups/snapshots/org/apache/openejb/openejb-standalone/$args{headers}{oversion}-SNAPSHOT/maven-metadata.xml";
- my $_ = get($url);
- s/\n| //g;
- my ($timestamp, $buildNumber) =
m,<timestamp>(.*)</timestamp>.*<buildNumber>(.*)</buildNumber>.*,;
- $args{headers}{obuild} = "$timestamp-$buildNumber";
- }
-
print " - rendering";
my $rendered = Dotiac::DTL->new($template_path)->render(\%args);