cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dar...@apache.org
Subject [10/47] git commit: updated refs/heads/master to c910196
Date Wed, 23 Oct 2013 19:43:27 GMT
Move ConfigurationDao and ConfigDepot to system context

Previously ConfigurationDao and ConfigDepot was in the bootstrap context
which was not needed.  Moving down to system to be more consistent with
the database upgrade checks.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/12146ce4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/12146ce4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/12146ce4

Branch: refs/heads/master
Commit: 12146ce40c97bf9fdffdf9c1c05a27ab90477559
Parents: 8cf00de
Author: Darren Shepherd <darren.s.shepherd@gmail.com>
Authored: Thu Oct 3 09:14:00 2013 -0700
Committer: Darren Shepherd <darren.s.shepherd@gmail.com>
Committed: Thu Oct 3 09:14:00 2013 -0700

----------------------------------------------------------------------
 ...ork-config-bootstrap-context-inheritable.xml | 38 ---------------
 ...pring-framework-config-bootstrap-context.xml | 51 --------------------
 ...mework-config-system-context-inheritable.xml | 38 +++++++++++++++
 .../spring-framework-config-system-context.xml  | 51 ++++++++++++++++++++
 4 files changed, 89 insertions(+), 89 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/12146ce4/framework/config/resources/META-INF/cloudstack/bootstrap/spring-framework-config-bootstrap-context-inheritable.xml
----------------------------------------------------------------------
diff --git a/framework/config/resources/META-INF/cloudstack/bootstrap/spring-framework-config-bootstrap-context-inheritable.xml
b/framework/config/resources/META-INF/cloudstack/bootstrap/spring-framework-config-bootstrap-context-inheritable.xml
deleted file mode 100644
index c887531..0000000
--- a/framework/config/resources/META-INF/cloudstack/bootstrap/spring-framework-config-bootstrap-context-inheritable.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:aop="http://www.springframework.org/schema/aop"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-                      http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-                      http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
-                      http://www.springframework.org/schema/context
-                      http://www.springframework.org/schema/context/spring-context-3.0.xsd"
-                      >                     
-
-  <bean class="org.apache.cloudstack.spring.lifecycle.registry.RegistryLifecycle" >
-    <property name="registry" ref="scopedConfigStorageRegistry" />
-    <property name="typeClass" value="org.apache.cloudstack.framework.config.ScopedConfigStorage"
/>
-  </bean>
-  
-  <bean class="org.apache.cloudstack.spring.lifecycle.ConfigDepotLifeCycle" />
-
-
-</beans>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/12146ce4/framework/config/resources/META-INF/cloudstack/bootstrap/spring-framework-config-bootstrap-context.xml
----------------------------------------------------------------------
diff --git a/framework/config/resources/META-INF/cloudstack/bootstrap/spring-framework-config-bootstrap-context.xml
b/framework/config/resources/META-INF/cloudstack/bootstrap/spring-framework-config-bootstrap-context.xml
deleted file mode 100644
index 8d75d27..0000000
--- a/framework/config/resources/META-INF/cloudstack/bootstrap/spring-framework-config-bootstrap-context.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:aop="http://www.springframework.org/schema/aop"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-                      http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-                      http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
-                      http://www.springframework.org/schema/context
-                      http://www.springframework.org/schema/context/spring-context-3.0.xsd"
-                      >
-
-    <bean id="configurationDaoImpl"
-        class="org.apache.cloudstack.framework.config.dao.ConfigurationDaoImpl">
-        <property name="configParams">
-            <map>
-                <entry key="premium" value="${premium}" />
-            </map>
-        </property>
-    </bean>
-
-    <bean id="configDepot"
-        class="org.apache.cloudstack.framework.config.impl.ConfigDepotImpl">
-        <property name="scopedStorages"
-            value="#{scopedConfigStorageRegistry.registered}" />
-        <property name="configurables">
-            <list />
-        </property>
-    </bean>
-
-    <bean id="scopedConfigStorageRegistry"
-        class="org.apache.cloudstack.spring.lifecycle.registry.ExtensionRegistry" />
-
-</beans>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/12146ce4/framework/config/resources/META-INF/cloudstack/system/spring-framework-config-system-context-inheritable.xml
----------------------------------------------------------------------
diff --git a/framework/config/resources/META-INF/cloudstack/system/spring-framework-config-system-context-inheritable.xml
b/framework/config/resources/META-INF/cloudstack/system/spring-framework-config-system-context-inheritable.xml
new file mode 100644
index 0000000..c887531
--- /dev/null
+++ b/framework/config/resources/META-INF/cloudstack/system/spring-framework-config-system-context-inheritable.xml
@@ -0,0 +1,38 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:aop="http://www.springframework.org/schema/aop"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                      http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+                      http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
+                      http://www.springframework.org/schema/context
+                      http://www.springframework.org/schema/context/spring-context-3.0.xsd"
+                      >                     
+
+  <bean class="org.apache.cloudstack.spring.lifecycle.registry.RegistryLifecycle" >
+    <property name="registry" ref="scopedConfigStorageRegistry" />
+    <property name="typeClass" value="org.apache.cloudstack.framework.config.ScopedConfigStorage"
/>
+  </bean>
+  
+  <bean class="org.apache.cloudstack.spring.lifecycle.ConfigDepotLifeCycle" />
+
+
+</beans>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/12146ce4/framework/config/resources/META-INF/cloudstack/system/spring-framework-config-system-context.xml
----------------------------------------------------------------------
diff --git a/framework/config/resources/META-INF/cloudstack/system/spring-framework-config-system-context.xml
b/framework/config/resources/META-INF/cloudstack/system/spring-framework-config-system-context.xml
new file mode 100644
index 0000000..8d75d27
--- /dev/null
+++ b/framework/config/resources/META-INF/cloudstack/system/spring-framework-config-system-context.xml
@@ -0,0 +1,51 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:aop="http://www.springframework.org/schema/aop"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                      http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+                      http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
+                      http://www.springframework.org/schema/context
+                      http://www.springframework.org/schema/context/spring-context-3.0.xsd"
+                      >
+
+    <bean id="configurationDaoImpl"
+        class="org.apache.cloudstack.framework.config.dao.ConfigurationDaoImpl">
+        <property name="configParams">
+            <map>
+                <entry key="premium" value="${premium}" />
+            </map>
+        </property>
+    </bean>
+
+    <bean id="configDepot"
+        class="org.apache.cloudstack.framework.config.impl.ConfigDepotImpl">
+        <property name="scopedStorages"
+            value="#{scopedConfigStorageRegistry.registered}" />
+        <property name="configurables">
+            <list />
+        </property>
+    </bean>
+
+    <bean id="scopedConfigStorageRegistry"
+        class="org.apache.cloudstack.spring.lifecycle.registry.ExtensionRegistry" />
+
+</beans>


Mime
View raw message