Item14408: preparing release

foswiki · Jun 20, 2017 · 8590d75 · 8590d75
1 parent cf891d7
commit 8590d75
Show file tree

Hide file tree

Showing 14 changed files with 75 additions and 42 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,11 @@
+*.gz
+*.lease
+igp_*
+*.swp
+/VirtualHostingContrib.md5
+/VirtualHostingContrib.sha1
+/VirtualHostingContrib.tgz
+/VirtualHostingContrib.txt
+/VirtualHostingContrib.zip
+/VirtualHostingContrib_installer
+/VirtualHostingContrib_installer.pl
diff --git a/bin/virtualhosts b/bin/virtualhosts
@@ -1,9 +1,9 @@
-#!/usr/bin/perl -wT
+#!/usr/bin/env perl
 #
 # Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 #
 # Copyright (C) 1999-2007 Peter Thoeny, peter@thoeny.org and TWiki Contributors
-# Copyright (C) 2008-2009 Foswiki Contributors.
+# Copyright (C) 2008-2017 Foswiki Contributors.
 # All Rights Reserved. TWiki Contributors and Foswiki Contributors
 # are listed in the AUTHORS file in the root of this distribution.
 # NOTE: Please extend that file, not this notice.

diff --git a/bin/virtualhosts.fcgi b/bin/virtualhosts.fcgi
@@ -87,7 +87,7 @@ __END__
 
 =head1 SYNOPSIS
 
-foswiki.fcgi [options]
+virtualhosts.fcgi [options]
 
   Options:
     -l --listen     Socket to listen on

diff --git a/data/System/VirtualHostingContrib.txt b/data/System/VirtualHostingContrib.txt
@@ -1,16 +1,7 @@
 %META:TOPICINFO{author="ProjectContributor" date="1496108938" format="1.1" version="1"}%
 ---+!! !VirtualHostingContrib
-<!--
-One line description, required for extensions repository catalog.
-BuildContrib will fill in the SHORTDESCRIPTION with the value of
-$SHORTDESCRIPTION from the .pm module, or you can redefine it here if you
-prefer.
-   * Set SHORTDESCRIPTION = %$SHORTDESCRIPTION%
--->
-
 <img style="float:right" src="%ATTACHURL%/logo-colivre.png" />
-
-%SHORTDESCRIPTION%
+%FORMFIELD{"Description"}%
 
 %TOC%
 
@@ -75,7 +66,7 @@ configuration interface:
 | *Setting* | *Meaning* | *Default value* |
 | =VirtualHostsDir= | The directory in which you virtual hosts are stored | (empty) uses =/path/to/foswiki/virtualhosts= |
 | =ServerAlias= | a mapping of aliases to real hostnames | |
-| =DisabledServers= | a list of servers that are disabled temporarily even though there's a valid environment present in =VirtualHostsDir= |
+| =DisabledServers= | a list of servers that are disabled temporarily even though there's a valid environment present in =VirtualHostsDir= | |
 
 ---+++ The structure of a virtualhost
 
@@ -362,9 +353,7 @@ We need something like this:
     |    |                                 |
     |    V                                 |
 +------------------+             +---------+---------+
-|                  |             |                   |
 | Incoming Request +             | Outgoing Response +
-|                  |             |                   |
 +--------+---------+             +-------------------+
          |                                 ^
          | Configuration ajusted           |
@@ -554,18 +543,18 @@ $ perl test.pl
 
 Many thanks to [[http://colivre.coop.br/][Colivre]] for supporting this work.
 
-|  Author(s): | [[Foswiki:Main/AntonioTerceiro][Antonio Terceiro]], [[Foswiki:Main/JoenioCosta][Joenio Costa]], [[Foswiki:Main/MichaelDaum][Michael Daum]] |
-|  Copyright: | &copy; 2010 [[http://www.colivre.coop.br/][Colivre]], &copy; 2011-2017, Foswiki Contributors |
-|  License: | [[http://www.gnu.org/licenses/gpl.html][GPL (Gnu General Public License)]] |
-|  Release: | %$RELEASE% |
-|  Version: | %$VERSION% |
-|  Change History: | <!-- versions below in reverse order -->&nbsp; |
-|  30 May 2017 (1.12) | Foswikitask:Item9958: virtualhosts-create.sh has issues.<br/>\
-                        Foswikitask:Item11629: Add config checker and fail more gracefully.<br/>\
-                        Foswikitask:Item14408: VirtualHostingContrib needs to support convertTopicSettings.<br/>\
-                        Foswikitask:Item14409: Add checker and wizard to help manage virtual hosts.<br/>\
-                        Foswikitask:Item14410: VirtualHostingContrib not compatible with CharsetConverterContrib.<br/>\
-                        Foswikitask:Item14411: virtualhost.fcgi out of sync with foswiki.fcgi. |
+---++ Dependencies
+%$DEPENDENCIES%
+
+---++ Change History
+|  20 Jun 2017 | Foswiktask:Item14424: remove pending registrations. <br />\
+                 Foswiktask:Item14423: adjust to newer versions of <nop>MailerContrib |
+|  30 May 2017 | Foswikitask:Item9958: virtualhosts-create.sh has issues.<br/>\
+                 Foswikitask:Item11629: Add config checker and fail more gracefully.<br/>\
+                 Foswikitask:Item14408: VirtualHostingContrib needs to support convertTopicSettings.<br/>\
+                 Foswikitask:Item14409: Add checker and wizard to help manage virtual hosts.<br/>\
+                 Foswikitask:Item14410: VirtualHostingContrib not compatible with CharsetConverterContrib.<br/>\
+                 Foswikitask:Item14411: virtualhost.fcgi out of sync with foswiki.fcgi. |
 |  18 Mar 2014: | exclude server aliases running a command on all hosts; added =quiet= commandline parameter |
 |  10 Jul 2013: | added feature to temporarily disable virtual hosts; -- Foswiki:Main/MichaelDaum |
 |  01 Jul 2013: | added support for !WebStatistics and a couple of other commandline tools |
@@ -574,8 +563,15 @@ Many thanks to [[http://colivre.coop.br/][Colivre]] for supporting this work.
 |  02 Nov 2010(2): | code cleanup and performance optimization -- Foswiki:Main/AntonioTerceiro |
 |  02 Nov 2010:    | added support for listening on non-standard ports; performance optimization -- Foswiki:Main/AntonioTerceiro |
 |  16 Jul 2010:    | first release ([[Foswiki:Main/AntonioTerceiro][Antonio Terceiro]])  |
-|  Dependencies: | %$DEPENDENCIES% |
-|  Home page: | Foswiki:Extensions/VirtualHostingContrib |
-|  Support: | Foswiki:Support/VirtualHostingContrib |
 
-<!-- Do _not_ attempt to edit this topic; it is auto-generated. -->
+
+%META:FORM{name="PackageForm"}%
+%META:FIELD{name="Author" title="Author" value="[[Foswiki:Main/AntonioTerceiro][Antonio Terceiro]], [[Foswiki:Main/JoenioCosta][Joenio Costa]], [[Foswiki:Main/MichaelDaum][Michael Daum]]"}%
+%META:FIELD{name="Version" title="Version" value="%25$VERSION%25"}%
+%META:FIELD{name="Release" title="Release" value="%25$RELEASE%25"}%
+%META:FIELD{name="Description" title="Description" value="%25$SHORTDESCRIPTION%25"}%
+%META:FIELD{name="Repository" title="Repository" value="https://github.com/foswiki/%25TOPIC%25"}%
+%META:FIELD{name="Copyright" title="Copyright" value="&copy; 2010 [[http://www.colivre.coop.br/][Colivre]], &copy; 2011-2017 Foswiki Contributors"}%
+%META:FIELD{name="License" title="License" value="[[http://www.gnu.org/licenses/gpl.html][GPL (Gnu General Public License)]]"}%
+%META:FIELD{name="Home" title="Home" value="Foswiki:Extensions/%25TOPIC%25"}%
+%META:FIELD{name="Support" title="Support" value="Foswiki:Support/%25TOPIC%25"}%
diff --git a/lib/Foswiki/Configure/Checkers/VirtualHostingContrib/VirtualHostsDir.pm b/lib/Foswiki/Configure/Checkers/VirtualHostingContrib/VirtualHostsDir.pm
@@ -100,7 +100,7 @@ sub check_current_value {
 __END__
 Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 
-Copyright (C) 2015 Foswiki Contributors. Foswiki Contributors
+Copyright (C) 2015-2017 Foswiki Contributors. Foswiki Contributors
 are listed in the AUTHORS file in the root of this distribution.
 NOTE: Please extend that file, not this notice.
 

diff --git a/lib/Foswiki/Contrib/VirtualHostingContrib.pm b/lib/Foswiki/Contrib/VirtualHostingContrib.pm
@@ -1,9 +1,15 @@
 # Contrib for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 #
+# Copyright (C) 2010-2017 Foswiki Contributors.
+# All Rights Reserved. TWiki Contributors and Foswiki Contributors
+# are listed in the AUTHORS file in the root of this distribution.
+# NOTE: Please extend that file, not this notice.
+#
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version. For
+# more details read LICENSE in the root of this distribution.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,8 +22,8 @@ package Foswiki::Contrib::VirtualHostingContrib;
 use strict;
 use warnings;
 
-our $VERSION = '1.12';
-our $RELEASE = '30 May 2017';
+our $VERSION = '2.00';
+our $RELEASE = '20 Jun 2017';
 
 our $SHORTDESCRIPTION = 'Adds virtual hosting support for Foswiki.';
 

diff --git a/lib/Foswiki/Contrib/VirtualHostingContrib/Config.spec b/lib/Foswiki/Contrib/VirtualHostingContrib/Config.spec
@@ -1,5 +1,5 @@
 # ---+ Extensions
-# ---++ VirtualHostingContrib settings
+# ---++ VirtualHostingContrib
 # This is the configuration used by the <b>VirtualHostingContrib</b>. It sets
 # the options for the Foswiki virtual hosting system.
 

diff --git a/lib/Foswiki/Contrib/VirtualHostingContrib/VirtualHost.pm b/lib/Foswiki/Contrib/VirtualHostingContrib/VirtualHost.pm
@@ -1,3 +1,22 @@
+# Contrib for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
+#
+# Copyright (C) 2010-2017 Foswiki Contributors.
+# All Rights Reserved. TWiki Contributors and Foswiki Contributors
+# are listed in the AUTHORS file in the root of this distribution.
+# NOTE: Please extend that file, not this notice.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version. For
+# more details read LICENSE in the root of this distribution.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details, published at
+# http://www.gnu.org/copyleft/gpl.html
+
 package Foswiki::Contrib::VirtualHostingContrib::VirtualHost;
 
 use File::Basename;

diff --git a/tools/virtualhosts-convertTopicSettings b/tools/virtualhosts-convertTopicSettings
@@ -443,7 +443,7 @@ on all expected changes.   No changes are written.
 __END__
 # Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 #
-# Copyright (C) 2008-2015 Foswiki Contributors. Foswiki Contributors
+# Copyright (C) 2008-2017 Foswiki Contributors. Foswiki Contributors
 # are listed in the AUTHORS file in the root of this distribution.
 # NOTE: Please extend that file, not this notice.
 #

diff --git a/tools/virtualhosts-jsonrpc b/tools/virtualhosts-jsonrpc
@@ -47,7 +47,7 @@ sub doit {
 __END__
 Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 
-Copyright (C) 2008-2010 Foswiki Contributors. Foswiki Contributors
+Copyright (C) 2008-2017 Foswiki Contributors. Foswiki Contributors
 are listed in the AUTHORS file in the root of this distribution.
 NOTE: Please extend that file, not this notice.
 

diff --git a/tools/virtualhosts-mailnotify b/tools/virtualhosts-mailnotify
@@ -4,6 +4,7 @@
 #
 # Copyright (C) 2004 Wind River Systems Inc.
 # Copyright (C) 2004-2007 Peter Thoeny, peter@thoeny.org
+# Copyright (C) 2008-2017 Foswiki Contributors
 # and TWiki Contributors.
 #
 # For licensing info read LICENSE file in the Foswiki root.

diff --git a/tools/virtualhosts-rest b/tools/virtualhosts-rest
@@ -47,7 +47,7 @@ sub doit {
 __END__
 Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 
-Copyright (C) 2008-2010 Foswiki Contributors. Foswiki Contributors
+Copyright (C) 2008-2017 Foswiki Contributors. Foswiki Contributors
 are listed in the AUTHORS file in the root of this distribution.
 NOTE: Please extend that file, not this notice.
 

diff --git a/tools/virtualhosts-statistics b/tools/virtualhosts-statistics
@@ -49,7 +49,7 @@ sub doit {
 __END__
 Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 
-Copyright (C) 2008-2010 Foswiki Contributors. Foswiki Contributors
+Copyright (C) 2008-2017 Foswiki Contributors. Foswiki Contributors
 are listed in the AUTHORS file in the root of this distribution.
 NOTE: Please extend that file, not this notice.
 

diff --git a/tools/virtualhosts-view b/tools/virtualhosts-view
@@ -48,7 +48,7 @@ sub doit {
 __END__
 Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 
-Copyright (C) 2008-2010 Foswiki Contributors. Foswiki Contributors
+Copyright (C) 2008-2017 Foswiki Contributors. Foswiki Contributors
 are listed in the AUTHORS file in the root of this distribution.
 NOTE: Please extend that file, not this notice.