Repository: cloudstack Updated Branches: refs/heads/master 1e72e5a81 -> 421d6029d
Remove cloud-server dependency for cloud-usage project Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/421d6029 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/421d6029 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/421d6029 Branch: refs/heads/master Commit: 421d6029dbaff5f5724dcf844ed7d5179d68c14e Parents: 1e72e5a Author: Kishan Kavala <[email protected]> Authored: Wed Jul 2 15:28:03 2014 +0530 Committer: Kishan Kavala <[email protected]> Committed: Wed Jul 2 15:28:42 2014 +0530 ---------------------------------------------------------------------- server/src/com/cloud/usage/StorageTypes.java | 23 ----------------------- usage/pom.xml | 19 +++++++------------ usage/resources/usageApplicationContext.xml | 1 - usage/src/com/cloud/usage/StorageTypes.java | 23 +++++++++++++++++++++++ 4 files changed, 30 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/421d6029/server/src/com/cloud/usage/StorageTypes.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/usage/StorageTypes.java b/server/src/com/cloud/usage/StorageTypes.java deleted file mode 100644 index a6f2131..0000000 --- a/server/src/com/cloud/usage/StorageTypes.java +++ /dev/null @@ -1,23 +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. -package com.cloud.usage; - -public class StorageTypes { - public static final int TEMPLATE = 1; - public static final int ISO = 2; - public static final int SNAPSHOT = 3; -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/421d6029/usage/pom.xml ---------------------------------------------------------------------- diff --git a/usage/pom.xml b/usage/pom.xml index e72e77f..0ce2ef6 100644 --- a/usage/pom.xml +++ b/usage/pom.xml @@ -27,12 +27,12 @@ </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> - <artifactId>cloud-server</artifactId> + <artifactId>cloud-engine-schema</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> - <artifactId>cloud-engine-schema</artifactId> + <artifactId>cloud-engine-components-api</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -40,6 +40,10 @@ <artifactId>commons-daemon</artifactId> </dependency> <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </dependency> + <dependency> <groupId>org.dbunit</groupId> <artifactId>dbunit</artifactId> <version>2.4.9</version> @@ -80,6 +84,7 @@ </executions> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> @@ -138,16 +143,6 @@ <dependencies> <dependency> <groupId>org.apache.cloudstack</groupId> - <artifactId>cloud-utils</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cloudstack</groupId> - <artifactId>cloud-server</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-usage</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/421d6029/usage/resources/usageApplicationContext.xml ---------------------------------------------------------------------- diff --git a/usage/resources/usageApplicationContext.xml b/usage/resources/usageApplicationContext.xml index f39127b..85936c7 100644 --- a/usage/resources/usageApplicationContext.xml +++ b/usage/resources/usageApplicationContext.xml @@ -32,7 +32,6 @@ <context:annotation-config /> <context:component-scan base-package="com.cloud.usage, com.cloud.event.dao, com.cloud.user.dao, com.cloud.configuration.dao, com.cloud.alert.dao, com.cloud.domain.dao, org.apache.cloudstack.framework.config.dao"> - <context:exclude-filter type="assignable" expression="com.cloud.usage.UsageServiceImpl"/> </context:component-scan> <!-- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/421d6029/usage/src/com/cloud/usage/StorageTypes.java ---------------------------------------------------------------------- diff --git a/usage/src/com/cloud/usage/StorageTypes.java b/usage/src/com/cloud/usage/StorageTypes.java new file mode 100644 index 0000000..a6f2131 --- /dev/null +++ b/usage/src/com/cloud/usage/StorageTypes.java @@ -0,0 +1,23 @@ +// 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. +package com.cloud.usage; + +public class StorageTypes { + public static final int TEMPLATE = 1; + public static final int ISO = 2; + public static final int SNAPSHOT = 3; +}
