Application context files so that hyperv guru and discoverer can be loaded. Also made changes to hyperv pom.xml to make sure the resources are picked up at build time.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a196fbc8 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a196fbc8 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a196fbc8 Branch: refs/heads/ui-restyle Commit: a196fbc8369d19c4f6615e74d382175dad27e23f Parents: d14592f Author: Devdeep Singh <[email protected]> Authored: Mon Nov 4 11:34:46 2013 +0530 Committer: Devdeep Singh <[email protected]> Committed: Mon Nov 4 18:48:54 2013 +0530 ---------------------------------------------------------------------- client/pom.xml | 6 ----- plugins/hypervisors/hyperv/pom.xml | 3 +++ .../cloudstack/hyperv-compute/module.properties | 18 ++++++++++++++ .../spring-hyperv-compute-context.xml | 24 +++++++++++++++++++ .../hyperv-discoverer/module.properties | 18 ++++++++++++++ .../spring-hyperv-discoverer-context.xml | 25 ++++++++++++++++++++ plugins/pom.xml | 11 --------- 7 files changed, 88 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a196fbc8/client/pom.xml ---------------------------------------------------------------------- diff --git a/client/pom.xml b/client/pom.xml index 6c2ecb9..54cb667 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -160,12 +160,6 @@ <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-hypervisor-hyperv</artifactId> <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a196fbc8/plugins/hypervisors/hyperv/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/hyperv/pom.xml b/plugins/hypervisors/hyperv/pom.xml index 042d3aa..19aa28a 100644 --- a/plugins/hypervisors/hyperv/pom.xml +++ b/plugins/hypervisors/hyperv/pom.xml @@ -60,6 +60,9 @@ <testSourceDirectory>test</testSourceDirectory> <resources> <resource> + <directory>resources</directory> + </resource> + <resource> <directory>conf</directory> </resource> </resources> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a196fbc8/plugins/hypervisors/hyperv/resources/META-INF/cloudstack/hyperv-compute/module.properties ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/hyperv/resources/META-INF/cloudstack/hyperv-compute/module.properties b/plugins/hypervisors/hyperv/resources/META-INF/cloudstack/hyperv-compute/module.properties new file mode 100644 index 0000000..439b7d5 --- /dev/null +++ b/plugins/hypervisors/hyperv/resources/META-INF/cloudstack/hyperv-compute/module.properties @@ -0,0 +1,18 @@ +# 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=hyperv-compute +parent=compute \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a196fbc8/plugins/hypervisors/hyperv/resources/META-INF/cloudstack/hyperv-compute/spring-hyperv-compute-context.xml ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/hyperv/resources/META-INF/cloudstack/hyperv-compute/spring-hyperv-compute-context.xml b/plugins/hypervisors/hyperv/resources/META-INF/cloudstack/hyperv-compute/spring-hyperv-compute-context.xml new file mode 100644 index 0000000..6352161 --- /dev/null +++ b/plugins/hypervisors/hyperv/resources/META-INF/cloudstack/hyperv-compute/spring-hyperv-compute-context.xml @@ -0,0 +1,24 @@ +<!-- 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="HypervGuru" class="com.cloud.hypervisor.hyperv.guru.HypervGuru"> + <property name="name" value="HypervGuru" /> + </bean> + +</beans> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a196fbc8/plugins/hypervisors/hyperv/resources/META-INF/cloudstack/hyperv-discoverer/module.properties ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/hyperv/resources/META-INF/cloudstack/hyperv-discoverer/module.properties b/plugins/hypervisors/hyperv/resources/META-INF/cloudstack/hyperv-discoverer/module.properties new file mode 100644 index 0000000..be51dd6 --- /dev/null +++ b/plugins/hypervisors/hyperv/resources/META-INF/cloudstack/hyperv-discoverer/module.properties @@ -0,0 +1,18 @@ +# 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=hyperv-discoverer +parent=discoverer \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a196fbc8/plugins/hypervisors/hyperv/resources/META-INF/cloudstack/hyperv-discoverer/spring-hyperv-discoverer-context.xml ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/hyperv/resources/META-INF/cloudstack/hyperv-discoverer/spring-hyperv-discoverer-context.xml b/plugins/hypervisors/hyperv/resources/META-INF/cloudstack/hyperv-discoverer/spring-hyperv-discoverer-context.xml new file mode 100644 index 0000000..ee394f0 --- /dev/null +++ b/plugins/hypervisors/hyperv/resources/META-INF/cloudstack/hyperv-discoverer/spring-hyperv-discoverer-context.xml @@ -0,0 +1,25 @@ +<!-- 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="HypervServerDiscoverer" + class="com.cloud.hypervisor.hyperv.discoverer.HypervServerDiscoverer"> + <property name="name" value="Hyper-V Agent" /> + </bean> + +</beans> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a196fbc8/plugins/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/pom.xml b/plugins/pom.xml index a707719..4f193bc 100755 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -121,17 +121,6 @@ </modules> </profile> <profile> - <id>hyperV</id> - <activation> - <property> - <name>hyperV</name> - </property> - </activation> - <modules> - <module>hypervisors/hyperv</module> - </modules> - </profile> - <profile> <id>f5</id> <activation> <property>
