Skip to content

MODCLUSTER-516 Move /container-spi module into /container/spi module #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 17, 2016
Merged

MODCLUSTER-516 Move /container-spi module into /container/spi module #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ Project Structure
-----------------

```
container-spi (contains no dependencies on a specific web container)
core
container
tomcat (base for Tomcat container implementations, based on Tomcat 7)
spi (contains no dependencies on a specific web container)
tomcat (base for Tomcat container implementations, based on Tomcat 7.0)
tomcat8 (Tomcat 8.0 container implementation)
tomcat85 (Tomcat 8.5 and 9.0 milestone container implementation)
core
demo
client
server
Expand Down
5 changes: 5 additions & 0 deletions container/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>spi</module>
<module>tomcat</module>
<module>tomcat8</module>
<module>tomcat85</module>
Expand All @@ -49,6 +50,7 @@
<activeByDefault>false</activeByDefault>
</activation>
<modules>
<module>spi</module>
<module>tomcat</module>
<module>tomcat85</module>
</modules>
Expand All @@ -59,6 +61,7 @@
<activeByDefault>false</activeByDefault>
</activation>
<modules>
<module>spi</module>
<module>tomcat</module>
<module>tomcat85</module>
</modules>
Expand All @@ -69,6 +72,7 @@
<activeByDefault>false</activeByDefault>
</activation>
<modules>
<module>spi</module>
<module>tomcat</module>
<module>tomcat8</module>
</modules>
Expand All @@ -79,6 +83,7 @@
<activeByDefault>false</activeByDefault>
</activation>
<modules>
<module>spi</module>
<module>tomcat</module>
</modules>
</profile>
Expand Down
2 changes: 1 addition & 1 deletion container-spi/pom.xml → container/spi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>mod_cluster-parent</artifactId>
<artifactId>mod_cluster-container</artifactId>
<groupId>org.jboss.mod_cluster</groupId>
<version>2.0.0.Alpha1-SNAPSHOT</version>
<relativePath>..</relativePath>
Expand Down
0 ...jboss/modcluster/container/Connector.java → ...jboss/modcluster/container/Connector.java
View file
Open in desktop
File renamed without changes.
0 ...ster/container/ContainerEventHandler.java → ...ster/container/ContainerEventHandler.java
View file
Open in desktop
File renamed without changes.
0 ...g/jboss/modcluster/container/Context.java → ...g/jboss/modcluster/container/Context.java
View file
Open in desktop
File renamed without changes.
0 ...rg/jboss/modcluster/container/Engine.java → ...rg/jboss/modcluster/container/Engine.java
View file
Open in desktop
File renamed without changes.
0 .../org/jboss/modcluster/container/Host.java → .../org/jboss/modcluster/container/Host.java
View file
Open in desktop
File renamed without changes.
0 ...rg/jboss/modcluster/container/Server.java → ...rg/jboss/modcluster/container/Server.java
View file
Open in desktop
File renamed without changes.
6 changes: 0 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>container-spi</module>
<module>core</module>
<module>container</module>
<module>demo</module>
Expand All @@ -195,7 +194,6 @@
<activeByDefault>false</activeByDefault>
</activation>
<modules>
<module>container-spi</module>
<module>core</module>
<module>container</module>
</modules>
Expand All @@ -206,7 +204,6 @@
<activeByDefault>false</activeByDefault>
</activation>
<modules>
<module>container-spi</module>
<module>core</module>
<module>container</module>
</modules>
Expand All @@ -217,7 +214,6 @@
<activeByDefault>false</activeByDefault>
</activation>
<modules>
<module>container-spi</module>
<module>core</module>
<module>container</module>
</modules>
Expand All @@ -228,7 +224,6 @@
<activeByDefault>false</activeByDefault>
</activation>
<modules>
<module>container-spi</module>
<module>core</module>
<module>container</module>
</modules>
Expand All @@ -239,7 +234,6 @@
<activeByDefault>false</activeByDefault>
</activation>
<modules>
<module>container-spi</module>
<module>core</module>
<module>container</module>
<module>demo</module>
Expand Down
2 changes: 1 addition & 1 deletion src/assembly/bin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

<!-- Container implementations -->
<fileSet>
<directory>container-spi/target/</directory>
<directory>container/spi/target/</directory>
<includes>
<include>*.jar</include>
</includes>
Expand Down