ZhouXY108
/
wisemapping-open-source
mirror of https://github.com/wisemapping/wisemapping-open-source.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to java 17

main
Paulo Gustavo Veiga 2023-07-30 18:04:45 -07:00
parent 53173ec75d
commit 0090464d88
8 changed files with 15 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -119,8 +119,8 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version> <version>3.11.0</version>
<configuration> <configuration>
<source>11</source> <source>17</source>
<target>11</target> <target>17</target>
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
</configuration> </configuration>
</plugin> </plugin>

5
wise-webapp/${database.base.url}/db/wisemapping.properties
View File

@ -1,5 +0,0 @@
#HSQL Database Engine 2.7.1
#Fri Jul 28 22:57:55 PDT 2023
modified=yes
tx_timestamp=93
version=2.7.1

46
wise-webapp/${database.base.url}/db/wisemapping.script
View File

@ -1,46 +0,0 @@
SET DATABASE UNIQUE NAME HSQLDB89A0348046
SET DATABASE DEFAULT RESULT MEMORY ROWS 0
SET DATABASE EVENT LOG LEVEL 0
SET DATABASE TRANSACTION CONTROL LOCKS
SET DATABASE DEFAULT ISOLATION LEVEL READ COMMITTED
SET DATABASE TRANSACTION ROLLBACK ON CONFLICT TRUE
SET DATABASE TEXT TABLE DEFAULTS ''
SET DATABASE SQL NAMES FALSE
SET DATABASE SQL RESTRICT EXEC FALSE
SET DATABASE SQL REFERENCES FALSE
SET DATABASE SQL SIZE TRUE
SET DATABASE SQL TYPES FALSE
SET DATABASE SQL TDC DELETE TRUE
SET DATABASE SQL TDC UPDATE TRUE
SET DATABASE SQL SYS INDEX NAMES TRUE
SET DATABASE SQL CONCAT NULLS TRUE
SET DATABASE SQL UNIQUE NULLS TRUE
SET DATABASE SQL CONVERT TRUNCATE TRUE
SET DATABASE SQL AVG SCALE 0
SET DATABASE SQL DOUBLE NAN TRUE
SET FILES WRITE DELAY 500 MILLIS
SET FILES BACKUP INCREMENT TRUE
SET FILES CACHE SIZE 10000
SET FILES CACHE ROWS 50000
SET FILES SCALE 32
SET FILES LOB SCALE 32
SET FILES DEFRAG 0
SET FILES NIO TRUE
SET FILES NIO SIZE 256
SET FILES LOG TRUE
SET FILES LOG SIZE 50
SET FILES CHECK 93
SET DATABASE COLLATION "SQL_TEXT" PAD SPACE
CREATE USER SA PASSWORD DIGEST 'd41d8cd98f00b204e9800998ecf8427e'
ALTER USER SA SET LOCAL TRUE
CREATE SCHEMA PUBLIC AUTHORIZATION DBA
ALTER SEQUENCE SYSTEM_LOBS.LOB_ID RESTART WITH 1
SET DATABASE DEFAULT INITIAL SCHEMA PUBLIC
GRANT USAGE ON DOMAIN INFORMATION_SCHEMA.CARDINAL_NUMBER TO PUBLIC
GRANT USAGE ON DOMAIN INFORMATION_SCHEMA.YES_OR_NO TO PUBLIC
GRANT USAGE ON DOMAIN INFORMATION_SCHEMA.CHARACTER_DATA TO PUBLIC
GRANT USAGE ON DOMAIN INFORMATION_SCHEMA.SQL_IDENTIFIER TO PUBLIC
GRANT USAGE ON DOMAIN INFORMATION_SCHEMA.TIME_STAMP TO PUBLIC
GRANT DBA TO SA
SET SCHEMA SYSTEM_LOBS
INSERT INTO BLOCKS VALUES(0,2147483647,0)

36
wise-webapp/pom.xml
View File

@ -128,12 +128,7 @@
<version>5.3.15</version> <version>5.3.15</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- <dependency>-->
<!-- <groupId>antlr</groupId>-->
<!-- <artifactId>antlr</artifactId>-->
<!-- <version>2.7.7</version>-->
<!-- <scope>runtime</scope>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId> <artifactId>spring-aop</artifactId>
@ -146,11 +141,6 @@
<version>${org.springframework.addons}</version> <version>${org.springframework.addons}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<!-- <dependency>-->
<!-- <groupId>jakarta.persistence</groupId>-->
<!-- <artifactId>jakarta.persistence-api</artifactId>-->
<!-- <version>3.1.0</version>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>org.springframework.security</groupId> <groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId> <artifactId>spring-security-core</artifactId>
@ -185,16 +175,16 @@
<artifactId>commons-dbcp2</artifactId> <artifactId>commons-dbcp2</artifactId>
<version>2.9.0</version> <version>2.9.0</version>
</dependency> </dependency>
<!-- <dependency>--> <dependency>
<!-- <groupId>org.hibernate</groupId>--> <groupId>org.hibernate</groupId>
<!-- <artifactId>hibernate-ehcache</artifactId>--> <artifactId>hibernate-ehcache</artifactId>
<!-- <version>5.6.15.Final</version>--> <version>5.6.15.Final</version>
<!-- </dependency>--> </dependency>
<!-- <dependency>--> <dependency>
<!-- <groupId>javax.cache</groupId>--> <groupId>javax.cache</groupId>
<!-- <artifactId>cache-api</artifactId>--> <artifactId>cache-api</artifactId>
<!-- <version>1.1.1</version>--> <version>1.1.1</version>
<!-- </dependency>--> </dependency>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId> <artifactId>log4j-core</artifactId>
@ -416,7 +406,7 @@
<plugin> <plugin>
<groupId>org.jacoco</groupId> <groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId> <artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version> <version>0.8.10</version>
<executions> <executions>
<execution> <execution>
<id>default-prepare-agent</id> <id>default-prepare-agent</id>
@ -477,6 +467,7 @@
<httpConnector> <httpConnector>
<port>8080</port> <port>8080</port>
</httpConnector> </httpConnector>
<jvmArgs>-Ddatabase.base.url=${project.build.directory} -Djetty.port=8080</jvmArgs>
<stopPort>9999</stopPort> <stopPort>9999</stopPort>
<deployMode>FORK</deployMode> <deployMode>FORK</deployMode>
<stopKey>foo</stopKey> <stopKey>foo</stopKey>
@ -494,7 +485,6 @@
</goals> </goals>
<configuration> <configuration>
<useTestScope>true</useTestScope> <useTestScope>true</useTestScope>
<jvmArgs>-Ddatabase.base.url=${project.build.directory} -Djetty.port=8080</jvmArgs>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>

6
wise-webapp/src/main/webapp/WEB-INF/views/error.jsp
View File

@ -1,6 +0,0 @@
<%@ page autoFlush="true" buffer="none" %>
<%@ include file="/jsp/init.jsp" %>
<h1>
<spring:message code="UNEXPECTED_ERROR"/>
</h1>

52
wise-webapp/src/main/webapp/WEB-INF/views/errorTemplate.jsp
View File

@ -1,52 +0,0 @@
<%@page pageEncoding="UTF-8" %>
<%@include file="/jsp/init.jsp" %>
<!DOCTYPE HTML>
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
<tiles:importAttribute name="title" scope="request"/>
<tiles:importAttribute name="details" scope="request"/>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<base href="${requestScope['site.baseurl']}/">
<title>
<spring:message code="SITE.TITLE"/>-
<c:choose>
<c:when test="${requestScope.viewTitle!=null}">
${requestScope.viewTitle}
</c:when>
<c:otherwise>
<spring:message code="${requestScope.title}"/>
</c:otherwise>
</c:choose>
</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<base href="${requestScope['site.baseurl']}/static/mindplot/">
<title><spring:message code="SITE.TITLE"/> - <c:out value="${mindmap.title}"/></title>
<link rel="stylesheet" href="../../css/error.css"/>
<%@ include file="/jsp/pageHeaders.jsf" %>
</head>
<body>
<div id="errorContainer">
<div class='col'>
<h1>Oops !</h1>
<h2>
<spring:message code="${requestScope.title}"/>
</h2>
<p>
<spring:message code="${requestScope.details}"/>
</p>
</div>
<div class='column'>
<a href="https://www.wisemapping.com">
<img src="/images/logo-icon.svg" alt="Wisemapping icon" id="icon" />
</a>
</div>
</div>
<div id="bottom-logo"></div>
</body>
</html>

52
wise-webapp/src/main/webapp/WEB-INF/views/securityError.jsp
View File

@ -1,52 +0,0 @@
<%@page pageEncoding="UTF-8" %>
<%@include file="init.jsp" %>
<!DOCTYPE HTML>
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
<tiles:importAttribute name="title" scope="request"/>
<tiles:importAttribute name="details" scope="request"/>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<base href="${requestScope['site.baseurl']}/">
<title>
<spring:message code="SITE.TITLE"/>-
<c:choose>
<c:when test="${requestScope.viewTitle!=null}">
${requestScope.viewTitle}
</c:when>
<c:otherwise>
<spring:message code="${requestScope.title}"/>
</c:otherwise>
</c:choose>
</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<base href="${requestScope['site.baseurl']}/static/mindplot/">
<title><spring:message code="SITE.TITLE"/> - <c:out value="${mindmap.title}"/></title>
<link rel="stylesheet" href="../../css/error.css"/>
<%@ include file="/jsp/pageHeaders.jsf" %>
</head>
<body>
<div id="errorContainer">
<div class='col'>
<h1>Oops !</h1>
<h2>
<spring:message code="${requestScope.title}"/>
</h2>
<p>
<spring:message code="${requestScope.details}"/>
</p>
</div>
<div class='column'>
<a href="https://www.wisemapping.com">
<img src="/images/logo-icon.svg" alt="Wisemapping icon" id="icon" />
</a>
</div>
</div>
<div id="bottom-logo"></div>
</body>
</html>

41
wise-webapp/src/main/webapp/css/error.css
View File

@ -1,41 +0,0 @@
div#errorContainer {
font-family:Helvetica;
display: flex;
padding: 200px 80px;
}
h1 {
color: #696969;
font-weight: bold;
font-size:100px;
}
h2 {
color: rgb(241, 163, 39);
font-size: 40px;
}
p {
font-size: 25px;
}
#icon {
height: 150px;
}
div#bottom-logo {
position: fixed;
right: 20px;
bottom: 10px;
background: url(../../images/logo-text-black.svg) no-repeat;
width: 90px;
height: 40px;
}
.column {
justify-content: center;
align-items: center;
flex: 1;
display: flex;
}