[java-shib-shared] branch main updated: Move Velocity Spring classes to new module.
Scott Cantor
cantor.2 at osu.edu
Tue Sep 6 19:22:37 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-shib-shared.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-shared.git;a=commit;h=ec2d6169d6079869c434e6517a47060eec14eea3
The following commit(s) were added to refs/heads/main by this push:
new ec2d6169 Move Velocity Spring classes to new module.
ec2d6169 is described below
commit ec2d6169d6079869c434e6517a47060eec14eea3
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Sep 6 15:22:34 2022 -0400
Move Velocity Spring classes to new module.
---
pom.xml | 1 +
shib-shared-bom/pom.xml | 5 ++
shib-spring/pom.xml | 7 --
shib-velocity-spring/.check-m2 | 1 +
shib-velocity-spring/.checkstyle | 15 ++++
shib-velocity-spring/.gitignore | 21 ++++++
shib-velocity-spring/pom.xml | 79 ++++++++++++++++++++++
.../ext/spring/velocity/SpringResourceLoader.java | 0
.../ext/spring/velocity/VelocityConfig.java | 0
.../ext/spring/velocity/VelocityConfigurer.java | 0
.../ext/spring/velocity/VelocityEngineFactory.java | 0
.../spring/velocity/VelocityEngineFactoryBean.java | 0
.../ext/spring/velocity/VelocityView.java | 0
.../ext/spring/velocity/VelocityViewResolver.java | 0
.../ext/spring/velocity/package-info.java | 0
15 files changed, 122 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index ef8ecc52..f7c8269a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,6 +32,7 @@
<module>shib-service</module>
<module>shib-testing</module>
<module>shib-velocity</module>
+ <module>shib-velocity-spring</module>
</modules>
<properties>
diff --git a/shib-shared-bom/pom.xml b/shib-shared-bom/pom.xml
index 79fa5441..c97cff81 100644
--- a/shib-shared-bom/pom.xml
+++ b/shib-shared-bom/pom.xml
@@ -47,6 +47,11 @@
<artifactId>shib-velocity</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shib-velocity-spring</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/shib-spring/pom.xml b/shib-spring/pom.xml
index 696d94fb..796bfeca 100644
--- a/shib-spring/pom.xml
+++ b/shib-spring/pom.xml
@@ -39,13 +39,6 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-cache</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-engine-core</artifactId>
- <!-- Required for Velocity Spring integration code. -->
- <optional>true</optional>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/shib-velocity-spring/.check-m2 b/shib-velocity-spring/.check-m2
new file mode 100644
index 00000000..048849a0
--- /dev/null
+++ b/shib-velocity-spring/.check-m2
@@ -0,0 +1 @@
+This file provokes a signature check of the maven repository unless overridden by the no-check-m2 property.
\ No newline at end of file
diff --git a/shib-velocity-spring/.checkstyle b/shib-velocity-spring/.checkstyle
new file mode 100644
index 00000000..186d7f35
--- /dev/null
+++ b/shib-velocity-spring/.checkstyle
@@ -0,0 +1,15 @@
+<?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="/java-shib-shared/resources/checkstyle/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/shib-velocity-spring/.gitignore b/shib-velocity-spring/.gitignore
new file mode 100644
index 00000000..d8e6f876
--- /dev/null
+++ b/shib-velocity-spring/.gitignore
@@ -0,0 +1,21 @@
+# A simulation of Subversion default ignores, generated by reposurgeon.
+*.o
+*.lo
+*.la
+*.al
+*.libs
+*.so
+*.so.[0-9]*
+*.a
+*.pyc
+*.pyo
+*.rej
+*.iml
+*~
+*.#*
+.*.swp
+.DS_store
+# Simulated Subversion default ignores end here
+# The contents of the svn:ignore property on the branch root.
+/test-output
+/target
diff --git a/shib-velocity-spring/pom.xml b/shib-velocity-spring/pom.xml
new file mode 100644
index 00000000..50a6761d
--- /dev/null
+++ b/shib-velocity-spring/pom.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>net.shibboleth</groupId>
+ <artifactId>shib-shared-parent</artifactId>
+ <version>9.0.0-SNAPSHOT</version>
+ </parent>
+
+ <name>Shibboleth Shared :: Velocity Spring Support</name>
+ <artifactId>shib-velocity-spring</artifactId>
+ <packaging>jar</packaging>
+
+ <properties>
+ <automatic.module.name>net.shibboleth.spring.velocity</automatic.module.name>
+ <checkstyle.configLocation>${project.basedir}/../resources/checkstyle/checkstyle.xml</checkstyle.configLocation>
+ </properties>
+
+ <dependencies>
+ <!-- Compile Dependencies -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shib-support</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shib-spring</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-beans</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ </dependency>
+
+ <!-- Provided dependencies -->
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Runtime Dependencies -->
+
+ <!-- Test Dependencies -->
+ </dependencies>
+
+ <scm>
+ <connection>${shibboleth.scm.connection}java-shib-shared</connection>
+ <developerConnection>${shibboleth.scm.developerConnection}java-shib-shared</developerConnection>
+ <url>${shibboleth.scm.url}java-shib-shared.git</url>
+ </scm>
+
+ <distributionManagement>
+ <site>
+ <id>site</id>
+ <url>scp:${shared-module.site.url}</url>
+ </site>
+ </distributionManagement>
+
+</project>
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/velocity/SpringResourceLoader.java b/shib-velocity-spring/src/main/java/net/shibboleth/ext/spring/velocity/SpringResourceLoader.java
similarity index 100%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/velocity/SpringResourceLoader.java
rename to shib-velocity-spring/src/main/java/net/shibboleth/ext/spring/velocity/SpringResourceLoader.java
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/velocity/VelocityConfig.java b/shib-velocity-spring/src/main/java/net/shibboleth/ext/spring/velocity/VelocityConfig.java
similarity index 100%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/velocity/VelocityConfig.java
rename to shib-velocity-spring/src/main/java/net/shibboleth/ext/spring/velocity/VelocityConfig.java
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/velocity/VelocityConfigurer.java b/shib-velocity-spring/src/main/java/net/shibboleth/ext/spring/velocity/VelocityConfigurer.java
similarity index 100%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/velocity/VelocityConfigurer.java
rename to shib-velocity-spring/src/main/java/net/shibboleth/ext/spring/velocity/VelocityConfigurer.java
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/velocity/VelocityEngineFactory.java b/shib-velocity-spring/src/main/java/net/shibboleth/ext/spring/velocity/VelocityEngineFactory.java
similarity index 100%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/velocity/VelocityEngineFactory.java
rename to shib-velocity-spring/src/main/java/net/shibboleth/ext/spring/velocity/VelocityEngineFactory.java
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/velocity/VelocityEngineFactoryBean.java b/shib-velocity-spring/src/main/java/net/shibboleth/ext/spring/velocity/VelocityEngineFactoryBean.java
similarity index 100%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/velocity/VelocityEngineFactoryBean.java
rename to shib-velocity-spring/src/main/java/net/shibboleth/ext/spring/velocity/VelocityEngineFactoryBean.java
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/velocity/VelocityView.java b/shib-velocity-spring/src/main/java/net/shibboleth/ext/spring/velocity/VelocityView.java
similarity index 100%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/velocity/VelocityView.java
rename to shib-velocity-spring/src/main/java/net/shibboleth/ext/spring/velocity/VelocityView.java
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/velocity/VelocityViewResolver.java b/shib-velocity-spring/src/main/java/net/shibboleth/ext/spring/velocity/VelocityViewResolver.java
similarity index 100%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/velocity/VelocityViewResolver.java
rename to shib-velocity-spring/src/main/java/net/shibboleth/ext/spring/velocity/VelocityViewResolver.java
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/velocity/package-info.java b/shib-velocity-spring/src/main/java/net/shibboleth/ext/spring/velocity/package-info.java
similarity index 100%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/velocity/package-info.java
rename to shib-velocity-spring/src/main/java/net/shibboleth/ext/spring/velocity/package-info.java
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list