Merge pull request #1035 from mgage/WeBWorK-2.15

We b wor k 2.15

VERSION

@@ -1,4 +1,4 @@
-$WW_VERSION = '2.15';    # beta!!!
+$WW_VERSION = '2.15';
 $WW_COPYRIGHT_YEARS = '1996-2019';
 
 1;

bin/check_modules.pl

@@ -37,9 +37,7 @@
 	Apache2::ServerUtil
 );
 
-# Crypt::SSLeay was commented out below, but should the not be
-#   in the array when commented out - remove it.
-# For WW 2.15 replace Email::Address with Email::Address::XS
+
 
 my @modulesList = qw(
 	Array::Utils

clients/sendXMLRPC.pl

@@ -306,7 +306,6 @@ BEGIN
 
 
 use Carp;
-#use Crypt::SSLeay;  # needed for https
 use LWP::Protocol::https;
 use Time::HiRes qw/time/;
 use MIME::Base64 qw( encode_base64 decode_base64);

conf/defaults.config

@@ -29,11 +29,10 @@
 # file, you can put a directive in localOverrides.conf.
 
 include("conf/site.conf");
-include("VERSION");  # get WW version 
-#include("PG_VERSION"); 
-# The version of PG is now obtained from pg/VERSION
-# using code inside CourseEnvironment.pm  
-# include can only read files under the webwork2 directory 
+include("VERSION");  # get WW version  
+# The version of PG is now obtained from the file pg/VERSION
+# using code added to CourseEnvironment.pm  
+# with this one exception include can only read files under the webwork2 directory 
 
 ################################################################################
 # site.conf  should contain basic information about directories and URLs on

lib/WeBWorK/ContentGenerator/instructorXMLHandler.pm

@@ -31,7 +31,6 @@ use PGUtil qw(not_null);
 
 our $UNIT_TESTS_ON      = 0;  # should be called DEBUG??  FIXME
 
-#use Crypt::SSLeay;
 #use XMLRPC::Lite;
 
 use strict;

lib/WeBWorK/ContentGenerator/renderViaXMLRPC.pm

@@ -27,7 +27,7 @@ use warnings;
 package WeBWorK::ContentGenerator::renderViaXMLRPC;
 use base qw(WeBWorK::ContentGenerator);
 
-#use Crypt::SSLeay;
+
 #use XMLRPC::Lite;
 #use MIME::Base64 qw( encode_base64 decode_base64);
 

lib/WeBWorK/CourseEnvironment.pm

@@ -226,10 +226,10 @@ sub new {
 	}
 	# #	We'll get the pg version here and read it into the safe symbol table
 	if (-r $PG_version_file){
-		#print STDERR ( "\n\nread PG_version file $PG_version_file\n\n");
+			#print STDERR ( "\n\nread PG_version file $PG_version_file\n\n");
 		my $PG_version_file_contents = readFile($PG_version_file)//'';
 		$safe->reval($PG_version_file_contents);
-		#print STDERR ("\n contents: $PG_version_file_contents");
+			#print STDERR ("\n contents: $PG_version_file_contents");
 
 		no strict 'refs';
 		my %symbolHash2 = %{$safe->root."::"};