[java-idp-jetty-base] 02/06: JJETTY-14 Complete move to separate Repository
Rod Widdowson
rdw at steadingsoftware.com
Mon Aug 4 10:37:07 UTC 2025
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch 12
in repository java-idp-jetty-base.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-jetty-base.git;a=commit;h=721551c247ea7ee55eb3089593a944f4ac51edbb
commit 721551c247ea7ee55eb3089593a944f4ac51edbb
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun Aug 3 14:35:16 2025 +0100
JJETTY-14 Complete move to separate Repository
https://shibboleth.atlassian.net/browse/JJETTY-14
Remove "plugin" and "module" stuff from impl project leaving just jetty base stuff
---
.../shibboleth/idp/module/jetty/JettyModule.java | 107 ------------------
.../shibboleth/idp/module/jetty/package-info.java | 17 ---
.../shibboleth/idp/plugin/jetty/JettyPlugin.java | 45 --------
.../net/shibboleth/idp/plugin/jetty/Version.java | 46 --------
.../shibboleth/idp/plugin/jetty/package-info.java | 17 ---
.../services/net.shibboleth.idp.module.IdPModule | 1 -
.../services/net.shibboleth.idp.plugin.IdPPlugin | 1 -
.../shibboleth/idp/module/jetty/config-jetty.bat | 123 ---------------------
.../shibboleth/idp/module/jetty/module.properties | 80 --------------
.../net/shibboleth/idp/module/jetty/runjetty.bat | 49 --------
.../net/shibboleth/idp/module/jetty/runjetty.sh | 49 --------
.../shibboleth/idp/plugin/jetty/plugin.properties | 20 ----
12 files changed, 555 deletions(-)
diff --git a/jetty-impl/src/main/java/net/shibboleth/idp/module/jetty/JettyModule.java b/jetty-impl/src/main/java/net/shibboleth/idp/module/jetty/JettyModule.java
deleted file mode 100644
index 6d2ae50..0000000
--- a/jetty-impl/src/main/java/net/shibboleth/idp/module/jetty/JettyModule.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-package net.shibboleth.idp.module.jetty;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Map;
-
-import javax.annotation.Nonnull;
-
-import org.apache.commons.lang3.SystemUtils;
-import org.slf4j.Logger;
-
-import net.shibboleth.idp.Version;
-import net.shibboleth.idp.installer.InstallerProperties;
-import net.shibboleth.idp.module.impl.PluginIdPModule;
-import net.shibboleth.profile.module.ModuleContext;
-import net.shibboleth.profile.module.ModuleException;
-import net.shibboleth.shared.collection.CollectionSupport;
-import net.shibboleth.shared.primitive.LoggerFactory;
-import net.shibboleth.shared.security.impl.SelfSignedCertificateGenerator;
-
-public class JettyModule extends PluginIdPModule {
-
- /** Class logger. */
- @Nonnull private Logger log = LoggerFactory.getLogger(JettyModule.class);
-
- /**
- * Constructor.
- */
- public JettyModule() throws IOException, ModuleException {
- super(Version.getVersion(), JettyModule.class);
- }
-
- /** {@inheritDoc} */
- @Override
- @Nonnull
- public Map<ModuleResource, ResourceResult> enable(@Nonnull ModuleContext moduleContext) throws ModuleException {
- final Map<ModuleResource, ResourceResult> result = super.enable(moduleContext);
- final Path idpHome = Path.of(moduleContext.getInstallLocation());
- final Path jettyBase = idpHome.resolve("jetty-base");
- log.debug("Creating directories (if needed): '{}' '{}'\n", jettyBase.resolve("tmp"));
- try {
- Files.createDirectories(jettyBase.resolve("tmp"));
- } catch (final IOException e) {
- log.error("Create Directory failed", e);
- throw new ModuleException(e);
- }
- final Path keystore= idpHome.resolve("credentials").resolve("idp-userfacing.p12");
- if (!Files.exists(keystore)) {
- generateKeystore(keystore);
- }
- if (SystemUtils.IS_OS_WINDOWS) {
- final File jettyHelper = idpHome.resolve("jetty-base").resolve("jetty.base.linux").toFile();
- if (!jettyHelper.exists()) {
- try {
- final String idpHomeString = idpHome.toFile().getCanonicalPath().replace('\\', '/');
- try (final PrintStream stream = new PrintStream(jettyHelper)) {
- stream.printf("%s\n", idpHomeString);
- }
- }
- catch (IOException e) {
- log.error("Could not write jetty-base/jetty.base.linux", e);
- throw new ModuleException("Could not write jetty-base/jetty.base.linux", e);
- }
- }
- }
- return result;
- }
-
- /** Generate an mock idp-userfacing.p12 keystore.
- * @param keystore where to put it
- * @throws ModuleException if the generator fails
- */
- private void generateKeystore(Path keyStore) throws ModuleException {
- final SelfSignedCertificateGenerator generator = new SelfSignedCertificateGenerator();
- generator.setKeystoreFile(keyStore.toFile());
- generator.setKeySize(InstallerProperties.DEFAULT_KEY_SIZE);
- final String hostName = "localhost";
- generator.setHostName(hostName);
- final String altName = "https://" + hostName + "/idp/shibboleth";
- generator.setURISubjectAltNames(CollectionSupport.singletonList(altName));
- generator.setKeystorePassword("changeit");
- log.info("Creating {}, CN = {} URI = {}, keySize={}",
- keyStore, hostName, altName, InstallerProperties.DEFAULT_KEY_SIZE);
- try {
- generator.generate();
- } catch (final Exception e) {
- log.error("Error building ketstore files {}", keyStore, e);
- throw new ModuleException("Error Key Store", e);
- }
- }
-}
diff --git a/jetty-impl/src/main/java/net/shibboleth/idp/module/jetty/package-info.java b/jetty-impl/src/main/java/net/shibboleth/idp/module/jetty/package-info.java
deleted file mode 100644
index edb2ee4..0000000
--- a/jetty-impl/src/main/java/net/shibboleth/idp/module/jetty/package-info.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-
-/** Classes for working the Jetty Module (included in the Jetty Plugin). */
-
-package net.shibboleth.idp.module.jetty;
\ No newline at end of file
diff --git a/jetty-impl/src/main/java/net/shibboleth/idp/plugin/jetty/JettyPlugin.java b/jetty-impl/src/main/java/net/shibboleth/idp/plugin/jetty/JettyPlugin.java
deleted file mode 100644
index 340ab47..0000000
--- a/jetty-impl/src/main/java/net/shibboleth/idp/plugin/jetty/JettyPlugin.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-
-package net.shibboleth.idp.plugin.jetty;
-
-import java.io.IOException;
-import java.util.Set;
-
-import net.shibboleth.idp.module.IdPModule;
-import net.shibboleth.idp.module.jetty.JettyModule;
-import net.shibboleth.idp.plugin.impl.FirstPartyIdPPlugin;
-import net.shibboleth.profile.module.ModuleException;
-import net.shibboleth.profile.plugin.PluginException;
-import net.shibboleth.shared.collection.CollectionSupport;
-
-/**Details about the Jetty plugin. */
-public class JettyPlugin extends FirstPartyIdPPlugin {
- /** Constructor.
- * @throws PluginException from {@link FirstPartyIdPPlugin}
- * @throws IOException from {@link FirstPartyIdPPlugin}
- */
- public JettyPlugin() throws PluginException, IOException {
- super(JettyPlugin.class);
- try {
- final Set<IdPModule> modules = CollectionSupport.singleton(new JettyModule());
- setEnableOnInstall(modules);
- setDisableOnRemoval(modules);
- } catch (final IOException e) {
- throw e;
- } catch (final ModuleException e) {
- throw new PluginException(e);
- }
- }
-}
diff --git a/jetty-impl/src/main/java/net/shibboleth/idp/plugin/jetty/Version.java b/jetty-impl/src/main/java/net/shibboleth/idp/plugin/jetty/Version.java
deleted file mode 100644
index 9ddfbeb..0000000
--- a/jetty-impl/src/main/java/net/shibboleth/idp/plugin/jetty/Version.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-
-package net.shibboleth.idp.plugin.jetty;
-
-import javax.annotation.Nullable;
-
-/** Class for getting and printing the version of the plugin. */
-public final class Version {
-
- /** Plugin version. */
- @Nullable private static final String VERSION = Version.class.getPackage().getImplementationVersion();
-
- /** Constructor. */
- private Version() {
- }
-
- /**
- * Main entry point to program.
- *
- * @param args command line arguments
- */
- public static void main(final String[] args) {
- System.out.println(VERSION);
- }
-
- /**
- * Get the version of the IdP.
- *
- * @return version of the IdP
- */
- @Nullable public static String getVersion() {
- return VERSION;
- }
-}
diff --git a/jetty-impl/src/main/java/net/shibboleth/idp/plugin/jetty/package-info.java b/jetty-impl/src/main/java/net/shibboleth/idp/plugin/jetty/package-info.java
deleted file mode 100644
index cd308f3..0000000
--- a/jetty-impl/src/main/java/net/shibboleth/idp/plugin/jetty/package-info.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-
-/** Classes for working the Jetty Plugin. */
-
-package net.shibboleth.idp.plugin.jetty;
diff --git a/jetty-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule b/jetty-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
deleted file mode 100644
index 3314621..0000000
--- a/jetty-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
+++ /dev/null
@@ -1 +0,0 @@
-net.shibboleth.idp.module.jetty.JettyModule
\ No newline at end of file
diff --git a/jetty-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin b/jetty-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin
deleted file mode 100644
index a35ba71..0000000
--- a/jetty-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin
+++ /dev/null
@@ -1 +0,0 @@
-net.shibboleth.idp.plugin.jetty.JettyPlugin
\ No newline at end of file
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/config-jetty.bat b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/config-jetty.bat
deleted file mode 100644
index 4c747f0..0000000
--- a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/config-jetty.bat
+++ /dev/null
@@ -1,123 +0,0 @@
- at echo off
-setlocal
-
-REM We need a JVM
-if not defined JAVA_HOME (
- echo Error: JAVA_HOME is not defined.
- exit /b
-)
-
-if not exist "%JAVA_HOME%\bin\server\jvm.dll" (
- echo Error: %JAVA_HOME%\bin\server\jvm.dll not found
- exit /b
-)
-
-set IDP_HOME_WINDOWS=%~dp0..
-set JETTY_BASE=%~dp0..\jetty-base
-set JETTY_HOME=%~dp0..\jetty-home
-set PRUNSRV=%IDP_HOME_WINDOWS%\shibd_idp\amd64\prunsrv.exe
-
-for /f "tokens=* USEBACKQ" %%F in (`type "%JETTY_BASE%\jetty.base.linux"`) do (
- SET IDP_HOME_UNIX=%%F
-)
-
-if "%1" EQU "UNINSTALL" (
- @echo on
- "%PRUNSRV%" //DS/Shibd_idp
- exit /b
-)
-
-if "%1" EQU "EDIT" (
- @echo on
- start /d "%IDP_HOME_WINDOWS%\shibd_idp" prunmgr //ES/Shibd_idp
- exit /b
-)
-
-if NOT "%1" EQU "INSTALL" (
- echo "Usage : config-jetty [EDIT|INSTALL|UNINSTALL] [User]
- exit /b
-)
-
-if NOT "%2" EQU "" (
- USERNAME=%2
- SET /P PASSWORD="Password for %USERNAME%: "
- SET PR_SERVICEUSER=%USERNAME%
- SET PR_SERVICEPASSWORD=%PASSWORD%
-) else (
- SET USERNAME=LocalService
-)
-
-
-REM
-REM First up create and configure the procrun instance which will run jetty
-REM This is described in
-REM https://commons.apache.org/proper/commons-daemon/procrun.html
-REM And what is set comes from the jetty documentation
-REM
-SET PORTPASS=%random%-%random%-%random%-%random%
-
-REM
-REM Use PR_xxx for parameters to keep things legible and to allow for spaces in paths
-REM
-SET PR_DISPLAYNAME=Shibboleth IdP Daemon
-SET PR_DESCRIPTION=Runs the Jetty Container
-SET PR_CLASSPATH=%JETTY_HOME%\start.jar
-SET PR_JVMOPTIONS=-Didp.home=%IDP_HOME_UNIX%;-Djdk.tls.ephemeralDHKeySize=2048;-Dorg.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.Slf4jLog;-Djava.io.tmpdir=%JETTY_BASE%\tmp;-Dlogback.configurationFile=%JETTY_BASE%\resources\logback.xml;-XX:+UseG1GC
-SET PR_JVMMX=2048
-SET PR_JVM=auto
-SET PR_JAVAHOME=%JAVA_HOME%
-
-SET PR_LOGPATH=%IDP_HOME_WINDOWS%\logs
-SET PR_STDOUTPUT=auto
-SET PR_STDERROR=auto
-
-SET PR_STARTMODE=JVM
-SET PR_STARTCLASS=org.eclipse.jetty.start.Main
-SET PR_STARTPARAMS=STOP_PORT=8963;STOP.KEY=%PORTPASS%;jetty.base=%JETTY_BASE%;jetty.logging.dir=%IDP_HOME_WINDOWS%\logs
-
-SET PR_STOPMODE=JVM
-SET PR_STOPCLASS=org.eclipse.jetty.start.Main
-SET PR_STOPPARAMS=--stop;%PR_STARTPARAMS%
-
-"%PRUNSRV%" //IS/Shibd_idp --Startup=auto
-
-REM
-REM With that done poke holes in the firewall using "netsh advfirewall"
-REM
-netsh advfirewall firewall add rule name="Shibboleth IdP Service" dir=in action=allow program="%PRUNSRV%" enable=yes protocol=tcp
-
-REM
-REM Lock down the install
-REM
-call "%~dp0\setacl.bat" %USERNAME%
-
-REM
-REM We also need to lock down jetty-base-tmp
-REM
-echo Setting FULL ACL on %JETTY_BASE%\tmp directory for SYSTEM, Administrators and %USERNAME%
-icacls "%JETTY_BASE%\tmp" /t /inheritance:r /grant:r "SYSTEM:(OI)(CI)(F)" "Administrators:(OI)(CI)(F)" "%USERNAME%:(OI)(CI)(F)" /q
-if ERRORLEVEL 1 (
- echo Error: Could not set ACL
- exit /b
-)
-
-echo Setting FULL ACL on %JETTY_BASE%\tmp directory content for SYSTEM, Administrators and %USERNAME%
-icacls "%JETTY_BASE%\tmp" /t /inheritance:r /grant:r SYSTEM:F Administrators:F "%USERNAME%:F" /q
-if ERRORLEVEL 1 (
- echo Error: Could not set ACL
- exit /b
-)
-
-
-REM
-REM start the service
-REM
-
-"%PRUNSRV%" //ES/Shibd_idp
-
-REM
-REM All done!
-REM
-exit /b
-
-
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/module.properties b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/module.properties
deleted file mode 100644
index 59dc72b..0000000
--- a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/module.properties
+++ /dev/null
@@ -1,80 +0,0 @@
-# Properties defining this module.
-
-# Class to Module ID mappings
-net.shibboleth.idp.module.jetty.JettyModule = jetty.module
-
-# Module Owner
-jetty.plugin = net.shibboleth.idp.plugin.jetty
-
-jetty.module.name = Jetty Base Module
-jetty.module.desc = Configures jetty
-
-jetty.module.1.src = /net/shibboleth/idp/module/jetty/jetty-base/etc/jetty-requestlog.xml
-jetty.module.1.dest = jetty-base/etc/jetty-requestlog.xml
-
-jetty.module.2.src = /net/shibboleth/idp/module/jetty/jetty-base/modules/idp.mod
-jetty.module.2.dest = jetty-base/modules/idp.mod
-
-jetty.module.3.src = /net/shibboleth/idp/module/jetty/jetty-base/resources/logback.xml
-jetty.module.3.dest = jetty-base/resources/logback.xml
-
-jetty.module.4.src = /net/shibboleth/idp/module/jetty/jetty-base/webapps/idp.xml
-jetty.module.4.dest = jetty-base/webapps/idp.xml
-
-jetty.module.5.src = /net/shibboleth/idp/module/jetty/jetty-base/webapps/static.xml
-jetty.module.5.dest = jetty-base/webapps/static.xml
-
-jetty.module.6.src = /net/shibboleth/idp/module/jetty/jetty-base/static/index.html
-jetty.module.6.dest = jetty-base/static/index.html
-
-
-# For legacy reasons we separate Windows and non windows start.d
-
-jetty.module.7.src = /net/shibboleth/idp/module/jetty/jetty-base/start.d/custom.ini
-jetty.module.7.dest = jetty-base/start.d/custom.ini
-jetty.module.7.nonwindows = true
-jetty.module.7.windows = false
-jetty.module.7.replace = false
-
-jetty.module.8.src = /net/shibboleth/idp/module/jetty/jetty-base/start.d/idp.ini
-jetty.module.8.dest = jetty-base/start.d/idp.ini
-jetty.module.8.nonwindows = true
-jetty.module.8.windows = false
-jetty.module.8.replace = false
-
-jetty.module.9.src = /net/shibboleth/idp/module/jetty/jetty-base/start.d/idp.ini
-jetty.module.9.dest = jetty-base/start.d/idp.ini-unix
-jetty.module.9.nonwindows = false
-jetty.module.9.windows = true
-jetty.module.9.replace = false
-
-
-jetty.module.10.src = /net/shibboleth/idp/module/jetty/jetty-base-windows/start.d/idp-system.ini
-jetty.module.10.dest = jetty-base/start.d/idp-system.ini
-jetty.module.10.nonwindows = false
-jetty.module.10.windows = true
-jetty.module.10.replace = true
-
-jetty.module.11.src = /net/shibboleth/idp/module/jetty/jetty-base-windows/start.d/idp.ini-windows
-jetty.module.11.dest = jetty-base/start.d/idp.ini
-jetty.module.11.nonwindows = false
-jetty.module.11.windows = true
-jetty.module.11.replace = false
-
-jetty.module.12.src = /net/shibboleth/idp/module/jetty/runjetty.bat
-jetty.module.12.dest = bin/runjetty.bat
-jetty.module.12.nonwindows = false
-jetty.module.12.windows = true
-
-jetty.module.13.src = /net/shibboleth/idp/module/jetty/runjetty.sh
-jetty.module.13.dest = bin/runjetty.sh
-jetty.module.13.nonwindows = true
-jetty.module.13.windows = false
-jetty.module.13.exec = true
-
-jetty.module.14.src = /net/shibboleth/idp/module/jetty/config-jetty.bat
-jetty.module.14.dest = bin/config-jetty.bat
-jetty.module.14.nonwindows = false
-jetty.module.14.windows = true
-
-
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/runjetty.bat b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/runjetty.bat
deleted file mode 100644
index fe6f4bb..0000000
--- a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/runjetty.bat
+++ /dev/null
@@ -1,49 +0,0 @@
- at echo off
-setlocal
-
-
-REM We need a JVM
-if not defined JAVA_HOME (
- echo Error: JAVA_HOME is not defined.
- exit /b
-)
-
-if not defined JAVACMD (
- set JAVACMD="%JAVA_HOME%\bin\java.exe"
-)
-
-if not exist %JAVACMD% (
- echo Error: %JAVACMD% not found
- exit /b
-)
-
-set IDP_HOME_WINDOWS=%~dp0..
-
-for /f "tokens=* USEBACKQ" %%F in (`type %~dp0..\jetty-base\jetty.base.linux`) do (
-SET IDP_HOME_UNIX=%%F
-)
-
-if not defined JETTY_HOME (
- set JETTY_HOME=%IDP_HOME_WINDOWS%\jetty-home
-)
-
-if not defined JETTY_BASE (
- set JETTY_BASE=%IDP_HOME_WINDOWS%\jetty-base
-)
-
-if not exist "%JETTY_HOME%\start.jar" (
- echo Error: JETTY_HOME does not point to a valid Jetty Installation
- exit /b
-)
-
-if not exist "%JETTY_BASE%\start.d" (
- echo Error: JETTY_BASE does not point to a Jetty Base
- exit /b
-)
-
-set JVM_ARGS=-Didp.home="%IDP_HOME_UNIX%" -Djdk.tls.ephemeralDHKeySize=2048 -Dorg.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.Slf4jLog -Djava.io.tmpdir="%JETTY_BASE%/tmp" -XX:+UseG1GC
-
-
-SET JETTY_ARGS=jetty.base="%JETTY_BASE%" jetty.logging.dir="%IDP_HOME_WINDOWS%\logs"
-
-%JAVACMD% %JAVA_OPTS% -jar "%JETTY_HOME%/start.jar" %JVM_ARGS% %JETTY_ARGS% %*
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/runjetty.sh b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/runjetty.sh
deleted file mode 100644
index 598719c..0000000
--- a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/runjetty.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env bash
-
-declare JAVACMD
-declare LOCATION
-declare IDP_HOME
-declare JETTY_HOME
-declare JETTY_BASE
-
-declare JVM_ARGS
-declare JETTY_ARGS
-
-LOCATION=$(dirname $0)
-
-if [ -z "$JAVACMD" ] ; then
- if [ -n "$JAVA_HOME" ] ; then
- JAVACMD=$JAVA_HOME/bin/java
- else
- JAVACMD=$(which java)
- fi
-fi
-
-if [ ! -x "$JAVACMD" ] ; then
- echo "Error: JAVA_HOME is not defined correctly."
- echo " We cannot execute $JAVACMD"
- exit 1
-fi
-
-IDP_HOME=$(realpath ${LOCATION}/..)
-
-JETTY_HOME=$LOCATION/../jetty-home
-if [ ! -e "$JETTY_HOME/start.jar" ] ; then
- echo "Error: JETTY_HOME is not defined correctly."
- echo " $JETTY_HOME/start.jar not found"
- exit 1
-fi
-
-JETTY_BASE=$LOCATION/../jetty-base
-if [ ! -d "$JETTY_BASE/start.d" ] ; then
- echo "Error: JETTY_BASE is not defined correctly."
- echo " $JETTY_BASE/start.d not found"
- exit 1
-fi
-
-JVM_ARGS="-Didp.home=$IDP_HOME -Djdk.tls.ephemeralDHKeySize=2048 -Dorg.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.Slf4jLog -Djava.io.tmpdir=$JETTY_BASE/tmp -XX:+UseG1GC"
-
-JETTY_ARGS="jetty.base=$JETTY_BASE jetty.logging.dir=$IDP_HOME/logs"
-
-$JAVACMD $JAVA_OPTS '-jar' $JETTY_HOME/start.jar $JVM_ARGS $JETTY_ARGS "$@"
-
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jetty/plugin.properties b/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jetty/plugin.properties
deleted file mode 100644
index 18d7934..0000000
--- a/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jetty/plugin.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-# Properties defining this plugin
-
-plugin.id = net.shibboleth.idp.plugin.jetty
-# Only used when package manifest is not available
-plugin.version = 5.12018.0
-plugin.license =
-
-plugin.package.1.source=packages/jetty-home.tar.gz
-plugin.package.1.destination=jetty-home
-
-plugin.package.2.source=packages/logback.tar.gz
-plugin.package.2.destination=jetty-base/lib/logging
-
-plugin.package.3.source=packages/procrun.zip
-plugin.package.3.destination=shibd_idp
-plugin.package.3.stripTopLevelDir=false
-plugin.package.3.nonwindows=false
-
-# No prereqs
-#plugin.modules.required =
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list