apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack

Browse Source
This commit is contained in:
Pranav Saxena 2013-01-29 14:33:55 +05:30
commit 3b52249417
19 changed files with 8592 additions and 4764 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3569
LICENSE
View File

File diff suppressed because it is too large Load Diff

618
NOTICE
View File

@ -76,620 +76,4 @@
Inspiration from jQuery color animation plugin by John Resig.
Released under the MIT license by Ole Laursen, October 2009.
********************************************************************************
Binary or packaged versions of this software (including versions built from source)
contains third party resources requiring the following notices:
For
cloud-ejb-api-3.0.jar
cloud-email.jar
cloud-jstl-1.2.jar
jaxb-api-2.1.jar
jaxb-impl-2.1.7.jar
jaxb-xjc-2.1.7.jar
jta-1.1.jar
mail-1.4.jar
NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE
(CDDL)
The code released under the CDDL shall be governed by the laws of the State of
California (excluding conflict-of-law provisions). Any litigation relating to
this License shall be subject to the jurisdiction of the Federal Courts of the
Northern District of California and the state courts of the State of California,
with venue lying in Santa Clara County, California.
For
cloud-javax.persistence-2.0.0.jar
EclipseLink 2.0.0
Dec 10th, 2009
About
The EclipseLink project's goal is to provide a complete persistence framework
that is both comprehensive and universal. It will run in any Java environment
and read and write objects to virtually any type of data source, including
relational databases, and XML. EclipseLink will focus on providing leading edge
support, including advanced feature extensions, for the dominant persistence
standards for each target data source; Java Persistence API (JPA) for relational
databases, Java API for XML Binding (JAXB) for XML, Service Data Objects (SDO),
and Database Web services (DBWS).
For tips on getting started with EclipseLink, please see the following
resources:
EclipseLink 2.0.0 Release Notes Documentation Examples and How To License
The Eclipse Foundation makes available all content in this plug-in ("Content").
Unless otherwise indicated below, the Content is provided to you under the terms
and conditions of the Eclipse Public License Version 1.0 ("EPL") and Eclipse
Distribution License Version 1.0 ("EDL"). A copy of the EPL is available at
http://www.eclipse.org/legal/epl-v10.html and a copy of the EDL is available at
http://www.eclipse.org/org/documents/edl-v10.php. For purposes of the EPL,
"Program" will mean the Content.
If you did not receive this Content directly from the Eclipse Foundation, the
Content is being redistributed by another party ("Redistributor") and different
terms and conditions may apply to your use of any object code in the Content.
Check the Redistributor's license that was provided with the Content. If no such
license exists, contact the Redistributor. Unless otherwise indicated below, the
terms and conditions of the EPL and EDL still apply to any source code in the
Content and such source code may be obtained at http://www.eclipse.org.
Third Party Content
The Content includes items that have been sourced from third parties as set out
below. If you did not receive this Content directly from the Eclipse Foundation,
the following is provided for informational purposes only, and you should look
to the Redistributor's license for terms and conditions of use.
Foundation Dependencies ASM EclipseLink JPA ANTLR Java Persistence API (JPA) 1.0
- EJB 3.0 Java Persistence API (JPA) 2.0 EARLY ACCESS EclipseLink MOXy Java
Architecture for XML Binding (JAXB) Java Mail Java Activation Framework
Streaming API for XML (StAX) EclipseLink SDO Service Data Objects (SDO)
Utilities Java Connector Xerces WSDL4J 1.6.2 ASM v1.5.3
The EclipseLink Project includes ASM for the purpose of byte code weaving. The
AMS library is re-packaged within the source of the project
(org.persistence.eclipse.internal.libraries.asm.*) to avoid version collisions
with other usage of ASM. A custom patch has been added to the ASM 1.5.3 source
to handle an issue with other usages. This fix has also been contributed back to
the ASM project for inclusion in later projects.
The source code is available within the project's subversion repository. The
binaries are distributed within the eclipselink.jar and in the
org.eclipse.persistence.asm_2.0.0.v*.jar bundle.
http://asm.objectweb.org/license.html
Copyright (c) 2000-2005 INRIA, France Telecom, All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
Redistributions of source code must retain the above copyright notice, this list
of conditions and the following disclaimer. Redistributions in binary form must
reproduce the above copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided with the
distribution. Neither the name of the copyright holders nor the names of its
contributors may be used to endorse or promote products derived from this
software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY
THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"AND ANY EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THEIMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSEARE DISCLAIMED. IN NO EVENT
SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BELIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, ORCONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OFSUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER INCONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
OR OTHERWISE)ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OFTHE POSSIBILITY OF SUCH DAMAGE.
ANTLR v3.0
The ANTLR library (license) is included within EclipseLink Project to enable
parsing of the Java Persistence Query language (JP QL). The ANTLR library is re-
packaged within the project in the
org.eclipse.persistence.internal.libraries.antlr.* packages.
The source is available with the project's subversion repository. The binaries
are distributed within the eclipselink.jar and in the
org.eclipse.persistence.antlr_2.0.0.v*.jar bundle.
Java Architecture for XML Binding (JAXB) v2.0.5
The JAXB libraries distributed under CDDL v1.0 are included within the
EclipseLink Project to enable the MOXY component's implementation of JAXB.
JAXB Libraries:
/jlib/moxy/javax.xml.bind_2.1.12.v20090708-1500.jar /jlib/moxy/jaxb-impl.jar
/jlib/moxy/jaxb.xjc.jar Java Persistence (JPA) 1.0 - EJB 3.0
The Java Persistence API, included with EJB 3.0, is available for download from
the ejb-api directory in the glassfish CVS repository.It is distributed under
CDDLv1.0 . The jar is being shipped as an OSGi bundle and is required for
compilation of some container based fuctionality.
Java Persistence (JPA) 2.0.
EclipseLink is the Java Persistence (JPA) 2.0 Reference Implementation (JSR
317). The JPA 2.0 specification API is included in EclipseLink under the EPL and
EDL licenses.
Java Mail v1.4
The Java Mail library (mail.jar) is distributed with the JAXB v2.0.5 under CDDL
v1.0 and is included within the EclipseLink Project distribution to support Web
Services attachment handling in the MOXy component. It is only required when
using Java SE 5 (Java Mail is included in Java SE 6).
Java Activation Framework v1.1
The Java Activation Framework (activation.jar) is distributed with the JAXB
v2.0.5 under CDDL v1.0 and is included within the EclipseLink Project
distribution to support Web Services attachment handling in the MOXy component.
It is only required when using Java SE 5 (The Java Activation Framework is
included in Java SE 6).
Streaming API for XML (StAX) v1.0
The Streaming API for XML (StAX) library (jsr173_1.0_api.jar) is distributed
with the JAXB v2.0.5 under CDDL v1.0 and is included within the EclipseLink
Project distribution as an optional XML processing approach in the MOXy
component.
Service Data Objects (SDO) v2.1.1
The Service Data Objects (SDO) API is distributed under a CDDLv1.0 and custom
license. It provides the standard API implemented by the EclipseLink Project's
SDO component.
Java Connector v1.5
The JCA 1.5 API is available for download from the connector-api directory in
the glassfish CVS repository. It is distributed under CDDLv1.0 .
This jar is being shipped and required by the Workbench only. When using
EclipseLink in a container where JCA integration is required that container will
provide the necessary API libraries.
Xerces v2.9.0
Xerces 2.9.0 is available from the Xerces home page. It is distributed under
Apache 2.0.
This jar is shipped for the Workbench's use only in the reading and writing of
XML configuration files.
WSDL4j v1.6.2
WSDL4J 1.6.2 is available for download from the wsdl4j project. It distributed
under CPLv1.0 .
This jar is being shipped as a OSGi bundle and is only required for the DBWS
Builder utility.
For
cloud-commons-logging-1.1.1.jar
commons-logging-1.1.1.jar
// ------------------------------------------------------------------
// NOTICE file corresponding to the section 4d of The Apache License,
// Version 2.0, in this case for Commons Logging
// ------------------------------------------------------------------
Commons Logging
Copyright 2001-2007 The Apache Software Foundation
This product includes/uses software(s) developed by 'an unknown organization'
- Unnamed - avalon-framework:avalon-framework:jar:4.1.3
- Unnamed - log4j:log4j:jar:1.2.12
- Unnamed - logkit:logkit:jar:1.0.1
For
neethi-2.0.4.jar
=========================================================================
== NOTICE file corresponding to the section 4 d of ==
== the Apache License, Version 2.0, ==
== in this case for the Apache AXIOM distribution. ==
=========================================================================
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Portions Copyright 2006 International Business Machines Corp.
Please read the different LICENSE files present in the licenses directory of
this distribution.
For
cloud-jasypt-1.9.jar
Copyright (c) 2007-2010, The JASYPT team (http://www.jasypt.org)
Licensed 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 distribution includes cryptographic software. The country in
which you currently reside may have restrictions on the import,
possession, use, and/or re-export to another country, of
encryption software. BEFORE using any encryption software, please
check your country's laws, regulations and policies concerning the
import, possession, or use, and re-export of encryption software, to
see if this is permitted. See http://www.wassenaar.org/ for more
information.
The U.S. Government Department of Commerce, Bureau of Industry and
Security (BIS), has classified this software as Export Commodity
Control Number (ECCN) 5D002.C.1, which includes information security
software using or performing cryptographic functions with asymmetric
algorithms. The form and manner of this distribution makes it
eligible for export under the License Exception ENC Technology
Software Unrestricted (TSU) exception (see the BIS Export
Administration Regulations, Section 740.13) for both object code and
source code.
The following provides more details on the cryptographic software
used (note that this software is not included in the distribution):
* The PBE Encryption facilities require the Java Cryptography
extensions: http://java.sun.com/javase/technologies/security/.
---------------------------------
Distributions of this software may include software developed by
The Apache Software Foundation (http://www.apache.org/).
---------------------------------
ICU License - ICU 1.8.1 and later
COPYRIGHT AND PERMISSION NOTICE
Copyright (c) 1995-2006 International Business Machines
Corporation and others
All rights reserved.
Permission is hereby granted, free of charge, to any
person obtaining a copy of this software and associated
documentation files (the "Software"), to deal in the
Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish,
distribute, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so,
provided that the above copyright notice(s) and this
permission notice appear in all copies of the Software and
that both the above copyright notice(s) and this
permission notice appear in supporting documentation.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO
EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
USE OR PERFORMANCE OF THIS SOFTWARE.
Except as contained in this notice, the name of a copyright
holder shall not be used in advertising or otherwise to
promote the sale, use or other dealings in this Software
without prior written authorization of the copyright holder.
For
XmlSchema-1.4.3.jar
Portions Copyright 2006 International Business Machines Corp.
For
cloud-trilead-ssh2-build213.jar
Trilead SSH-2 for Java includes code that was written by Dr. Christian Plattner
during his PhD at ETH Zurich. The license states the following:
Copyright (c) 2005 - 2006 Swiss Federal Institute of Technology (ETH Zurich),
Department of Computer Science (http://www.inf.ethz.ch),
Christian Plattner. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
a.) Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
b.) Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
c.) Neither the name of ETH Zurich nor the names of its contributors may
be used to endorse or promote products derived from this software
without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
The Java implementations of the AES, Blowfish and 3DES ciphers have been
taken (and slightly modified) from the cryptography package released by
"The Legion Of The Bouncy Castle".
Their license states the following:
Copyright (c) 2000 - 2004 The Legion Of The Bouncy Castle
(http://www.bouncycastle.org)
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
For
axis2-1.5.1.jar
axis2-adb-1.5.1.jar
axis2-ant-plugin-1.5.1.jar
axis2-codegen-1.4.1.jar
axis2-jaxbri-1.5.1.jar
axis2-jaxws-1.5.1.jar
axis2-jibx-1.5.1.jar
axis2-json-1.5.1.jar
axis2-kernel-1.5.1.jar
axis2-transport-http-1.5.1.jar
axis2-transport-local-1.5.1.jar
axis2-webapp-1.5.1.war
cloud-axis.jar
=========================================================================
== NOTICE file corresponding to the section 4 d of ==
== the Apache License, Version 2.0, ==
== in this case for the Apache Axis2 distribution. ==
=========================================================================
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Portions Copyright 2006 International Business Machines Corp.
Portions Copyright 2005-2007 WSO2, Inc.
This product also includes schemas and specification developed by:
- the W3C consortium (http://www.w3c.org)
This product also includes WS-* schemas developed by International
Business Machines Corporation, Microsoft Corporation, BEA Systems,
TIBCO Software, SAP AG, Sonic Software, and VeriSign
This product also includes a WSDL developed by salesforce.com
- Copyright 1999-2006 salesforce.com, inc.
Portions of the included xmlbeans library were originally based on the following:
- software copyright (c) 2000-2003, BEA Systems, <http://www.bea.com/>.
Please read the different LICENSE files present in the lib directory of
this distribution.
For
xml-apis.jar
=========================================================================
== NOTICE file corresponding to section 4(d) of the Apache License, ==
== Version 2.0, in this case for the Apache xml-commons xml-apis ==
== distribution. ==
=========================================================================
Apache XML Commons XML APIs
Copyright 2006 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Portions of this software were originally based on the following:
- software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
- software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
- software copyright (c) 2000 World Wide Web Consortium, http://www.w3.org
For
cloud-commons-codec-1.5.jar
commons-codec-1.4.jar
Apache Commons Codec
Copyright 2002-2011 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
--------------------------------------------------------------------------------
src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java contains
test data from http://aspell.sourceforge.net/test/batch0.tab.
Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org). Verbatim copying
and distribution of this entire article is permitted in any medium,
provided this notice is preserved.
--------------------------------------------------------------------------------
For
rampart-lib
Apache Rampart
Copyright 2010 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Please read the different LICENSE files present in the lib directory of
this distribution.
For
xercesImpl.jar
=========================================================================
== NOTICE file corresponding to section 4(d) of the Apache License, ==
== Version 2.0, in this case for the Apache Xerces Java distribution. ==
=========================================================================
Apache Xerces Java
Copyright 1999-2012 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Portions of this software were originally based on the following:
- software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
- software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
- voluntary contributions made by Paul Eng on behalf of the
Apache Software Foundation that were originally developed at iClick, Inc.,
software copyright (c) 1999.
For
woden-api-1.0M8.jar
woden-impl-dom-1.0M8.jar
=========================================================================
== NOTICE file corresponding to the section 4 d of ==
== the Apache License, Version 2.0, ==
== in this case for the Apache Woden distribution. ==
=========================================================================
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
This product also includes software developed by :
- IBM Corporation (http://www.ibm.com),
WSDL4J was the initial code contribution for the Apache Woden
project and some of the WSDL4J design and code has been reused.
- The W3C Consortium (http://www.w3c.org),
Common W3C XML Schema and DTD files are packaged with Apache Woden.
Please read the different LICENSE files present in the root directory of
this distribution.
For
axiom-api-1.2.8.jar
axiom-impl-1.2.8.jar
Axiom includes software from other projects, as follows:
This software includes the Woodstox High-performance XML processor
http://woodstox.codehaus.org/
licensed under the Apache License, Version 2.0
This software includes the Jaxen XPath library
http://jaxen.codehaus.org/
licensed under the following BSD 3 Clause license:
================================================================================
Copyright 2003-2006 The Werken Company. All Rights Reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of the Jaxen Project nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
================================================================================
For
wss4j-1.5.8.jar
Apache WebServices - WSS4J
Copyright 2004-2011 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
This product includes software Copyright University of Southampton IT
Innovation Centre, 2006 (http://www.it-innovation.soton.ac.uk).
Released under the MIT license by Ole Laursen, October 2009.

2
api/src/org/apache/cloudstack/api/ApiErrorCode.java
View File

@ -33,7 +33,7 @@ public enum ApiErrorCode {
ACCOUNT_RESOURCE_LIMIT_ERROR(532),
INSUFFICIENT_CAPACITY_ERROR(533),
RESOURCE_UNAVAILABLE_ERROR(534),
RESOURCE_ALLOCATION_ERROR(534),
RESOURCE_ALLOCATION_ERROR(535),
RESOURCE_IN_USE_ERROR(536),
NETWORK_RULE_CONFLICT_ERROR(537);

3
api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
View File

@ -146,8 +146,7 @@ public class DeployVMCmd extends BaseAsyncCreateCmd {
"Mutually exclusive with securitygroupids parameter")
private List<String> securityGroupNameList;
@ACL(checkKeyAccess=true)
@Parameter(name = ApiConstants.IP_NETWORK_LIST, type = CommandType.MAP, entityType={Network.class, IpAddress.class},
@Parameter(name = ApiConstants.IP_NETWORK_LIST, type = CommandType.MAP,
description = "ip to network mapping. Can't be specified with networkIds parameter." +
" Example: iptonetworklist[0].ip=10.10.10.11&iptonetworklist[0].networkid=uuid - requests to use ip 10.10.10.11 in network id=uuid")
private Map ipToNetworkList;

4
api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
View File

@ -21,7 +21,7 @@ import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.response.DiskOfferingResponse;
import org.apache.cloudstack.api.response.ServiceOfferingResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.offering.ServiceOffering;
@ -44,7 +44,7 @@ public class UpgradeVMCmd extends BaseCmd {
required=true, description="The ID of the virtual machine")
private Long id;
@Parameter(name=ApiConstants.SERVICE_OFFERING_ID, type=CommandType.UUID, entityType=DiskOfferingResponse.class,
@Parameter(name=ApiConstants.SERVICE_OFFERING_ID, type=CommandType.UUID, entityType=ServiceOfferingResponse.class,
required=true, description="the service offering ID to apply to the virtual machine")
private Long serviceOfferingId;

3
core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java
View File

@ -398,7 +398,8 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements
@Override
public boolean accept(final File directory,
final String fileName) {
return !fileName.startsWith(".");
File fileToUpload = new File(directory.getAbsolutePath() + "/" + fileName);
return !fileName.startsWith(".") && !fileToUpload.isDirectory();
}
}, new ObjectNamingStrategy() {
@Override

144
docs/en-US/network-rate.xml Normal file
View File

@ -0,0 +1,144 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
%BOOK_ENTITIES;
]>
<!-- 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.
-->
<section id="network-rate">
<title>Network Throttling</title>
<para>Network throttling is the process of controlling the network access and bandwidth usage
based on certain rules. &PRODUCT; controls this behaviour of the guest networks in the cloud by
using the network rate parameter. This parameter is defined as the default data transfer rate in
Mbps (Megabits Per Second) allowed in a guest network. It defines the upper limits for network
utilization. If the current utilization is below the allowed upper limits, access is granted,
else revoked.</para>
<para>You can throttle the network bandwidth either to control the usage above a certain limit for
some accounts, or to control network congestion in a large cloud environment. The network rate
for your cloud can be configured on the following:</para>
<itemizedlist>
<listitem>
<para>Network Offering</para>
</listitem>
<listitem>
<para>Service Offering</para>
</listitem>
<listitem>
<para>Global parameter</para>
</listitem>
</itemizedlist>
<para>If network rate is set to NULL in service offering, the value provided in the
vm.network.throttling.rate global parameter is applied. If the value is set to NULL for network
offering, the value provided in the network.throttling.rate global parameter is
considered.</para>
<para>For the default public, storage, and management networks, network rate is set to 0. This
implies that the public, storage, and management networks will have unlimited bandwidth by
default. For default guest networks, network rate is set to NULL. In this case, network rate is
defaulted to the global parameter value.</para>
<para>The following table gives you an overview of how network rate is applied on different types
of networks in &PRODUCT;.</para>
<informaltable>
<tgroup cols="2" align="left" colsep="1" rowsep="1">
<colspec colwidth="1.0*" colname="1" colnum="1"/>
<colspec colwidth="3.18*" colname="2" colnum="2"/>
<thead>
<row>
<entry><para>Networks</para></entry>
<entry><para>Network Rate Is Taken from</para></entry>
</row>
</thead>
<tbody>
<row>
<entry><para>Guest network of Virtual Router</para></entry>
<entry><para>Guest Network Offering</para></entry>
</row>
<row>
<entry><para>Public network of Virtual Router</para></entry>
<entry><para>Guest Network Offering</para></entry>
</row>
<row>
<entry><para>Storage network of Secondary Storage VM</para></entry>
<entry><para>System Network Offering</para></entry>
</row>
<row>
<entry><para>Management network of Secondary Storage VM</para></entry>
<entry><para>System Network Offering</para></entry>
</row>
<row>
<entry><para>Storage network of Console Proxy VM</para></entry>
<entry><para>System Network Offering</para></entry>
</row>
<row>
<entry><para>Management network of Console Proxy VM</para></entry>
<entry><para>System Network Offering</para></entry>
</row>
<row>
<entry><para>Storage network of Virtual Router</para></entry>
<entry><para>System Network Offering</para></entry>
</row>
<row>
<entry><para>Management network of Virtual Router</para></entry>
<entry><para>System Network Offering</para></entry>
</row>
<row>
<entry><para>Public network of Secondary Storage VM</para></entry>
<entry><para>System Network Offering</para></entry>
</row>
<row>
<entry><para>Public network of Console Proxy VM</para></entry>
<entry><para>System Network Offering</para></entry>
</row>
<row>
<entry><para>Default network of a guest VM</para></entry>
<entry><para>Compute Offering</para></entry>
</row>
<row>
<entry><para>Additional networks of a guest VM</para></entry>
<entry><para>Corresponding Network Offerings</para></entry>
</row>
</tbody>
</tgroup>
</informaltable>
<para>A guest VM must have a default network, and can also have many additional networks.
Depending on various parameters, such as the host and virtual switch used, you can observe a
difference in the network rate in your cloud. For example, on a VMware host the actual network
rate varies based on where they are configured (compute offering, network offering, or both);
the network type (shared or isolated); and traffic direction (ingress or egress). </para>
<para>The network rate set for a network offering used by a particular network in &PRODUCT; is
used for the traffic shaping policy of a port group, for example: port group A, for that
network: a particular subnet or VLAN on the actual network. The virtual routers for that network
connects to the port group A, and by default instances in that network connects to this port
group. However, if an instance is deployed with a compute offering with the network rate set,
and if this rate is used for the traffic shaping policy of another port group for the network,
for example port group B, then instances using this compute offering are connected to the port
group B, instead of connecting to port group A.</para>
<para>The traffic shaping policy on standard port groups in VMware only applies to the egress
traffic, and the net effect depends on the type of network used in &PRODUCT;. In shared
networks, ingress traffic is unlimited for &PRODUCT;, and egress traffic is limited to the rate
that applies to the port group used by the instance if any. If the compute offering has a
network rate configured, this rate applies to the egress traffic, otherwise the network rate set
for the network offering applies. For isolated networks, the network rate set for the network
offering, if any, effectively applies to the ingress traffic. This is mainly because the network
rate set for the network offering applies to the egress traffic from the virtual router to the
instance. The egress traffic is limited by the rate that applies to the port group used by the
instance if any, similar to shared networks. </para>
<para>For example:</para>
<para>Network rate of network offering = 10 Mbps</para>
<para>Network rate of compute offering = 200 Mbps</para>
<para>In shared networks, ingress traffic will not be limited for &PRODUCT;, while egress traffic
will be limited to 200 Mbps. In an isolated network, ingress traffic will be limited to 10 Mbps
and egress to 200 Mbps.</para>
</section>

1
docs/en-US/offerings.xml
View File

@ -25,5 +25,6 @@
are discussed in the section on setting up networking for users.</para>
<xi:include href="compute-disk-service-offerings.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="system-service-offerings.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="network-rate.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="sys-offering-sysvm.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
</chapter>

550
docs/en-US/vmware-install.xml
View File

@ -21,253 +21,313 @@
specific language governing permissions and limitations
under the License.
-->
<section id="vmware-install">
<title>VMware vSphere Installation and Configuration</title>
<para>If you want to use the VMware vSphere hypervisor to run guest virtual machines, install vSphere on the host(s) in your cloud.</para>
<xi:include href="vmware-requirements.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<section id="vmware-preparation-checklist">
<title>VMware vSphere Installation and Configuration</title>
<para>If you want to use the VMware vSphere hypervisor to run guest virtual machines, install
vSphere on the host(s) in your cloud.</para>
<xi:include href="vmware-requirements.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<section id="vmware-preparation-checklist">
<title>Preparation Checklist for VMware</title>
<para>For a smoother installation, gather the following information before you start:</para>
<itemizedlist>
<listitem><para>Information listed in <xref linkend="vmware-vcenter-checklist" /></para></listitem>
<listitem><para>Information listed in <xref linkend="vmware-network-checklist" /></para></listitem>
<listitem>
<para>Information listed in <xref linkend="vmware-vcenter-checklist"/></para>
</listitem>
<listitem>
<para>Information listed in <xref linkend="vmware-network-checklist"/></para>
</listitem>
</itemizedlist>
<section id="vmware-vcenter-checklist">
<title>vCenter Checklist</title>
<para>You will need the following information about vCenter.</para>
<informaltable frame="all">
<title>vCenter Checklist</title>
<para>You will need the following information about vCenter.</para>
<informaltable frame="all">
<tgroup cols="3" align="left" colsep="1" rowsep="1">
<colspec colname="c1" />
<colspec colname="c2" />
<colspec colname="c3" />
<thead>
<colspec colname="c1"/>
<colspec colname="c2"/>
<colspec colname="c3"/>
<thead>
<row>
<entry><para>vCenter Requirement</para></entry>
<entry><para>Value</para></entry>
<entry><para>Notes</para></entry>
<entry><para>vCenter Requirement</para></entry>
<entry><para>Value</para></entry>
<entry><para>Notes</para></entry>
</row>
</thead>
<tbody>
</thead>
<tbody>
<row>
<entry><para>vCenter User</para></entry>
<entry><para></para></entry>
<entry><para>This user must have admin privileges.</para></entry>
<entry><para>vCenter User</para></entry>
<entry><para/></entry>
<entry><para>This user must have admin privileges.</para></entry>
</row>
<row>
<entry><para>vCenter User Password</para></entry>
<entry><para></para></entry>
<entry><para>Password for the above user.</para></entry>
<entry><para>vCenter User Password</para></entry>
<entry><para/></entry>
<entry><para>Password for the above user.</para></entry>
</row>
<row>
<entry><para>vCenter Datacenter Name</para></entry>
<entry><para></para></entry>
<entry><para>Name of the datacenter.</para></entry>
<entry><para>vCenter Datacenter Name</para></entry>
<entry><para/></entry>
<entry><para>Name of the datacenter.</para></entry>
</row>
<row>
<entry><para>vCenter Cluster Name</para></entry>
<entry><para></para></entry>
<entry><para>Name of the cluster.</para></entry>
<entry><para>vCenter Cluster Name</para></entry>
<entry><para/></entry>
<entry><para>Name of the cluster.</para></entry>
</row>
</tbody>
</tbody>
</tgroup>
</informaltable>
</informaltable>
</section>
<section id="vmware-network-checklist">
<title>Networking Checklist for VMware</title>
<para>You will need the following information about VLAN.</para>
<informaltable frame="all">
<title>Networking Checklist for VMware</title>
<para>You will need the following information about VLAN.</para>
<informaltable frame="all">
<tgroup cols="3" align="left" colsep="1" rowsep="1">
<colspec colname="c1" />
<colspec colname="c2" />
<colspec colname="c3" />
<thead>
<colspec colname="c1"/>
<colspec colname="c2"/>
<colspec colname="c3"/>
<thead>
<row>
<entry><para>VLAN Information</para></entry>
<entry><para>Value</para></entry>
<entry><para>Notes</para></entry>
<entry><para>VLAN Information</para></entry>
<entry><para>Value</para></entry>
<entry><para>Notes</para></entry>
</row>
</thead>
<tbody>
</thead>
<tbody>
<row>
<entry><para>ESXi VLAN</para></entry>
<entry><para></para></entry>
<entry><para>VLAN on which all your ESXi hypervisors reside.</para></entry>
<entry><para>ESXi VLAN</para></entry>
<entry><para/></entry>
<entry><para>VLAN on which all your ESXi hypervisors reside.</para></entry>
</row>
<row>
<entry><para>ESXI VLAN IP Address</para></entry>
<entry><para></para></entry>
<entry><para>IP Address Range in the ESXi VLAN. One address per Virtual Router is used from this range.</para></entry>
<entry><para>ESXI VLAN IP Address</para></entry>
<entry><para/></entry>
<entry><para>IP Address Range in the ESXi VLAN. One address per Virtual Router is used
from this range.</para></entry>
</row>
<row>
<entry><para>ESXi VLAN IP Gateway</para></entry>
<entry><para></para></entry>
<entry><para></para></entry>
<entry><para>ESXi VLAN IP Gateway</para></entry>
<entry><para/></entry>
<entry><para/></entry>
</row>
<row>
<entry><para>ESXi VLAN Netmask</para></entry>
<entry><para></para></entry>
<entry><para></para></entry>
<entry><para>ESXi VLAN Netmask</para></entry>
<entry><para/></entry>
<entry><para/></entry>
</row>
<row>
<entry><para>Management Server VLAN</para></entry>
<entry><para></para></entry>
<entry><para>VLAN on which the &PRODUCT; Management server is installed.</para></entry>
<entry><para>Management Server VLAN</para></entry>
<entry><para/></entry>
<entry><para>VLAN on which the &PRODUCT; Management server is
installed.</para></entry>
</row>
<row>
<entry><para>Public VLAN</para></entry>
<entry><para></para></entry>
<entry><para>VLAN for the Public Network.</para></entry>
<entry><para>Public VLAN</para></entry>
<entry><para/></entry>
<entry><para>VLAN for the Public Network.</para></entry>
</row>
<row>
<entry><para>Public VLAN Gateway</para></entry>
<entry><para></para></entry>
<entry><para></para></entry>
<entry><para>Public VLAN Gateway</para></entry>
<entry><para/></entry>
<entry><para/></entry>
</row>
<row>
<entry><para>Public VLAN Netmask</para></entry>
<entry><para></para></entry>
<entry><para></para></entry>
<entry><para>Public VLAN Netmask</para></entry>
<entry><para/></entry>
<entry><para/></entry>
</row>
<row>
<entry><para>Public VLAN IP Address Range</para></entry>
<entry><para></para></entry>
<entry><para>Range of Public IP Addresses available for &PRODUCT; use. These addresses will be used for virtual router on &PRODUCT; to route private traffic to external networks.</para></entry>
<entry><para>Public VLAN IP Address Range</para></entry>
<entry><para/></entry>
<entry><para>Range of Public IP Addresses available for &PRODUCT; use. These addresses
will be used for virtual router on &PRODUCT; to route private traffic to external
networks.</para></entry>
</row>
<row>
<entry><para>VLAN Range for Customer use</para></entry>
<entry><para></para></entry>
<entry><para>A contiguous range of non-routable VLANs. One VLAN will be assigned for each customer.</para></entry>
<entry><para>VLAN Range for Customer use</para></entry>
<entry><para/></entry>
<entry><para>A contiguous range of non-routable VLANs. One VLAN will be assigned for
each customer.</para></entry>
</row>
</tbody>
</tbody>
</tgroup>
</informaltable>
</informaltable>
</section>
</section>
<section id="vmware-vsphere-installation-steps">
</section>
<section id="vmware-vsphere-installation-steps">
<title>vSphere Installation Steps</title>
<orderedlist>
<listitem><para>If you haven't already, you'll need to download and purchase vSphere from the VMware Website (<ulink url="https://www.vmware.com/tryvmware/index.php?p=vmware-vsphere&amp;lp=1">https://www.vmware.com/tryvmware/index.php?p=vmware-vsphere&amp;lp=1</ulink>) and install it by following the VMware vSphere Installation Guide.</para></listitem>
<listitem>
<para>Following installation, perform the following configuration, which are described in the next few sections:</para>
<listitem>
<para>If you haven't already, you'll need to download and purchase vSphere from the VMware
Website (<ulink url="https://www.vmware.com/tryvmware/index.php?p=vmware-vsphere&amp;lp=1"
>https://www.vmware.com/tryvmware/index.php?p=vmware-vsphere&amp;lp=1</ulink>) and
install it by following the VMware vSphere Installation Guide.</para>
</listitem>
<listitem>
<para>Following installation, perform the following configuration, which are described in
the next few sections:</para>
<informaltable frame="all">
<tgroup cols="2" align="left" colsep="1" rowsep="1">
<colspec colname="c1" />
<colspec colname="c2" />
<tgroup cols="2" align="left" colsep="1" rowsep="1">
<colspec colname="c1"/>
<colspec colname="c2"/>
<thead>
<row>
<row>
<entry><para>Required</para></entry>
<entry><para>Optional</para></entry>
</row>
</row>
</thead>
<tbody>
<row>
<row>
<entry><para>ESXi host setup</para></entry>
<entry><para>NIC bonding</para></entry>
</row>
<row>
<entry><para>Configure host physical networking, virtual switch, vCenter Management Network, and extended port range</para></entry>
</row>
<row>
<entry><para>Configure host physical networking, virtual switch, vCenter Management
Network, and extended port range</para></entry>
<entry><para>Multipath storage</para></entry>
</row>
<row>
</row>
<row>
<entry><para>Prepare storage for iSCSI</para></entry>
<entry><para></para></entry>
</row>
<row>
<entry><para>Configure clusters in vCenter and add hosts to them, or add hosts without clusters to vCenter</para></entry>
<entry><para></para></entry>
</row>
<entry><para/></entry>
</row>
<row>
<entry><para>Configure clusters in vCenter and add hosts to them, or add hosts
without clusters to vCenter</para></entry>
<entry><para/></entry>
</row>
</tbody>
</tgroup>
</tgroup>
</informaltable>
</listitem>
</listitem>
</orderedlist>
</section>
<section id="vmware-esxi-host-setup">
</section>
<section id="vmware-esxi-host-setup">
<title>ESXi Host setup</title>
<para>All ESXi hosts should enable CPU hardware virtualization support in BIOS. Please note hardware virtualization support is not enabled by default on most servers.</para>
</section>
<section id="vmware-physical-host-networking">
<para>All ESXi hosts should enable CPU hardware virtualization support in BIOS. Please note
hardware virtualization support is not enabled by default on most servers.</para>
</section>
<section id="vmware-physical-host-networking">
<title>Physical Host Networking</title>
<para>You should have a plan for cabling the vSphere hosts. Proper network configuration is required before adding a vSphere host to &PRODUCT;. To configure an ESXi host, you can use vClient to add it as standalone host to vCenter first. Once you see the host appearing in the vCenter inventory tree, click the host node in the inventory tree, and navigate to the Configuration tab.</para>
<para>You should have a plan for cabling the vSphere hosts. Proper network configuration is
required before adding a vSphere host to &PRODUCT;. To configure an ESXi host, you can use
vClient to add it as standalone host to vCenter first. Once you see the host appearing in the
vCenter inventory tree, click the host node in the inventory tree, and navigate to the
Configuration tab.</para>
<mediaobject>
<imageobject>
<imageobject>
<imagedata fileref="./images/vmware-physical-network.png"/>
</imageobject>
<textobject>
</imageobject>
<textobject>
<phrase>vsphereclient.png: vSphere client</phrase>
</textobject>
</textobject>
</mediaobject>
<para>In the host configuration tab, click the &quot;Hardware/Networking&quot; link to bring up the networking configuration page as above.</para>
<section id="vmware-physical-host-networking-config-vswitch">
<title>Configure Virtual Switch</title>
<para>A default virtual switch vSwitch0 is created. &PRODUCT; requires all ESXi hosts in the cloud to use the same set of virtual switch names. If you change the default virtual switch name, you will need to configure one or more &PRODUCT; configuration variables as well.</para>
<section id="vmware-physical-host-networking-config-vswitch-separate-traffic">
<para>In the host configuration tab, click the &quot;Hardware/Networking&quot; link to bring up
the networking configuration page as above.</para>
<section id="vmware-physical-host-networking-config-vswitch">
<title>Configure Virtual Switch</title>
<para>A default virtual switch vSwitch0 is created. &PRODUCT; requires all ESXi hosts in the
cloud to use the same set of virtual switch names. If you change the default virtual switch
name, you will need to configure one or more &PRODUCT; configuration variables as
well.</para>
<section id="vmware-physical-host-networking-config-vswitch-separate-traffic">
<title>Separating Traffic</title>
<para>&PRODUCT; allows you to use vCenter to configure three separate networks per ESXi host. These networks are identified by the name of the vSwitch they are connected to. The allowed networks for configuration are public (for traffic to/from the public internet), guest (for guest-guest traffic), and private (for management and usually storage traffic). You can use the default virtual switch for all three, or create one or two other vSwitches for those traffic types.</para>
<para>If you want to separate traffic in this way you should first create and configure vSwitches in vCenter according to the vCenter instructions. Take note of the vSwitch names you have used for each traffic type. You will configure &PRODUCT; to use these vSwitches.</para>
</section>
<section id="vmware-physical-host-networking-config-vswitch-increasing-port">
<para>&PRODUCT; allows you to use vCenter to configure three separate networks per ESXi
host. These networks are identified by the name of the vSwitch they are connected to. The
allowed networks for configuration are public (for traffic to/from the public internet),
guest (for guest-guest traffic), and private (for management and usually storage traffic).
You can use the default virtual switch for all three, or create one or two other vSwitches
for those traffic types.</para>
<para>If you want to separate traffic in this way you should first create and configure
vSwitches in vCenter according to the vCenter instructions. Take note of the vSwitch names
you have used for each traffic type. You will configure &PRODUCT; to use these
vSwitches.</para>
</section>
<section id="vmware-physical-host-networking-config-vswitch-increasing-port">
<title>Increasing Ports</title>
<para>By default a virtual switch on ESXi hosts is created with 56 ports. We recommend setting it to 4088, the maximum number of ports allowed. To do that, click the &quot;Properties...&quot; link for virtual switch (note this is not the Properties link for Networking).</para>
<para>By default a virtual switch on ESXi hosts is created with 56 ports. We recommend
setting it to 4088, the maximum number of ports allowed. To do that, click the
&quot;Properties...&quot; link for virtual switch (note this is not the Properties link
for Networking).</para>
<mediaobject>
<imageobject>
<imageobject>
<imagedata fileref="./images/vmware-increase-ports.png"/>
</imageobject>
<textobject>
</imageobject>
<textobject>
<phrase>vsphereclient.png: vSphere client</phrase>
</textobject>
</textobject>
</mediaobject>
<para>In vSwitch properties dialog, select the vSwitch and click Edit. You should see the following dialog:</para>
<para>In vSwitch properties dialog, select the vSwitch and click Edit. You should see the
following dialog:</para>
<mediaobject>
<imageobject>
<imageobject>
<imagedata fileref="./images/vmware-vswitch-properties.png"/>
</imageobject>
<textobject>
</imageobject>
<textobject>
<phrase>vsphereclient.png: vSphere client</phrase>
</textobject>
</textobject>
</mediaobject>
<para>In this dialog, you can change the number of switch ports. After you&apos;ve done that, ESXi hosts are required to reboot in order for the setting to take effect.</para>
</section>
<para>In this dialog, you can change the number of switch ports. After you&apos;ve done
that, ESXi hosts are required to reboot in order for the setting to take effect.</para>
</section>
</section>
<section id="vmware-physical-host-networking-config-vcenter-mgt">
<title>Configure vCenter Management Network</title>
<para>In the vSwitch properties dialog box, you may see a vCenter management network. This same network will also be used as the &PRODUCT; management network. &PRODUCT; requires the vCenter management network to be configured properly. Select the management network item in the dialog, then click Edit.</para>
<mediaobject>
<title>Configure vCenter Management Network</title>
<para>In the vSwitch properties dialog box, you may see a vCenter management network. This
same network will also be used as the &PRODUCT; management network. &PRODUCT; requires the
vCenter management network to be configured properly. Select the management network item in
the dialog, then click Edit.</para>
<mediaobject>
<imageobject>
<imagedata fileref="./images/vmware-mgt-network-properties.png"/>
<imagedata fileref="./images/vmware-mgt-network-properties.png"/>
</imageobject>
<textobject>
<phrase>vsphereclient.png: vSphere client</phrase>
<phrase>vsphereclient.png: vSphere client</phrase>
</textobject>
</mediaobject>
<para>Make sure the following values are set:</para>
<itemizedlist>
<listitem><para>VLAN ID set to the desired ID</para></listitem>
<listitem><para>vMotion enabled.</para></listitem>
<listitem><para>Management traffic enabled.</para></listitem>
</itemizedlist>
<para>If the ESXi hosts have multiple VMKernel ports, and ESXi is not using the default value &quot;Management Network&quot; as the management network name, you must follow these guidelines to configure the management network port group so that &PRODUCT; can find it:</para>
<itemizedlist>
<listitem><para>Use one label for the management network port across all ESXi hosts.</para></listitem>
<listitem><para>In the &PRODUCT; UI, go to Configuration - Global Settings and set vmware.management.portgroup to the management network label from the ESXi hosts.</para></listitem>
</itemizedlist>
</mediaobject>
<para>Make sure the following values are set:</para>
<itemizedlist>
<listitem>
<para>VLAN ID set to the desired ID</para>
</listitem>
<listitem>
<para>vMotion enabled.</para>
</listitem>
<listitem>
<para>Management traffic enabled.</para>
</listitem>
</itemizedlist>
<para>If the ESXi hosts have multiple VMKernel ports, and ESXi is not using the default value
&quot;Management Network&quot; as the management network name, you must follow these
guidelines to configure the management network port group so that &PRODUCT; can find
it:</para>
<itemizedlist>
<listitem>
<para>Use one label for the management network port across all ESXi hosts.</para>
</listitem>
<listitem>
<para>In the &PRODUCT; UI, go to Configuration - Global Settings and set
vmware.management.portgroup to the management network label from the ESXi hosts.</para>
</listitem>
</itemizedlist>
</section>
<section id="vmware-physical-networking-extend-port-console-proxy">
<title>Extend Port Range for &PRODUCT; Console Proxy</title>
<para>(Applies only to VMware vSphere version 4.x)</para>
<para>You need to extend the range of firewall ports that the console proxy works with on the hosts. This is to enable the console proxy to work with VMware-based VMs. The default additional port range is 59000-60000. To extend the port range, log in to the VMware ESX service console on each host and run the following commands:</para>
<programlisting>
<title>Extend Port Range for &PRODUCT; Console Proxy</title>
<para>(Applies only to VMware vSphere version 4.x)</para>
<para>You need to extend the range of firewall ports that the console proxy works with on the
hosts. This is to enable the console proxy to work with VMware-based VMs. The default
additional port range is 59000-60000. To extend the port range, log in to the VMware ESX
service console on each host and run the following commands:</para>
<programlisting>
esxcfg-firewall -o 59000-60000,tcp,in,vncextras
esxcfg-firewall -o 59000-60000,tcp,out,vncextras
</programlisting>
</section>
<section id="vmware-physical-networking-config-vsphere-nic-bond">
<title>Configure NIC Bonding for vSphere</title>
<para>NIC bonding on vSphere hosts may be done according to the vSphere installation guide.</para>
<title>Configure NIC Bonding for vSphere</title>
<para>NIC bonding on vSphere hosts may be done according to the vSphere installation
guide.</para>
</section>
</section>
<!-- <section id="vmware-vsphere-cluster-config-nexus-vswitch">
</section>
<!-- <section id="vmware-vsphere-cluster-config-nexus-vswitch">
<title>Configuring a vSphere Cluster with Nexus 1000v Virtual Switch</title>
<para>&PRODUCT; supports Cisco Nexus 1000v dvSwitch (Distributed Virtual Switch) for virtual network configuration in a VMware vSphere environment. This section helps you configure a vSphere cluster with Nexus 1000v virtual switch in a VMware vCenter environment. For information on creating a vSphere cluster, see <xref linkend="vmware-install" /></para>
<section id="vmware-vsphere-cluster-config-nexus-vswitch-about">
@ -543,89 +603,169 @@ esxcfg-firewall -o 59000-60000,tcp,out,vncextras
</orderedlist>
</section>
</section> -->
<section id="vmware-vsphere-iscsi-storage-preparation">
<section id="vmware-vsphere-iscsi-storage-preparation">
<title>Storage Preparation for vSphere (iSCSI only)</title>
<para>Use of iSCSI requires preparatory work in vCenter. You must add an iSCSI target and create an iSCSI datastore.</para>
<para>Use of iSCSI requires preparatory work in vCenter. You must add an iSCSI target and create
an iSCSI datastore.</para>
<para>If you are using NFS, skip this section.</para>
<section id="vmware-vsphere-iscsi-storage-enable-initiator">
<title>Enable iSCSI initiator for ESXi hosts</title>
<orderedlist>
<title>Enable iSCSI initiator for ESXi hosts</title>
<orderedlist>
<listitem>
<para>In vCenter, go to hosts and Clusters/Configuration, and click Storage Adapters link. You will see:</para>
<mediaobject>
<para>In vCenter, go to hosts and Clusters/Configuration, and click Storage Adapters link.
You will see:</para>
<mediaobject>
<imageobject>
<imagedata fileref="./images/vmware-iscsi-initiator.png"/>
<imagedata fileref="./images/vmware-iscsi-initiator.png"/>
</imageobject>
<textobject>
<phrase>vsphereclient.png: vSphere client</phrase>
<phrase>vsphereclient.png: vSphere client</phrase>
</textobject>
</mediaobject>
</mediaobject>
</listitem>
<listitem>
<para>Select iSCSI software adapter and click Properties.</para>
<mediaobject>
<para>Select iSCSI software adapter and click Properties.</para>
<mediaobject>
<imageobject>
<imagedata fileref="./images/vmware-iscsi-initiator-properties.png"/>
<imagedata fileref="./images/vmware-iscsi-initiator-properties.png"/>
</imageobject>
<textobject>
<phrase>vsphereclient.png: vSphere client</phrase>
<phrase>vsphereclient.png: vSphere client</phrase>
</textobject>
</mediaobject>
</mediaobject>
</listitem>
<listitem>
<para>Click the Configure... button.</para>
<mediaobject>
<para>Click the Configure... button.</para>
<mediaobject>
<imageobject>
<imagedata fileref="./images/vmware-iscsi-general.png"/>
<imagedata fileref="./images/vmware-iscsi-general.png"/>
</imageobject>
<textobject>
<phrase>vsphereclient.png: vSphere client</phrase>
<phrase>vsphereclient.png: vSphere client</phrase>
</textobject>
</mediaobject>
</mediaobject>
</listitem>
<listitem><para>Check Enabled to enable the initiator.</para></listitem>
<listitem><para>Click OK to save.</para></listitem>
</orderedlist>
<listitem>
<para>Check Enabled to enable the initiator.</para>
</listitem>
<listitem>
<para>Click OK to save.</para>
</listitem>
</orderedlist>
</section>
<section id="vmware-vsphere-iscsi-storage-add-target">
<title>Add iSCSI target</title>
<para>Under the properties dialog, add the iSCSI target info:</para>
<mediaobject>
<title>Add iSCSI target</title>
<para>Under the properties dialog, add the iSCSI target info:</para>
<mediaobject>
<imageobject>
<imagedata fileref="./images/vmware-iscsi-target-add.png"/>
<imagedata fileref="./images/vmware-iscsi-target-add.png"/>
</imageobject>
<textobject>
<phrase>vsphereclient.png: vSphere client</phrase>
<phrase>vsphereclient.png: vSphere client</phrase>
</textobject>
</mediaobject>
<para>Repeat these steps for all ESXi hosts in the cluster.</para>
</mediaobject>
<para>Repeat these steps for all ESXi hosts in the cluster.</para>
</section>
<section id="vmware-vsphere-iscsi-storage-create-datastore">
<title>Create an iSCSI datastore</title>
<para>You should now create a VMFS datastore. Follow these steps to do so:</para>
<orderedlist>
<listitem><para>Select Home/Inventory/Datastores.</para></listitem>
<listitem><para>Right click on the datacenter node.</para></listitem>
<listitem><para>Choose Add Datastore... command.</para></listitem>
<listitem><para>Follow the wizard to create a iSCSI datastore.</para></listitem>
</orderedlist>
<para>This procedure should be done on one host in the cluster. It is not necessary to do this on all hosts.</para>
<mediaobject>
<title>Create an iSCSI datastore</title>
<para>You should now create a VMFS datastore. Follow these steps to do so:</para>
<orderedlist>
<listitem>
<para>Select Home/Inventory/Datastores.</para>
</listitem>
<listitem>
<para>Right click on the datacenter node.</para>
</listitem>
<listitem>
<para>Choose Add Datastore... command.</para>
</listitem>
<listitem>
<para>Follow the wizard to create a iSCSI datastore.</para>
</listitem>
</orderedlist>
<para>This procedure should be done on one host in the cluster. It is not necessary to do this
on all hosts.</para>
<mediaobject>
<imageobject>
<imagedata fileref="./images/vmware-iscsi-datastore.png"/>
<imagedata fileref="./images/vmware-iscsi-datastore.png"/>
</imageobject>
<textobject>
<phrase>vsphereclient.png: vSphere client</phrase>
<phrase>vsphereclient.png: vSphere client</phrase>
</textobject>
</mediaobject>
</mediaobject>
</section>
<section id="vmware-vsphere-iscsi-storage-multipathing">
<title>Multipathing for vSphere (Optional)</title>
<para>Storage multipathing on vSphere nodes may be done according to the vSphere installation guide.</para>
<title>Multipathing for vSphere (Optional)</title>
<para>Storage multipathing on vSphere nodes may be done according to the vSphere installation
guide.</para>
</section>
</section>
<section id="vmware-add-hosts-config-vsphere-cluster">
</section>
<section id="vmware-add-hosts-config-vsphere-cluster">
<title>Add Hosts or Configure Clusters (vSphere)</title>
<para>Use vCenter to create a vCenter cluster and add your desired hosts to the cluster. You will later add the entire cluster to &PRODUCT;. (see <xref linkend="add-clusters-vsphere" />).</para>
</section>
<para>Use vCenter to create a vCenter cluster and add your desired hosts to the cluster. You
will later add the entire cluster to &PRODUCT;. (see <xref linkend="add-clusters-vsphere"
/>).</para>
</section>
<section id="esxi-patch-install">
<title>Applying Hotfixes to a VMware vSphere Host</title>
<orderedlist>
<listitem>
<para>Disconnect the VMware vSphere cluster from &PRODUCT;. It should remain disconnected
long enough to apply the hotfix on the host.</para>
<orderedlist numeration="loweralpha">
<listitem>
<para>Log in to the &PRODUCT; UI as root. </para>
<para>See <xref linkend="log-in"/>.</para>
</listitem>
<listitem>
<para>Navigate to the VMware cluster, click Actions, and select Unmanage.</para>
</listitem>
<listitem>
<para>Watch the cluster status until it shows Unmanaged.</para>
</listitem>
</orderedlist>
</listitem>
<listitem>
<para>Perform the following on each of the ESXi hosts in the cluster:</para>
<orderedlist numeration="loweralpha">
<listitem>
<para>Move each of the ESXi hosts in the cluster to maintenance mode.</para>
</listitem>
<listitem>
<para>Ensure that all the VMs are migrated to other hosts in that cluster.</para>
</listitem>
<listitem>
<para>If there is only one host in that cluster, shutdown all the VMs and move the host
into maintenance mode.</para>
</listitem>
<listitem>
<para>Apply the patch on the ESXi host.</para>
</listitem>
<listitem>
<para>Restart the host if prompted.</para>
</listitem>
<listitem>
<para>Cancel the maintenance mode on the host.</para>
</listitem>
</orderedlist>
</listitem>
<listitem>
<para>Reconnect the cluster to &PRODUCT;:</para>
<orderedlist numeration="loweralpha">
<listitem>
<para>Log in to the &PRODUCT; UI as root.</para>
</listitem>
<listitem>
<para>Navigate to the VMware cluster, click Actions, and select Manage.</para>
</listitem>
<listitem>
<para>Watch the status to see that all the hosts come up. It might take several minutes
for the hosts to come up.</para>
<para>Alternatively, verify the host state is properly synchronized and updated in the
&PRODUCT; database.</para>
</listitem>
</orderedlist>
</listitem>
</orderedlist>
</section>
</section>

2
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
View File

@ -903,7 +903,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements
String fname = interfaces[i].getName();
s_logger.debug("matchPifFileInDirectory: file name '"+fname+"'");
if (fname.startsWith("eth") || fname.startsWith("bond")
|| fname.startsWith("vlan")) {
|| fname.startsWith("vlan") || fname.startsWith("em")) {
return fname;
}
}

10
server/src/com/cloud/vm/UserVmManagerImpl.java
View File

@ -1593,14 +1593,14 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
}
// used for vm transitioning to error state
private void updateVmStateForFailedVmCreation(Long vmId) {
private void updateVmStateForFailedVmCreation(Long vmId, Long hostId) {
UserVmVO vm = _vmDao.findById(vmId);
if (vm != null) {
if (vm.getState().equals(State.Stopped)) {
s_logger.debug("Destroying vm " + vm + " as it failed to create");
s_logger.debug("Destroying vm " + vm + " as it failed to create on Host with Id:" + hostId);
try {
_itMgr.stateTransitTo(vm, VirtualMachine.Event.OperationFailedToError, null);
} catch (NoTransitionException e1) {
@ -1618,7 +1618,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
s_logger.warn("Unable to delete volume:" + volume.getId() + " for vm:" + vmId + " whilst transitioning to error state");
}
}
String msg = "Failed to deploy Vm with Id: " + vmId;
String msg = "Failed to deploy Vm with Id: " + vmId + ", on Host with Id: " + hostId;
_alertMgr.sendAlert(AlertManager.ALERT_TYPE_USERVM, vm.getDataCenterIdToDeployIn(), vm.getPodIdToDeployIn(), msg, msg);
_resourceLimitMgr.decrementResourceCount(vm.getAccountId(), ResourceType.user_vm);
@ -2550,9 +2550,9 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
Pair<UserVmVO, Map<VirtualMachineProfile.Param, Object>> vmParamPair = null;
try {
vmParamPair = startVirtualMachine(vmId, hostId, additonalParams);
vm = vmParamPair.first();;
vm = vmParamPair.first();
} finally {
updateVmStateForFailedVmCreation(vm.getId());
updateVmStateForFailedVmCreation(vm.getId(), hostId);
}
// Check that the password was passed in and is valid

103
tools/cli/cloudmonkey/cloudmonkey.py
View File

@ -20,7 +20,6 @@
try:
import atexit
import cmd
import clint
import codecs
import json
import logging
@ -32,14 +31,15 @@ try:
import time
import types
from clint.textui import colored
from ConfigParser import ConfigParser, SafeConfigParser
from urllib2 import HTTPError, URLError
from httplib import BadStatusLine
from prettytable import PrettyTable
from common import __version__, config_file, config_fields
from common import __version__, config_dir, config_file, config_fields
from common import precached_verbs
from lexer import monkeyprint
from marvin.cloudstackConnection import cloudConnection
from marvin.cloudstackException import cloudstackAPIException
from marvin.cloudstackAPI import *
@ -70,37 +70,47 @@ class CloudMonkeyShell(cmd.Cmd, object):
intro = ("☁ Apache CloudStack 🐵 cloudmonkey " + __version__ +
". Type help or ? to list commands.\n")
ruler = "="
config_dir = config_dir
config_file = config_file
config_fields = config_fields
# datastructure {'verb': {cmd': ['api', [params], doc, required=[]]}}
cache_verbs = precached_verbs
config_options = []
def __init__(self, pname, verbs):
self.program_name = pname
self.verbs = verbs
global config_fields
first_time = False
if not os.path.exists(self.config_dir):
os.makedirs(self.config_dir)
if os.path.exists(self.config_file):
config = self.read_config()
else:
for key in self.config_fields.keys():
setattr(self, key, self.config_fields[key])
config = self.write_config()
first_time = True
config = self.write_config(first_time)
for section in config_fields.keys():
for key in config_fields[section].keys():
try:
self.config_options.append(key)
setattr(self, key, config.get(section, key))
except Exception:
print "Please fix `%s` in %s" % (key, self.config_file)
sys.exit()
if first_time:
print "Welcome! Using `set` configure the necessary settings:"
print " ".join(sorted(self.config_fields.keys()))
print " ".join(sorted(self.config_options))
print "Config file:", self.config_file
print "For debugging, tail -f", self.log_file, "\n"
for key in self.config_fields.keys():
try:
setattr(self, key, config.get('CLI', key))
self.config_fields[key] = config.get('CLI', key)
except Exception:
print "Please fix `%s` config in %s" % (key, self.config_file)
sys.exit()
self.prompt = self.prompt.strip() + " " # Cosmetic fix for prompt
logging.basicConfig(filename=self.log_file,
level=logging.DEBUG, format=log_fmt)
logger.debug("Loaded config fields:\n%s" % self.config_fields)
logger.debug("Loaded config fields:\n%s" % map(lambda x: "%s=%s" %
(x, getattr(self, x)),
self.config_options))
cmd.Cmd.__init__(self)
if not os.path.exists(self.config_file):
@ -122,11 +132,16 @@ class CloudMonkeyShell(cmd.Cmd, object):
self.print_shell("Error: config_file not found", e)
return config
def write_config(self):
def write_config(self, first_time=False):
global config_fields
config = ConfigParser()
config.add_section('CLI')
for key in self.config_fields.keys():
config.set('CLI', key, getattr(self, key))
for section in config_fields.keys():
config.add_section(section)
for key in config_fields[section].keys():
if first_time:
config.set(section, key, config_fields[section][key])
else:
config.set(section, key, getattr(self, key))
with open(self.config_file, 'w') as cfg:
config.write(cfg)
return config
@ -144,35 +159,19 @@ class CloudMonkeyShell(cmd.Cmd, object):
print("^C")
def print_shell(self, *args):
output = ""
try:
for arg in args:
arg = str(arg)
if isinstance(type(args), types.NoneType):
continue
if self.color == 'true':
if str(arg).count(self.ruler) == len(str(arg)):
print colored.green(arg),
elif 'Error' in arg:
print colored.red(arg),
elif ":\n=" in arg:
print colored.red(arg),
elif ':' in arg:
print colored.blue(arg),
elif 'type' in arg:
print colored.green(arg),
elif 'state' in arg or 'count' in arg:
print colored.magenta(arg),
elif 'id =' in arg:
print colored.yellow(arg),
elif 'name =' in arg:
print colored.cyan(arg),
else:
print arg,
else:
print arg,
print
output += arg
if self.color == 'true':
monkeyprint(output)
else:
print output
except Exception, e:
print colored.red("Error: "), e
self.print_shell("Error: " + e)
def print_result(self, result, result_filter=None):
if result is None or len(result) == 0:
@ -180,7 +179,7 @@ class CloudMonkeyShell(cmd.Cmd, object):
def printer_helper(printer, toprow):
if printer:
print printer
self.print_shell(printer)
return PrettyTable(toprow)
def print_result_tabular(result, result_filter=None):
@ -201,16 +200,16 @@ class CloudMonkeyShell(cmd.Cmd, object):
if printer and row:
printer.add_row(row)
if printer:
print printer
self.print_shell(printer)
def print_result_as_dict(result, result_filter=None):
for key in sorted(result.keys(),
key=lambda x: x != 'id' and x != 'count' and x):
for key in sorted(result.keys(), key=lambda x:
x not in ['id', 'count', 'name'] and x):
if not (isinstance(result[key], list) or
isinstance(result[key], dict)):
self.print_shell("%s = %s" % (key, result[key]))
else:
self.print_shell(key + ":\n" + len(key) * self.ruler)
self.print_shell(key + ":")
self.print_result(result[key], result_filter)
def print_result_as_list(result, result_filter=None):
@ -360,7 +359,7 @@ class CloudMonkeyShell(cmd.Cmd, object):
command.required)
if len(missing_args) > 0:
self.print_shell("Missing arguments:", ' '.join(missing_args))
self.print_shell("Missing arguments: ", ' '.join(missing_args))
return
isAsync = False
@ -400,7 +399,7 @@ class CloudMonkeyShell(cmd.Cmd, object):
self.cache_verbs[verb][subject][1])
search_string = text
if self.tabularize == "true":
if self.tabularize == "true" and subject != "":
autocompletions.append("filter=")
return [s for s in autocompletions if s.startswith(search_string)]
@ -441,7 +440,7 @@ class CloudMonkeyShell(cmd.Cmd, object):
def complete_set(self, text, line, begidx, endidx):
mline = line.partition(" ")[2]
offs = len(mline) - len(text)
return [s[offs:] for s in self.config_fields.keys()
return [s[offs:] for s in self.config_options
if s.startswith(mline)]
def do_shell(self, args):

46
tools/cli/cloudmonkey/common.py
View File

@ -17,25 +17,43 @@
# under the License.
# Use following rules for versioning:
# <cloudstack major version>.<cloudstack minor version>.<cli increment>
__version__ = "4.0.0"
# <cloudstack version>-<cli increment, starts from 0>
__version__ = "4.1.0-0"
try:
from os.path import expanduser
import os
from precache import precached_verbs
except ImportError, e:
precached_verbs = {}
# Add config key:value
config_file = os.path.expanduser('~/.cloudmonkey_config')
config_fields = {'host': 'localhost', 'port': '8080',
'protocol': 'http', 'path': '/client/api',
'apikey': '', 'secretkey': '',
'timeout': '3600', 'asyncblock': 'true',
'prompt': '🐵 cloudmonkey>', 'color': 'true',
'tabularize': 'false',
'log_file':
os.path.expanduser('~/.cloudmonkey_log'),
'history_file':
os.path.expanduser('~/.cloudmonkey_history')}
param_type = ['boolean', 'date', 'float', 'integer', 'short', 'list',
'long', 'object', 'map', 'string', 'tzdate', 'uuid']
config_dir = expanduser('~/.cloudmonkey')
config_file = expanduser(config_dir + '/config')
# cloudmonkey config fields
config_fields = {'core': {}, 'ui': {}, 'server': {}, 'user': {}}
# core
config_fields['core']['cache_file'] = expanduser(config_dir + '/cache')
config_fields['core']['history_file'] = expanduser(config_dir + '/history')
config_fields['core']['log_file'] = expanduser(config_dir + '/log')
# ui
config_fields['ui']['color'] = 'true'
config_fields['ui']['prompt'] = '> '
config_fields['ui']['tabularize'] = 'false'
# server
config_fields['server']['asyncblock'] = 'true'
config_fields['server']['host'] = 'localhost'
config_fields['server']['path'] = '/client/api'
config_fields['server']['port'] = '8080'
config_fields['server']['protocol'] = 'http'
config_fields['server']['timeout'] = '3600'
# user
config_fields['user']['apikey'] = ''
config_fields['user']['secretkey'] = ''

121
tools/cli/cloudmonkey/lexer.py Normal file
View File

@ -0,0 +1,121 @@
# -*- coding: utf-8 -*-
# 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.
try:
from pygments import highlight
from pygments.console import ansiformat
from pygments.formatter import Formatter
from pygments.formatters import Terminal256Formatter
from pygments.lexer import bygroups, include, RegexLexer
from pygments.token import *
import sys
except ImportError, e:
print e
MONKEY_COLORS = {
Token: '',
Whitespace: 'reset',
Text: 'reset',
Name: 'green',
Operator: 'teal',
Operator.Word: 'lightgray',
String: 'purple',
Keyword: '_red_',
Error: 'red',
Literal: 'yellow',
Number: 'blue',
}
def get_colorscheme():
return MONKEY_COLORS
class MonkeyLexer(RegexLexer):
keywords = ['[a-z]*id', '^[a-z A-Z]*:']
attributes = ['[Tt]rue', '[Ff]alse']
params = ['[a-z]*[Nn]ame', 'type', '[Ss]tate']
uuid_rgx = r'[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
date_rgx = r'[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9:]{8}-[0-9]{4}'
def makelistre(lis):
return r'(' + r'|'.join(lis) + r')'
tokens = {
'root': [
(r' ', Whitespace),
(date_rgx, Number),
(uuid_rgx, Literal),
(r'(?:\b\d+\b(?:-\b\d+|%)?)', Number),
(r'^[-=]*\n', Operator.Word),
(r'Error', Error),
(makelistre(keywords), Keyword),
(makelistre(attributes), Literal),
(makelistre(params) + r'( = )(.*)', bygroups(Name, Operator,
String)),
(makelistre(params), Name),
(r'(^[a-zA-Z]* )(=)', bygroups(Name, Operator)),
(r'\S+', Text),
]
}
def analyse_text(text):
npos = text.find('\n')
if npos < 3:
return False
return text[0] == '[' and text[npos - 1] == ']'
class MonkeyFormatter(Formatter):
def __init__(self, **options):
Formatter.__init__(self, **options)
self.colorscheme = get_colorscheme()
def format(self, tokensource, outfile):
self.encoding = outfile.encoding
return Formatter.format(self, tokensource, outfile)
def format_unencoded(self, tokensource, outfile):
for ttype, value in tokensource:
color = self.colorscheme.get(ttype)
while color is None:
ttype = ttype[:-1]
color = self.colorscheme.get(ttype)
if color:
spl = value.split('\n')
for line in spl[:-1]:
if line:
outfile.write(ansiformat(color, line))
outfile.write('\n')
if spl[-1]:
outfile.write(ansiformat(color, spl[-1]))
else:
outfile.write(value)
def monkeyprint(text):
fmter = MonkeyFormatter()
lexer = MonkeyLexer()
lexer.encoding = 'utf-8'
fmter.encoding = 'utf-8'
highlight(text, lexer, fmter, sys.stdout)

2
tools/cli/setup.py
View File

@ -26,7 +26,7 @@ from cloudmonkey import __version__
name = 'cloudmonkey'
version = __version__
requires = ['clint>=0.3.0',
requires = ['Pygments>=1.5',
'prettytable>=0.6',
]

4241
tools/whisker/LICENSE Normal file
View File

File diff suppressed because it is too large Load Diff

690
tools/whisker/NOTICE Normal file
View File

@ -0,0 +1,690 @@
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Source code distribution if this software contains third party resources requiring
the following notices:
For
jquery.md5.js
jQuery MD5 Plugin 1.2.1
https://github.com/blueimp/jQuery-MD5
Copyright 2010, Sebastian Tschan
https://blueimp.net
Licensed under the MIT license:
http://creativecommons.org/licenses/MIT/
Based on
A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
Digest Algorithm, as defined in RFC 1321.
Version 2.2 Copyright (C) Paul Johnston 1999 - 2009
Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
Distributed under the BSD License
See http://pajhome.org.uk/crypt/md5 for more info.
For
jquery.js
jQuery JavaScript Library v1.3.2
http://jquery.com/
Copyright (c) 2009 John Resig
Dual licensed under the MIT and GPL licenses.
http://docs.jquery.com/License
Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009)
Revision: 6246
For
jquery.js
jQuery JavaScript Library v1.6.1
http://jquery.com/
Copyright 2011, John Resig
Dual licensed under the MIT or GPL Version 2 licenses.
http://jquery.org/license
Includes Sizzle.js
http://sizzlejs.com/
Copyright 2011, The Dojo Foundation
Released under the MIT, BSD, and GPL Licenses.
Date: Thu May 12 15:04:36 2011 -0400
For
jquery.colorhelpers.js
Plugin for jQuery for working with colors.
Version 1.1.
Inspiration from jQuery color animation plugin by John Resig.
Released under the MIT license by Ole Laursen, October 2009.
For
cloud-ejb-api-3.0.jar
cloud-email.jar
cloud-jstl-1.2.jar
jaxb-api-2.1.jar
jaxb-impl-2.1.7.jar
jaxb-xjc-2.1.7.jar
jta-1.1.jar
mail-1.4.jar
NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE
(CDDL)
The code released under the CDDL shall be governed by the laws of the State of
California (excluding conflict-of-law provisions). Any litigation relating to
this License shall be subject to the jurisdiction of the Federal Courts of the
Northern District of California and the state courts of the State of California,
with venue lying in Santa Clara County, California.
For
cloud-javax.persistence-2.0.0.jar
EclipseLink 2.0.0
Dec 10th, 2009
About
The EclipseLink project's goal is to provide a complete persistence framework
that is both comprehensive and universal. It will run in any Java environment
and read and write objects to virtually any type of data source, including
relational databases, and XML. EclipseLink will focus on providing leading edge
support, including advanced feature extensions, for the dominant persistence
standards for each target data source; Java Persistence API (JPA) for relational
databases, Java API for XML Binding (JAXB) for XML, Service Data Objects (SDO),
and Database Web services (DBWS).
For tips on getting started with EclipseLink, please see the following
resources:
EclipseLink 2.0.0 Release Notes Documentation Examples and How To License
The Eclipse Foundation makes available all content in this plug-in ("Content").
Unless otherwise indicated below, the Content is provided to you under the terms
and conditions of the Eclipse Public License Version 1.0 ("EPL") and Eclipse
Distribution License Version 1.0 ("EDL"). A copy of the EPL is available at
http://www.eclipse.org/legal/epl-v10.html and a copy of the EDL is available at
http://www.eclipse.org/org/documents/edl-v10.php. For purposes of the EPL,
"Program" will mean the Content.
If you did not receive this Content directly from the Eclipse Foundation, the
Content is being redistributed by another party ("Redistributor") and different
terms and conditions may apply to your use of any object code in the Content.
Check the Redistributor's license that was provided with the Content. If no such
license exists, contact the Redistributor. Unless otherwise indicated below, the
terms and conditions of the EPL and EDL still apply to any source code in the
Content and such source code may be obtained at http://www.eclipse.org.
Third Party Content
The Content includes items that have been sourced from third parties as set out
below. If you did not receive this Content directly from the Eclipse Foundation,
the following is provided for informational purposes only, and you should look
to the Redistributor's license for terms and conditions of use.
Foundation Dependencies ASM EclipseLink JPA ANTLR Java Persistence API (JPA) 1.0
- EJB 3.0 Java Persistence API (JPA) 2.0 EARLY ACCESS EclipseLink MOXy Java
Architecture for XML Binding (JAXB) Java Mail Java Activation Framework
Streaming API for XML (StAX) EclipseLink SDO Service Data Objects (SDO)
Utilities Java Connector Xerces WSDL4J 1.6.2 ASM v1.5.3
The EclipseLink Project includes ASM for the purpose of byte code weaving. The
AMS library is re-packaged within the source of the project
(org.persistence.eclipse.internal.libraries.asm.*) to avoid version collisions
with other usage of ASM. A custom patch has been added to the ASM 1.5.3 source
to handle an issue with other usages. This fix has also been contributed back to
the ASM project for inclusion in later projects.
The source code is available within the project's subversion repository. The
binaries are distributed within the eclipselink.jar and in the
org.eclipse.persistence.asm_2.0.0.v*.jar bundle.
http://asm.objectweb.org/license.html
Copyright (c) 2000-2005 INRIA, France Telecom, All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
Redistributions of source code must retain the above copyright notice, this list
of conditions and the following disclaimer. Redistributions in binary form must
reproduce the above copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided with the
distribution. Neither the name of the copyright holders nor the names of its
contributors may be used to endorse or promote products derived from this
software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY
THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"AND ANY EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THEIMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSEARE DISCLAIMED. IN NO EVENT
SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BELIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, ORCONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OFSUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER INCONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
OR OTHERWISE)ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OFTHE POSSIBILITY OF SUCH DAMAGE.
ANTLR v3.0
The ANTLR library (license) is included within EclipseLink Project to enable
parsing of the Java Persistence Query language (JP QL). The ANTLR library is re-
packaged within the project in the
org.eclipse.persistence.internal.libraries.antlr.* packages.
The source is available with the project's subversion repository. The binaries
are distributed within the eclipselink.jar and in the
org.eclipse.persistence.antlr_2.0.0.v*.jar bundle.
Java Architecture for XML Binding (JAXB) v2.0.5
The JAXB libraries distributed under CDDL v1.0 are included within the
EclipseLink Project to enable the MOXY component's implementation of JAXB.
JAXB Libraries:
/jlib/moxy/javax.xml.bind_2.1.12.v20090708-1500.jar /jlib/moxy/jaxb-impl.jar
/jlib/moxy/jaxb.xjc.jar Java Persistence (JPA) 1.0 - EJB 3.0
The Java Persistence API, included with EJB 3.0, is available for download from
the ejb-api directory in the glassfish CVS repository.It is distributed under
CDDLv1.0 . The jar is being shipped as an OSGi bundle and is required for
compilation of some container based fuctionality.
Java Persistence (JPA) 2.0.
EclipseLink is the Java Persistence (JPA) 2.0 Reference Implementation (JSR
317). The JPA 2.0 specification API is included in EclipseLink under the EPL and
EDL licenses.
Java Mail v1.4
The Java Mail library (mail.jar) is distributed with the JAXB v2.0.5 under CDDL
v1.0 and is included within the EclipseLink Project distribution to support Web
Services attachment handling in the MOXy component. It is only required when
using Java SE 5 (Java Mail is included in Java SE 6).
Java Activation Framework v1.1
The Java Activation Framework (activation.jar) is distributed with the JAXB
v2.0.5 under CDDL v1.0 and is included within the EclipseLink Project
distribution to support Web Services attachment handling in the MOXy component.
It is only required when using Java SE 5 (The Java Activation Framework is
included in Java SE 6).
Streaming API for XML (StAX) v1.0
The Streaming API for XML (StAX) library (jsr173_1.0_api.jar) is distributed
with the JAXB v2.0.5 under CDDL v1.0 and is included within the EclipseLink
Project distribution as an optional XML processing approach in the MOXy
component.
Service Data Objects (SDO) v2.1.1
The Service Data Objects (SDO) API is distributed under a CDDLv1.0 and custom
license. It provides the standard API implemented by the EclipseLink Project's
SDO component.
Java Connector v1.5
The JCA 1.5 API is available for download from the connector-api directory in
the glassfish CVS repository. It is distributed under CDDLv1.0 .
This jar is being shipped and required by the Workbench only. When using
EclipseLink in a container where JCA integration is required that container will
provide the necessary API libraries.
Xerces v2.9.0
Xerces 2.9.0 is available from the Xerces home page. It is distributed under
Apache 2.0.
This jar is shipped for the Workbench's use only in the reading and writing of
XML configuration files.
WSDL4j v1.6.2
WSDL4J 1.6.2 is available for download from the wsdl4j project. It distributed
under CPLv1.0 .
This jar is being shipped as a OSGi bundle and is only required for the DBWS
Builder utility.
For
cloud-commons-logging-1.1.1.jar
commons-logging-1.1.1.jar
// ------------------------------------------------------------------
// NOTICE file corresponding to the section 4d of The Apache License,
// Version 2.0, in this case for Commons Logging
// ------------------------------------------------------------------
Commons Logging
Copyright 2001-2007 The Apache Software Foundation
This product includes/uses software(s) developed by 'an unknown organization'
- Unnamed - avalon-framework:avalon-framework:jar:4.1.3
- Unnamed - log4j:log4j:jar:1.2.12
- Unnamed - logkit:logkit:jar:1.0.1
For
neethi-2.0.4.jar
=========================================================================
== NOTICE file corresponding to the section 4 d of ==
== the Apache License, Version 2.0, ==
== in this case for the Apache AXIOM distribution. ==
=========================================================================
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Portions Copyright 2006 International Business Machines Corp.
Please read the different LICENSE files present in the licenses directory of
this distribution.
For
cloud-jasypt-1.9.jar
Copyright (c) 2007-2010, The JASYPT team (http://www.jasypt.org)
Licensed 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 distribution includes cryptographic software. The country in
which you currently reside may have restrictions on the import,
possession, use, and/or re-export to another country, of
encryption software. BEFORE using any encryption software, please
check your country's laws, regulations and policies concerning the
import, possession, or use, and re-export of encryption software, to
see if this is permitted. See http://www.wassenaar.org/ for more
information.
The U.S. Government Department of Commerce, Bureau of Industry and
Security (BIS), has classified this software as Export Commodity
Control Number (ECCN) 5D002.C.1, which includes information security
software using or performing cryptographic functions with asymmetric
algorithms. The form and manner of this distribution makes it
eligible for export under the License Exception ENC Technology
Software Unrestricted (TSU) exception (see the BIS Export
Administration Regulations, Section 740.13) for both object code and
source code.
The following provides more details on the cryptographic software
used (note that this software is not included in the distribution):
* The PBE Encryption facilities require the Java Cryptography
extensions: http://java.sun.com/javase/technologies/security/.
---------------------------------
Distributions of this software may include software developed by
The Apache Software Foundation (http://www.apache.org/).
---------------------------------
ICU License - ICU 1.8.1 and later
COPYRIGHT AND PERMISSION NOTICE
Copyright (c) 1995-2006 International Business Machines
Corporation and others
All rights reserved.
Permission is hereby granted, free of charge, to any
person obtaining a copy of this software and associated
documentation files (the "Software"), to deal in the
Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish,
distribute, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so,
provided that the above copyright notice(s) and this
permission notice appear in all copies of the Software and
that both the above copyright notice(s) and this
permission notice appear in supporting documentation.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO
EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
USE OR PERFORMANCE OF THIS SOFTWARE.
Except as contained in this notice, the name of a copyright
holder shall not be used in advertising or otherwise to
promote the sale, use or other dealings in this Software
without prior written authorization of the copyright holder.
For
XmlSchema-1.4.3.jar
Portions Copyright 2006 International Business Machines Corp.
For
cloud-trilead-ssh2-build213.jar
Trilead SSH-2 for Java includes code that was written by Dr. Christian Plattner
during his PhD at ETH Zurich. The license states the following:
Copyright (c) 2005 - 2006 Swiss Federal Institute of Technology (ETH Zurich),
Department of Computer Science (http://www.inf.ethz.ch),
Christian Plattner. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
a.) Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
b.) Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
c.) Neither the name of ETH Zurich nor the names of its contributors may
be used to endorse or promote products derived from this software
without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
The Java implementations of the AES, Blowfish and 3DES ciphers have been
taken (and slightly modified) from the cryptography package released by
"The Legion Of The Bouncy Castle".
Their license states the following:
Copyright (c) 2000 - 2004 The Legion Of The Bouncy Castle
(http://www.bouncycastle.org)
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
For
axis2-1.5.1.jar
axis2-adb-1.5.1.jar
axis2-ant-plugin-1.5.1.jar
axis2-codegen-1.4.1.jar
axis2-jaxbri-1.5.1.jar
axis2-jaxws-1.5.1.jar
axis2-jibx-1.5.1.jar
axis2-json-1.5.1.jar
axis2-kernel-1.5.1.jar
axis2-transport-http-1.5.1.jar
axis2-transport-local-1.5.1.jar
axis2-webapp-1.5.1.war
cloud-axis.jar
=========================================================================
== NOTICE file corresponding to the section 4 d of ==
== the Apache License, Version 2.0, ==
== in this case for the Apache Axis2 distribution. ==
=========================================================================
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Portions Copyright 2006 International Business Machines Corp.
Portions Copyright 2005-2007 WSO2, Inc.
This product also includes schemas and specification developed by:
- the W3C consortium (http://www.w3c.org)
This product also includes WS-* schemas developed by International
Business Machines Corporation, Microsoft Corporation, BEA Systems,
TIBCO Software, SAP AG, Sonic Software, and VeriSign
This product also includes a WSDL developed by salesforce.com
- Copyright 1999-2006 salesforce.com, inc.
Portions of the included xmlbeans library were originally based on the following:
- software copyright (c) 2000-2003, BEA Systems, <http://www.bea.com/>.
Please read the different LICENSE files present in the lib directory of
this distribution.
For
xml-apis.jar
=========================================================================
== NOTICE file corresponding to section 4(d) of the Apache License, ==
== Version 2.0, in this case for the Apache xml-commons xml-apis ==
== distribution. ==
=========================================================================
Apache XML Commons XML APIs
Copyright 2006 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Portions of this software were originally based on the following:
- software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
- software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
- software copyright (c) 2000 World Wide Web Consortium, http://www.w3.org
For
cloud-commons-codec-1.5.jar
commons-codec-1.4.jar
Apache Commons Codec
Copyright 2002-2011 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
--------------------------------------------------------------------------------
src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java contains
test data from http://aspell.sourceforge.net/test/batch0.tab.
Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org). Verbatim copying
and distribution of this entire article is permitted in any medium,
provided this notice is preserved.
--------------------------------------------------------------------------------
For
rampart-lib
Apache Rampart
Copyright 2010 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Please read the different LICENSE files present in the lib directory of
this distribution.
For
xercesImpl.jar
=========================================================================
== NOTICE file corresponding to section 4(d) of the Apache License, ==
== Version 2.0, in this case for the Apache Xerces Java distribution. ==
=========================================================================
Apache Xerces Java
Copyright 1999-2012 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Portions of this software were originally based on the following:
- software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
- software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
- voluntary contributions made by Paul Eng on behalf of the
Apache Software Foundation that were originally developed at iClick, Inc.,
software copyright (c) 1999.
For
woden-api-1.0M8.jar
woden-impl-dom-1.0M8.jar
=========================================================================
== NOTICE file corresponding to the section 4 d of ==
== the Apache License, Version 2.0, ==
== in this case for the Apache Woden distribution. ==
=========================================================================
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
This product also includes software developed by :
- IBM Corporation (http://www.ibm.com),
WSDL4J was the initial code contribution for the Apache Woden
project and some of the WSDL4J design and code has been reused.
- The W3C Consortium (http://www.w3c.org),
Common W3C XML Schema and DTD files are packaged with Apache Woden.
Please read the different LICENSE files present in the root directory of
this distribution.
For
axiom-api-1.2.8.jar
axiom-impl-1.2.8.jar
Axiom includes software from other projects, as follows:
This software includes the Woodstox High-performance XML processor
http://woodstox.codehaus.org/
licensed under the Apache License, Version 2.0
This software includes the Jaxen XPath library
http://jaxen.codehaus.org/
licensed under the following BSD 3 Clause license:
================================================================================
Copyright 2003-2006 The Werken Company. All Rights Reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of the Jaxen Project nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
================================================================================
For
wss4j-1.5.8.jar
Apache WebServices - WSS4J
Copyright 2004-2011 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
This product includes software Copyright University of Southampton IT
Innovation Centre, 2006 (http://www.it-innovation.soton.ac.uk).

2952
tools/whisker/descriptor-for-packaging.xml Normal file
View File

File diff suppressed because it is too large Load Diff

295
tools/whisker/descriptor.xml
View File

@ -2654,299 +2654,4 @@ Copyright (c) 2010-2011 OpenStack, LLC.
</by-organisation>
</with-license>
</within>
<!-- Resources below this line are binary dependencies that are only pulled in during the build process. -->
<within dir='target/jar'>
<with-license id='MIT'>
<copyright-notice>
Copyright (C) 2008 Tóth István &lt;stoty@tvnet.hu&gt;
2008-2012 Daniel Veillard &lt;veillard@redhat.com&gt;
2009-2011 Bryan Kearney &lt;bkearney@redhat.com&gt;
</copyright-notice>
<by-organisation id='libvirt.org'>
<resource name='libvirt-java-0.4.9' />
</by-organisation>
</with-license>
<with-license id="ApacheLicenseVersion2">
<copyright-notice>
Copyright (c) 2012 The Apache Software Foundation
</copyright-notice>
<by-organisation id="apache.org.2">
<resource name="cloud-axis.jar" source="http://axis.apache.org/axis/" notice='axis2.notice'/>
<resource name="cloud-commons-codec-1.5.jar" source="http://commons.apache.org/codec/" notice="codec" />
<resource name="cloud-commons-collections-3.2.1.jar" source="http://commons.apache.org/collections/"/>
<resource name="cloud-commons-configuration-1.8.jar" source="http://commons.apache.org/configuration/"/>
<resource name="cloud-commons-dbcp-1.4.jar" source="http://commons.apache.org/dbcp/" />
<resource name="cloud-commons-httpclient-3.1.jar" source="http://hc.apache.org/httpclient-3.x/" />
<resource name="cloud-commons-lang-2.6.jar" source="http://commons.apache.org/lang/" />
<resource name="cloud-commons-logging-1.1.1.jar" source="http://commons.apache.org/logging/" notice="logging" />
<resource name="cloud-commons-pool-1.5.6.jar" source="http://commons.apache.org/pool/" />
<resource name="cloud-log4j.jar" source="http://logging.apache.org/log4j/" />
<resource name="cloud-log4j-extras.jar" source="http://logging.apache.org/log4j/companions/extras/" />
<resource name="cloud-ws-commons-util-1.0.2.jar" source="http://ws.apache.org/commons/util/" />
<resource name="cloud-xmlrpc-client-3.1.3.jar" source="http://ws.apache.org/xmlrpc/client.html" />
<resource name="cloud-xmlrpc-common-3.1.3.jar" source="http://ws.apache.org/xmlrpc/xmlrpc-common/" />
<resource name="cloud-cglib.jar" source='http://cglib.sourceforge.net/' />
</by-organisation>
</with-license>
<with-license id="ApacheLicenseVersion1.1">
<copyright-notice>
Copyright (c) 2012 The Apache Software Foundation
</copyright-notice>
<by-organisation id="apache.org.2">
<resource name="cloud-commons-discovery.jar" source="http://commons.apache.org/discovery/" />
</by-organisation>
</with-license>
<with-license id="ApacheLicenseVersion2">
<copyright-notice>
Copyright (c) 2007-2010, The JASYPT team (http://www.jasypt.org)
</copyright-notice>
<by-organisation id='jasypt.org'>
<resource name='cloud-jasypt-1.9.jar' source='http://www.jasypt.org' notice='jasypt.notice' />
</by-organisation>
</with-license>
<with-license id="ApacheLicenseVersion2">
<copyright-notice>
Copyright (c) 2003-2007 Luck Consulting Pty Ltd
</copyright-notice>
<by-organisation id="luck">
<resource name="cloud-ehcache.jar" source="http://ehcache.org/" />
</by-organisation>
</with-license>
<with-license id='CDDL'>
<copyright-notice>
Copyright (c) 2006 Sun Microsystems, Inc. All rights reserved.
</copyright-notice>
<by-organisation id='glassfish.org'>
<resource name='cloud-ejb-api-3.0.jar' source='http://repo1.maven.org/maven2/javax/ejb/ejb-api/3.0/ejb-api-3.0-sources.jar' notice='cddlnotice' />
<resource name='cloud-jstl-1.2.jar' source='http://jstl.java.net/' notice='cddlnotice' />
</by-organisation>
</with-license>
<with-license id='CDDL'>
<copyright-notice>
Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
</copyright-notice>
<by-organisation id='oracle.com'>
<resource name='cloud-email.jar' source='http://kenai.com/projects/javamail' notice='cddlnotice' />
</by-organisation>
</with-license>
<with-license id='ApacheLicenseVersion2'>
<copyright-notice>
Copyright (c) 2009 Google Inc.
</copyright-notice>
<by-organisation id='google.com'>
<resource name='cloud-google-gson-1.7.1.jar' source='http://code.google.com/p/google-gson/' />
</by-organisation>
</with-license>
<with-license id='EclipseDistributionLicense1'>
<copyright-notice>
Copyright (c) 2012 The Eclipse Foundation.
</copyright-notice>
<by-organisation id='eclipse.org'>
<resource name='cloud-javax.persistence-2.0.0.jar' source='http://wiki.eclipse.org/EclipseLink/Release/2.0.0' notice='eclipse.persistence' />
</by-organisation>
</with-license>
<with-license id='BSD3ClauseGeneric'>
<copyright-notice>
Copyright (c) 2009, Caringo, Inc.
</copyright-notice>
<by-organisation id='caringo.com'>
<resource name='CAStorSDK.jar' source='http://www.castor.org/download.html' />
</by-organisation>
</with-license>
<with-license id='BSD3ClauseGeneric'>
<copyright-notice>
Copyright (c) 2002-2011 Atsuhiko Yamanaka, JCraft,Inc.
</copyright-notice>
<by-organisation id='jcraft.com'>
<resource name='cloud-jsch-0.1.42.jar' source='http://www.jcraft.com/jsch/' />
</by-organisation>
</with-license>
<with-license id='CPL1'>
<copyright-notice>
Copyright (c) IBM Corp 2006
</copyright-notice>
<by-organisation id='ibm.com'>
<resource name='cloud-wsdl4j-1.6.2.jar' source='http://sourceforge.net/projects/wsdl4j/' />
<resource name='cloud-wsdl4j.jar' source='http://sourceforge.net/projects/wsdl4j/' />
</by-organisation>
</with-license>
<with-license id='xstream.bsd'>
<copyright-notice />
<by-organisation id='xstream.codehaus.com'>
<resource name='cloud-xstream-1.3.1.jar' source='http://xstream.codehaus.org/repository.html' />
</by-organisation>
</with-license>
<with-license id='bouncy.mit'>
<copyright-notice />
<by-organisation id='bouncy.castle'>
<resource name='cloud-bcprov-jdk16-1.45.jar' source='http://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk16/1.45/bcprov-jdk16-1.45-sources.jar' />
</by-organisation>
</with-license>
<with-license id='BSD3ClauseGeneric'>
<copyright-notice>
Copyright (c) 2007-2008 Trilead AG (http://www.trilead.com)
All rights reserved.
</copyright-notice>
<by-organisation id='trilead.com'>
<resource name='cloud-trilead-ssh2-build213.jar' source='http://sourceforge.net/projects/orion-ssh2/' notice='trilead.notice' />
</by-organisation>
</with-license>
<with-license id='ApacheLicenseVersion2'>
<copyright-notice />
<by-organisation id='jetty.codehaus.com'>
<resource name='jetty-6.1.26.jar' source='http://repo1.maven.org/maven2/org/mortbay/jetty/jetty/6.1.26/jetty-6.1.26-sources.jar' />
<resource name='jetty-util-6.1.26.jar' source='http://repo1.maven.org/maven2/org/mortbay/jetty/jetty-util/6.1.26/jetty-util-6.1.26-sources.jar' />
</by-organisation>
</with-license>
<with-license id='CPL1'>
<copyright-notice />
<by-organisation id='junit.org'>
<resource name='cloud-junit.jar' source='http://kentbeck.github.com/junit/' />
</by-organisation>
</with-license>
<public-domain>
<by-organisation id='distcomplab.emory'>
<resource name='cloud-backport-util-concurrent-3.0.jar' source='http://backport-jsr166.sourceforge.net/' />
</by-organisation>
</public-domain>
</within>
<within dir='deps/awsapi-lib'>
<with-license id='ApacheLicenseVersion2'>
<copyright-notice>
Copyright (c) 2004-2008 The Apache Software Foundation
</copyright-notice>
<by-organisation id='apache.org.2'>
<resource name='XmlSchema-1.4.3.jar' notice='xmlschema.notice' />
</by-organisation>
</with-license>
<with-license id='antlr2'>
<copyright-notice />
<by-organisation id='antlr2.org'>
<resource name='antlr-2.7.6.jar' source='http://repo1.maven.org/maven2/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar' />
</by-organisation>
</with-license>
<with-license id='MIT'>
<copyright-notice>
Copyright (c) 2004-2011 QOS.ch
</copyright-notice>
<by-organisation id='qos.ch'>
<resource name='slf4j-api-1.5.11.jar' source='https://github.com/qos-ch/slf4j' />
<resource name='slf4j-jdk14-1.5.11.jar' source='https://github.com/qos-ch/slf4j' />
</by-organisation>
</with-license>
<with-license id="ApacheLicenseVersion2">
<copyright-notice>
Copyright (c) 2004-2012 The Apache Software Foundation
</copyright-notice>
<by-organisation id="apache.org.2">
<resource name="apache-log4j-extras-1.0.jar" source="http://logging.apache.org/log4j/companions/extras/" />
<resource name="axiom-api-1.2.8.jar" source="http://ws.apache.org/axiom/source-repository.html" notice="axiom.notice" />
<resource name="axiom-impl-1.2.8.jar" source="http://ws.apache.org/axiom/source-repository.html" notice="axiom.notice" />
<resource name="axis2-1.5.1.jar" source="http://axis.apache.org/axis/" notice='axis2.notice' />
<resource name="axis2-codegen-1.4.1.jar" source="http://axis.apache.org/axis/" notice='axis2.notice' />
<resource name="axis2-adb-1.5.1.jar" source="http://axis.apache.org/axis/" notice='axis2.notice' />
<resource name="axis2-ant-plugin-1.5.1.jar" source="http://axis.apache.org/axis/" notice='axis2.notice' />
<resource name="axis2-jaxbri-1.5.1.jar" source="http://axis.apache.org/axis/" notice='axis2.notice' />
<resource name="axis2-jaxws-1.5.1.jar" source="http://axis.apache.org/axis/" notice='axis2.notice' />
<resource name="axis2-jibx-1.5.1.jar" source="http://axis.apache.org/axis/" notice='axis2.notice' />
<resource name="axis2-json-1.5.1.jar" source="http://axis.apache.org/axis/" notice='axis2.notice' />
<resource name="axis2-kernel-1.5.1.jar" source="http://axis.apache.org/axis/" notice='axis2.notice' />
<resource name="axis2-transport-http-1.5.1.jar" source="http://axis.apache.org/axis/" notice='axis2.notice' />
<resource name="axis2-transport-local-1.5.1.jar" source="http://axis.apache.org/axis/" notice='axis2.notice' />
<resource name="axis2-webapp-1.5.1.war" source="http://axis.apache.org/axis/" notice='axis2.notice' />
<resource name="commons-codec-1.4.jar" source="http://commons.apache.org/codec/" notice="codec" />
<resource name="commons-collections-3.1.jar" source="http://commons.apache.org/collections/"/>
<resource name='commons-fileupload-1.2.jar' source='http://commons.apache.org/fileupload/' />
<resource name="commons-httpclient-3.1.jar" source="http://hc.apache.org/httpclient-3.x/" />
<resource name='commons-io-1.4.jar' source='http://commons.apache.org/io/' />
<resource name="commons-logging-1.1.1.jar" source="http://commons.apache.org/logging/" notice="logging" />
<resource name="httpcore-4.0.jar" source="http://hc.apache.org/httpcomponents-core-ga/" />
<resource name="log4j-1.2.15.jar" source="http://logging.apache.org/log4j/" />
<resource name="neethi-2.0.4.jar" source="http://svn.apache.org/viewvc/webservices/commons/tags/neethi/2.0.4/" notice='neethi.notice' />
<resource name="rampart-lib" source="http://axis.apache.org/axis2/java/rampart/download/1.5/download.cgi" notice='rampart.notice' />
<resource name="woden-api-1.0M8.jar" source='http://svn.apache.org/viewvc/webservices/woden/tags/1.0M8_20080423/' notice='woden.notice' />
<resource name="woden-impl-dom-1.0M8.jar" source='http://svn.apache.org/viewvc/webservices/woden/tags/1.0M8_20080423/' notice='woden.notice' />
<resource name='xercesImpl.jar' source='http://xerces.apache.org/xerces2-j/source-repository.html' notice='xerces.notice' />
<resource name='xml-apis.jar' source='http://repo1.maven.org/maven2/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04-sources.jar' notice='xml-apis.notice' />
<resource name='wss4j-1.5.8.jar' source='http://ws.apache.org/wss4j/source-repository.html' notice='wss4j.notice' />
</by-organisation>
</with-license>
<with-license id='ApacheLicenseVersion2'>
<copyright-notice>
Copyright (c) 2009 Google Inc.
</copyright-notice>
<by-organisation id='google.com'>
<resource name='cloud-gson.jar' source='http://code.google.com/p/google-gson/' />
</by-organisation>
</with-license>
<with-license id='dom4j.license'>
<copyright-notice />
<by-organisation id='dom4j.sourceforge.net'>
<!-- TODO: Need to have a review of this license! -->
<resource name='dom4j-1.6.1.jar' source='http://dom4j.sourceforge.net/source-repository.html' />
</by-organisation>
</with-license>
<with-license id='CDDL'>
<copyright-notice>
Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
</copyright-notice>
<by-organisation id='oracle.com'>
<resource name='jaxb-api-2.1.jar' source='http://repo1.maven.org/maven2/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar' notice='cddlnotice' />
<resource name='jaxb-impl-2.1.7.jar' source='http://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-impl/2.1.7/jaxb-impl-2.1.7-sources.jar' notice='cddlnotice' />
<resource name='jaxb-xjc-2.1.7.jar' source='http://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-xjc/2.1.7/jaxb-xjc-2.1.7-sources.jar' notice='cddlnotice' />
</by-organisation>
</with-license>
<with-license id='CDDL'>
<copyright-notice>
Copyright (c) 2006 Sun Microsystems, Inc. All rights reserved.
</copyright-notice>
<by-organisation id='glassfish.org'>
<resource name='jta-1.1.jar' source='http://repo1.maven.org/maven2/javax/transaction/jta/1.1/jta-1.1-sources.jar' notice='cddlnotice' />
</by-organisation>
</with-license>
<with-license id='BSD3ClauseGeneric'>
<copyright-notice>
Copyright (c) 2002-2011 Atsuhiko Yamanaka, JCraft,Inc.
</copyright-notice>
<by-organisation id='jcraft.com'>
<resource name='jsch-0.1.42.jar' source='http://www.jcraft.com/jsch/' />
</by-organisation>
</with-license>
<with-license id='ApacheLicenseVersion2'>
<copyright-notice />
<by-organisation id='json-simple'>
<resource name='json_simple-1.1.jar' source='http://code.google.com/p/json-simple/source/checkout' />
</by-organisation>
</with-license>
<with-license id='CDDL'>
<copyright-notice>
Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
</copyright-notice>
<by-organisation id='oracle.com'>
<resource name='mail-1.4.jar' source='http://kenai.com/projects/javamail' notice='cddlnotice' />
</by-organisation>
</with-license>
<with-license id='CPL1'>
<copyright-notice />
<by-organisation id='junit.org'>
<resource name='junit-4.8.1.jar' source='http://kentbeck.github.com/junit/' />
</by-organisation>
</with-license>
<with-license id='MPL1'>
<copyright-notice />
<license-parameters>
<parameter><name>PROJECT</name><value>Javassist</value></parameter>
<parameter><name>INITIAL_DEVELOPER</name><value>Shigeru Chiba</value></parameter>
<parameter><name>INITIAL_DEVELOPER_COPYRIGHT</name><value>1999-2008 Shigeru Chiba</value></parameter>
<parameter><name>CONTRIBUTORS</name><value></value></parameter>
<parameter><name>ALT_LIC_NAME</name><value>GNU Lesser General Public License Version 2.1 or later</value></parameter>
<parameter><name>ALT_LIC_SHORT</name><value>LGPL</value></parameter>
</license-parameters>
<by-organisation id='person:shigeru.chiba'>
<resource name='javassist-3.9.0.GA.jar' source='http://sourceforge.net/projects/jboss/files/Javassist/' />
</by-organisation>
</with-license>
</within>
</manifest>