Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AD75F119BD for ; Wed, 2 Jul 2014 10:03:09 +0000 (UTC) Received: (qmail 73668 invoked by uid 500); 2 Jul 2014 10:03:04 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 73638 invoked by uid 500); 2 Jul 2014 10:03:04 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 73629 invoked by uid 99); 2 Jul 2014 10:03:04 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jul 2014 10:03:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 44C39993124; Wed, 2 Jul 2014 10:03:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kishan@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 421d602 Date: Wed, 2 Jul 2014 10:03:04 +0000 (UTC) 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 Authored: Wed Jul 2 15:28:03 2014 +0530 Committer: Kishan Kavala 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 @@ org.apache.cloudstack - cloud-server + cloud-engine-schema ${project.version} org.apache.cloudstack - cloud-engine-schema + cloud-engine-components-api ${project.version} @@ -40,6 +40,10 @@ commons-daemon + javax.mail + mail + + org.dbunit dbunit 2.4.9 @@ -80,6 +84,7 @@ + org.apache.maven.plugins maven-antrun-plugin @@ -138,16 +143,6 @@ org.apache.cloudstack - cloud-utils - ${project.version} - - - org.apache.cloudstack - cloud-server - ${project.version} - - - org.apache.cloudstack cloud-usage ${project.version} 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 @@ -