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 357D1F484 for ; Thu, 4 Apr 2013 23:00:56 +0000 (UTC) Received: (qmail 82775 invoked by uid 500); 4 Apr 2013 23:00:55 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 82751 invoked by uid 500); 4 Apr 2013 23:00:55 -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 82735 invoked by uid 99); 4 Apr 2013 23:00:55 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Apr 2013 23:00:55 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 62D5B1E0C6; Thu, 4 Apr 2013 23:00:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kelveny@apache.org To: commits@cloudstack.apache.org Date: Thu, 04 Apr 2013 23:00:55 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: updated refs/heads/4.1 to a17adda Updated Branches: refs/heads/4.1 016742011 -> a17addafa refs/heads/master 42ffac3ae -> 1274d8f68 CLOUDSTACK-1917: Finalize componentContext.xml/nonComponentContext.xml content organization to be plugin friendly Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a17addaf Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a17addaf Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a17addaf Branch: refs/heads/4.1 Commit: a17addafaaf5e342d270d7e4b53520c1fb658466 Parents: 0167420 Author: Kelven Yang Authored: Thu Apr 4 14:16:13 2013 -0700 Committer: Kelven Yang Committed: Thu Apr 4 14:16:13 2013 -0700 ---------------------------------------------------------------------- client/tomcatconf/applicationContext.xml.in | 155 +++++++++---- client/tomcatconf/componentContext.xml.in | 176 +++++++------- client/tomcatconf/nonossComponentContext.xml.in | 184 +++++++-------- .../src/com/cloud/utils/component/AdapterList.java | 34 +++ 4 files changed, 312 insertions(+), 237 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a17addaf/client/tomcatconf/applicationContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/applicationContext.xml.in b/client/tomcatconf/applicationContext.xml.in index 17725f0..bd95bb4 100644 --- a/client/tomcatconf/applicationContext.xml.in +++ b/client/tomcatconf/applicationContext.xml.in @@ -32,6 +32,12 @@ + + + + + + @@ -568,7 +574,53 @@ + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -631,49 +683,6 @@ - - - @@ -704,7 +713,7 @@ - + @@ -715,12 +724,12 @@ - + - + @@ -730,7 +739,7 @@ - + @@ -740,5 +749,55 @@ + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a17addaf/client/tomcatconf/componentContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in index 2a4a29f..48a6d75 100644 --- a/client/tomcatconf/componentContext.xml.in +++ b/client/tomcatconf/componentContext.xml.in @@ -30,74 +30,49 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - + + - - - - - - - - - - - - - - - - - + + + + + - - - - - - - + + - - + - - - - - - - - - - - - - - - - - - - - - - + + + @@ -108,12 +83,13 @@ --> - + - - + + + @@ -121,7 +97,10 @@ - + + + + @@ -130,13 +109,9 @@ - - - - - - - + + + @@ -145,46 +120,48 @@ - + + + + + + + + - - + + - - - - - - - - - + - + + + + - - - - - + + - + + + + + - + + + + @@ -195,8 +172,24 @@ - - + + + + + + + + + + + + + + + + + + @@ -206,8 +199,9 @@ ---> +--> + http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a17addaf/client/tomcatconf/nonossComponentContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/nonossComponentContext.xml.in b/client/tomcatconf/nonossComponentContext.xml.in index 13004c3..c81f100 100644 --- a/client/tomcatconf/nonossComponentContext.xml.in +++ b/client/tomcatconf/nonossComponentContext.xml.in @@ -32,9 +32,16 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - + - - - - - - - - - - - - - - - - + + + + + - - - - - - - + + - - + - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -197,12 +170,13 @@ --> - + - - + + + @@ -211,7 +185,10 @@ - + + + + @@ -221,76 +198,87 @@ - - - - - - - + + + + + + + + + + + + - - + + - - - - - - - - - + - + + + + - - - - - - - - - - + + - + + + + + - + + + + - +--> - - + + + + + + + + + + + + + + + + + + @@ -309,5 +297,5 @@ - + http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a17addaf/utils/src/com/cloud/utils/component/AdapterList.java ---------------------------------------------------------------------- diff --git a/utils/src/com/cloud/utils/component/AdapterList.java b/utils/src/com/cloud/utils/component/AdapterList.java new file mode 100644 index 0000000..ae86717 --- /dev/null +++ b/utils/src/com/cloud/utils/component/AdapterList.java @@ -0,0 +1,34 @@ +// 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 +// 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.utils.component; + +import java.util.List; + +public class AdapterList { + protected List adapters; + + public AdapterList() { + } + + public List getAdapters() { + return adapters; + } + + public void setAdapters(List adapters) { + this.adapters = adapters; + } +}