diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b7f8a0a46a..fa9a35a43f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -22,9 +22,7 @@ jobs: build_and_check: runs-on: ubuntu-latest steps: - # Using v1 (rather than v2) through-out this workflow due to issue: - # https://github.com/actions/checkout/issues/237 - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: NPM Cache uses: actions/cache@v2 @@ -55,12 +53,12 @@ jobs: id: nvm - name: Setup node - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: "${{ steps.nvm.outputs.NVMRC }}" - name: Set up JDK 1.8 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: adopt java-version: 8 @@ -119,7 +117,7 @@ jobs: target/*.zip - name: Save primary artefacts - uses: actions/upload-artifact@v2.2.4 + uses: actions/upload-artifact@v3.0.0 with: name: Artefacts path: artefacts.tar @@ -129,7 +127,7 @@ jobs: steps: # Using v1 (rather than v2) through-out this workflow due to issue: # https://github.com/actions/checkout/issues/237 - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: NPM Cache uses: actions/cache@v2 @@ -144,7 +142,7 @@ jobs: id: nvm - name: Setup node - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: "${{ steps.nvm.outputs.NVMRC }}" @@ -164,7 +162,7 @@ jobs: tar cvf storybook.tar storybook-static - name: Save Static Storybook instance - uses: actions/upload-artifact@v2.2.4 + uses: actions/upload-artifact@v3.0.0 with: name: Storybook path: react-front-end/storybook.tar @@ -172,10 +170,10 @@ jobs: build_import_export_tool: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK 1.8 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: adopt java-version: 8 @@ -186,7 +184,7 @@ jobs: ./gradlew build - name: Save primary artefacts - uses: actions/upload-artifact@v2.2.4 + uses: actions/upload-artifact@v3.0.0 with: name: ImportExportTools path: import-export-tool/build/libs/ @@ -199,7 +197,7 @@ jobs: strategy: matrix: newui: [true, false] - pgsql-image: [latest, 9.6] + pgsql-image: [latest, 10] exclude: - newui: false pgsql-image: latest @@ -239,24 +237,24 @@ jobs: sudo ln -s /usr/bin/ffprobe /usr/bin/avprobe - name: Set up JDK 1.8 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: adopt java-version: 8 + - uses: actions/checkout@v3 + - name: Read .nvmrc run: echo ::set-output name=NVMRC::$(cat .nvmrc) id: nvm - name: Setup node - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: "${{ steps.nvm.outputs.NVMRC }}" - - uses: actions/checkout@v2 - - name: Download Artefacts - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: path: Artefacts name: Artefacts @@ -284,7 +282,7 @@ jobs: - name: Save Scalacheck results if: matrix.newui && failure() - uses: actions/upload-artifact@v2.2.4 + uses: actions/upload-artifact@v3.0.0 with: name: ScalacheckReports path: autotest/Tests/target/test-reports @@ -296,21 +294,21 @@ jobs: - name: Save TestNG Reports if: failure() - uses: actions/upload-artifact@v2.2.4 + uses: actions/upload-artifact@v3.0.0 with: name: TestNGReports-new-${{ matrix.newui }} path: autotest/OldTests/target/testng - name: Save oEQ Logs if: failure() - uses: actions/upload-artifact@v2.2.4 + uses: actions/upload-artifact@v3.0.0 with: name: oEQLogs-new-${{ matrix.newui }} path: autotest/equella-install/logs - name: Save Screenshots if: failure() - uses: actions/upload-artifact@v2.2.4 + uses: actions/upload-artifact@v3.0.0 with: name: Screenshots-new-${{ matrix.newui }} path: autotest/Tests/target/test-reports/screenshots @@ -328,7 +326,7 @@ jobs: tar cvf coverage_report.tar autotest/target/coverage-report/ - name: Save Coverage Report - uses: actions/upload-artifact@v2.2.4 + uses: actions/upload-artifact@v3.0.0 with: name: CoverageReport-newui-${{ matrix.newui }} path: coverage_report.tar @@ -358,7 +356,7 @@ jobs: AUTOTEST_CONFIG: autotest/github-actions.conf steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install OS dependencies run: | @@ -372,7 +370,7 @@ jobs: sudo ln -s /usr/bin/ffprobe /usr/bin/avprobe - name: Set up JDK 1.8 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: adopt java-version: 8 @@ -382,12 +380,12 @@ jobs: id: nvm - name: Setup node - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: "${{ steps.nvm.outputs.NVMRC }}" - name: Download installer - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: path: Artefacts name: Artefacts @@ -419,7 +417,7 @@ jobs: - name: Save oEQ logs for REST Module if: failure() - uses: actions/upload-artifact@v2.2.4 + uses: actions/upload-artifact@v3.0.0 with: name: oEQ-logs-rest-module path: autotest/equella-install/logs diff --git a/.husky/commit-msg b/.husky/commit-msg new file mode 100755 index 0000000000..7fed48507b --- /dev/null +++ b/.husky/commit-msg @@ -0,0 +1,4 @@ +#!/bin/sh +. "$(dirname "$0")/_/husky.sh" + +npx --no -- commitlint --edit diff --git a/.nvmrc b/.nvmrc index 07c142ffe2..d9f880069d 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -16.13.1 +16.14.2 diff --git a/Dev/docs/scaladb.md b/Dev/docs/scaladb.md deleted file mode 100644 index 5ec60847b7..0000000000 --- a/Dev/docs/scaladb.md +++ /dev/null @@ -1,11 +0,0 @@ -# Scala DB monad - -```scala -import io.doolse.simpledba.jdbc._ - -case class UserContext(inst: Institution, user: UserState, ds: DataSource) - -type DB[A] = Kleisli[JDBCIO, UserContext, A] -``` - -TODO - Explain diff --git a/Dev/learningedge-config/build.sbt b/Dev/learningedge-config/build.sbt index dcdbaab51b..1ca7e6fb8d 100644 --- a/Dev/learningedge-config/build.sbt +++ b/Dev/learningedge-config/build.sbt @@ -13,7 +13,7 @@ prepareDevConfig := { installerConfig / "hikari.properties" ).pair(rebase(installerConfig, baseDir)) val fromDefaults = Seq( - "learningedge-log4j.properties", + "learningedge-log4j.yaml", "optional-config.properties", "hibernate.properties" ).map(f => (defaultsDir / s"$f.default", baseDir / f)) diff --git a/Dev/learningedge-config/defaults/learningedge-log4j.yaml.default b/Dev/learningedge-config/defaults/learningedge-log4j.yaml.default new file mode 100644 index 0000000000..6cb1a53744 --- /dev/null +++ b/Dev/learningedge-config/defaults/learningedge-log4j.yaml.default @@ -0,0 +1,22 @@ +Configuration: + status: debug + + appenders: + Console: + name: CONSOLE + target: SYSTEM_OUT + Filters: + ThresholdFilter: + level: debug + RegexFilter: + regex: ".*(HHH90000022|HHH90000014).*" + onMatch: "DENY" + onMismatch: "NEUTRAL" + PatternLayout: + Pattern: "%d{ABSOLUTE} %-5p [%c{1}] %m%n" + + Loggers: + Root: + level: info + AppenderRef: + - ref: CONSOLE diff --git a/Installer/build.sbt b/Installer/build.sbt index 99ce6f1995..b6177a1560 100644 --- a/Installer/build.sbt +++ b/Installer/build.sbt @@ -1,8 +1,7 @@ import Path.relativeTo libraryDependencies ++= Seq( - "com.google.guava" % "guava" % "31.0.1-jre", - "org.slf4j" % "slf4j-simple" % "1.7.32", + "com.google.guava" % "guava" % "31.1-jre", "commons-codec" % "commons-codec" % "1.15", postgresDep, sqlServerDep @@ -23,6 +22,13 @@ excludeDependencies ++= Seq( "stax" % "stax-api" ) +(assembly / assemblyMergeStrategy) := { + case "module-info.class" => MergeStrategy.discard + case x => + val oldStrategy = (assembly / assemblyMergeStrategy).value + oldStrategy(x) +} + (assembly / assemblyOption) := (assembly / assemblyOption).value.copy(includeScala = false) (assembly / mainClass) := Some("com.dytech.edge.installer.application.Launch") diff --git a/Installer/data/server/conversion/all/log4j.properties b/Installer/data/server/conversion/all/log4j.properties deleted file mode 100644 index 47205371e0..0000000000 --- a/Installer/data/server/conversion/all/log4j.properties +++ /dev/null @@ -1,36 +0,0 @@ -# Sample ResourceBundle properties file -log4j.rootLogger=DEBUG, FILE - -############################################################## -# FILE - -log4j.appender.FILE=com.dytech.common.log4j.DailySizeRollingAppender -log4j.appender.FILE.Threshold=INFO -log4j.appender.FILE.ImmediateFlush=true -log4j.appender.FILE.Append=true -log4j.appender.FILE.File=../logs/conversion-service/conversion.html - -log4j.appender.FILE.layout=com.dytech.common.log4j.HTMLLayout2 -log4j.appender.FILE.layout.title=TLE Conversion Service -log4j.appender.FILE.layout.LocationInfo=true - - -############################################################## -# CONSOLE -# -#log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender -#log4j.appender.CONSOLE.Target=System.out -#log4j.appender.CONSOLE.Threshold=INFO -#log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout -#log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n - - -############################################################## -# CHAINSAW_CLIENT -# -#log4j.appender.CHAINSAW_CLIENT=org.apache.log4j.net.SocketAppender -#log4j.appender.CHAINSAW_CLIENT.RemoteHost=localhost -#log4j.appender.CHAINSAW_CLIENT.Port=4445 -#log4j.appender.CHAINSAW_CLIENT.LocationInfo=true - - diff --git a/Installer/data/server/conversion/all/log4j2.yaml b/Installer/data/server/conversion/all/log4j2.yaml new file mode 100644 index 0000000000..509fa21b0c --- /dev/null +++ b/Installer/data/server/conversion/all/log4j2.yaml @@ -0,0 +1,40 @@ +Configuration: + status: warn + + properties: + property: + - name: filePath + value: "../logs/conversion-service" + - name: fileName + value: "${filePath}/conversion.html" + - name: filePattern + value: "${filePath}/%d{yyyy-MM-dd}/conversion-%i.html" + + appenders: + RollingFile: + name: ROLLING_FILE + fileName: "${fileName}" + filePattern: "${filePattern}" + immediateFlush: true + append: true + Filters: + ThresholdFilter: + level: info + HTMLLayout: + title: TLE Service Manager + datePattern: ISO8601 + locationInfo: true + Policies: + TimeBasedTriggeringPolicy: + interval: 1 + modulate: true + SizeBasedTriggeringPolicy: + size: 10 MB + DefaultRollOverStrategy: + max: 20 + + Loggers: + Root: + level: debug + AppenderRef: + ref: ROLLING_FILE diff --git a/Installer/data/server/learningedge-config/hibernate.properties.sqlserver b/Installer/data/server/learningedge-config/hibernate.properties.sqlserver index fa3f06f8ae..09c1e91a07 100644 --- a/Installer/data/server/learningedge-config/hibernate.properties.sqlserver +++ b/Installer/data/server/learningedge-config/hibernate.properties.sqlserver @@ -1,6 +1,6 @@ hibernate.connection.driver_class = com.microsoft.sqlserver.jdbc.SQLServerDriver hibernate.dialect = com.tle.hibernate.dialect.SQLServerDialect -hibernate.connection.url = jdbc:sqlserver://${datasource/host}:${datasource/port};databaseName=${datasource/database} +hibernate.connection.url = jdbc:sqlserver://${datasource/host}:${datasource/port};databaseName=${datasource/database};trustServerCertificate=${datasource/trustservercerts} hibernate.connection.username = ${datasource/username} hibernate.connection.password = ${datasource/password} diff --git a/Installer/data/server/learningedge-config/learningedge-log4j.properties b/Installer/data/server/learningedge-config/learningedge-log4j.properties deleted file mode 100644 index 6ea1f16b47..0000000000 --- a/Installer/data/server/learningedge-config/learningedge-log4j.properties +++ /dev/null @@ -1,56 +0,0 @@ - -# This file configures the logging features of TLE. Please go through each -# of the following lines, and replace with the appropriate values. - -# Logs location. You should always use forward slashes for the path -# even on a Microsoft Windows box. Files names end up like this... -# -# Example 1: c:/tle/logs/resource-centre/application.html -# -# Logs To: c:/tle/logs/resource-centre/2006-05-23/application.html -# c:/tle/logs/resource-centre/2006-05-23/application.1.html -# c:/tle/logs/resource-centre/2006-05-23/application.2.html -# ..... -# -log4j.appender.FILE.File=${install.path#t\/}/logs/resource-centre/application.html -log4j.appender.REPORT.File=${install.path#t\/}/logs/reporting/log.html -log4j.appender.TOMCAT.File=${install.path#t\/}/logs/tomcat/tomcat.html - -###### IGNORE EVERYTHING BELOW THIS LINE ######## - -log4j.rootLogger=INFO, FILE -log4j.logger.org.eclipse.birt=INFO, REPORT -log4j.logger.TomcatLog=INFO, TOMCAT - -#log4j.logger.org.hibernate.SQL=DEBUG - -log4j.appender.FILE=com.tle.core.equella.runner.DailySizeRollingAppender -log4j.appender.FILE.Threshold=DEBUG -log4j.appender.FILE.ImmediateFlush=true -log4j.appender.FILE.Append=true -log4j.appender.FILE.layout=com.tle.core.equella.runner.HTMLLayout3 -log4j.appender.FILE.layout.title=TLE Resource Centre - -log4j.appender.REPORT=com.tle.core.equella.runner.DailySizeRollingAppender -log4j.appender.REPORT.Threshold=DEBUG -log4j.appender.REPORT.ImmediateFlush=true -log4j.appender.REPORT.Append=true -log4j.appender.REPORT.layout=com.tle.core.equella.runner.HTMLLayout3 -log4j.appender.REPORT.layout.title=EQUELLA Reporting Logs - -log4j.appender.TOMCAT=com.tle.core.equella.runner.DailySizeRollingAppender -log4j.appender.TOMCAT.Threshold=DEBUG -log4j.appender.TOMCAT.ImmediateFlush=true -log4j.appender.TOMCAT.Append=true -log4j.appender.TOMCAT.layout=com.tle.core.equella.runner.HTMLLayout3 -log4j.appender.TOMCAT.layout.title=Tomcat Logs - -# Criteria deprecation warning suppression -log4j.appender.FILE.filter.1=org.apache.log4j.varia.StringMatchFilter -log4j.appender.FILE.filter.1.StringToMatch=HHH90000022 -log4j.appender.FILE.filter.1.AcceptOnMatch=false - -# Generator warning suppression -log4j.appender.FILE.filter.2=org.apache.log4j.varia.StringMatchFilter -log4j.appender.FILE.filter.2.StringToMatch=HHH90000014 -log4j.appender.FILE.filter.2.AcceptOnMatch=false diff --git a/Installer/data/server/learningedge-config/learningedge-log4j.yaml b/Installer/data/server/learningedge-config/learningedge-log4j.yaml new file mode 100644 index 0000000000..f24ddc17b2 --- /dev/null +++ b/Installer/data/server/learningedge-config/learningedge-log4j.yaml @@ -0,0 +1,101 @@ +# This file configures the logging features of TLE. Please go through each +# of the following lines, and replace with the appropriate values. + +# Logs location. You should always use forward slashes for the path +# even on a Microsoft Windows box. Files names end up like this... +# +# Example 1: c:/tle/logs/resource-centre/application.html +# +# Logs To: c:/tle/logs/resource-centre/2006-05-23/application.html +# c:/tle/logs/resource-centre/2006-05-23/application.1.html +# c:/tle/logs/resource-centre/2006-05-23/application.2.html +# ..... +# + +Configuration: + status: warn + + appenders: + RollingFile: + - name: FILE + fileName: "${install.path#t\/}/logs/resource-centre/application.html" + filePattern: "${install.path#t\/}/logs/resource-centre/%d{yyyy-MM-dd}/application-%i.html" + immediateFlush: true + append: true + Filters: + ThresholdFilter: + level: DEBUG + RegexFilter: + # Filter out Hibernate Criteria deprecation warning and Generator warning. + regex: ".*(HHH90000022|HHH90000014).*" + onMatch: "DENY" + onMismatch: "NEUTRAL" + HTMLLayout: + title: TLE Resource Centre + datePattern: ISO8601 + locationInfo: true + Policies: + TimeBasedTriggeringPolicy: + interval: 1 + modulate: true + SizeBasedTriggeringPolicy: + size: 10 MB + DefaultRollOverStrategy: + max: 20 + + - name: REPORT + fileName: "${install.path#t\/}/logs/reporting/log.html" + filePattern: "${install.path#t\/}/logs/reporting/%d{yyyy-MM-dd}/log-%i.html" + immediateFlush: true + append: true + Filters: + ThresholdFilter: + level: DEBUG + HTMLLayout: + title: EQUELLA Reporting Logs + datePattern: ISO8601 + locationInfo: true + Policies: + TimeBasedTriggeringPolicy: + interval: 1 + modulate: true + SizeBasedTriggeringPolicy: + size: 10 MB + DefaultRollOverStrategy: + max: 20 + + - name: TOMCAT + fileName: "${install.path#t\/}/logs/tomcat/tomcat.html" + filePattern: "${install.path#t\/}/logs/tomcat/%d{yyyy-MM-dd}/tomcat-%i.html" + immediateFlush: true + append: true + Filters: + ThresholdFilter: + level: DEBUG + HTMLLayout: + title: Tomcat Logs + datePattern: ISO8601 + locationInfo: true + Policies: + TimeBasedTriggeringPolicy: + interval: 1 + modulate: true + SizeBasedTriggeringPolicy: + size: 10 MB + DefaultRollOverStrategy: + max: 20 + + Loggers: + Root: + level: info + AppenderRef: + ref: FILE + Logger: + - name: org.eclipse.birt + level: INFO + AppenderRef: + ref: REPORT + - name: TomcatLog + level: INFO + AppenderRef: + ref: TOMCAT diff --git a/Installer/data/server/manager/all/log4j.properties b/Installer/data/server/manager/all/log4j.properties deleted file mode 100644 index 6bef7cf532..0000000000 --- a/Installer/data/server/manager/all/log4j.properties +++ /dev/null @@ -1,30 +0,0 @@ -# Sample ResourceBundle properties file -log4j.rootLogger=DEBUG, FILE, CONSOLE - -############################################################## -# FILE - -log4j.appender.FILE=com.dytech.common.log4j.DailySizeRollingAppender -log4j.appender.FILE.Threshold=INFO -log4j.appender.FILE.ImmediateFlush=true -log4j.appender.FILE.Append=true -log4j.appender.FILE.File=../logs/equella-manager/services.html - -log4j.appender.FILE.layout=com.dytech.common.log4j.HTMLLayout2 -log4j.appender.FILE.layout.title=TLE Service Manager -log4j.appender.FILE.layout.LocationInfo=true - - -############################################################## -# CONSOLE - -log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender -log4j.appender.CONSOLE.Target=System.out -log4j.appender.CONSOLE.Threshold=INFO -log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout -log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n - - - -log4j.logger.com.tle.common.util.ExecUtils=WARN - diff --git a/Installer/data/server/manager/all/log4j2.yaml b/Installer/data/server/manager/all/log4j2.yaml new file mode 100644 index 0000000000..46d76094c4 --- /dev/null +++ b/Installer/data/server/manager/all/log4j2.yaml @@ -0,0 +1,53 @@ +Configuration: + status: warn + + properties: + property: + - name: filePath + value: "../logs/equella-manager" + - name: fileName + value: "${filePath}/services.html" + - name: filePattern + value: "${filePath}/%d{yyyy-MM-dd}/services-%i.html" + + appenders: + Console: + name: STDOUT + target: SYSTEM_OUT + Filters: + ThresholdFilter: + level: info + PatternLayout: + Pattern: "%d{ABSOLUTE} %-5p [%c{1}] %m%n" + + RollingFile: + name: ROLLING_FILE + fileName: "${fileName}" + filePattern: "${filePattern}" + immediateFlush: true + append: true + Filters: + ThresholdFilter: + level: info + HTMLLayout: + title: TLE Service Manager + datePattern: ISO8601 + locationInfo: true + Policies: + TimeBasedTriggeringPolicy: + interval: 1 + modulate: true + SizeBasedTriggeringPolicy: + size: 10 MB + DefaultRollOverStrategy: + max: 20 + + Loggers: + Root: + level: debug + AppenderRef: + - ref: STDOUT + - ref: ROLLING_FILE + Logger: + name: com.tle.common.util.ExecUtils + level: warn diff --git a/Installer/data/server/manager/all/upgrader-log4j.properties b/Installer/data/server/manager/all/upgrader-log4j.properties deleted file mode 100644 index 9fccb7e59b..0000000000 --- a/Installer/data/server/manager/all/upgrader-log4j.properties +++ /dev/null @@ -1,30 +0,0 @@ -# Sample ResourceBundle properties file -log4j.rootLogger=DEBUG, FILE, CONSOLE - -############################################################## -# FILE - -log4j.appender.FILE=com.dytech.common.log4j.DailySizeRollingAppender -log4j.appender.FILE.Threshold=INFO -log4j.appender.FILE.ImmediateFlush=true -log4j.appender.FILE.Append=true -log4j.appender.FILE.File=../logs/equella-upgrader/upgrader.html - -log4j.appender.FILE.layout=com.dytech.common.log4j.HTMLLayout2 -log4j.appender.FILE.layout.title=TLE Service Manager -log4j.appender.FILE.layout.LocationInfo=true - - -############################################################## -# CONSOLE - -log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender -log4j.appender.CONSOLE.Target=System.out -log4j.appender.CONSOLE.Threshold=INFO -log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout -log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n - - - -log4j.logger.com.tle.common.util.ExecUtils=WARN - diff --git a/Installer/data/server/manager/all/upgrader-log4j.yaml b/Installer/data/server/manager/all/upgrader-log4j.yaml new file mode 100644 index 0000000000..503691637c --- /dev/null +++ b/Installer/data/server/manager/all/upgrader-log4j.yaml @@ -0,0 +1,53 @@ +Configuration: + status: warn + + properties: + property: + - name: filePath + value: "../logs/equella-upgrader" + - name: fileName + value: "${filePath}/upgrader.html" + - name: filePattern + value: "${filePath}/%d{yyyy-MM-dd}/upgrader-%i.html" + + appenders: + Console: + name: STDOUT + target: SYSTEM_OUT + Filters: + ThresholdFilter: + level: info + PatternLayout: + Pattern: "%d{ABSOLUTE} %-5p [%c{1}] %m%n" + + RollingFile: + name: ROLLING_FILE + fileName: "${fileName}" + filePattern: "${filePattern}" + immediateFlush: true + append: true + Filters: + ThresholdFilter: + level: info + HTMLLayout: + title: TLE Service Manager + datePattern: ISO8601 + locationInfo: true + Policies: + TimeBasedTriggeringPolicy: + interval: 1 + modulate: true + SizeBasedTriggeringPolicy: + size: 10 MB + DefaultRollOverStrategy: + max: 20 + + Loggers: + Root: + level: debug + AppenderRef: + - ref: STDOUT + - ref: ROLLING_FILE + Logger: + name: com.tle.common.util.ExecUtils + level: warn diff --git a/Installer/plugin-jpf.xml b/Installer/plugin-jpf.xml index 147bcbba03..11437bd807 100644 --- a/Installer/plugin-jpf.xml +++ b/Installer/plugin-jpf.xml @@ -1,17 +1,15 @@ - - + - diff --git a/Installer/resources/images/equella.jpg b/Installer/resources/images/equella.jpg deleted file mode 100644 index 61363db640..0000000000 Binary files a/Installer/resources/images/equella.jpg and /dev/null differ diff --git a/Installer/resources/images/vertical-banner.png b/Installer/resources/images/vertical-banner.png new file mode 100644 index 0000000000..2364fbfe8d Binary files /dev/null and b/Installer/resources/images/vertical-banner.png differ diff --git a/Installer/resources/script/app-commands.xml b/Installer/resources/script/app-commands.xml index 6fbfffdd1e..74a7e71f68 100644 --- a/Installer/resources/script/app-commands.xml +++ b/Installer/resources/script/app-commands.xml @@ -19,58 +19,58 @@ - + - + - + - + - + - + - + - + - - + + - + @@ -78,27 +78,27 @@ - + - + - + - + @@ -114,12 +114,12 @@ - - + + - - + + @@ -129,7 +129,7 @@ - + @@ -148,8 +148,8 @@ - - + + @@ -192,14 +192,14 @@ - - + + - + diff --git a/Installer/resources/script/app-script.xml b/Installer/resources/script/app-script.xml index b957bcff9e..2ecf24801c 100644 --- a/Installer/resources/script/app-script.xml +++ b/Installer/resources/script/app-script.xml @@ -4,7 +4,7 @@ openEQUELLA Apereo - + @@ -13,8 +13,12 @@ What is openEQUELLA? - openEQUELLA is an award–winning Digital Repository that incorporates Learning Objects, Learning Content Management and integrated content authoring. openEQUELLA is revolutionising the way institutions search, manage and create content online. + Designed specifically to fit snugly in the education ecosystem, openEQUELLA sits in the centre of your edTech stack and acts as a ‘single source of truth’ to house your teaching and learning, research, media and library content. + + + openEQUELLA has been deployed for copyright resource collections, research materials, managing and exposing materials through websites and portals, content authoring, workflow, institutional policy and organisational resources. + Please ensure you have reviewed the openEQUELLA Installation and Administration Guide available from @@ -79,9 +83,9 @@ Select the database type from the list of currently supported databases. datasource/dbtype - - - + + + @@ -137,6 +141,17 @@ + + Trust Server Certificates + + Do you want to trust the SSL certficates used by your DB server - thereby, skipping + certificate validation. (Relates to JDBC URL option 'trustServerCertificate'.) + + datasource/trustservercerts + + + +