Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3150DE014 for ; Fri, 22 Feb 2013 14:01:26 +0000 (UTC) Received: (qmail 2257 invoked by uid 500); 22 Feb 2013 14:01:22 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 699 invoked by uid 500); 22 Feb 2013 14:01:19 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 96464 invoked by uid 99); 22 Feb 2013 14:01:12 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Feb 2013 14:01:12 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2A88482EB40; Fri, 22 Feb 2013 14:01:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: widodh@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [27/58] [abbrv] git commit: refs/heads/qemu-img - Correcting license headers that broke the build Message-Id: <20130222140112.2A88482EB40@tyr.zones.apache.org> Date: Fri, 22 Feb 2013 14:01:12 +0000 (UTC) Correcting license headers that broke the build Signed-off-by: Chip Childers Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/6cc1123a Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6cc1123a Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6cc1123a Branch: refs/heads/qemu-img Commit: 6cc1123a3e8d1a3b4ac970f1498a3d2d22ce0c22 Parents: 18e496b Author: Chip Childers Authored: Thu Feb 21 16:29:05 2013 -0500 Committer: Chip Childers Committed: Thu Feb 21 16:29:05 2013 -0500 ---------------------------------------------------------------------- .../subsystem/api/storage/SnapshotStrategy.java | 17 ++++++++++++ .../snapshot/SnapshotStateMachineManager.java | 17 ++++++++++++ .../snapshot/SnapshotStateMachineManagerImpl.java | 17 ++++++++++++ .../snapshot/strategy/AncientSnasphotStrategy.java | 17 ++++++++++++ .../storage/datastore/manager/data model.ucls | 20 ++++++++++++++- .../src/com/cloud/storage/ResizeVolumePayload.java | 17 ++++++++++++ test/selenium/lib/Global_Locators.py | 17 ++++++++++++ test/selenium/lib/initialize.py | 16 ++++++++++++ test/selenium/smoke/Login_and_Accounts.py | 19 +++++++++++++- test/selenium/smoke/Service_Offering.py | 19 +++++++++++++- test/selenium/smoke/TemplatesAndISO.py | 19 +++++++++++++- test/selenium/smoke/VM_lifeCycle.py | 19 +++++++++++++- test/selenium/smoke/main.py | 17 ++++++++++++ 13 files changed, 226 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6cc1123a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotStrategy.java ---------------------------------------------------------------------- diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotStrategy.java b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotStrategy.java index f854f6b..e9492c4 100644 --- a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotStrategy.java +++ b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotStrategy.java @@ -1,3 +1,20 @@ +// 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 org.apache.cloudstack.engine.subsystem.api.storage; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6cc1123a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManager.java ---------------------------------------------------------------------- diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManager.java b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManager.java index 1c3ac28..c605770 100644 --- a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManager.java +++ b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManager.java @@ -1,3 +1,20 @@ +// 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 org.apache.cloudstack.storage.snapshot; import com.cloud.storage.Snapshot.Event; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6cc1123a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManagerImpl.java ---------------------------------------------------------------------- diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManagerImpl.java b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManagerImpl.java index c2213b6..aa1cf68 100644 --- a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManagerImpl.java +++ b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManagerImpl.java @@ -1,3 +1,20 @@ +// 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 org.apache.cloudstack.storage.snapshot; import javax.inject.Inject; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6cc1123a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/strategy/AncientSnasphotStrategy.java ---------------------------------------------------------------------- diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/strategy/AncientSnasphotStrategy.java b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/strategy/AncientSnasphotStrategy.java index b2a58a4..5cbe224 100644 --- a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/strategy/AncientSnasphotStrategy.java +++ b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/strategy/AncientSnasphotStrategy.java @@ -1,3 +1,20 @@ +// 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 org.apache.cloudstack.storage.snapshot.strategy; import java.util.List; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6cc1123a/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/manager/data model.ucls ---------------------------------------------------------------------- diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/manager/data model.ucls b/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/manager/data model.ucls index f159039..8d7a696 100644 --- a/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/manager/data model.ucls +++ b/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/manager/data model.ucls @@ -1,3 +1,21 @@ + - \ No newline at end of file + http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6cc1123a/server/src/com/cloud/storage/ResizeVolumePayload.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/storage/ResizeVolumePayload.java b/server/src/com/cloud/storage/ResizeVolumePayload.java index 472d627..205fafa 100644 --- a/server/src/com/cloud/storage/ResizeVolumePayload.java +++ b/server/src/com/cloud/storage/ResizeVolumePayload.java @@ -1,3 +1,20 @@ +// 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.storage; public class ResizeVolumePayload { http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6cc1123a/test/selenium/lib/Global_Locators.py ---------------------------------------------------------------------- diff --git a/test/selenium/lib/Global_Locators.py b/test/selenium/lib/Global_Locators.py index ec3de57..b2d93cd 100644 --- a/test/selenium/lib/Global_Locators.py +++ b/test/selenium/lib/Global_Locators.py @@ -1,3 +1,20 @@ +# 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. + ''' Variable Names are as follows Logical Page Descriptor_____What Element Represents and/or where it is_____LocatorType http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6cc1123a/test/selenium/lib/initialize.py ---------------------------------------------------------------------- diff --git a/test/selenium/lib/initialize.py b/test/selenium/lib/initialize.py index 6da7166..e8cc49a 100644 --- a/test/selenium/lib/initialize.py +++ b/test/selenium/lib/initialize.py @@ -1,3 +1,19 @@ +# 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. ''' This will help pass webdriver (Browser instance) across our test cases. ''' http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6cc1123a/test/selenium/smoke/Login_and_Accounts.py ---------------------------------------------------------------------- diff --git a/test/selenium/smoke/Login_and_Accounts.py b/test/selenium/smoke/Login_and_Accounts.py index 8ff17f4..c5132d9 100644 --- a/test/selenium/smoke/Login_and_Accounts.py +++ b/test/selenium/smoke/Login_and_Accounts.py @@ -1,3 +1,20 @@ +# 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. + import sys, os sys.path.append(os.path.abspath(os.path.dirname(__file__) + '/'+'../lib')) @@ -233,4 +250,4 @@ class tearAcc(unittest.TestCase): -################################################################################################################################################ \ No newline at end of file +################################################################################################################################################ http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6cc1123a/test/selenium/smoke/Service_Offering.py ---------------------------------------------------------------------- diff --git a/test/selenium/smoke/Service_Offering.py b/test/selenium/smoke/Service_Offering.py index fa9b449..66478e6 100644 --- a/test/selenium/smoke/Service_Offering.py +++ b/test/selenium/smoke/Service_Offering.py @@ -1,3 +1,20 @@ +# 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. + import sys, os sys.path.append(os.path.abspath(os.path.dirname(__file__) + '/'+'../lib')) @@ -406,4 +423,4 @@ class Compute_offering_Delete(unittest.TestCase): def tearDown(self): - self.assertEqual([], self.verificationErrors) \ No newline at end of file + self.assertEqual([], self.verificationErrors) http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6cc1123a/test/selenium/smoke/TemplatesAndISO.py ---------------------------------------------------------------------- diff --git a/test/selenium/smoke/TemplatesAndISO.py b/test/selenium/smoke/TemplatesAndISO.py index 3bb6f5b..120c8d1 100644 --- a/test/selenium/smoke/TemplatesAndISO.py +++ b/test/selenium/smoke/TemplatesAndISO.py @@ -1,3 +1,20 @@ +# 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. + ''' ISO PART YET TO BE ADDED:: remove this after adding it. ''' @@ -224,4 +241,4 @@ class Template_Delete(unittest.TestCase): def tearDown(self): - self.assertEqual([], self.verificationErrors) \ No newline at end of file + self.assertEqual([], self.verificationErrors) http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6cc1123a/test/selenium/smoke/VM_lifeCycle.py ---------------------------------------------------------------------- diff --git a/test/selenium/smoke/VM_lifeCycle.py b/test/selenium/smoke/VM_lifeCycle.py index cd17f86..845a5cb 100644 --- a/test/selenium/smoke/VM_lifeCycle.py +++ b/test/selenium/smoke/VM_lifeCycle.py @@ -1,3 +1,20 @@ +# 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. + import sys, os sys.path.append(os.path.abspath(os.path.dirname(__file__) + '/'+'../lib')) @@ -593,4 +610,4 @@ class stopVM(unittest.TestCase): self.assertEqual([], self.verificationErrors) -######################################################################################################################################################### \ No newline at end of file +######################################################################################################################################################### http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6cc1123a/test/selenium/smoke/main.py ---------------------------------------------------------------------- diff --git a/test/selenium/smoke/main.py b/test/selenium/smoke/main.py index d783531..86bb930 100644 --- a/test/selenium/smoke/main.py +++ b/test/selenium/smoke/main.py @@ -1,3 +1,20 @@ +# 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. + import unittest import HTMLTestRunner import xmlrunner