Update build system to use gradle and update dependency versions. Compatible up to Tomcat 9.x

git-svn-id: https://brutex.net/svn/xservices/trunk@198 e7e49efb-446e-492e-b9ec-fcafc1997a86
master
Brian Rosenberger 2023-09-13 14:27:58 +00:00
parent 9d95f5194a
commit 3395c35ad0
132 changed files with 417 additions and 204 deletions

54
build.gradle Normal file
View File

@ -0,0 +1,54 @@
apply plugin: 'war'
repositories {
mavenCentral()
}
dependencies {
compileOnly "javax.servlet:javax.servlet-api:4.0.1"
compileOnly "javax.ws.rs:javax.ws.rs-api:2.1.1"
implementation "org.apache.commons:commons-configuration2:2.9.0"
implementation "org.apache.commons:commons-lang3:3.12.0"
implementation "commons-net:commons-net:3.9.0"
implementation "commons-beanutils:commons-beanutils:1.9.4"
implementation "org.apache.ant:ant:1.10.13"
implementation "org.apache.ant:ant-nodeps:1.8.1"
implementation "org.apache.ant:ant-jsch:1.10.13"
implementation "org.apache.ant:ant-commons-net:1.10.13"
implementation "org.apache.ant:ant-javamail:1.10.13"
implementation "org.apache.ant:ant-launcher:1.10.13"
implementation "org.apache.commons:commons-jcs-core:2.2.1"
implementation "org.quartz-scheduler:quartz:2.3.2"
implementation "org.apache.logging.log4j:log4j-core:2.20.0"
implementation "org.apache.logging.log4j:log4j-web:2.20.0"
implementation "org.apache.logging.log4j:log4j-1.2-api:2.20.0"
implementation "org.apache.logging.log4j:log4j-slf4j18-impl:2.18.0"
implementation "org.apache.ws.commons.axiom:axiom:1.2.22"
implementation "org.apache.ws.commons.axiom:axiom-impl:1.2.22"
implementation "org.apache.shiro:shiro-core:1.12.0"
implementation "org.apache.shiro:shiro-root:1.12.0"
implementation "org.apache.shiro:shiro-web:1.12.0"
implementation "org.apache.cxf:cxf:3.6.1"
implementation "org.apache.cxf:cxf-rt-databinding-aegis:3.6.1"
runtimeOnly "org.apache.cxf:cxf-rt-transports-http:3.6.1"
runtimeOnly "org.apache.cxf:cxf-rt-frontend-jaxrs:3.6.1"
runtimeOnly "org.apache.cxf:cxf-rt-frontend-jaxws:3.6.1"
runtimeOnly "org.apache.cxf:cxf-rt-security:3.6.1"
implementation "rhino:js:1.7R2"
implementation "org.springframework:spring-core:5.3.29"
implementation "org.springframework:spring-context:5.3.29"
implementation "org.springframework:spring-web:5.3.29"
implementation fileTree(dir: "lib/", includes: ["*.jar"])
}

BIN
gradle/wrapper/gradle-wrapper.jar vendored Normal file

Binary file not shown.

View File

@ -0,0 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

248
gradlew vendored Normal file
View File

@ -0,0 +1,248 @@
#!/bin/sh
#
# Copyright © 2015-2021 the original authors.
#
# Licensed 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
#
# https://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.
#
##############################################################################
#
# Gradle start up script for POSIX generated by Gradle.
#
# Important for running:
#
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
# noncompliant, but you have some other compliant shell such as ksh or
# bash, then to run this script, type that shell name before the whole
# command line, like:
#
# ksh Gradle
#
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
# (2) This script targets any POSIX shell, so it avoids extensions provided
# by Bash, Ksh, etc; in particular arrays are avoided.
#
# The "traditional" practice of packing multiple parameters into a
# space-separated string is a well documented source of bugs and security
# problems, so this is (mostly) avoided, by progressively accumulating
# options in "$@", and eventually passing that to Java.
#
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
# see the in-line comments for details.
#
# There are tweaks for specific operating systems such as AIX, CygWin,
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
#
##############################################################################
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
app_path=$0
# Need this for daisy-chained symlinks.
while
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
[ -h "$app_path" ]
do
ls=$( ls -ld "$app_path" )
link=${ls#*' -> '}
case $link in #(
/*) app_path=$link ;; #(
*) app_path=$APP_HOME$link ;;
esac
done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
warn () {
echo "$*"
} >&2
die () {
echo
echo "$*"
echo
exit 1
} >&2
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "$( uname )" in #(
CYGWIN* ) cygwin=true ;; #(
Darwin* ) darwin=true ;; #(
MSYS* | MINGW* ) msys=true ;; #(
NONSTOP* ) nonstop=true ;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD=$JAVA_HOME/jre/sh/java
else
JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD=java
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi
# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
fi
# Collect all arguments for the java command, stacking in reverse order:
# * args from the command line
# * the main class name
# * -classpath
# * -D...appname settings
# * --module-path (only if needed)
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
# For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
JAVACMD=$( cygpath --unix "$JAVACMD" )
# Now convert the arguments - kludge to limit ourselves to /bin/sh
for arg do
if
case $arg in #(
-*) false ;; # don't mess with options #(
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
[ -e "$t" ] ;; #(
*) false ;;
esac
then
arg=$( cygpath --path --ignore --mixed "$arg" )
fi
# Roll the args list around exactly as many times as the number of
# args, so each arg winds up back in the position where it started, but
# possibly modified.
#
# NB: a `for` loop captures its iteration list before it begins, so
# changing the positional parameters here affects neither the number of
# iterations, nor the values presented in `arg`.
shift # remove old arg
set -- "$@" "$arg" # push replacement arg
done
fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
"$@"
# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi
# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
#
# In Bash we could simply go:
#
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
# set -- "${ARGS[@]}" "$@"
#
# but POSIX shell has neither arrays nor command substitution, so instead we
# post-process each arg (as a line of input to sed) to backslash-escape any
# character that might be a shell metacharacter, then use eval to reverse
# that process (while maintaining the separation between arguments), and wrap
# the whole thing up as a single "set" statement.
#
# This will of course break if any of these variables contains a newline or
# an unmatched quote.
#
eval "set -- $(
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
xargs -n1 |
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
tr '\n' ' '
)" '"$@"'
exec "$JAVACMD" "$@"

92
gradlew.bat vendored Normal file
View File

@ -0,0 +1,92 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell
if %ERRORLEVEL% equ 0 goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega

177
ivy.xml
View File

@ -1,177 +0,0 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- 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. -->
<ivy-module version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
<info organisation="Brutex Network" module="XServices" status="integration">
</info>
<configurations >
<conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf" extends="runtime,master"/>
<conf name="master" visibility="public" description="contains only the artifact published by this module itself, with no transitive dependencies"/>
<conf name="compile" visibility="public" description="this is the default scope, used if none is specified. Compile dependencies are available in all classpaths." extends="master"/>
<conf name="provided" visibility="public" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
<conf name="runtime" visibility="public" description="this scope indicates that the dependency is not required for compilation, but is for execution. It is in the runtime and test classpaths, but not the compile classpath." extends="compile"/>
<conf name="test" visibility="private" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases." extends="runtime"/>
<conf name="system" visibility="public" description="this scope is similar to provided except that you have to provide the JAR which contains it explicitly. The artifact is always available and is not looked up in a repository."/>
<conf name="sources" visibility="public" description="this configuration contains the source artifact of this module, if any."/>
<conf name="javadoc" visibility="public" description="this configuration contains the javadoc artifact of this module, if any."/>
<conf name="optional" visibility="public" description="contains all optional dependencies"/>
</configurations>
<dependencies defaultconf="master">
<dependency org="org.apache.commons" name="commons-lang3" rev="3.7"/>
<dependency org="org.apache.commons" name="commons-configuration2" rev="2.7" />
<dependency org="commons-net" name="commons-net" rev="3.2"/>
<dependency org="org.apache.ant" name="ant" rev="1.8.4"/>
<dependency org="org.apache.ant" name="ant-nodeps" rev="1.8.1"/>
<dependency org="org.apache.ant" name="ant-jsch" rev="1.8.4"/>
<!--<dependency org="ant-contrib" name="ant-contrib" rev="20020829"/>-->
<dependency org="org.apache.ant" name="ant-commons-net" rev="1.8.4"/>
<dependency org="javax.mail" name="mail" rev="1.4.7"/>
<dependency org="org.apache.ant" name="ant-javamail" rev="1.8.1"/>
<dependency org="org.apache.ant" name="ant-launcher" rev="1.8.4"/>
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-jcs-core -->
<dependency org="org.apache.commons" name="commons-jcs-core" rev="2.2"/>
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-jcs-jcache -->
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-jcs-jcache-extras -->
<!--<dependency org="org.apache.commons" name="commons-jcs-jcache" rev="2.2"/>
<dependency org="org.apache.commons" name="commons-jcs-jcache-extras" rev="2.2"/>-->
<dependency org="org.quartz-scheduler" name="quartz" rev="2.3.0"/>
<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
<dependency org="org.apache.logging.log4j" name="log4j-api" rev="2.17.1"/>
<dependency org="org.apache.logging.log4j" name="log4j-core" rev="2.17.1"/>
<dependency org="org.apache.logging.log4j" name="log4j-web" rev="2.17.1"/>
<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-1.2-api -->
<dependency org="org.apache.logging.log4j" name="log4j-1.2-api" rev="2.17.1"/>
<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-slf4j-impl -->
<dependency org="org.apache.logging.log4j" name="log4j-slf4j-impl" rev="2.17.1" />
<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
<!-- <dependency org="org.slf4j" name="slf4j-api" rev="1.7.25" />-->
<dependency org="org.springframework" name="spring-core" rev="5.0.5.RELEASE" conf="master,compile,runtime"/>
<dependency org="org.springframework" name="spring-context" rev="5.0.5.RELEASE" conf="master,compile,runtime"/>
<dependency org="org.springframework" name="spring-web" rev="5.0.5.RELEASE" conf="master,compile,runtime"/>
<dependency org="commons-beanutils" name="commons-beanutils" rev="1.9.3"/>
<!-- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api -->
<dependency org="javax.servlet" name="javax.servlet-api" rev="4.0.1"/>
<dependency org="org.apache.ws.commons.axiom" name="axiom-api" rev="1.2.20" conf="compile,master">
<!-- <artifact name="axiom-api" ext="jar"/>-->
<exclude name="axiom-api-1.2.20-tests" ext="jar"/>
</dependency>
<dependency org="org.apache.ws.commons.axiom" name="axiom-impl" rev="1.2.20" conf="master" />
<!--
<dependency org="org.codehaus.woodstox" name="woodstox-core-asl" rev="4.4.1"/>
<dependency org="org.codehaus.woodstox" name="stax2-api" rev="4.1"/>
-->
<dependency org="org.apache.shiro" name="shiro-core" rev="1.8.0" />
<dependency org="org.apache.shiro" name="shiro-root" rev="1.8.0" />
<dependency org="org.apache.shiro" name="shiro-web" rev="1.8.0" />
<dependency org="org.apache.cxf" name="cxf-core" rev="3.2.4" conf="master,compile"/>
<dependency org="org.apache.cxf" name="cxf-rt-transports-http" rev="3.2.4" conf="master,compile" />
<dependency org="org.apache.cxf" name="cxf-rt-databinding-aegis" rev="3.2.4" conf="master,compile"/>
<dependency org="org.apache.cxf" name="cxf-rt-frontend-jaxrs" rev="3.2.4" conf="master,compile"/>
<dependency org="org.apache.cxf" name="cxf-rt-frontend-jaxws" rev="3.2.4" conf="master,compile"/>
<dependency org="org.apache.cxf" name="cxf-rt-security" rev="3.2.4" conf="master,compile"/>
<dependency org="org.apache.cxf" name="cxf-rt-ws-security" rev="3.2.4" conf="master,compile"/>
<!--
<dependency org="org.apache.wss4j" name="wss4j" rev="2.2.1" conf="*->compile"/>
<dependency org="org.apache.wss4j" name="wss4j-ws-security-common" rev="2.2.1" conf="*->compile"/>
-->
<dependency org="org.apache.ws.security" name="wss4j" rev="1.6.19"/>
<dependency org="rhino" name="js" rev="1.7R2"/>
<!-- https://mvnrepository.com/artifact/javax.ws.rs/javax.ws.rs-api -->
<dependency org="javax.ws.rs" name="javax.ws.rs-api" rev="2.1"/>
<!--
Locally managed libraries
-->
<dependency org="lib" name="java-unrar" rev="0.3" conf="*->default">
<artifact name="java-unrar" type="jar" />
</dependency>
<dependency org="lib" name="lib.cvsclient" rev="20131001" conf="*->default">
<artifact name="lib.cvsclient" type="jar" />
</dependency>
<dependency org="lib" name="lib.xservices-scmtypes" rev="20131001" conf="*->default">
<artifact name="lib.xservices-scmtypes" type="jar" />
</dependency>
<dependency org="lib" name="MgmtDataModel" rev="20131001" conf="*->default">
<artifact name="MgmtDataModel" type="jar" />
</dependency>
<!--
<dependency org="lib" name="OADocGenerator" rev="20131001" conf="*->default">
<artifact name="OADocGenerator" type="jar" />
</dependency>
-->
<dependency org="lib" name="DocBuilder" rev="20131001" conf="*->default">
<artifact name="DocBuilder" type="jar" />
</dependency>
<!-- Micro Focus/ Serena Software Dimensions CM 14.1 API -->
<dependency org="lib" name="serena.darius" rev="14.1" conf="*->default">
<artifact name="serena.darius" type="jar" />
</dependency>
<dependency org="lib" name="serena.dmclient" rev="14.1" conf="*->default">
<artifact name="serena.dmclient" type="jar" />
</dependency>
<dependency org="lib" name="serena.dmfile" rev="14.1" conf="*->default">
<artifact name="serena.dmfile" type="jar" />
</dependency>
<dependency org="lib" name="serena.dmnet" rev="14.1" conf="*->default">
<artifact name="serena.dmnet" type="jar" />
</dependency>
<dependency org="lib" name="serena.dmtpi" rev="14.1" conf="*->default">
<artifact name="serena.dmtpi" type="jar" />
</dependency>
<conflict manager="latest-revision"/>
</dependencies>
</ivy-module>

View File

@ -1,26 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivysettings>
<settings defaultResolver="defaultchain" />
<resolvers>
<ibiblio name="apache-maven" m2compatible="true" usepoms="true" root="https://repo.maven.apache.org/maven2/" />
<ibiblio name="java" m2compatible="true" usepoms="true" root="http://download.java.net/maven/2/" />
<filesystem name="local-filesystem">
<!-- <ivy pattern="${ivy.settings.dir}/1/[organisation]/[module]/ivys/ivy-[revision].xml"/> -->
<artifact pattern="${ivy.settings.dir}/lib/[artifact]-[revision].[ext]" />
</filesystem>
<chain name="defaultchain">
<resolver ref="local-filesystem" />
<resolver ref="apache-maven" />
<resolver ref="java" />
</chain>
</resolvers>
<modules>
<module organisation="javax.transaction" resolver="java" />
<module organisation="javax.sql" resolver="java" />
</modules>
</ivysettings>

View File

@ -87,6 +87,11 @@ public class BrutexHSQLQuartzConnectionProvider implements ConnectionProvider {
} }
@Override
public void initialize() throws SQLException {
}
private synchronized void recursiveDelete(File dbDir) { private synchronized void recursiveDelete(File dbDir) {
File[] files = dbDir.listFiles(); File[] files = dbDir.listFiles();
for (int i = 0; i < files.length; i++) { for (int i = 0; i < files.length; i++) {

View File

@ -87,6 +87,11 @@ public class BrutexQuartzConnectionProvider implements ConnectionProvider {
} }
@Override
public void initialize() throws SQLException {
}
private synchronized void recursiveDelete(File dbDir) { private synchronized void recursiveDelete(File dbDir) {
File[] files = dbDir.listFiles(); File[] files = dbDir.listFiles();
for (int i = 0; i < files.length; i++) { for (int i = 0; i < files.length; i++) {

Some files were not shown because too many files have changed in this diff Show More