Skip to content

Commit e3280bd

Browse files
ibuildthecloudibuildthecloud
committed
Merge remote-tracking branch 'origin/spring-modularization'
Conflicts: client/tomcatconf/applicationContext.xml.in client/tomcatconf/nonossComponentContext.xml.in client/tomcatconf/simulatorComponentContext.xml.in framework/db/src/com/cloud/utils/db/Transaction.java plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java server/src/com/cloud/api/ApiServer.java server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
2 parents 80509f9 + d769a73 commit e3280bd

259 files changed

Lines changed: 8339 additions & 2150 deletions

File tree

Some content is hidden

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

‎api/resources/META-INF/cloudstack/api-planner/module.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
name=api-planner
2+
parent=planner

‎api/resources/META-INF/cloudstack/api-planner/spring-api-planner-context.xml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one
3+
or more contributor license agreements. See the NOTICE file
4+
distributed with this work for additional information
5+
regarding copyright ownership. The ASF licenses this file
6+
to you under the Apache License, Version 2.0 (the
7+
"License"); you may not use this file except in compliance
8+
with the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing,
13+
software distributed under the License is distributed on an
14+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
KIND, either express or implied. See the License for the
16+
specific language governing permissions and limitations
17+
under the License.
18+
-->
19+
<beans xmlns="http://www.springframework.org/schema/beans"
20+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xmlns:context="http://www.springframework.org/schema/context"
22+
xmlns:aop="http://www.springframework.org/schema/aop"
23+
xsi:schemaLocation="http://www.springframework.org/schema/beans
24+
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
25+
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
26+
http://www.springframework.org/schema/context
27+
http://www.springframework.org/schema/context/spring-context-3.0.xsd"
28+
>
29+
30+
<bean id="UserDispersingPlanner" class="com.cloud.deploy.UserDispersingPlanner">
31+
<property name="name" value="UserDispersingPlanner" />
32+
</bean>
33+
34+
</beans>

‎api/src/org/apache/cloudstack/context/CallContext.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ protected Stack<CallContext> initialValue() {
5757
private User user;
5858
private final Map<Object, Object> context = new HashMap<Object, Object>();
5959

60-
private static EntityManager s_entityMgr;
60+
static EntityManager s_entityMgr;
6161

6262
public static void init(EntityManager entityMgr) {
6363
s_entityMgr = entityMgr;

‎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/resources/META-INF/cloudstack/webApplicationContext.xml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one
3+
or more contributor license agreements. See the NOTICE file
4+
distributed with this work for additional information
5+
regarding copyright ownership. The ASF licenses this file
6+
to you under the Apache License, Version 2.0 (the
7+
"License"); you may not use this file except in compliance
8+
with the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing,
13+
software distributed under the License is distributed on an
14+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
KIND, either express or implied. See the License for the
16+
specific language governing permissions and limitations
17+
under the License.
18+
-->
19+
<beans xmlns="http://www.springframework.org/schema/beans"
20+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xmlns:context="http://www.springframework.org/schema/context"
22+
xmlns:aop="http://www.springframework.org/schema/aop"
23+
xsi:schemaLocation="http://www.springframework.org/schema/beans
24+
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
25+
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
26+
http://www.springframework.org/schema/context
27+
http://www.springframework.org/schema/context/spring-context-3.0.xsd"
28+
>
29+
30+
<!-- There is no reason to put anything here -->
31+
32+
</beans>

0 commit comments

Comments
 (0)