Updated Branches: refs/heads/master 858ce7666 -> b4ceefa46
spring-modularization: remove simulator planner The simulator uses the default planners of cloudstack and does not require a separate planner context (as of now). This was just c&p from baremetal planners. Signed-off-by: Prasanna Santhanam <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f4fb5f55 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f4fb5f55 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f4fb5f55 Branch: refs/heads/master Commit: f4fb5f5582569ea30a0004587a3f340193caf47a Parents: 858ce76 Author: Prasanna Santhanam <[email protected]> Authored: Fri Oct 25 11:18:31 2013 +0530 Committer: Prasanna Santhanam <[email protected]> Committed: Mon Oct 28 11:29:01 2013 +0530 ---------------------------------------------------------------------- .../simulator-planner/module.properties | 18 ----------- .../simulator-planner/spring-context.xml | 34 -------------------- 2 files changed, 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f4fb5f55/plugins/hypervisors/simulator/resources/META-INF/cloudstack/simulator-planner/module.properties ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/simulator/resources/META-INF/cloudstack/simulator-planner/module.properties b/plugins/hypervisors/simulator/resources/META-INF/cloudstack/simulator-planner/module.properties deleted file mode 100644 index 055be73..0000000 --- a/plugins/hypervisors/simulator/resources/META-INF/cloudstack/simulator-planner/module.properties +++ /dev/null @@ -1,18 +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. -name=simulator-planner -parent=planner \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f4fb5f55/plugins/hypervisors/simulator/resources/META-INF/cloudstack/simulator-planner/spring-context.xml ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/simulator/resources/META-INF/cloudstack/simulator-planner/spring-context.xml b/plugins/hypervisors/simulator/resources/META-INF/cloudstack/simulator-planner/spring-context.xml deleted file mode 100644 index 8c14c3e..0000000 --- a/plugins/hypervisors/simulator/resources/META-INF/cloudstack/simulator-planner/spring-context.xml +++ /dev/null @@ -1,34 +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="BareMetalPlanner" class="com.cloud.baremetal.manager.BareMetalPlanner"> - <property name="name" value="BareMetalPlanner" /> - </bean> - -</beans>
