Skip to content

Commit 8cf00de

Browse files
ibuildthecloudibuildthecloud
committed
Configuration to enable Spring Modularization
All of the code changes for the Spring Modularization will work in a modularized context or a non-modularized context. This commit is the final commit to turn modularization on. Revert this commit to disable the modularization and go back to monolithic Spring configuration.
1 parent 6718642 commit 8cf00de

10 files changed

Lines changed: 46 additions & 2026 deletions

File tree

‎client/WEB-INF/web.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
</listener>
3030

3131
<listener>
32-
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
32+
<listener-class>org.apache.cloudstack.spring.module.web.CloudStackContextLoaderListener</listener-class>
3333
</listener>
34-
<context-param>
34+
<context-param>
3535
<param-name>contextConfigLocation</param-name>
36-
<param-value>classpath:applicationContext.xml, classpath:componentContext.xml</param-value>
36+
<param-value>classpath:META-INF/cloudstack/webApplicationContext.xml</param-value>
3737
</context-param>
3838

3939
<servlet>

‎client/pom.xml‎

Lines changed: 25 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,16 @@
2020
<version>4.3.0-SNAPSHOT</version>
2121
</parent>
2222
<dependencies>
23+
<dependency>
24+
<groupId>org.apache.cloudstack</groupId>
25+
<artifactId>cloud-framework-spring-module</artifactId>
26+
<version>${project.version}</version>
27+
</dependency>
28+
<dependency>
29+
<groupId>org.apache.cloudstack</groupId>
30+
<artifactId>cloud-framework-spring-lifecycle</artifactId>
31+
<version>${project.version}</version>
32+
</dependency>
2333
<dependency>
2434
<groupId>org.apache.cloudstack</groupId>
2535
<artifactId>cloud-plugin-storage-volume-solidfire</artifactId>
@@ -467,21 +477,6 @@
467477
</target>
468478
</configuration>
469479
</execution>
470-
<execution>
471-
<id>process-simulator-context</id>
472-
<phase>process-resources</phase>
473-
<goals>
474-
<goal>run</goal>
475-
</goals>
476-
<configuration>
477-
<target if="${simulator}">
478-
<echo>test</echo>
479-
<replaceregexp file="${basedir}/target/generated-webapp/WEB-INF/web.xml"
480-
match="classpath:componentContext.xml"
481-
replace="classpath:simulatorComponentContext.xml" byline="true"/>
482-
</target>
483-
</configuration>
484-
</execution>
485480
<execution>
486481
<id>process-noredist-spring-context</id>
487482
<phase>process-resources</phase>
@@ -502,22 +497,6 @@
502497
</target>
503498
</configuration>
504499
</execution>
505-
<execution>
506-
<id>process-quickcloud-spring-context</id>
507-
<phase>process-resources</phase>
508-
<goals>
509-
<goal>run</goal>
510-
</goals>
511-
<configuration>
512-
<target if="${quickcloud}">
513-
<echo>quickcloud</echo>
514-
<replaceregexp
515-
file="${basedir}/target/generated-webapp/WEB-INF/classes/applicationContext.xml"
516-
match="com.cloud.consoleproxy.ConsoleProxyManagerImpl"
517-
replace="com.cloud.consoleproxy.StaticConsoleProxyManager" byline="true"/>
518-
</target>
519-
</configuration>
520-
</execution>
521500
</executions>
522501
</plugin>
523502
<!-- there are the jasypt libs requires by some of the python scripts -->
@@ -730,5 +709,20 @@
730709
</dependency>
731710
</dependencies>
732711
</profile>
712+
<profile>
713+
<id>quickcloud</id>
714+
<activation>
715+
<property>
716+
<name>quickcloud</name>
717+
</property>
718+
</activation>
719+
<dependencies>
720+
<dependency>
721+
<groupId>org.apache.cloudstack</groupId>
722+
<artifactId>cloud-quickcloud</artifactId>
723+
<version>${project.version}</version>
724+
</dependency>
725+
</dependencies>
726+
</profile>
733727
</profiles>
734728
</project>

‎client/tomcatconf/applicationContext.xml.in‎

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

0 commit comments

Comments
 (0)