Skip to content

Commit 8a5a16f

Browse files
author
Justin Richer
committed
refactored project into four modules:
Common Client Server Library Server Webapp addresses #367
1 parent bf3e003 commit 8a5a16f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+89
-68
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@ bin
88
.project
99
.settings
1010
.classpath
11+
/target
12+
.springBeans

openid-connect-client/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ bin
99
.settings
1010
.classpath
1111
/target
12+
.springBeans

openid-connect-client/.springBeans

Lines changed: 0 additions & 14 deletions
This file was deleted.

openid-connect-common/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@ bin
88
.project
99
.settings
1010
.classpath
11+
/target
12+
.springBeans
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
local-values.conf
2+
target
3+
*~
4+
bin
5+
*.idea
6+
*.iml
7+
*.eml
8+
.project
9+
.settings
10+
.classpath
11+
/target
12+
.springBeans

openid-connect-server-webapp/pom.xml

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
<?xml version="1.0"?>
2+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4+
<modelVersion>4.0.0</modelVersion>
5+
<parent>
6+
<groupId>org.mitre</groupId>
7+
<artifactId>openid-connect-parent</artifactId>
8+
<version>1.1.0-SNAPSHOT</version>
9+
</parent>
10+
<artifactId>openid-connect-server-webapp</artifactId>
11+
<packaging>war</packaging>
12+
<name>OpenID Connect Server Webapp</name>
13+
<build>
14+
<plugins>
15+
<plugin>
16+
<groupId>org.apache.maven.plugins</groupId>
17+
<artifactId>maven-compiler-plugin</artifactId>
18+
<configuration>
19+
<source>${java-version}</source>
20+
<target>${java-version}</target>
21+
</configuration>
22+
</plugin>
23+
<plugin>
24+
<groupId>org.apache.maven.plugins</groupId>
25+
<artifactId>maven-war-plugin</artifactId>
26+
<configuration>
27+
<warName>openid-connect-server-webapp</warName>
28+
<nonFilteredFileExtensions>
29+
<nonFilteredFileExtension>gif</nonFilteredFileExtension>
30+
<nonFilteredFileExtension>ico</nonFilteredFileExtension>
31+
<nonFilteredFileExtension>jpg</nonFilteredFileExtension>
32+
<nonFilteredFileExtension>png</nonFilteredFileExtension>
33+
<nonFilteredFileExtension>pdf</nonFilteredFileExtension>
34+
</nonFilteredFileExtensions>
35+
<webResources>
36+
<resource>
37+
<directory>src/main/webapp</directory>
38+
<filtering>true</filtering>
39+
</resource>
40+
</webResources>
41+
</configuration>
42+
</plugin>
43+
<plugin>
44+
<groupId>org.apache.maven.plugins</groupId>
45+
<artifactId>maven-dependency-plugin</artifactId>
46+
<executions>
47+
<execution>
48+
<id>install</id>
49+
<phase>install</phase>
50+
<goals>
51+
<goal>sources</goal>
52+
</goals>
53+
</execution>
54+
</executions>
55+
</plugin>
56+
</plugins>
57+
</build>
58+
<dependencies>
59+
<dependency>
60+
<groupId>org.mitre</groupId>
61+
<artifactId>openid-connect-server</artifactId>
62+
<version>1.1.0-SNAPSHOT</version>
63+
</dependency>
64+
</dependencies>
65+
</project>

openid-connect-server/src/main/webapp/WEB-INF/server-config.xml renamed to openid-connect-server-webapp/src/main/webapp/WEB-INF/server-config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.2.xsd">
3030

3131
<bean id="configBean" class="org.mitre.openid.connect.config.ConfigurationPropertiesBean">
32-
<property name="issuer" value="http://localhost:8080/openid-connect-server/" />
32+
<property name="issuer" value="http://localhost:8080/openid-connect-server-webapp/" />
3333
<property name="logoImageUrl" value="resources/images/openid_connect_small.png" />
3434
<property name="topbarTitle" value="OpenID Connect Server" />
3535
</bean>

openid-connect-server/pom.xml

Lines changed: 2 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
<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">
1919
<modelVersion>4.0.0</modelVersion>
2020
<artifactId>openid-connect-server</artifactId>
21-
<name>OpenID Connect Server</name>
22-
<packaging>war</packaging>
21+
<name>OpenID Connect Server Library</name>
2322
<parent>
2423
<groupId>org.mitre</groupId>
2524
<artifactId>openid-connect-parent</artifactId>
@@ -33,52 +32,6 @@
3332
<version>1.1.0-SNAPSHOT</version>
3433
</dependency>
3534
</dependencies>
36-
<description>Reference implementation of OpenID Connect spec (http://openid.net/connect/).
37-
</description>
35+
<description>OpenID Connect server libraries for Spring and Spring Security.</description>
3836
<url />
39-
<build>
40-
<plugins>
41-
<plugin>
42-
<groupId>org.apache.maven.plugins</groupId>
43-
<artifactId>maven-compiler-plugin</artifactId>
44-
<configuration>
45-
<source>${java-version}</source>
46-
<target>${java-version}</target>
47-
</configuration>
48-
</plugin>
49-
<plugin>
50-
<groupId>org.apache.maven.plugins</groupId>
51-
<artifactId>maven-war-plugin</artifactId>
52-
<configuration>
53-
<warName>openid-connect-server</warName>
54-
<nonFilteredFileExtensions>
55-
<nonFilteredFileExtension>gif</nonFilteredFileExtension>
56-
<nonFilteredFileExtension>ico</nonFilteredFileExtension>
57-
<nonFilteredFileExtension>jpg</nonFilteredFileExtension>
58-
<nonFilteredFileExtension>png</nonFilteredFileExtension>
59-
<nonFilteredFileExtension>pdf</nonFilteredFileExtension>
60-
</nonFilteredFileExtensions>
61-
<webResources>
62-
<resource>
63-
<directory>src/main/webapp</directory>
64-
<filtering>true</filtering>
65-
</resource>
66-
</webResources>
67-
</configuration>
68-
</plugin>
69-
<plugin>
70-
<groupId>org.apache.maven.plugins</groupId>
71-
<artifactId>maven-dependency-plugin</artifactId>
72-
<executions>
73-
<execution>
74-
<id>install</id>
75-
<phase>install</phase>
76-
<goals>
77-
<goal>sources</goal>
78-
</goals>
79-
</execution>
80-
</executions>
81-
</plugin>
82-
</plugins>
83-
</build>
8437
</project>

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1515
See the License for the specific language governing permissions and
1616
limitations under the License.
17-
-->
18-
<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">
17+
--><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">
1918
<modelVersion>4.0.0</modelVersion>
2019
<groupId>org.mitre</groupId>
2120
<artifactId>openid-connect-parent</artifactId>
@@ -39,7 +38,8 @@
3938
<module>openid-connect-common</module>
4039
<module>openid-connect-client</module>
4140
<module>openid-connect-server</module>
42-
</modules>
41+
<module>openid-connect-server-webapp</module>
42+
</modules>
4343

4444
<scm>
4545
<connection>scm:git:https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server.git</connection>
@@ -473,4 +473,4 @@
473473
</plugins>
474474
</reporting>
475475

476-
</project>
476+
</project>

0 commit comments

Comments
 (0)