[java-idp-tomcat-base] 04/10: Simplify project layout
Tom Zeller
tzeller at dragonacea.biz
Tue Aug 8 12:44:09 UTC 2023
This is an automated email from the git hooks/post-receive script.
tzeller pushed a commit to branch 10.1
in repository java-idp-tomcat-base.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-tomcat-base.git;a=commit;h=ebe2ca75ff9acc5a06b043a9f3203a018e68bfbf
commit ebe2ca75ff9acc5a06b043a9f3203a018e68bfbf
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Tue Jul 25 11:22:41 2023 -0500
Simplify project layout
---
.checkstyle | 15 ---
.classpath | 24 -----
.project | 8 --
.settings/org.eclipse.core.resources.prefs | 2 -
checkstyle.xml | 109 ---------------------
src/main/assembly/tgz.xml => pom-assembly-tgz.xml | 6 +-
src/main/assembly/zip.xml => pom-assembly-zip.xml | 20 +---
pom.xml | 46 +--------
src/site/site.xml | 11 ---
src/test/resources/logback-test.xml | 17 ----
.../tomcat-base => tomcat-base}/bin/setenv.bat | 0
.../tomcat-base => tomcat-base}/bin/setenv.sh | 0
.../tomcat-base => tomcat-base}/conf/.gitkeep | 0
.../conf/Catalina/localhost/idp.xml | 0
.../conf/catalina.policy | 0
.../conf/catalina.properties | 0
.../tomcat-base => tomcat-base}/conf/context.xml | 0
.../conf/jaspic-providers.xml | 0
.../conf/jaspic-providers.xsd | 0
.../conf/logging.properties | 0
.../tomcat-base => tomcat-base}/conf/server.xml | 0
.../conf/tomcat-users.xml | 0
.../conf/tomcat-users.xsd | 0
.../tomcat-base => tomcat-base}/conf/web.xml | 0
.../credentials/.gitkeep | 0
.../lib-extras/trustany-ssl-1.0.0.jar | Bin
.../tomcat-base => tomcat-base}/lib/.gitkeep | 0
.../lib/jakarta.servlet.jsp.jstl-3.0.1.jar | Bin
.../lib/jakarta.servlet.jsp.jstl-api-3.0.0.jar | Bin
.../tomcat-base => tomcat-base}/logs/.gitkeep | 0
.../tomcat-base => tomcat-base}/temp/.gitkeep | 0
.../webapps/ROOT/.gitkeep | 0
.../tomcat-base => tomcat-base}/work/.gitkeep | 0
33 files changed, 9 insertions(+), 249 deletions(-)
diff --git a/.checkstyle b/.checkstyle
deleted file mode 100644
index 5ef9989..0000000
--- a/.checkstyle
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
-
- <local-check-config name="Shibboleth Checkstyle" location="checkstyle.xml" type="project" description="">
- <additional-data name="cache-file" value="true"/>
- <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
- <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
- </local-check-config>
-
- <fileset name="main source" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
- <file-match-pattern match-pattern="src/main/java/.*\.java$" include-pattern="true"/>
- </fileset>
-
-</fileset-config>
diff --git a/.classpath b/.classpath
deleted file mode 100644
index df47484..0000000
--- a/.classpath
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/.project b/.project
index 9b4a332..41503ff 100644
--- a/.project
+++ b/.project
@@ -5,19 +5,11 @@
<projects>
</projects>
<buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- <buildCommand>
- <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
- </buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
</buildCommand>
</buildSpec>
<natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
\ No newline at end of file
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index 609d3ca..99f26c0 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,2 @@
eclipse.preferences.version=1
-encoding//src/main/resources=UTF-8
-encoding//src/test/resources=UTF-8
encoding/<project>=UTF-8
diff --git a/checkstyle.xml b/checkstyle.xml
deleted file mode 100644
index 5565264..0000000
--- a/checkstyle.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-
-<!--
- This configuration file was written by the eclipse-cs plugin configuration editor
--->
-<!--
- Checkstyle-Configuration: Shibboleth Checkstyle
- Description: none
--->
-<module name="Checker">
- <property name="severity" value="warning"/>
- <module name="TreeWalker">
- <module name="FileContentsHolder"/>
- <property name="tabWidth" value="4"/>
- <module name="JavadocMethod">
- <property name="allowThrowsTagsForSubclasses" value="true"/>
- <property name="allowUndeclaredRTE" value="true"/>
- </module>
- <module name="JavadocType">
- <property name="allowUnknownTags" value="true"/>
- </module>
- <module name="JavadocVariable"/>
- <module name="JavadocStyle">
- <property name="checkEmptyJavadoc" value="true"/>
- </module>
- <module name="ConstantName"/>
- <module name="LocalFinalVariableName"/>
- <module name="LocalVariableName"/>
- <module name="MemberName"/>
- <module name="MethodName"/>
- <module name="PackageName"/>
- <module name="ParameterName"/>
- <module name="StaticVariableName"/>
- <module name="TypeName"/>
- <module name="AvoidStarImport"/>
- <module name="IllegalImport"/>
- <module name="RedundantImport"/>
- <module name="UnusedImports"/>
- <module name="LineLength">
- <property name="max" value="120"/>
- </module>
- <module name="MethodLength">
- <property name="max" value="70"/>
- </module>
- <module name="ParameterNumber">
- <property name="max" value="5"/>
- </module>
- <module name="EmptyForIteratorPad"/>
- <module name="MethodParamPad"/>
- <module name="ModifierOrder"/>
- <module name="AvoidNestedBlocks"/>
- <module name="LeftCurly"/>
- <module name="NeedBraces"/>
- <module name="RightCurly"/>
- <module name="EmptyStatement"/>
- <module name="EqualsHashCode"/>
- <module name="HiddenField"/>
- <module name="IllegalInstantiation"/>
- <module name="InnerAssignment"/>
- <module name="MissingSwitchDefault"/>
- <module name="SimplifyBooleanExpression"/>
- <module name="SimplifyBooleanReturn"/>
- <module name="FinalClass"/>
- <module name="HideUtilityClassConstructor"/>
- <module name="VisibilityModifier"/>
- <module name="ArrayTypeStyle"/>
- <module name="UpperEll"/>
- <module name="AnonInnerLength"/>
- <module name="EmptyForInitializerPad"/>
- <module name="CovariantEquals"/>
- <module name="DefaultComesLast"/>
- <module name="DeclarationOrder"/>
- <module name="ExplicitInitialization"/>
- <module name="FallThrough"/>
- <module name="IllegalThrows"/>
- <module name="MultipleVariableDeclarations"/>
- <module name="PackageDeclaration"/>
- <module name="ParameterAssignment"/>
- <module name="ReturnCount">
- <property name="max" value="8"/>
- </module>
- <module name="StringLiteralEquality"/>
- <module name="SuperFinalize"/>
- <module name="ArrayTrailingComma"/>
- <module name="UnnecessaryParentheses"/>
- <module name="MutableException"/>
- <module name="ThrowsCount">
- <property name="max" value="3"/>
- </module>
- <module name="CyclomaticComplexity"/>
- <module name="TrailingComment"/>
- <module name="EqualsAvoidNull"/>
- <module name="ModifiedControlVariable"/>
- </module>
- <module name="SuppressionCommentFilter">
- <property name="offCommentFormat" value="\bCheck[Ss]tyle:\s*([\w|]+)\s+OFF\b"/>
- <property name="onCommentFormat" value="\bCheck[Ss]tyle:\s*([\w|]+)\s+ON\b"/>
- <property name="checkFormat" value="$1"/>
- </module>
- <module name="FileTabCharacter"/>
- <module name="FileLength">
- <property name="max" value="1000"/>
- </module>
- <module name="Header">
- <property name="header" value="/*\n * Licensed to the University Corporation for Advanced Internet Development, \n * Inc. (UCAID) under one or more contributor license agreements. See the \n * NOTICE file distributed with this work for additional information regarding\n * copyright ownership. The UCAID licenses this file to You under the Apache \n * License, Version 2.0 (the "License"); you may not use this file except in \n * compliance with the License. You may obtain a [...]
- </module>
- <module name="JavadocPackage"/>
-</module>
\ No newline at end of file
diff --git a/src/main/assembly/tgz.xml b/pom-assembly-tgz.xml
similarity index 82%
rename from src/main/assembly/tgz.xml
rename to pom-assembly-tgz.xml
index e48d2b9..a018653 100644
--- a/src/main/assembly/tgz.xml
+++ b/pom-assembly-tgz.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
- <id>assembly-tgz</id>
+ <id>tgz</id>
<formats>
- <format>tar.gz</format>
+ <format>tgz</format>
</formats>
<fileSets>
<fileSet>
- <directory>${assemblyDirectory}</directory>
+ <directory>tomcat-base</directory>
<outputDirectory></outputDirectory>
</fileSet>
</fileSets>
diff --git a/src/main/assembly/zip.xml b/pom-assembly-zip.xml
similarity index 53%
rename from src/main/assembly/zip.xml
rename to pom-assembly-zip.xml
index 7c57005..807d0c6 100644
--- a/src/main/assembly/zip.xml
+++ b/pom-assembly-zip.xml
@@ -1,35 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
- <id>assembly-zip</id>
+ <id>zip</id>
<formats>
<format>zip</format>
</formats>
<fileSets>
<fileSet>
- <directory>${assemblyDirectory}</directory>
+ <directory>tomcat-base</directory>
<outputDirectory></outputDirectory>
<excludes>
- <exclude>**/*.bat*</exclude>
- <exclude>**/*.config*</exclude>
- <exclude>**/*.ini*</exclude>
- <exclude>**/*.properties*</exclude>
- <exclude>**/*.txt*</exclude>
- <exclude>**/*.vm*</exclude>
- <exclude>**/*.xml*</exclude>
+ <exclude>**/*</exclude>
</excludes>
</fileSet>
<fileSet>
<directory>${assemblyDirectory}</directory>
<outputDirectory></outputDirectory>
<includes>
- <include>**/*.bat*</include>
- <include>**/*.config*</include>
- <include>**/*.ini*</include>
- <include>**/*.properties*</include>
- <include>**/*.txt*</include>
- <include>**/*.vm*</include>
- <include>**/*.xml*</include>
+ <include>**/*</include>
</includes>
<lineEnding>windows</lineEnding>
</fileSet>
diff --git a/pom.xml b/pom.xml
index f1d7f31..2bee11b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,58 +16,16 @@
<packaging>pom</packaging>
<version>10.1.0-SNAPSHOT</version>
- <properties>
- <assemblyDirectory>${project.build.directory}/idp-tomcat-base</assemblyDirectory>
- </properties>
-
- <dependencies>
- <!-- Compile Dependencies -->
-
- <!-- Provided Dependencies -->
-
- <!-- Runtime Dependencies -->
-
- <!-- Test Dependencies -->
-
- <!-- Managed Dependencies -->
- </dependencies>
-
<build>
<plugins>
- <!-- Copy src/main/resources to assembly directory. -->
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-resources</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <includeEmptyDirs>true</includeEmptyDirs>
- <outputDirectory>${assemblyDirectory}</outputDirectory>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- <excludes>
- <exclude>**/.gitkeep</exclude>
- </excludes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- Assemble -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
- <descriptor>src/main/assembly/tgz.xml</descriptor>
- <descriptor>src/main/assembly/zip.xml</descriptor>
+ <descriptor>pom-assembly-tgz.xml</descriptor>
+ <descriptor>pom-assembly-zip.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
diff --git a/src/site/site.xml b/src/site/site.xml
deleted file mode 100644
index 8068292..0000000
--- a/src/site/site.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd">
-
- <publishDate position="navigation-bottom" />
-
- <body>
- <menu ref="reports" />
- </body>
-
-</project>
\ No newline at end of file
diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
deleted file mode 100644
index f3280e5..0000000
--- a/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<configuration>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <pattern>%level [%logger:%line] - %msg%n</pattern>
- <charset>UTF-8</charset>
- </encoder>
- </appender>
-
- <root>
- <level value="warn" />
- <appender-ref ref="STDOUT" />
- </root>
-
-</configuration>
\ No newline at end of file
diff --git a/src/main/resources/tomcat-base/bin/setenv.bat b/tomcat-base/bin/setenv.bat
similarity index 100%
rename from src/main/resources/tomcat-base/bin/setenv.bat
rename to tomcat-base/bin/setenv.bat
diff --git a/src/main/resources/tomcat-base/bin/setenv.sh b/tomcat-base/bin/setenv.sh
similarity index 100%
rename from src/main/resources/tomcat-base/bin/setenv.sh
rename to tomcat-base/bin/setenv.sh
diff --git a/src/main/resources/tomcat-base/conf/.gitkeep b/tomcat-base/conf/.gitkeep
similarity index 100%
rename from src/main/resources/tomcat-base/conf/.gitkeep
rename to tomcat-base/conf/.gitkeep
diff --git a/src/main/resources/tomcat-base/conf/Catalina/localhost/idp.xml b/tomcat-base/conf/Catalina/localhost/idp.xml
similarity index 100%
rename from src/main/resources/tomcat-base/conf/Catalina/localhost/idp.xml
rename to tomcat-base/conf/Catalina/localhost/idp.xml
diff --git a/src/main/resources/tomcat-base/conf/catalina.policy b/tomcat-base/conf/catalina.policy
similarity index 100%
rename from src/main/resources/tomcat-base/conf/catalina.policy
rename to tomcat-base/conf/catalina.policy
diff --git a/src/main/resources/tomcat-base/conf/catalina.properties b/tomcat-base/conf/catalina.properties
similarity index 100%
rename from src/main/resources/tomcat-base/conf/catalina.properties
rename to tomcat-base/conf/catalina.properties
diff --git a/src/main/resources/tomcat-base/conf/context.xml b/tomcat-base/conf/context.xml
similarity index 100%
rename from src/main/resources/tomcat-base/conf/context.xml
rename to tomcat-base/conf/context.xml
diff --git a/src/main/resources/tomcat-base/conf/jaspic-providers.xml b/tomcat-base/conf/jaspic-providers.xml
similarity index 100%
rename from src/main/resources/tomcat-base/conf/jaspic-providers.xml
rename to tomcat-base/conf/jaspic-providers.xml
diff --git a/src/main/resources/tomcat-base/conf/jaspic-providers.xsd b/tomcat-base/conf/jaspic-providers.xsd
similarity index 100%
rename from src/main/resources/tomcat-base/conf/jaspic-providers.xsd
rename to tomcat-base/conf/jaspic-providers.xsd
diff --git a/src/main/resources/tomcat-base/conf/logging.properties b/tomcat-base/conf/logging.properties
similarity index 100%
rename from src/main/resources/tomcat-base/conf/logging.properties
rename to tomcat-base/conf/logging.properties
diff --git a/src/main/resources/tomcat-base/conf/server.xml b/tomcat-base/conf/server.xml
similarity index 100%
rename from src/main/resources/tomcat-base/conf/server.xml
rename to tomcat-base/conf/server.xml
diff --git a/src/main/resources/tomcat-base/conf/tomcat-users.xml b/tomcat-base/conf/tomcat-users.xml
similarity index 100%
rename from src/main/resources/tomcat-base/conf/tomcat-users.xml
rename to tomcat-base/conf/tomcat-users.xml
diff --git a/src/main/resources/tomcat-base/conf/tomcat-users.xsd b/tomcat-base/conf/tomcat-users.xsd
similarity index 100%
rename from src/main/resources/tomcat-base/conf/tomcat-users.xsd
rename to tomcat-base/conf/tomcat-users.xsd
diff --git a/src/main/resources/tomcat-base/conf/web.xml b/tomcat-base/conf/web.xml
similarity index 100%
rename from src/main/resources/tomcat-base/conf/web.xml
rename to tomcat-base/conf/web.xml
diff --git a/src/main/resources/tomcat-base/credentials/.gitkeep b/tomcat-base/credentials/.gitkeep
similarity index 100%
rename from src/main/resources/tomcat-base/credentials/.gitkeep
rename to tomcat-base/credentials/.gitkeep
diff --git a/src/main/resources/tomcat-base/lib-extras/trustany-ssl-1.0.0.jar b/tomcat-base/lib-extras/trustany-ssl-1.0.0.jar
similarity index 100%
rename from src/main/resources/tomcat-base/lib-extras/trustany-ssl-1.0.0.jar
rename to tomcat-base/lib-extras/trustany-ssl-1.0.0.jar
diff --git a/src/main/resources/tomcat-base/lib/.gitkeep b/tomcat-base/lib/.gitkeep
similarity index 100%
rename from src/main/resources/tomcat-base/lib/.gitkeep
rename to tomcat-base/lib/.gitkeep
diff --git a/src/main/resources/tomcat-base/lib/jakarta.servlet.jsp.jstl-3.0.1.jar b/tomcat-base/lib/jakarta.servlet.jsp.jstl-3.0.1.jar
similarity index 100%
rename from src/main/resources/tomcat-base/lib/jakarta.servlet.jsp.jstl-3.0.1.jar
rename to tomcat-base/lib/jakarta.servlet.jsp.jstl-3.0.1.jar
diff --git a/src/main/resources/tomcat-base/lib/jakarta.servlet.jsp.jstl-api-3.0.0.jar b/tomcat-base/lib/jakarta.servlet.jsp.jstl-api-3.0.0.jar
similarity index 100%
rename from src/main/resources/tomcat-base/lib/jakarta.servlet.jsp.jstl-api-3.0.0.jar
rename to tomcat-base/lib/jakarta.servlet.jsp.jstl-api-3.0.0.jar
diff --git a/src/main/resources/tomcat-base/logs/.gitkeep b/tomcat-base/logs/.gitkeep
similarity index 100%
rename from src/main/resources/tomcat-base/logs/.gitkeep
rename to tomcat-base/logs/.gitkeep
diff --git a/src/main/resources/tomcat-base/temp/.gitkeep b/tomcat-base/temp/.gitkeep
similarity index 100%
rename from src/main/resources/tomcat-base/temp/.gitkeep
rename to tomcat-base/temp/.gitkeep
diff --git a/src/main/resources/tomcat-base/webapps/ROOT/.gitkeep b/tomcat-base/webapps/ROOT/.gitkeep
similarity index 100%
rename from src/main/resources/tomcat-base/webapps/ROOT/.gitkeep
rename to tomcat-base/webapps/ROOT/.gitkeep
diff --git a/src/main/resources/tomcat-base/work/.gitkeep b/tomcat-base/work/.gitkeep
similarity index 100%
rename from src/main/resources/tomcat-base/work/.gitkeep
rename to tomcat-base/work/.gitkeep
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list