equals.)
+ String equalityPredicate = problem.getEqualityPredicate();
+ if (equalityPredicate.trim().equals("")) {
+ // Generate the default equality predicate.
+ tester.append("\tpublic static boolean eq(Object o1, Object o2) { return o1.equals(o2); }\n");
+ } else {
+ // Generate the Problem's custom equality predicate.
+ tester.append(equalityPredicate);
+ tester.append("\n");
+ }
+
for (TestCase tc : testCaseList) {
tester.append("\tpublic static Object[] ");
tester.append(tc.getTestCaseName());
diff --git a/CloudCoderBuilder2/src/org/cloudcoder/builder2/pythonfunction/AddPythonFunctionScaffoldingBuildStep.java b/CloudCoderBuilder2/src/org/cloudcoder/builder2/pythonfunction/AddPythonFunctionScaffoldingBuildStep.java
index d2d8e226..3ac8d2cd 100644
--- a/CloudCoderBuilder2/src/org/cloudcoder/builder2/pythonfunction/AddPythonFunctionScaffoldingBuildStep.java
+++ b/CloudCoderBuilder2/src/org/cloudcoder/builder2/pythonfunction/AddPythonFunctionScaffoldingBuildStep.java
@@ -1,6 +1,6 @@
// CloudCoder - a web-based pedagogical programming environment
// Copyright (C) 2011-2012, Jaime Spacco curl
+ * as a subprocess.) The default is "httpclient".
+ *
+ * @param httpAccess the http access mechanism
+ */
+ public void setHttpAccess(String httpAccess) {
+ this.httpAccess = httpAccess;
+ }
+
+ /**
+ * @return http access type, either "httpclient" or "curl"
+ */
+ public String getHttpAccess() {
+ return httpAccess;
+ }
+
/**
* Load from a reader reading a properties file.
*
@@ -202,6 +221,7 @@ public void load(Properties props) {
smtpServer = getRequiredProperty(props, "cloudcoder.healthmonitor.smtp.host");
smtpPort = Integer.parseInt(getRequiredProperty(props, "cloudcoder.healthmonitor.smtp.port"));
smtpUseTLS = Boolean.parseBoolean(getRequiredProperty(props, "cloudcoder.healthmonitor.smtp.useTLS"));
+ httpAccess = props.getProperty("cloudcoder.healthmonitor.httpaccess", "httpclient");
}
/**
@@ -232,10 +252,10 @@ protected HealthMonitorConfig clone() {
}
private String getRequiredProperty(Properties props, String propName) {
- String instances = props.getProperty(propName);
- if (instances == null) {
- throw new IllegalArgumentException("Missing cloudcoder.healthmonitor.instances property");
+ String propVal = props.getProperty(propName);
+ if (propVal == null) {
+ throw new IllegalArgumentException("Missing " + propName + " property");
}
- return instances;
+ return propVal;
}
}
diff --git a/CloudCoderHealthMonitor/src/org/cloudcoder/healthmonitor/HealthMonitorDaemon.java b/CloudCoderHealthMonitor/src/org/cloudcoder/healthmonitor/HealthMonitorDaemon.java
index 3ffdd8b7..3f4ff11b 100644
--- a/CloudCoderHealthMonitor/src/org/cloudcoder/healthmonitor/HealthMonitorDaemon.java
+++ b/CloudCoderHealthMonitor/src/org/cloudcoder/healthmonitor/HealthMonitorDaemon.java
@@ -1,6 +1,6 @@
// CloudCoder - a web-based pedagogical programming environment
-// Copyright (C) 2011-2014, Jaime Spacco This is a test email sent from the CloudCoder health monitor.
"); + message.setContent(buf.toString(), "text/html"); + + Transport.send(message); + } catch (Exception e) { + //logger.error("Error sending email to {}", reportEmailAddress, e); + logger.error("Error sending email", e); + } + } } @Override diff --git a/CloudCoderHealthMonitor/src/org/cloudcoder/healthmonitor/TestMain.java b/CloudCoderHealthMonitor/src/org/cloudcoder/healthmonitor/TestMain.java index 702c3a21..99726ddc 100644 --- a/CloudCoderHealthMonitor/src/org/cloudcoder/healthmonitor/TestMain.java +++ b/CloudCoderHealthMonitor/src/org/cloudcoder/healthmonitor/TestMain.java @@ -1,6 +1,6 @@ // CloudCoder - a web-based pedagogical programming environment -// Copyright (C) 2011-2014, Jaime SpaccoPlease enter your AWS credentials.
+Your AWS credentials will be used to provision the +server on which the CloudCoder webapp will run, +and will also be used to dynamically provision +servers to build and test submissions.
+The credentials you provide can (and should) be +an IAM user. The user should have permission +to create EC2 instances and VPCs.
diff --git a/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/awsInstanceType.msg.html b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/awsInstanceType.msg.html new file mode 100644 index 00000000..c8892d8e --- /dev/null +++ b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/awsInstanceType.msg.html @@ -0,0 +1,32 @@ ++Choose an EC2 instance type +for the CloudCoder webapp/database server. +
+ +
+A t2.micro instance, which is eligible for the EC2 free
+tier, is known to work well for CloudCoder if you have 60 or fewer
+concurrent users. It is likely that a t2.nano
+instance will work reasonably well if you have a relatively
+small number of concurrent users (perhaps 30 or so). If you are
+expecting a large number of concurrent users (100 or more)
+you should consider using one of the larger instance types.
+
+Note that if you will have a significant number of concurrent +users, you will want to run some number of builders +separately (not on the webapp server.) See [TODO: link to +documentation] for details on setting up builders. +
+ + \ No newline at end of file diff --git a/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/awsKeypair.msg.html b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/awsKeypair.msg.html new file mode 100644 index 00000000..284c2d3b --- /dev/null +++ b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/awsKeypair.msg.html @@ -0,0 +1,21 @@ ++You will need to choose a keypair to use to control access to +the server(s) to be provisioned for CloudCoder. +You can use an existing keypair associated with your AWS +account, or the installation wizard can create a new +keypair for you. +
+
+If you want to use an existing keypair, choose the .pem
+file containing the keypair. Important:
+the filename must match the name of the keypair in your
+AWS account.
+
+If you do not use an existing keypair, the installation wizard
+will create a new one for you, which will be called
+cloudcoder-keypair. Once the keypair is generated,
+you will have the opportunity to save it to a file. You
+will need the keypair in order to connect to your servers
+via ssh, so be sure to save it.
+
Please choose an +AWS EC2 Region. +
+ ++Choosing a region close to you geographically isn't a bad idea. +Also note that regions vary in cost, with US regions +generally being the least expensive. +
\ No newline at end of file diff --git a/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/bootstrap.msg.html b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/bootstrap.msg.html new file mode 100644 index 00000000..10332f79 --- /dev/null +++ b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/bootstrap.msg.html @@ -0,0 +1,7 @@ ++Bootstrapping CloudCoder by downloading, configuring, and installing +the CloudCoder software on the webapp instance. +
++This can take several minutes. +
diff --git a/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/ccAcct.msg.html b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/ccAcct.msg.html new file mode 100644 index 00000000..6eebf70f --- /dev/null +++ b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/ccAcct.msg.html @@ -0,0 +1,13 @@ ++Please enter information for your CloudCoder user account. +This account will be the administrator account for the CloudCoder +installation, meaning that you will be able to create courses, +register instructors and students, and perform other administrative +tasks using this account. +
+ ++Note that the email address will be +used as the contact information for the Let's Encrypt +SSL certificate, so make sure you use a valid email address. +
diff --git a/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/dns.msg.html b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/dns.msg.html new file mode 100644 index 00000000..b88b8dee --- /dev/null +++ b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/dns.msg.html @@ -0,0 +1,18 @@ ++Enter the hostname that you will use for your CloudCoder instance. +
+ +
+If you will be using a dynamic DNS provider such as
+Duck DNS, make sure that
+the hostname matches the subdomain(s) offered by your
+dynamic DNS provider. For example, a Duck DNS hostname
+should be something like myserver.duckdns.org.
+
+If you will not be using a dynamic DNS provider, then you will need to
+configure an A record for the hostname you choose.
+The wizard will let you know what IP address to use once
+the webapp server has been provisioned.
+
+This page allows you to specify your Duck DNS authorization +token. This will allow the installation wizard to +use Duck DNS to associate the CloudCoder webapp's public +IP address with a hostname once the webapp is provisioned. +
diff --git a/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/dynDns.msg.html b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/dynDns.msg.html new file mode 100644 index 00000000..07b4ff71 --- /dev/null +++ b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/dynDns.msg.html @@ -0,0 +1,20 @@ ++This page allows you to choose a dynamic DNS provider. +This is the easiest way to configure a DNS hostname for your +CloudCoder instance. We highly recommend using dynamic +DNS if you are just trying out CloudCoder. It's easy and +free! +
+ ++If you choose to use a dynamic DNS provider, +you should create an account with that provider (if you haven't +already) and create a hostname for your CloudCoder instance. +You'll also need your account credentials. +
+ ++If you don't use a dynamic DNS provider, you'll need to +create a DNS entry for the CloudCoder webapp once it is +provisioned. +
diff --git a/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/dynDnsAcct.msg.html b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/dynDnsAcct.msg.html new file mode 100644 index 00000000..d1ff8262 --- /dev/null +++ b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/dynDnsAcct.msg.html @@ -0,0 +1,7 @@ ++Enter your username and password for your Dynamic DNS provider. +This step is required if you are using one of the following providers: +
++An error occurred running the CloudCoder installation wizard. +
+ ++Please copy all of the text from the "Output log" tab into +a text editor and save it to a file. Then, email +dhovemey@ycp.edu +to report the error. +
+ ++Please accept our sincere apologies: we would like to make +installing and running CloudCoder as easy as possible, +and we will do what we can to help you get up and running. +
diff --git a/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/errorSsl.msg.html b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/errorSsl.msg.html new file mode 100644 index 00000000..4d351b28 --- /dev/null +++ b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/errorSsl.msg.html @@ -0,0 +1,5 @@ ++An error occurred installing the SSL certificate. +See error log for details. +Sorry that this is a very lame message. +
diff --git a/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/finished.msg.html b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/finished.msg.html new file mode 100644 index 00000000..9a158ce8 --- /dev/null +++ b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/finished.msg.html @@ -0,0 +1,3 @@ ++Dummy report — you are not supposed to see this. +
diff --git a/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/finished.reporttemplate.html b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/finished.reporttemplate.html new file mode 100644 index 00000000..34d74def --- /dev/null +++ b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/finished.reporttemplate.html @@ -0,0 +1,39 @@ ++Congratulations, CloudCoder has been installed successfully! +Please read this information carefully. +
+ ++Details about your installation: +
+| Detail | Value |
|---|---|
| Hostname | ${dns.hostname} |
| URL | https://${dns.hostname}/cloudcoder |
| Public IP address | ${cloudInfo.webappPublicIp} |
| DNS hostname configured | ${db.dnsHostnameConfigured} |
| SSL certificate installed | ${db.sslCertInstalled} |
| Used existing keypair | ${awsKeypair.useExisting} |
+The ${cloudInfo.dataDir} directory contains files
+with information about the installation.
+Within this directory:
+
report.html file is this installation report.
+ccinstall.properties
+file has all of the configuration information you entered.cloudcoder-keypair.pem file is the keypair
+controlling ssh access to the webapp instance. If this keypair was
+generated (i.e., you didn't use an existing keypair), make sure
+you save the keypair.installwizard-yyyy-MM-dd-hh-mm.log
+file is the complete output log of the installation. Note that it will
+likely contain sensitive information.
++Please email dhovemey@ycp.edu +if you have any questions about CloudCoder. +
diff --git a/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/finishedSsl.msg.html b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/finishedSsl.msg.html new file mode 100644 index 00000000..cc9725c2 --- /dev/null +++ b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/finishedSsl.msg.html @@ -0,0 +1,3 @@ ++Dummy SSL installation report — you are not supposed to see this. +
diff --git a/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/finishedSsl.reporttemplate.html b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/finishedSsl.reporttemplate.html new file mode 100644 index 00000000..a7839f26 --- /dev/null +++ b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/finishedSsl.reporttemplate.html @@ -0,0 +1,11 @@ ++Let's Encrypt SSL certificate for ${dns.hostname} issued and installed successfully! +
+ ++You should now be able to connect to CloudCoder using the following link: +
+ ++https://${dns.hostname}/cloudcoder +diff --git a/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/instDetails.msg.html b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/instDetails.msg.html new file mode 100644 index 00000000..77b7a54f --- /dev/null +++ b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/instDetails.msg.html @@ -0,0 +1,3 @@ +
+Please enter details about your CloudCoder instance. +
diff --git a/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/installSsl.msg.html b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/installSsl.msg.html new file mode 100644 index 00000000..c5633a08 --- /dev/null +++ b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/installSsl.msg.html @@ -0,0 +1,4 @@ ++Issuing and installing Let's Encrypt SSL certificate. +This can take several minutes. +
diff --git a/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/intBuild.msg.html b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/intBuild.msg.html new file mode 100644 index 00000000..a2d89b31 --- /dev/null +++ b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/intBuild.msg.html @@ -0,0 +1,19 @@ ++Check the Enable integrated builder? checkbox below if you want to enable an +integrated builder. +
+ ++The builder is the component of CloudCoder that compiles and +tests submissions. Enabling the integrated builder means that +a builder will run on the webapp server. This is very +useful if you are just trying out CloudCoder, or if this +CloudCoder instance will have only very light use. +
+ ++For production use, it is better to run builders on +dedicated computers. Builders are CPU and memory intensive, +and running a builder on the webapp server can degrade +the performance of the webapp. +
diff --git a/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/mysqlAcct.msg.html b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/mysqlAcct.msg.html new file mode 100644 index 00000000..36eac828 --- /dev/null +++ b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/mysqlAcct.msg.html @@ -0,0 +1,13 @@ +
+Choose passwords for the MySQL root and
+cloudcoder accounts. The root account
+is the MySQL superuser, and the cloudcoder
+user is the account the CloudCoder webapp uses to access
+the database.
+
+The MySQL database is not exposed to external clients,
+so it's not terribly important to use strong passwords here.
+If you would like to keep the default values (which is
+abc123 for both passwords), that should be fine.
+
+It looks like you have run the CloudCoder installation wizard +previously. Check the box labeled Load previous values +if you would like to load the previous values. +
+ ++This is a very good idea if +
++Loading the previous configuration values means you won't +have to re-enter them. You will still be able to make +changes if you desire. +
\ No newline at end of file diff --git a/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/provisioningStep.msg.html b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/provisioningStep.msg.html new file mode 100644 index 00000000..06608b5f --- /dev/null +++ b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/provisioningStep.msg.html @@ -0,0 +1,10 @@ ++Provisioning the server and network resources for the +CloudCoder webapp. On AWS, this includes creating a +VPC (virtual private cloud), an EC2 virtual machine +to run the webapp, and an elastic IP address as the webapp's +public address. +
++This can take several minutes. +
diff --git a/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/ready.msg.html b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/ready.msg.html new file mode 100644 index 00000000..90d7796b --- /dev/null +++ b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/ready.msg.html @@ -0,0 +1,7 @@ ++At this point we are ready to install CloudCoder! +
+ ++Click Install to proceed with the installation. +
diff --git a/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/selectTask.msg.html b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/selectTask.msg.html new file mode 100644 index 00000000..2c9fc3dd --- /dev/null +++ b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/res/selectTask.msg.html @@ -0,0 +1,20 @@ ++Welcome to the CloudCoder installation wizard! +Please choose a task. +
++Choose Install Cloudcoder if you want to install +Cloudcoder. +
++Choose Issue and install SSL certificate if you have already +installed CloudCoder, but the installer did not issue and install +an SSL certificate because either +
++Let's install CloudCoder! +You will need the following resources: +
+ ++You can check the Do a dry run checkbox if you just want +to see how the installation wizard works, without actually +installing CloudCoder. We highly recommend doing this +your first time through. Your settings will be saved +automatically so that you can reload them when you are ready +to install for real. +
diff --git a/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/ui/BooleanValueField.java b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/ui/BooleanValueField.java new file mode 100644 index 00000000..1efa6307 --- /dev/null +++ b/CloudCoderInstallationWizard/src/org/cloudcoder/app/wizard/ui/BooleanValueField.java @@ -0,0 +1,60 @@ +package org.cloudcoder.app.wizard.ui; + +import java.awt.Dimension; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + +import javax.swing.JCheckBox; + +import org.cloudcoder.app.wizard.model.BooleanValue; +import org.cloudcoder.app.wizard.model.IValue; + +public class BooleanValueField extends LabeledField