[java-idp-jetty-base] 05/05: JJETTY-4 Rationalize file layout inside jetty-[base-]plugin-impl
Rod Widdowson
rdw at steadingsoftware.com
Fri Oct 25 12:35:25 UTC 2024
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=0f304153a05d162499d66af69e1347047f110823
commit 0f304153a05d162499d66af69e1347047f110823
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Oct 25 10:58:56 2024 +0100
JJETTY-4 Rationalize file layout inside jetty-[base-]plugin-impl
https://shibboleth.atlassian.net/browse/JJETTY-4
---
jetty-dist/src/main/assembly/plugin.xml | 2 +-
jetty-impl/pom.xml | 2 +-
.../jettybase => module/jetty}/JettyModule.java | 18 +-----------
.../jettybase => module/jetty}/package-info.java | 4 +--
.../plugin/{jettybase => jetty}/JettyPlugin.java | 3 +-
.../idp/plugin/{jettybase => jetty}/Version.java | 2 +-
.../plugin/{jettybase => jetty}/package-info.java | 4 +--
.../services/net.shibboleth.idp.module.IdPModule | 2 +-
.../services/net.shibboleth.idp.plugin.IdPPlugin | 2 +-
.../module => module/jetty}/config-jetty.bat | 0
.../jetty-base-windows/start.d/idp-system.ini | 0
.../jetty-base-windows/start.d/idp.ini-windows | 0
.../jetty}/jetty-base/credentials/.gitkeep | 0
.../jetty}/jetty-base/etc/idp-backchannel.xml | 0
.../jetty}/jetty-base/etc/jetty-requestlog.xml | 0
.../lib/idp-backchannel/jetty94-dta-ssl-1.0.0.jar | Bin
.../jetty}/jetty-base/logs/.gitkeep | 0
.../jetty}/jetty-base/modules/idp.mod | 0
.../jetty}/jetty-base/resources/logback.xml | 0
.../jetty}/jetty-base/start.d/custom.ini | 0
.../jetty}/jetty-base/start.d/idp.ini | 0
.../jetty}/jetty-base/static/index.html | 0
.../jetty}/jetty-base/tmp/.gitkeep | 0
.../jetty}/jetty-base/webapps/idp.xml | 0
.../jetty}/jetty-base/webapps/static.xml | 0
.../jettybase => module/jetty}/module.properties | 32 ++++++++++-----------
.../jettybase/module => module/jetty}/runjetty.bat | 0
.../jettybase/module => module/jetty}/runjetty.sh | 0
.../plugin/{jettybase => jetty}/plugin.properties | 0
jetty-packages/pom.xml | 2 +-
30 files changed, 29 insertions(+), 44 deletions(-)
diff --git a/jetty-dist/src/main/assembly/plugin.xml b/jetty-dist/src/main/assembly/plugin.xml
index 6211e7a..8bad9be 100644
--- a/jetty-dist/src/main/assembly/plugin.xml
+++ b/jetty-dist/src/main/assembly/plugin.xml
@@ -27,7 +27,7 @@
</fileSet>
<fileSet>
<!-- The properties file -->
- <directory>../jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/</directory>
+ <directory>../jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jetty/</directory>
<outputDirectory>bootstrap</outputDirectory>
<includes>
<include>plugin.properties</include>
diff --git a/jetty-impl/pom.xml b/jetty-impl/pom.xml
index 7d65437..6b564c7 100644
--- a/jetty-impl/pom.xml
+++ b/jetty-impl/pom.xml
@@ -111,7 +111,7 @@
<outputDirectory>${assemblyDirectory}</outputDirectory>
<resources>
<resource>
- <directory>${basedir}/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base</directory>
+ <directory>${basedir}/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base</directory>
<excludes>
<exclude>**/.gitkeep</exclude>
</excludes>
diff --git a/jetty-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/JettyModule.java b/jetty-impl/src/main/java/net/shibboleth/idp/module/jetty/JettyModule.java
similarity index 81%
rename from jetty-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/JettyModule.java
rename to jetty-impl/src/main/java/net/shibboleth/idp/module/jetty/JettyModule.java
index 3898d96..7ae119d 100644
--- a/jetty-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/JettyModule.java
+++ b/jetty-impl/src/main/java/net/shibboleth/idp/module/jetty/JettyModule.java
@@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.jettybase;
+package net.shibboleth.idp.module.jetty;
import java.io.File;
import java.io.IOException;
@@ -64,22 +64,6 @@ public class JettyModule extends PluginIdPModule {
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;
}
diff --git a/jetty-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/package-info.java b/jetty-impl/src/main/java/net/shibboleth/idp/module/jetty/package-info.java
similarity index 82%
copy from jetty-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/package-info.java
copy to jetty-impl/src/main/java/net/shibboleth/idp/module/jetty/package-info.java
index 5d3d849..edb2ee4 100644
--- a/jetty-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/package-info.java
+++ b/jetty-impl/src/main/java/net/shibboleth/idp/module/jetty/package-info.java
@@ -12,6 +12,6 @@
* limitations under the License.
*/
-/** Classes for working with JSR-223 scripting environments. */
+/** Classes for working the Jetty Module (included in the Jetty Plugin). */
-package net.shibboleth.idp.plugin.jettybase;
+package net.shibboleth.idp.module.jetty;
\ No newline at end of file
diff --git a/jetty-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/JettyPlugin.java b/jetty-impl/src/main/java/net/shibboleth/idp/plugin/jetty/JettyPlugin.java
similarity index 94%
rename from jetty-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/JettyPlugin.java
rename to jetty-impl/src/main/java/net/shibboleth/idp/plugin/jetty/JettyPlugin.java
index 0791dfe..340ab47 100644
--- a/jetty-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/JettyPlugin.java
+++ b/jetty-impl/src/main/java/net/shibboleth/idp/plugin/jetty/JettyPlugin.java
@@ -12,12 +12,13 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.jettybase;
+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;
diff --git a/jetty-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/Version.java b/jetty-impl/src/main/java/net/shibboleth/idp/plugin/jetty/Version.java
similarity index 96%
rename from jetty-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/Version.java
rename to jetty-impl/src/main/java/net/shibboleth/idp/plugin/jetty/Version.java
index 5f5c3de..9ddfbeb 100644
--- a/jetty-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/Version.java
+++ b/jetty-impl/src/main/java/net/shibboleth/idp/plugin/jetty/Version.java
@@ -12,7 +12,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.jettybase;
+package net.shibboleth.idp.plugin.jetty;
import javax.annotation.Nullable;
diff --git a/jetty-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/package-info.java b/jetty-impl/src/main/java/net/shibboleth/idp/plugin/jetty/package-info.java
similarity index 83%
rename from jetty-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/package-info.java
rename to jetty-impl/src/main/java/net/shibboleth/idp/plugin/jetty/package-info.java
index 5d3d849..cd308f3 100644
--- a/jetty-impl/src/main/java/net/shibboleth/idp/plugin/jettybase/package-info.java
+++ b/jetty-impl/src/main/java/net/shibboleth/idp/plugin/jetty/package-info.java
@@ -12,6 +12,6 @@
* limitations under the License.
*/
-/** Classes for working with JSR-223 scripting environments. */
+/** Classes for working the Jetty Plugin. */
-package net.shibboleth.idp.plugin.jettybase;
+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
index d063152..3314621 100644
--- 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
@@ -1 +1 @@
-net.shibboleth.idp.plugin.jettybase.JettyModule
\ No newline at end of file
+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
index cc1d497..a35ba71 100644
--- 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
@@ -1 +1 @@
-net.shibboleth.idp.plugin.jettybase.JettyPlugin
\ No newline at end of file
+net.shibboleth.idp.plugin.jetty.JettyPlugin
\ No newline at end of file
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/config-jetty.bat b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/config-jetty.bat
similarity index 100%
rename from jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/config-jetty.bat
rename to jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/config-jetty.bat
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base-windows/start.d/idp-system.ini b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base-windows/start.d/idp-system.ini
similarity index 100%
rename from jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base-windows/start.d/idp-system.ini
rename to jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base-windows/start.d/idp-system.ini
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base-windows/start.d/idp.ini-windows b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base-windows/start.d/idp.ini-windows
similarity index 100%
rename from jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base-windows/start.d/idp.ini-windows
rename to jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base-windows/start.d/idp.ini-windows
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/credentials/.gitkeep b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/credentials/.gitkeep
similarity index 100%
rename from jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/credentials/.gitkeep
rename to jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/credentials/.gitkeep
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/etc/idp-backchannel.xml b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/etc/idp-backchannel.xml
similarity index 100%
rename from jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/etc/idp-backchannel.xml
rename to jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/etc/idp-backchannel.xml
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/etc/jetty-requestlog.xml b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/etc/jetty-requestlog.xml
similarity index 100%
rename from jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/etc/jetty-requestlog.xml
rename to jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/etc/jetty-requestlog.xml
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/lib/idp-backchannel/jetty94-dta-ssl-1.0.0.jar b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/lib/idp-backchannel/jetty94-dta-ssl-1.0.0.jar
similarity index 100%
rename from jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/lib/idp-backchannel/jetty94-dta-ssl-1.0.0.jar
rename to jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/lib/idp-backchannel/jetty94-dta-ssl-1.0.0.jar
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/logs/.gitkeep b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/logs/.gitkeep
similarity index 100%
rename from jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/logs/.gitkeep
rename to jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/logs/.gitkeep
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/modules/idp.mod b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/modules/idp.mod
similarity index 100%
rename from jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/modules/idp.mod
rename to jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/modules/idp.mod
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/resources/logback.xml b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/resources/logback.xml
similarity index 100%
rename from jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/resources/logback.xml
rename to jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/resources/logback.xml
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/start.d/custom.ini b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/custom.ini
similarity index 100%
rename from jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/start.d/custom.ini
rename to jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/custom.ini
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/start.d/idp.ini b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/idp.ini
similarity index 100%
rename from jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/start.d/idp.ini
rename to jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/idp.ini
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/static/index.html b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/static/index.html
similarity index 100%
rename from jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/static/index.html
rename to jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/static/index.html
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/tmp/.gitkeep b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/tmp/.gitkeep
similarity index 100%
rename from jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/tmp/.gitkeep
rename to jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/tmp/.gitkeep
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/webapps/idp.xml b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/webapps/idp.xml
similarity index 100%
rename from jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/webapps/idp.xml
rename to jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/webapps/idp.xml
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/webapps/static.xml b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/webapps/static.xml
similarity index 100%
rename from jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/jetty-base/webapps/static.xml
rename to jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/webapps/static.xml
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module.properties b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/module.properties
similarity index 53%
rename from jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module.properties
rename to jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/module.properties
index 6c0b6ab..a551abb 100644
--- a/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module.properties
+++ b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/module.properties
@@ -1,78 +1,78 @@
# Properties defining this module.
# Class to Module ID mappings
-net.shibboleth.idp.plugin.jettybase.JettyModule = jetty.module
+net.shibboleth.idp.module.jetty.JettyModule = jetty.module
# Module Owner
-jetty.plugin = net.shibboleth.idp.plugin.jetty-base
+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/plugin/jettybase/module/jetty-base/etc/jetty-requestlog.xml
+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/plugin/jettybase/module/jetty-base/modules/idp.mod
+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/plugin/jettybase/module/jetty-base/resources/logback.xml
+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/plugin/jettybase/module/jetty-base/webapps/idp.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/plugin/jettybase/module/jetty-base/webapps/static.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/plugin/jettybase/module/jetty-base/static/index.html
+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/plugin/jettybase/module/jetty-base/start.d/custom.ini
+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/plugin/jettybase/module/jetty-base/start.d/idp.ini
+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/plugin/jettybase/module/jetty-base/start.d/idp.ini
+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/plugin/jettybase/module/jetty-base-windows/start.d/idp-system.ini
+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/plugin/jettybase/module/jetty-base-windows/start.d/idp.ini-windows
+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/plugin/jettybase/module/runjetty.bat
+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/plugin/jettybase/module/runjetty.sh
+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.13.src = /net/shibboleth/idp/plugin/jettybase/module/config-jetty.bat
+jetty.module.13.src = /net/shibboleth/idp/module/jetty/config-jetty.bat
jetty.module.13.dest = bin/config-jetty.bat
jetty.module.13.nonwindows = false
jetty.module.13.windows = true
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/runjetty.bat b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/runjetty.bat
similarity index 100%
rename from jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/runjetty.bat
rename to jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/runjetty.bat
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/runjetty.sh b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/runjetty.sh
similarity index 100%
rename from jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/runjetty.sh
rename to jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/runjetty.sh
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/plugin.properties b/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jetty/plugin.properties
similarity index 100%
rename from jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/plugin.properties
rename to jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jetty/plugin.properties
diff --git a/jetty-packages/pom.xml b/jetty-packages/pom.xml
index b4218a9..45ce800 100644
--- a/jetty-packages/pom.xml
+++ b/jetty-packages/pom.xml
@@ -26,7 +26,7 @@
<dependencies/>
<build>
- <!-- So the build is quite complex
+ <!-- So, the build is quite complex:
The impl project builds the jar file
This project builds three packages
process-resources - download the logback jars to a staging area
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list