Skip to content

Commit

Permalink
Merge branch 'release-5.8'
Browse files Browse the repository at this point in the history
  • Loading branch information
hirokiterashima committed Sep 30, 2019
2 parents dee8b65 + 0585da8 commit 968cdc5
Show file tree
Hide file tree
Showing 1,604 changed files with 185,244 additions and 62,435 deletions.
2 changes: 1 addition & 1 deletion .babelrc
@@ -1,3 +1,3 @@
{
"presets": ["env"]
"presets": ["@babel/preset-env"]
}
29 changes: 26 additions & 3 deletions .classpath
Expand Up @@ -14,13 +14,36 @@
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="owner.project.facets" value="java"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**/org/wise/portal/service/**/*.java|**/org/wise/portal/domain/**/*.java|**/org/wise/portal/presentation/web/controllers/general/contactwise/*.java|**/org/wise/portal/presentation/web/controllers/teacher/**/*.java|**/org/wise/portal/presentation/web/controllers/*.java|**/org/wise/portal/presentation/validators/teacher/*.java|**/org/wise/portal/dao/**/*.java" kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="target/generated-sources/annotations">
<attributes>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
Expand Down
25 changes: 25 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,25 @@

##Description

[A clear and concise description of what the bug is.]

**Operating System:** [your OS]

**Browser:** [your browser information]

##Steps to Reproduce
1. [First Step]
2. [Second Step]
3. [and so on...]

**Expected behavior**

[A clear and concise description of what you expected to happen.]

**Actual behavior**

[A clear and concise description of what you see.]

##Additional Information

[Add any other context, data, screenshots about the problem here.]
11 changes: 11 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,11 @@
**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the feature you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
6 changes: 6 additions & 0 deletions .gitignore
Expand Up @@ -2,6 +2,9 @@
*.class
*.DS_Store
build
.classpath
.factoryPath
.vscode
.jspm
.m2
.npm
Expand All @@ -11,6 +14,7 @@ target
src/main/webapp/wise5/jspm_packages
src/main/webapp/wise5/node_modules
src/main/resources/wise.properties
src/main/resources/application.properties
*.bak
.idea
!.idea/compiler.xml
Expand All @@ -22,3 +26,5 @@ hsqldb_test
src/main/webapp/curriculum/*
!src/main/webapp/curriculum/demo/
!src/main/webapp/curriculum/e2e-test1/
.classpath
tokens/
11 changes: 8 additions & 3 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion .jshintrc
Expand Up @@ -25,6 +25,7 @@
"maxcomplexity": 8,
"maxlen": 120,
"devel": true,
"esversion":6,

"asi": false,
"boss": false,
Expand Down Expand Up @@ -60,4 +61,4 @@
"$": false,
"define":false
}
}
}
110 changes: 110 additions & 0 deletions .mvn/wrapper/MavenWrapperDownloader.java
@@ -0,0 +1,110 @@
/*
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.
*/

import java.net.*;
import java.io.*;
import java.nio.channels.*;
import java.util.Properties;

public class MavenWrapperDownloader {

/**
* Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
*/
private static final String DEFAULT_DOWNLOAD_URL =
"https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar";

/**
* Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
* use instead of the default one.
*/
private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
".mvn/wrapper/maven-wrapper.properties";

/**
* Path where the maven-wrapper.jar will be saved to.
*/
private static final String MAVEN_WRAPPER_JAR_PATH =
".mvn/wrapper/maven-wrapper.jar";

/**
* Name of the property which should be used to override the default download url for the wrapper.
*/
private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";

public static void main(String args[]) {
System.out.println("- Downloader started");
File baseDirectory = new File(args[0]);
System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());

// If the maven-wrapper.properties exists, read it and check if it contains a custom
// wrapperUrl parameter.
File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
String url = DEFAULT_DOWNLOAD_URL;
if(mavenWrapperPropertyFile.exists()) {
FileInputStream mavenWrapperPropertyFileInputStream = null;
try {
mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
Properties mavenWrapperProperties = new Properties();
mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
} catch (IOException e) {
System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
} finally {
try {
if(mavenWrapperPropertyFileInputStream != null) {
mavenWrapperPropertyFileInputStream.close();
}
} catch (IOException e) {
// Ignore ...
}
}
}
System.out.println("- Downloading from: : " + url);

File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
if(!outputFile.getParentFile().exists()) {
if(!outputFile.getParentFile().mkdirs()) {
System.out.println(
"- ERROR creating output direcrory '" + outputFile.getParentFile().getAbsolutePath() + "'");
}
}
System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
try {
downloadFileFromURL(url, outputFile);
System.out.println("Done");
System.exit(0);
} catch (Throwable e) {
System.out.println("- Error downloading");
e.printStackTrace();
System.exit(1);
}
}

private static void downloadFileFromURL(String urlString, File destination) throws Exception {
URL website = new URL(urlString);
ReadableByteChannel rbc;
rbc = Channels.newChannel(website.openStream());
FileOutputStream fos = new FileOutputStream(destination);
fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
fos.close();
rbc.close();
}

}
Binary file added .mvn/wrapper/maven-wrapper.jar
Binary file not shown.
1 change: 1 addition & 0 deletions .mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip
4 changes: 2 additions & 2 deletions .project
Expand Up @@ -26,12 +26,12 @@
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<name>com.eclipsesource.jshint.ui.builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.eclipsesource.jshint.ui.builder</name>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
Expand Down
5 changes: 5 additions & 0 deletions .settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,6 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
encoding//src/main/resources/i18n=UTF-8
encoding//src/main/resources/i18n/i18n_es.properties=UTF-8
encoding//src/main/resources/i18n/i18n_iw.properties=UTF-8
Expand All @@ -24,3 +26,6 @@ encoding//src/main/webapp/vle/view/i18n/i18n_nl_NL.json=UTF-8
encoding//src/main/webapp/vle/view/i18n/i18n_tr.json=UTF-8
encoding//src/main/webapp/vle/view/i18n/i18n_zh_CN.json=UTF-8
encoding//src/main/webapp/vle/view/i18n/i18n_zh_TW.json=UTF-8
encoding//src/test/java=UTF-8
encoding//src/test/resources=UTF-8
encoding/<project>=UTF-8
4 changes: 4 additions & 0 deletions .settings/org.eclipse.jdt.apt.core.prefs
@@ -0,0 +1,4 @@
eclipse.preferences.version=1
org.eclipse.jdt.apt.aptEnabled=false
org.eclipse.jdt.apt.genSrcDir=target/generated-sources/annotations
org.eclipse.jdt.apt.genTestSrcDir=target/generated-test-sources/test-annotations
13 changes: 8 additions & 5 deletions .settings/org.eclipse.jdt.core.prefs
Expand Up @@ -5,10 +5,10 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
Expand All @@ -22,6 +22,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
Expand Down Expand Up @@ -64,6 +65,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=igno
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
Expand Down Expand Up @@ -93,7 +95,9 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.compiler.processAnnotations=disabled
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
Expand Down Expand Up @@ -378,4 +382,3 @@ org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=true
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

27 changes: 14 additions & 13 deletions .travis.yml
@@ -1,24 +1,22 @@
language: java
jdk:
- oraclejdk8
- openjdk8
before_install:
- nvm install 5.0
- nvm use 5.0
- npm install -g jspm
- nvm install 10.16.0
- nvm use 10.16.0
- npm install -g jspm@0.16.54
- jspm config endpoints.github.auth $JSPM_GITHUB_AUTH_TOKEN
before_script:
script:
- mvn test
- touch output.txt
- ./wise.sh run > output.txt &
- while ! grep "initialization completed" output.txt >/dev/null; do sleep 2; echo "polling for WISE server..."; done
- npm install
- npm test
- npm run test-e2e
- npm run test-site
notifications:
email:
- honchikun@gmail.com
- geoffreykwan@gmail.com
- breity10@gmail.com
- honchikun@gmail.com
- geoffreykwan@gmail.com
- breity10@gmail.com
slack:
secure: 61bwiA2adujTpxYYJ45x8TYlexUM1JX/WYEbX/v0YmBqYA8O2h8YoAopK4VLvt/wNPqV5avQz3IoZP4YqzZlH8Ef4DaSwbPt6rSEKb8RiPuysAyd1ZiOKNzTQtB7kAhWmwC4Qj1xRTI8WutbeUma5LCYJlGpKcIM22HBILxJWWpUTeyabG6sxATlckQ6at3zCE6RpthoSBW/HA1PeDMYPDWK2MkF/Qn9J9qXGKkqfTK+Wtvsed/BZowJwQKpMSx7cTHVPuZPx3wleeR/mTcWzZl/EmTceTYEvBvOQ2SV9mR6rMcqKyhd8YRtME3ikqgyvbJsf4tUS5rt34scw+sPahbisl/NudArs2MTUWHMrmR3duVwikQHdUS8iHL/09c8jV0OqoUEFz18ByQvh2kVnazy4LewQvxU9xYeb0CVqxil+oktuk5dp/zFeuhcCEKnWvfXJC2R5mxSAc5RaWe1H1vD6j7RlED9viLae86F5xPP+Ve1tX9DF6iid5h7e0tf0EesmT58pAILj9O3TE2VeBkMUgrn9BPXbmPgBUTd4Ye/xt5KkkQBHYJkb2PCRBpW6n4khm5NM5ceNKjuDLthsDxfGEVRQd62pNkBRPeo9CGOSszHM9ckTvH7Oic3ogIVRUHjLms6aEbXnO6UlhYzmSPAjt6k5zL/XQtX3hTonTY=
on_success: change
Expand All @@ -30,7 +28,10 @@ notifications:
on_start: never
env:
global:
- secure: God9fsnKx0rLFxhUt4hadhi8U/WvpCxp5tDg9cx8UpZdDE1cvpNQores2RUo1IULK4G7wUOD4P8eiqXbQelBvn1qbt0+ZgaLWiYsVfS3VlrBmcws1KUdCFqgPEk4Iv6m7ixqlBx4/b9vJ6URJg7RVFkF1GAbgitouGRYpLl0rRqjNJuz0/9gQs395fVc5n9UA9K9SMThxbRiExlDKHo2nfptR+Qtdbn/TP4EjmEGEq5CqBK8rvGi3gpprAXguCLPRItIL7hCaMaxPOeX8K9s07W6ueXlMUemUywAFWH2auwVT+4B5KYYPhooXTf9jNPJ6BwpYKZAGErF8dkgld60S11Df0aHKNx34FX77qdPDKvFspRTJRz18xzh9cLB0RhpNoQHVnVGpA7q54SkETO3yhFZK3Q1R0nCB4qLb85mq4uvC4AVFMimqF0CKAgu/0uk1aeg1b+9DaJkqimjxSgPRJgfPtGJrit5eaaSYK/4/t0qbdaRBCtQND2CWfkqysf60B0+JSeBQAivVcOaE93Rqq6r9TbSI68UgHRNB7JtOUc68gfJqHpPhWwBb7+aP4/gWuulqSLXg9nMm3dlecMsi+oWpF9xnvKjeht11Izzgvnsia7vrNt1PZ4wpAgmL+mFeU1YWCQnaOBNa3rkyTmXvCs/WGImlybWD47b42ms6zI=
- secure: u2dKmevonrZURg68ILxXOk+aobyzIB33SuDShKSrBdjChIbgK94l8pzGBBXBRnCOmh0D1MNEamcwxbdpGc7tVM92KkK2QotNGm8otHD5ennOmwnnZBgdMDLGKUoN0rZ5PzR6/lw87djf8dlLfuW3CLDVCArlEhBnvrlp1rRASgwzZ3Y2ABVBYX+WYSn7FjH3g7HQoepirdDI2edXplr61DEA2pWXbfI1T7wcyY14hETyXE4UWtH55ISNr63JnaVFb4F25OPmoUEewgO/13ZYa12LfuY8GIOaQEXsA0Mf1dBMCiLpkh3hG6G6N/iuXmrjtySSIpC1rog/ErLQZ2lB6Vkfb6Wcjvm5ug4r/x5muKYgzSE5zmuebl/1+oeeraQY70z4DnDmwUOhC6cMw5rKTCAl7q5iVJz+W7BzRnKncC3KodXUKR+PNU9djUigPImkaS8UzwYDzVv6qNBxYEjVO3KuG0U3Zw5vqXdzxJuiMmCRyun3pl4BjY+jhBCQ0a5pNPHvvPuMVOArG4wu0peesoiUZo941aJNGGxCZhvgvh2sKJvIqtxEwgIb3aDw2Sn6Lwiv6pNBw6M6R1WzPiMUnY2YiuMrx2uME6Dh2VUs6WQYDQubxFz9UQ/VlYKaSeoS2b+BrztNzP9uJ/gi9k+HFbH8kA//b7cjoeXeW8qbCa8=
- secure: God9fsnKx0rLFxhUt4hadhi8U/WvpCxp5tDg9cx8UpZdDE1cvpNQores2RUo1IULK4G7wUOD4P8eiqXbQelBvn1qbt0+ZgaLWiYsVfS3VlrBmcws1KUdCFqgPEk4Iv6m7ixqlBx4/b9vJ6URJg7RVFkF1GAbgitouGRYpLl0rRqjNJuz0/9gQs395fVc5n9UA9K9SMThxbRiExlDKHo2nfptR+Qtdbn/TP4EjmEGEq5CqBK8rvGi3gpprAXguCLPRItIL7hCaMaxPOeX8K9s07W6ueXlMUemUywAFWH2auwVT+4B5KYYPhooXTf9jNPJ6BwpYKZAGErF8dkgld60S11Df0aHKNx34FX77qdPDKvFspRTJRz18xzh9cLB0RhpNoQHVnVGpA7q54SkETO3yhFZK3Q1R0nCB4qLb85mq4uvC4AVFMimqF0CKAgu/0uk1aeg1b+9DaJkqimjxSgPRJgfPtGJrit5eaaSYK/4/t0qbdaRBCtQND2CWfkqysf60B0+JSeBQAivVcOaE93Rqq6r9TbSI68UgHRNB7JtOUc68gfJqHpPhWwBb7+aP4/gWuulqSLXg9nMm3dlecMsi+oWpF9xnvKjeht11Izzgvnsia7vrNt1PZ4wpAgmL+mFeU1YWCQnaOBNa3rkyTmXvCs/WGImlybWD47b42ms6zI=
- secure: u2dKmevonrZURg68ILxXOk+aobyzIB33SuDShKSrBdjChIbgK94l8pzGBBXBRnCOmh0D1MNEamcwxbdpGc7tVM92KkK2QotNGm8otHD5ennOmwnnZBgdMDLGKUoN0rZ5PzR6/lw87djf8dlLfuW3CLDVCArlEhBnvrlp1rRASgwzZ3Y2ABVBYX+WYSn7FjH3g7HQoepirdDI2edXplr61DEA2pWXbfI1T7wcyY14hETyXE4UWtH55ISNr63JnaVFb4F25OPmoUEewgO/13ZYa12LfuY8GIOaQEXsA0Mf1dBMCiLpkh3hG6G6N/iuXmrjtySSIpC1rog/ErLQZ2lB6Vkfb6Wcjvm5ug4r/x5muKYgzSE5zmuebl/1+oeeraQY70z4DnDmwUOhC6cMw5rKTCAl7q5iVJz+W7BzRnKncC3KodXUKR+PNU9djUigPImkaS8UzwYDzVv6qNBxYEjVO3KuG0U3Zw5vqXdzxJuiMmCRyun3pl4BjY+jhBCQ0a5pNPHvvPuMVOArG4wu0peesoiUZo941aJNGGxCZhvgvh2sKJvIqtxEwgIb3aDw2Sn6Lwiv6pNBw6M6R1WzPiMUnY2YiuMrx2uME6Dh2VUs6WQYDQubxFz9UQ/VlYKaSeoS2b+BrztNzP9uJ/gi9k+HFbH8kA//b7cjoeXeW8qbCa8=
addons:
sauce_connect: true
chrome: stable
services:
- redis-server
2 changes: 1 addition & 1 deletion LICENSE.txt
@@ -1,4 +1,4 @@
Copyright (c) 2008-2017 Regents of the University of California (Regents). Created
Copyright (c) 2008-2018 Regent8 of the University of California (Regents). Created
by WISE, Graduate School of Education, University of California, Berkeley.

This software is distributed under the GNU General Public License, v3,
Expand Down

0 comments on commit 968cdc5

Please sign in to comment.