You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2014/03/31 10:39:11 UTC
[1/3] git commit: Ignore ~ backup files
Repository: incubator-stratos
Updated Branches:
refs/heads/master de87ec626 -> cce0f8a12
Ignore ~ backup files
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/bec09a35
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/bec09a35
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/bec09a35
Branch: refs/heads/master
Commit: bec09a3509ce6549f68c738326e9c02320215ed6
Parents: eadddc1
Author: M. Isuru Tharanga Chrishantha Perera <is...@apache.org>
Authored: Mon Mar 31 12:37:58 2014 +0530
Committer: M. Isuru Tharanga Chrishantha Perera <is...@apache.org>
Committed: Mon Mar 31 12:37:58 2014 +0530
----------------------------------------------------------------------
.gitignore | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bec09a35/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index e92d5c7..dc35d4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,6 @@ target/
*.ipr
*.iws
*.swp
+
+#Backup files
+*~
[3/3] git commit: Added Apache License Header for Puppet related files
Posted by is...@apache.org.
Added Apache License Header for Puppet related files
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/cce0f8a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/cce0f8a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/cce0f8a1
Branch: refs/heads/master
Commit: cce0f8a126b2a59f2b42b6588aa3fdd8bbd531d7
Parents: 5e6db52
Author: M. Isuru Tharanga Chrishantha Perera <is...@apache.org>
Authored: Mon Mar 31 14:07:22 2014 +0530
Committer: M. Isuru Tharanga Chrishantha Perera <is...@apache.org>
Committed: Mon Mar 31 14:07:22 2014 +0530
----------------------------------------------------------------------
tools/puppet3/auth.conf | 17 ++++++++++
tools/puppet3/autosign.conf | 16 ++++++++++
tools/puppet3/fileserver.conf | 17 ++++++++++
tools/puppet3/manifests/nodes.pp | 17 ++++++++++
tools/puppet3/manifests/site.pp | 17 ++++++++++
tools/puppet3/modules/agent/manifests/init.pp | 17 ++++++++++
.../modules/agent/manifests/initialize.pp | 33 ++++++++++----------
.../modules/agent/manifests/push_templates.pp | 33 ++++++++++----------
tools/puppet3/modules/agent/manifests/start.pp | 33 ++++++++++----------
.../templates/extensions/addons/_mysql.erb | 17 ++++++++++
.../agent/templates/extensions/addons/_ruby.erb | 17 ++++++++++
tools/puppet3/modules/java/manifests/init.pp | 17 ++++++++++
.../modules/java/templates/java_home.sh.erb | 17 ++++++++++
tools/puppet3/modules/lb/manifests/clean.pp | 33 ++++++++++----------
tools/puppet3/modules/lb/manifests/deploy.pp | 33 ++++++++++----------
tools/puppet3/modules/lb/manifests/init.pp | 33 ++++++++++----------
.../puppet3/modules/lb/manifests/initialize.pp | 33 ++++++++++----------
tools/puppet3/modules/lb/manifests/params.pp | 33 ++++++++++----------
.../modules/lb/manifests/push_templates.pp | 33 ++++++++++----------
tools/puppet3/modules/lb/manifests/start.pp | 33 ++++++++++----------
tools/puppet3/modules/mysql/manifests/init.pp | 17 ++++++++++
.../modules/mysql/templates/000-default.erb | 17 ++++++++++
.../puppet3/modules/mysql/templates/my.cnf.erb | 17 ++++++++++
.../modules/mysql/templates/phpMyAdmin.conf.erb | 17 ++++++++++
tools/puppet3/modules/nodejs/manifests/init.pp | 17 ++++++++++
.../modules/php/lib/facter/stratos_facts.rb | 17 ++++++++++
.../puppet3/modules/php/manifests/init.pp.cent | 17 ++++++++++
tools/puppet3/modules/php/manifests/init.pp.deb | 17 ++++++++++
tools/puppet3/modules/php/manifests/init.pp.rpm | 17 ++++++++++
.../modules/php/templates/httpd/httpd.conf.erb | 17 ++++++++++
tools/puppet3/modules/ruby/manifests/init.pp | 17 ++++++++++
.../modules/ruby/templates/ruby-start.sh.erb | 18 +++++++++++
tools/puppet3/modules/tomcat/manifests/init.pp | 17 ++++++++++
.../puppet3/modules/wordpress/manifests/init.pp | 17 ++++++++++
.../wordpress/templates/httpd/httpd.conf.erb | 17 ++++++++++
tools/puppet3/puppet.conf | 17 ++++++++++
36 files changed, 612 insertions(+), 160 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/auth.conf
----------------------------------------------------------------------
diff --git a/tools/puppet3/auth.conf b/tools/puppet3/auth.conf
index b31906b..a19683e 100644
--- a/tools/puppet3/auth.conf
+++ b/tools/puppet3/auth.conf
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
# This is the default auth.conf file, which implements the default rules
# used by the puppet master. (That is, the rules below will still apply
# even if this file is deleted.)
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/autosign.conf
----------------------------------------------------------------------
diff --git a/tools/puppet3/autosign.conf b/tools/puppet3/autosign.conf
index 72e8ffc..42b2cbb 100644
--- a/tools/puppet3/autosign.conf
+++ b/tools/puppet3/autosign.conf
@@ -1 +1,17 @@
+# 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.
*
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/fileserver.conf
----------------------------------------------------------------------
diff --git a/tools/puppet3/fileserver.conf b/tools/puppet3/fileserver.conf
index 62598c4..21328ea 100644
--- a/tools/puppet3/fileserver.conf
+++ b/tools/puppet3/fileserver.conf
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
# fileserver.conf
# Puppet automatically serves PLUGINS and FILES FROM MODULES: anything in
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/manifests/nodes.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/manifests/nodes.pp b/tools/puppet3/manifests/nodes.pp
index dda9557..dbfd27f 100644
--- a/tools/puppet3/manifests/nodes.pp
+++ b/tools/puppet3/manifests/nodes.pp
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
node 'base' {
#essential variables
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/manifests/site.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/manifests/site.pp b/tools/puppet3/manifests/site.pp
index 373acc6..cce0655 100644
--- a/tools/puppet3/manifests/site.pp
+++ b/tools/puppet3/manifests/site.pp
@@ -1 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
import "nodes"
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/modules/agent/manifests/init.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/agent/manifests/init.pp b/tools/puppet3/modules/agent/manifests/init.pp
index affab0a..2d1b078 100644
--- a/tools/puppet3/modules/agent/manifests/init.pp
+++ b/tools/puppet3/modules/agent/manifests/init.pp
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
class agent(
$version = '4.0.0-SNAPSHOT',
$owner = 'root',
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/modules/agent/manifests/initialize.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/agent/manifests/initialize.pp b/tools/puppet3/modules/agent/manifests/initialize.pp
index 39e9eb7..4fdb0c7 100755
--- a/tools/puppet3/modules/agent/manifests/initialize.pp
+++ b/tools/puppet3/modules/agent/manifests/initialize.pp
@@ -1,19 +1,20 @@
-# ----------------------------------------------------------------------------
-# Copyright 2005-2013 WSO2, Inc. http://www.wso2.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.
-# ----------------------------------------------------------------------------
-#
+# 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.
+
# Initializing the deployment
define agent::initialize ($repo, $version, $service, $local_dir, $target, $owner,) {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/modules/agent/manifests/push_templates.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/agent/manifests/push_templates.pp b/tools/puppet3/modules/agent/manifests/push_templates.pp
index 5227182..e6d7a53 100755
--- a/tools/puppet3/modules/agent/manifests/push_templates.pp
+++ b/tools/puppet3/modules/agent/manifests/push_templates.pp
@@ -1,19 +1,20 @@
-# ----------------------------------------------------------------------------
-# Copyright 2005-2013 WSO2, Inc. http://www.wso2.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.
-# ----------------------------------------------------------------------------
-#
+# 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.
+
# Apply the templates
define agent::push_templates ($target) {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/modules/agent/manifests/start.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/agent/manifests/start.pp b/tools/puppet3/modules/agent/manifests/start.pp
index 990b0ff..034834c 100755
--- a/tools/puppet3/modules/agent/manifests/start.pp
+++ b/tools/puppet3/modules/agent/manifests/start.pp
@@ -1,19 +1,20 @@
-# ----------------------------------------------------------------------------
-# Copyright 2005-2013 WSO2, Inc. http://www.wso2.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.
-# ----------------------------------------------------------------------------
-#
+# 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.
+
# Starts the service once the deployment is successful.
define agent::start ($target, $owner) {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/modules/agent/templates/extensions/addons/_mysql.erb
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/agent/templates/extensions/addons/_mysql.erb b/tools/puppet3/modules/agent/templates/extensions/addons/_mysql.erb
index 7f36e95..88f8891 100644
--- a/tools/puppet3/modules/agent/templates/extensions/addons/_mysql.erb
+++ b/tools/puppet3/modules/agent/templates/extensions/addons/_mysql.erb
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
export PATH='/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin'
PASSWD=`facter -p stratos_mysql_password`
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/modules/agent/templates/extensions/addons/_ruby.erb
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/agent/templates/extensions/addons/_ruby.erb b/tools/puppet3/modules/agent/templates/extensions/addons/_ruby.erb
index 84e25ff..9117dde 100644
--- a/tools/puppet3/modules/agent/templates/extensions/addons/_ruby.erb
+++ b/tools/puppet3/modules/agent/templates/extensions/addons/_ruby.erb
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
export PATH="/usr/local/rvm/gems/ruby-2.1.0/bin:/usr/local/rvm/gems/ruby-2.1.0@global/bin:/usr/local/rvm/rubies/ruby-2.1.0/bin:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/rvm/bin:/root/bin"
export HOME="/root/"
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/modules/java/manifests/init.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/java/manifests/init.pp b/tools/puppet3/modules/java/manifests/init.pp
index dd2f690..834c58a 100755
--- a/tools/puppet3/modules/java/manifests/init.pp
+++ b/tools/puppet3/modules/java/manifests/init.pp
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
class java {
$java_home = "/opt/${java_name}"
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/modules/java/templates/java_home.sh.erb
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/java/templates/java_home.sh.erb b/tools/puppet3/modules/java/templates/java_home.sh.erb
index b92b179..c5b02bc 100755
--- a/tools/puppet3/modules/java/templates/java_home.sh.erb
+++ b/tools/puppet3/modules/java/templates/java_home.sh.erb
@@ -1 +1,18 @@
+# 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.
+
export JAVA_HOME="<%= @java_home %>"
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/modules/lb/manifests/clean.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/lb/manifests/clean.pp b/tools/puppet3/modules/lb/manifests/clean.pp
index 9356bfa..b656d74 100755
--- a/tools/puppet3/modules/lb/manifests/clean.pp
+++ b/tools/puppet3/modules/lb/manifests/clean.pp
@@ -1,19 +1,20 @@
-# ----------------------------------------------------------------------------
-# Copyright 2005-2013 WSO2, Inc. http://www.wso2.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.
-# ----------------------------------------------------------------------------
-#
+# 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.
+
# Cleans the previous deployment. If the maintenance mode is set to true, this will only kill the running service.
define lb::clean ($mode, $target) {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/modules/lb/manifests/deploy.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/lb/manifests/deploy.pp b/tools/puppet3/modules/lb/manifests/deploy.pp
index ae23733..9768a90 100755
--- a/tools/puppet3/modules/lb/manifests/deploy.pp
+++ b/tools/puppet3/modules/lb/manifests/deploy.pp
@@ -1,19 +1,20 @@
-# ----------------------------------------------------------------------------
-# Copyright 2005-2013 WSO2, Inc. http://www.wso2.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.
-# ----------------------------------------------------------------------------
-#
+# 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.
+
# Executes the deployment by pushing all necessary configurations and patches
define lb::deploy ($service, $security, $target, $owner, $group) {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/modules/lb/manifests/init.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/lb/manifests/init.pp b/tools/puppet3/modules/lb/manifests/init.pp
index 8b199bb..ca7deed 100755
--- a/tools/puppet3/modules/lb/manifests/init.pp
+++ b/tools/puppet3/modules/lb/manifests/init.pp
@@ -1,19 +1,20 @@
-# ----------------------------------------------------------------------------
-# Copyright 2005-2013 WSO2, Inc. http://www.wso2.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.
-# ----------------------------------------------------------------------------
-#
+# 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.
+
# Class: lb
#
# This class installs Stratos Load balancer
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/modules/lb/manifests/initialize.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/lb/manifests/initialize.pp b/tools/puppet3/modules/lb/manifests/initialize.pp
index 8a13b3d..63c8bb6 100755
--- a/tools/puppet3/modules/lb/manifests/initialize.pp
+++ b/tools/puppet3/modules/lb/manifests/initialize.pp
@@ -1,19 +1,20 @@
-# ----------------------------------------------------------------------------
-# Copyright 2005-2013 WSO2, Inc. http://www.wso2.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.
-# ----------------------------------------------------------------------------
-#
+# 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.
+
# Initializing the deployment
define lb::initialize ($repo, $version, $service, $local_dir, $target, $mode, $owner,) {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/modules/lb/manifests/params.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/lb/manifests/params.pp b/tools/puppet3/modules/lb/manifests/params.pp
index 115411d..8dfd412 100755
--- a/tools/puppet3/modules/lb/manifests/params.pp
+++ b/tools/puppet3/modules/lb/manifests/params.pp
@@ -1,19 +1,20 @@
-# ----------------------------------------------------------------------------
-# Copyright 2005-2013 WSO2, Inc. http://www.wso2.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.
-# ----------------------------------------------------------------------------
-#
+# 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.
+
# Class lb::params
#
# This class manages lb parameters
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/modules/lb/manifests/push_templates.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/lb/manifests/push_templates.pp b/tools/puppet3/modules/lb/manifests/push_templates.pp
index 2159b13..eb835c6 100755
--- a/tools/puppet3/modules/lb/manifests/push_templates.pp
+++ b/tools/puppet3/modules/lb/manifests/push_templates.pp
@@ -1,19 +1,20 @@
-# ----------------------------------------------------------------------------
-# Copyright 2005-2013 WSO2, Inc. http://www.wso2.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.
-# ----------------------------------------------------------------------------
-#
+# 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.
+
# Apply the templates
define lb::push_templates ($directory, $target) {
file { "${target}/repository/${name}":
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/modules/lb/manifests/start.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/lb/manifests/start.pp b/tools/puppet3/modules/lb/manifests/start.pp
index 3ef1a04..0630fea 100755
--- a/tools/puppet3/modules/lb/manifests/start.pp
+++ b/tools/puppet3/modules/lb/manifests/start.pp
@@ -1,19 +1,20 @@
-# ----------------------------------------------------------------------------
-# Copyright 2005-2013 WSO2, Inc. http://www.wso2.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.
-# ----------------------------------------------------------------------------
-#
+# 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.
+
# Starts the service once the deployment is successful.
define lb::start ($target, $owner) {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/modules/mysql/manifests/init.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/mysql/manifests/init.pp b/tools/puppet3/modules/mysql/manifests/init.pp
index d099057..070862b 100644
--- a/tools/puppet3/modules/mysql/manifests/init.pp
+++ b/tools/puppet3/modules/mysql/manifests/init.pp
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
class mysql{
if $stratos_mysql_password {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/modules/mysql/templates/000-default.erb
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/mysql/templates/000-default.erb b/tools/puppet3/modules/mysql/templates/000-default.erb
index 2b8c502..e18c70c 100644
--- a/tools/puppet3/modules/mysql/templates/000-default.erb
+++ b/tools/puppet3/modules/mysql/templates/000-default.erb
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
<VirtualHost *:80>
ServerAdmin webmaster@localhost
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/modules/mysql/templates/my.cnf.erb
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/mysql/templates/my.cnf.erb b/tools/puppet3/modules/mysql/templates/my.cnf.erb
index 37b2e9a..eb82b2c 100644
--- a/tools/puppet3/modules/mysql/templates/my.cnf.erb
+++ b/tools/puppet3/modules/mysql/templates/my.cnf.erb
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
#
# The MySQL database server configuration file.
#
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/modules/mysql/templates/phpMyAdmin.conf.erb
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/mysql/templates/phpMyAdmin.conf.erb b/tools/puppet3/modules/mysql/templates/phpMyAdmin.conf.erb
index f1679a7..602caf3 100644
--- a/tools/puppet3/modules/mysql/templates/phpMyAdmin.conf.erb
+++ b/tools/puppet3/modules/mysql/templates/phpMyAdmin.conf.erb
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
# phpmyadmin - Web based MySQL browser written in php
#
# Allows only localhost by default
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/modules/nodejs/manifests/init.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/nodejs/manifests/init.pp b/tools/puppet3/modules/nodejs/manifests/init.pp
index f591ae1..7292a46 100644
--- a/tools/puppet3/modules/nodejs/manifests/init.pp
+++ b/tools/puppet3/modules/nodejs/manifests/init.pp
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
class nodejs {
$target = '/mnt'
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/modules/php/lib/facter/stratos_facts.rb
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/php/lib/facter/stratos_facts.rb b/tools/puppet3/modules/php/lib/facter/stratos_facts.rb
index 21a5019..3cab535 100644
--- a/tools/puppet3/modules/php/lib/facter/stratos_facts.rb
+++ b/tools/puppet3/modules/php/lib/facter/stratos_facts.rb
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
if FileTest.exists?("/tmp/payload/launch-params")
configs = File.read("/tmp/payload/launch-params").split(",").map(&:strip)
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/modules/php/manifests/init.pp.cent
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/php/manifests/init.pp.cent b/tools/puppet3/modules/php/manifests/init.pp.cent
index 87cf719..22a5d8a 100755
--- a/tools/puppet3/modules/php/manifests/init.pp.cent
+++ b/tools/puppet3/modules/php/manifests/init.pp.cent
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
class php ($syslog="", $docroot="/var/www/html", $samlalias="") {
$packages = [
'httpd',
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/modules/php/manifests/init.pp.deb
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/php/manifests/init.pp.deb b/tools/puppet3/modules/php/manifests/init.pp.deb
index 5ead615..8fc53c7 100755
--- a/tools/puppet3/modules/php/manifests/init.pp.deb
+++ b/tools/puppet3/modules/php/manifests/init.pp.deb
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
class php ($syslog="", $docroot="/var/www", $samlalias="") {
$packages = [
'nano',
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/modules/php/manifests/init.pp.rpm
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/php/manifests/init.pp.rpm b/tools/puppet3/modules/php/manifests/init.pp.rpm
index 42c1c10..42aba65 100755
--- a/tools/puppet3/modules/php/manifests/init.pp.rpm
+++ b/tools/puppet3/modules/php/manifests/init.pp.rpm
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
class php ($syslog="", $docroot="", $samlalias="") {
$packages = [
'httpd',
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/modules/php/templates/httpd/httpd.conf.erb
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/php/templates/httpd/httpd.conf.erb b/tools/puppet3/modules/php/templates/httpd/httpd.conf.erb
index 22b8e69..ce3ebeb 100644
--- a/tools/puppet3/modules/php/templates/httpd/httpd.conf.erb
+++ b/tools/puppet3/modules/php/templates/httpd/httpd.conf.erb
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
#
# This is the main Apache server configuration file. It contains the
# configuration directives that give the server its instructions.
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/modules/ruby/manifests/init.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/ruby/manifests/init.pp b/tools/puppet3/modules/ruby/manifests/init.pp
index ec4be1f..9b67106 100644
--- a/tools/puppet3/modules/ruby/manifests/init.pp
+++ b/tools/puppet3/modules/ruby/manifests/init.pp
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
class ruby( $target = '/mnt' ) {
if $stratos_app_path {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/modules/ruby/templates/ruby-start.sh.erb
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/ruby/templates/ruby-start.sh.erb b/tools/puppet3/modules/ruby/templates/ruby-start.sh.erb
index e32da09..2c115e4 100644
--- a/tools/puppet3/modules/ruby/templates/ruby-start.sh.erb
+++ b/tools/puppet3/modules/ruby/templates/ruby-start.sh.erb
@@ -1,5 +1,23 @@
#!/bin/bash
+# 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.
+
+
export PATH="/usr/local/rvm/gems/ruby-2.1.0/bin:/usr/local/rvm/gems/ruby-2.1.0@global/bin:/usr/local/rvm/rubies/ruby-2.1.0/bin:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/rvm/bin:/root/bin"
export HOME="/root/"
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/modules/tomcat/manifests/init.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/tomcat/manifests/init.pp b/tools/puppet3/modules/tomcat/manifests/init.pp
index b783a05..55df4e3 100644
--- a/tools/puppet3/modules/tomcat/manifests/init.pp
+++ b/tools/puppet3/modules/tomcat/manifests/init.pp
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
class tomcat(
$owner = 'root',
$group = 'root',
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/modules/wordpress/manifests/init.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/wordpress/manifests/init.pp b/tools/puppet3/modules/wordpress/manifests/init.pp
index 4670845..78328f6 100644
--- a/tools/puppet3/modules/wordpress/manifests/init.pp
+++ b/tools/puppet3/modules/wordpress/manifests/init.pp
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
class wordpress (
$httpd_user = 'apache',
$httpd_group = 'apache',
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/modules/wordpress/templates/httpd/httpd.conf.erb
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/wordpress/templates/httpd/httpd.conf.erb b/tools/puppet3/modules/wordpress/templates/httpd/httpd.conf.erb
index 89c341c..021484b 100644
--- a/tools/puppet3/modules/wordpress/templates/httpd/httpd.conf.erb
+++ b/tools/puppet3/modules/wordpress/templates/httpd/httpd.conf.erb
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
#
# This is the main Apache server configuration file. It contains the
# configuration directives that give the server its instructions.
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cce0f8a1/tools/puppet3/puppet.conf
----------------------------------------------------------------------
diff --git a/tools/puppet3/puppet.conf b/tools/puppet3/puppet.conf
index 312b567..4854197 100644
--- a/tools/puppet3/puppet.conf
+++ b/tools/puppet3/puppet.conf
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
[main]
logdir=/var/log/puppet
vardir=/var/lib/puppet
[2/3] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by is...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/5e6db522
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/5e6db522
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/5e6db522
Branch: refs/heads/master
Commit: 5e6db52297019e85322fa437751687c5174fe001
Parents: bec09a3 de87ec6
Author: M. Isuru Tharanga Chrishantha Perera <is...@apache.org>
Authored: Mon Mar 31 14:03:43 2014 +0530
Committer: M. Isuru Tharanga Chrishantha Perera <is...@apache.org>
Committed: Mon Mar 31 14:03:43 2014 +0530
----------------------------------------------------------------------
.../openstack-nova/1.7.1-stratos/README.txt | 3 +
.../apis/openstack-nova/1.7.1-stratos/pom.xml | 143 +++
.../jclouds/openstack/nova/v2_0/NovaApi.java | 208 +++++
.../openstack/nova/v2_0/NovaApiMetadata.java | 125 +++
.../openstack/nova/v2_0/NovaAsyncApi.java | 214 +++++
.../v2_0/binders/BindKeyPairToJsonPayload.java | 47 +
.../v2_0/binders/BindMetadataToJsonPayload.java | 47 +
.../BindSecurityGroupRuleToJsonPayload.java | 71 ++
.../nova/v2_0/compute/NovaComputeService.java | 183 ++++
.../v2_0/compute/NovaComputeServiceAdapter.java | 288 ++++++
.../config/NovaComputeServiceContextModule.java | 286 ++++++
.../compute/extensions/NovaImageExtension.java | 140 +++
.../extensions/NovaSecurityGroupExtension.java | 373 ++++++++
.../AllocateAndAddFloatingIpToNode.java | 112 +++
.../functions/CreateSecurityGroupIfNeeded.java | 93 ++
.../functions/FlavorInZoneToHardware.java | 60 ++
.../compute/functions/ImageInZoneToImage.java | 70 ++
.../functions/ImageToOperatingSystem.java | 128 +++
.../NovaSecurityGroupInZoneToSecurityGroup.java | 75 ++
.../NovaSecurityGroupToSecurityGroup.java | 69 ++
.../functions/OrphanedGroupsByZoneId.java | 77 ++
.../RemoveFloatingIpFromNodeAndDeallocate.java | 74 ++
.../SecurityGroupRuleToIpPermission.java | 99 ++
.../functions/ServerInZoneToNodeMetadata.java | 199 ++++
.../compute/loaders/CreateUniqueKeyPair.java | 79 ++
.../loaders/FindSecurityGroupOrCreate.java | 86 ++
.../loaders/LoadFloatingIpsForInstance.java | 63 ++
.../compute/options/NovaTemplateOptions.java | 649 +++++++++++++
.../predicates/AllNodesInGroupTerminated.java | 56 ++
...desWithGroupEncodedIntoNameThenAddToSet.java | 165 ++++
.../nova/v2_0/config/NovaParserModule.java | 159 ++++
.../nova/v2_0/config/NovaProperties.java | 43 +
.../nova/v2_0/config/NovaRestClientModule.java | 191 ++++
.../openstack/nova/v2_0/domain/Address.java | 138 +++
.../openstack/nova/v2_0/domain/BackupType.java | 41 +
.../openstack/nova/v2_0/domain/Flavor.java | 211 +++++
.../openstack/nova/v2_0/domain/FloatingIP.java | 173 ++++
.../openstack/nova/v2_0/domain/Host.java | 127 +++
.../nova/v2_0/domain/HostAggregate.java | 250 +++++
.../nova/v2_0/domain/HostResourceUsage.java | 180 ++++
.../openstack/nova/v2_0/domain/Image.java | 303 +++++++
.../openstack/nova/v2_0/domain/Ingress.java | 160 ++++
.../openstack/nova/v2_0/domain/KeyPair.java | 189 ++++
.../openstack/nova/v2_0/domain/Network.java | 173 ++++
.../openstack/nova/v2_0/domain/Quota.java | 356 ++++++++
.../openstack/nova/v2_0/domain/QuotaClass.java | 62 ++
.../openstack/nova/v2_0/domain/RebootType.java | 35 +
.../nova/v2_0/domain/SecurityGroup.java | 188 ++++
.../nova/v2_0/domain/SecurityGroupRule.java | 174 ++++
.../openstack/nova/v2_0/domain/Server.java | 476 ++++++++++
.../nova/v2_0/domain/ServerCreated.java | 127 +++
.../v2_0/domain/ServerExtendedAttributes.java | 156 ++++
.../nova/v2_0/domain/ServerExtendedStatus.java | 155 ++++
.../v2_0/domain/ServerWithSecurityGroups.java | 128 +++
.../nova/v2_0/domain/SimpleServerUsage.java | 312 +++++++
.../nova/v2_0/domain/SimpleTenantUsage.java | 245 +++++
.../nova/v2_0/domain/TenantIdAndName.java | 127 +++
.../nova/v2_0/domain/VirtualInterface.java | 128 +++
.../openstack/nova/v2_0/domain/Volume.java | 346 +++++++
.../nova/v2_0/domain/VolumeAttachment.java | 172 ++++
.../nova/v2_0/domain/VolumeSnapshot.java | 239 +++++
.../openstack/nova/v2_0/domain/VolumeType.java | 192 ++++
.../domain/zonescoped/AvailabilityZone.java | 73 ++
.../v2_0/domain/zonescoped/FlavorInZone.java | 46 +
.../v2_0/domain/zonescoped/ImageInZone.java | 46 +
.../domain/zonescoped/SecurityGroupInZone.java | 46 +
.../v2_0/domain/zonescoped/ServerInZone.java | 46 +
.../nova/v2_0/domain/zonescoped/ZoneAndId.java | 86 ++
.../v2_0/domain/zonescoped/ZoneAndName.java | 111 +++
.../ZoneSecurityGroupNameAndPorts.java | 62 ++
.../nova/v2_0/domain/zonescoped/ZoneState.java | 61 ++
.../v2_0/extensions/AvailabilityZoneAPI.java | 40 +
.../extensions/AvailabilityZoneAsyncApi.java | 58 ++
.../v2_0/extensions/ExtensionNamespaces.java | 110 +++
.../v2_0/extensions/FlavorExtraSpecsApi.java | 77 ++
.../extensions/FlavorExtraSpecsAsyncApi.java | 118 +++
.../nova/v2_0/extensions/FloatingIPApi.java | 98 ++
.../v2_0/extensions/FloatingIPAsyncApi.java | 145 +++
.../v2_0/extensions/HostAdministrationApi.java | 103 +++
.../extensions/HostAdministrationAsyncApi.java | 157 ++++
.../nova/v2_0/extensions/HostAggregateApi.java | 87 ++
.../v2_0/extensions/HostAggregateAsyncApi.java | 161 ++++
.../nova/v2_0/extensions/KeyPairApi.java | 65 ++
.../nova/v2_0/extensions/KeyPairAsyncApi.java | 101 +++
.../nova/v2_0/extensions/QuotaApi.java | 57 ++
.../nova/v2_0/extensions/QuotaAsyncApi.java | 89 ++
.../nova/v2_0/extensions/QuotaClassApi.java | 51 ++
.../v2_0/extensions/QuotaClassAsyncApi.java | 78 ++
.../nova/v2_0/extensions/SecurityGroupApi.java | 89 ++
.../v2_0/extensions/SecurityGroupAsyncApi.java | 152 ++++
.../nova/v2_0/extensions/ServerAdminApi.java | 120 +++
.../v2_0/extensions/ServerAdminAsyncApi.java | 175 ++++
.../extensions/ServerWithSecurityGroupsApi.java | 49 +
.../ServerWithSecurityGroupsAsyncApi.java | 62 ++
.../v2_0/extensions/SimpleTenantUsageApi.java | 50 +
.../extensions/SimpleTenantUsageAsyncApi.java | 77 ++
.../v2_0/extensions/VirtualInterfaceApi.java | 43 +
.../extensions/VirtualInterfaceAsyncApi.java | 59 ++
.../nova/v2_0/extensions/VolumeApi.java | 147 +++
.../nova/v2_0/extensions/VolumeAsyncApi.java | 254 ++++++
.../v2_0/extensions/VolumeAttachmentApi.java | 87 ++
.../extensions/VolumeAttachmentAsyncApi.java | 107 +++
.../nova/v2_0/extensions/VolumeTypeApi.java | 101 +++
.../v2_0/extensions/VolumeTypeAsyncApi.java | 161 ++++
.../openstack/nova/v2_0/features/FlavorApi.java | 78 ++
.../nova/v2_0/features/FlavorAsyncApi.java | 144 +++
.../openstack/nova/v2_0/features/ImageApi.java | 142 +++
.../nova/v2_0/features/ImageAsyncApi.java | 206 +++++
.../openstack/nova/v2_0/features/ServerApi.java | 276 ++++++
.../nova/v2_0/features/ServerAsyncApi.java | 356 ++++++++
.../functions/FieldValueResponseParsers.java | 105 +++
.../nova/v2_0/functions/OverLimitParser.java | 92 ++
.../ParseImageIdFromLocationHeader.java | 39 +
.../internal/OnlyMetadataValueOrNull.java | 63 ++
.../functions/internal/ParseDiagnostics.java | 47 +
.../functions/internal/ParseFlavorDetails.java | 94 ++
.../v2_0/functions/internal/ParseFlavors.java | 96 ++
.../functions/internal/ParseImageDetails.java | 95 ++
.../v2_0/functions/internal/ParseImages.java | 96 ++
.../v2_0/functions/internal/ParseKeyPairs.java | 64 ++
.../functions/internal/ParseServerDetails.java | 94 ++
.../v2_0/functions/internal/ParseServers.java | 96 ++
.../nova/v2_0/handlers/NovaErrorHandler.java | 129 +++
.../options/CreateBackupOfServerOptions.java | 105 +++
.../nova/v2_0/options/CreateServerOptions.java | 557 ++++++++++++
.../nova/v2_0/options/CreateVolumeOptions.java | 220 +++++
.../options/CreateVolumeSnapshotOptions.java | 138 +++
.../v2_0/options/CreateVolumeTypeOptions.java | 101 +++
.../nova/v2_0/options/ListOptions.java | 107 +++
.../nova/v2_0/options/RebuildServerOptions.java | 142 +++
.../FindSecurityGroupWithNameAndReturnTrue.java | 84 ++
.../nova/v2_0/predicates/ImagePredicates.java | 55 ++
.../nova/v2_0/predicates/KeyPairPredicates.java | 77 ++
.../predicates/SecurityGroupPredicates.java | 213 +++++
.../services/org.jclouds.apis.ApiMetadata | 1 +
...tKeyAndTenantIdAuthenticationExpectTest.java | 75 ++
...antNamePropertyAuthenticationExpectTest.java | 75 ++
...KeyAndSecretKeyAuthenticationExpectTest.java | 69 ++
.../nova/v2_0/EndpointIdIsRandomExpectTest.java | 72 ++
.../nova/v2_0/NovaApiMetadataTest.java | 32 +
.../v2_0/PasswordAuthenticationExpectTest.java | 60 ++
...dAuthenticationWithTenantNameExpectTest.java | 69 ++
.../NovaComputeServiceAdapterExpectTest.java | 321 +++++++
.../compute/NovaComputeServiceExpectTest.java | 382 ++++++++
.../compute/NovaComputeServiceLiveTest.java | 96 ++
.../NovaImageExtensionExpectTest.java | 92 ++
.../extensions/NovaImageExtensionLiveTest.java | 43 +
.../NovaSecurityGroupExtensionExpectTest.java | 433 +++++++++
.../NovaSecurityGroupExtensionLiveTest.java | 35 +
...llocateAndAddFloatingIpToNodeExpectTest.java | 133 +++
.../functions/FlavorInZoneToHardwareTest.java | 90 ++
.../functions/ImageInZoneToImageTest.java | 95 ++
.../functions/ImageToOperatingSystemTest.java | 192 ++++
...aSecurityGroupInZoneToSecurityGroupTest.java | 94 ++
.../NovaSecurityGroupToSecurityGroupTest.java | 155 ++++
.../functions/OrphanedGroupsByZoneIdTest.java | 96 ++
.../SecurityGroupRuleToIpPermissionTest.java | 81 ++
.../ServerInZoneToNodeMetadataTest.java | 311 +++++++
.../loaders/CreateUniqueKeyPairTest.java | 111 +++
.../loaders/FindSecurityGroupOrCreateTest.java | 144 +++
.../loaders/LoadFloatingIpsForInstanceTest.java | 108 +++
.../options/NovaTemplateOptionsTest.java | 263 ++++++
.../extensions/AdminActionsApiExpectTest.java | 350 +++++++
.../extensions/AdminActionsApiLiveTest.java | 195 ++++
.../AvailabilityZoneApiExpectTest.java | 64 ++
.../AvailabilityZonesApiLiveTest.java | 45 +
.../FlavorExtraSpecsApiExpectTest.java | 142 +++
.../extensions/FlavorExtraSpecsApiLiveTest.java | 123 +++
.../extensions/FloatingIPApiExpectTest.java | 191 ++++
.../v2_0/extensions/FloatingIPApiLiveTest.java | 171 ++++
.../HostAdministrationApiExpectTest.java | 241 +++++
.../HostAdministrationApiLiveTest.java | 116 +++
.../extensions/HostAggregateApiExpectTest.java | 179 ++++
.../extensions/HostAggregateApiLiveTest.java | 148 +++
.../v2_0/extensions/KeyPairApiExpectTest.java | 142 +++
.../v2_0/extensions/KeyPairApiLiveTest.java | 76 ++
.../v2_0/extensions/QuotaApiExpectTest.java | 125 +++
.../nova/v2_0/extensions/QuotaApiLiveTest.java | 100 ++
.../extensions/QuotaClassApiExpectTest.java | 105 +++
.../v2_0/extensions/QuotaClassApiLiveTest.java | 73 ++
.../extensions/SecurityGroupApiExpectTest.java | 235 +++++
.../extensions/SecurityGroupApiLiveTest.java | 100 ++
.../ServerWithSecurityGroupsApiExpectTest.java | 63 ++
.../ServerWithSecurityGroupsApiLiveTest.java | 80 ++
.../SimpleTenantUsageApiExpectTest.java | 99 ++
.../SimpleTenantUsageApiLiveTest.java | 51 ++
.../VirtualInterfaceApiExpectTest.java | 64 ++
.../extensions/VirtualInterfaceApiLiveTest.java | 68 ++
.../v2_0/extensions/VolumeApiExpectTest.java | 460 ++++++++++
.../nova/v2_0/extensions/VolumeApiLiveTest.java | 274 ++++++
.../VolumeAttachmentApiExpectTest.java | 168 ++++
.../extensions/VolumeAttachmentApiLiveTest.java | 156 ++++
.../extensions/VolumeTypeApiExpectTest.java | 259 ++++++
.../v2_0/extensions/VolumeTypeApiLiveTest.java | 126 +++
.../v2_0/features/ExtensionApiExpectTest.java | 115 +++
.../v2_0/features/ExtensionApiLiveTest.java | 84 ++
.../nova/v2_0/features/FlavorApiExpectTest.java | 164 ++++
.../nova/v2_0/features/FlavorApiLiveTest.java | 105 +++
.../nova/v2_0/features/ImageApiExpectTest.java | 377 ++++++++
.../nova/v2_0/features/ImageApiLiveTest.java | 101 +++
.../nova/v2_0/features/ServerApiExpectTest.java | 746 +++++++++++++++
.../nova/v2_0/features/ServerApiLiveTest.java | 206 +++++
.../CreateSecurityGroupIfNeededTest.java | 168 ++++
...ityGroupWithNameAndReturnTrueExpectTest.java | 102 +++
.../v2_0/functions/InternalURLLiveTest.java | 64 ++
.../v2_0/handlers/NovaErrorHandlerTest.java | 225 +++++
.../v2_0/internal/BaseNovaApiExpectTest.java | 28 +
.../nova/v2_0/internal/BaseNovaApiLiveTest.java | 120 +++
...BaseNovaComputeServiceContextExpectTest.java | 87 ++
.../BaseNovaComputeServiceExpectTest.java | 35 +
.../nova/v2_0/internal/BaseNovaExpectTest.java | 84 ++
...eComputeServiceTypicalSecurityGroupTest.java | 76 ++
.../nova/v2_0/parse/ParseCreateFlavorTest.java | 58 ++
.../nova/v2_0/parse/ParseCreatedServerTest.java | 80 ++
.../parse/ParseExtensionListNormalTest.java | 76 ++
.../nova/v2_0/parse/ParseExtensionListTest.java | 88 ++
.../nova/v2_0/parse/ParseExtensionTest.java | 71 ++
.../nova/v2_0/parse/ParseFlavorListTest.java | 85 ++
.../nova/v2_0/parse/ParseFlavorTest.java | 70 ++
.../v2_0/parse/ParseFloatingIPListTest.java | 59 ++
.../nova/v2_0/parse/ParseFloatingIPTest.java | 53 ++
.../nova/v2_0/parse/ParseImageListTest.java | 85 ++
.../nova/v2_0/parse/ParseImageTest.java | 98 ++
.../nova/v2_0/parse/ParseKeyPairListTest.java | 68 ++
.../nova/v2_0/parse/ParseKeyPairTest.java | 61 ++
.../nova/v2_0/parse/ParseMetadataItemTest.java | 58 ++
.../nova/v2_0/parse/ParseMetadataListTest.java | 63 ++
.../v2_0/parse/ParseMetadataUpdateTest.java | 64 ++
.../v2_0/parse/ParseSecurityGroupListTest.java | 72 ++
.../nova/v2_0/parse/ParseSecurityGroupTest.java | 69 ++
.../v2_0/parse/ParseServerDetailsEssexTest.java | 170 ++++
.../nova/v2_0/parse/ParseServerDiagnostics.java | 57 ++
.../nova/v2_0/parse/ParseServerListTest.java | 85 ++
.../nova/v2_0/parse/ParseServerTest.java | 117 +++
.../parse/ParseServerWithAllExtensionsTest.java | 104 +++
.../ParseServerWithInternetAddressesTest.java | 99 ++
...ublicIpsInPrivateAddressBlockExpectTest.java | 99 ++
.../v2_0/predicates/ImagePredicatesTest.java | 44 +
.../predicates/SecurityGroupPredicatesTest.java | 129 +++
.../src/test/resources/attachment_details.json | 1 +
.../src/test/resources/attachment_list.json | 1 +
.../src/test/resources/extension_details.json | 21 +
.../src/test/resources/extension_list.json | 42 +
.../src/test/resources/extension_list_full.json | 281 ++++++
.../test/resources/extension_list_normal.json | 31 +
.../resources/extension_list_openstack.json | 115 +++
.../src/test/resources/flavor_details.json | 19 +
.../src/test/resources/flavor_list.json | 32 +
.../src/test/resources/flavor_list_detail.json | 1 +
.../resources/flavor_list_detail_openstack.json | 83 ++
.../src/test/resources/flavor_new.json | 10 +
.../src/test/resources/floatingip_details.json | 9 +
.../src/test/resources/floatingip_list.json | 16 +
.../1.7.1-stratos/src/test/resources/host.json | 1 +
.../test/resources/host_aggregate_details.json | 1 +
.../src/test/resources/host_aggregate_list.json | 1 +
.../host_aggregate_with_host_details.json | 1 +
.../src/test/resources/hosts_list.json | 1 +
.../src/test/resources/image_active.json | 41 +
.../src/test/resources/image_details.json | 41 +
.../src/test/resources/image_list.json | 32 +
.../src/test/resources/image_list_detail.json | 1 +
.../image_list_detail_imageextension.json | 121 +++
.../resources/image_list_detail_openstack.json | 81 ++
.../src/test/resources/keypair_created.json | 9 +
.../keypair_created_computeservice.json | 9 +
.../src/test/resources/keypair_list.json | 18 +
.../test/resources/listAvailabilityZones.json | 11 +
.../src/test/resources/metadata_item.json | 5 +
.../src/test/resources/metadata_list.json | 6 +
.../src/test/resources/metadata_updated.json | 7 +
.../src/test/resources/new_server.json | 41 +
.../resources/new_server_disk_config_auto.json | 42 +
.../new_server_disk_config_manual.json | 42 +
.../src/test/resources/new_server_in_zone.json | 41 +
.../resources/new_server_networks_response.json | 42 +
.../test/resources/new_server_no_adminpass.json | 40 +
.../resources/new_server_nova_networks.json | 41 +
.../src/test/resources/quota_class.json | 15 +
.../src/test/resources/quotas.json | 15 +
.../test/resources/securitygroup_created.json | 9 +
.../test/resources/securitygroup_details.json | 34 +
...itygroup_details_computeservice_typical.json | 51 ++
.../securitygroup_details_extension.json | 34 +
...securitygroup_details_extension_norules.json | 10 +
.../resources/securitygroup_details_port22.json | 19 +
.../src/test/resources/securitygroup_list.json | 51 ++
...oup_list_details_computeservice_typical.json | 53 ++
.../resources/securitygroup_list_extension.json | 51 ++
.../resources/securitygrouprule_created.json | 12 +
.../securitygrouprule_created_cidr.json | 13 +
.../securitygrouprule_created_group.json | 14 +
.../src/test/resources/server_details.json | 86 ++
.../test/resources/server_details_devstack.json | 44 +
.../resources/server_details_openstack.json | 46 +
.../src/test/resources/server_diagnostics.json | 17 +
.../src/test/resources/server_list.json | 32 +
.../src/test/resources/server_list_details.json | 79 ++
.../resources/server_list_details_essex.json | 152 ++++
.../resources/server_public_ip_in_private.json | 51 ++
.../resources/server_with_security_groups.json | 1 +
.../server_with_security_groups_extension.json | 1 +
.../src/test/resources/simple_tenant_usage.json | 1 +
.../test/resources/simple_tenant_usages.json | 1 +
.../src/test/resources/snapshot_details.json | 1 +
.../src/test/resources/snapshot_list.json | 1 +
.../test/resources/snapshot_list_detail.json | 1 +
.../test/resources/virtual_interfaces_list.json | 1 +
.../src/test/resources/volume_details.json | 1 +
.../src/test/resources/volume_list.json | 1 +
.../src/test/resources/volume_list_detail.json | 1 +
.../src/test/resources/volume_type.json | 9 +
.../test/resources/volume_type_extra_specs.json | 1 +
.../src/test/resources/volume_type_list.json | 1 +
.../apis/vcloud/1.7.1-stratos/README.txt | 6 +
.../jclouds/apis/vcloud/1.7.1-stratos/pom.xml | 129 +++
.../vcloud/TaskInErrorStateException.java | 39 +
.../vcloud/TaskStillRunningException.java | 39 +
.../main/java/org/jclouds/vcloud/VCloudApi.java | 91 ++
.../org/jclouds/vcloud/VCloudApiMetadata.java | 103 +++
.../org/jclouds/vcloud/VCloudMediaType.java | 221 +++++
.../jclouds/vcloud/VCloudResponseException.java | 69 ++
.../java/org/jclouds/vcloud/VCloudToken.java | 37 +
.../org/jclouds/vcloud/VCloudVersionsApi.java | 38 +
.../binders/BindCPUCountToXmlPayload.java | 79 ++
.../BindCaptureVAppParamsToXmlPayload.java | 124 +++
.../binders/BindCatalogItemToXmlPayload.java | 126 +++
.../binders/BindCloneParamsToXmlPayload.java | 133 +++
.../BindCloneVAppParamsToXmlPayload.java | 65 ++
...BindCloneVAppTemplateParamsToXmlPayload.java | 60 ++
.../BindDeployVAppParamsToXmlPayload.java | 42 +
...ndGuestCustomizationSectionToXmlPayload.java | 112 +++
...stantiateVAppTemplateParamsToXmlPayload.java | 221 +++++
.../vcloud/binders/BindMemoryToXmlPayload.java | 80 ++
...indNetworkConnectionSectionToXmlPayload.java | 106 +++
.../vcloud/binders/BindParamsToXmlPayload.java | 81 ++
.../BindUndeployVAppParamsToXmlPayload.java | 42 +
.../OrgNameAndCatalogNameToEndpoint.java | 79 ++
.../binders/OrgNameAndVDCNameToEndpoint.java | 78 ++
.../OrgNameCatalogNameItemNameToEndpoint.java | 77 ++
...meCatalogNameVAppTemplateNameToEndpoint.java | 90 ++
.../OrgNameVDCNameNetworkNameToEndpoint.java | 54 ++
...NameVDCNameResourceEntityNameToEndpoint.java | 54 ++
.../OrgNameVDCNameResourceNameToEndpoint.java | 81 ++
.../VCloudComputeServiceContextModule.java | 39 +
.../VCloudComputeServiceDependenciesModule.java | 154 ++++
.../functions/FindLocationForResource.java | 69 ++
.../compute/functions/HardwareForVApp.java | 71 ++
.../functions/HardwareForVAppTemplate.java | 84 ++
.../compute/functions/ImageForVAppTemplate.java | 82 ++
.../compute/functions/VAppToNodeMetadata.java | 112 +++
...dHardwareBuilderFromResourceAllocations.java | 43 +
...EnvelopeOrThrowIllegalArgumentException.java | 77 ++
.../internal/VCloudTemplateBuilderImpl.java | 48 +
.../compute/options/VCloudTemplateOptions.java | 350 +++++++
...edIntoNameThenCustomizeDeployAndPowerOn.java | 302 +++++++
...etworkConfigurationForNetworkAndOptions.java | 80 ++
.../strategy/VCloudComputeServiceAdapter.java | 263 ++++++
.../vcloud/compute/util/VCloudComputeUtils.java | 116 +++
.../vcloud/config/DefaultCatalogForOrg.java | 63 ++
.../vcloud/config/DefaultNetworkForVDC.java | 65 ++
.../vcloud/config/DefaultOrgForUser.java | 58 ++
.../vcloud/config/DefaultTasksListForOrg.java | 53 ++
.../config/DefaultVCloudReferencesModule.java | 165 ++++
.../jclouds/vcloud/config/DefaultVDCForOrg.java | 63 ++
.../vcloud/config/VCloudHttpApiModule.java | 538 +++++++++++
.../jclouds/vcloud/domain/AllocationModel.java | 70 ++
.../org/jclouds/vcloud/domain/Capacity.java | 108 +++
.../java/org/jclouds/vcloud/domain/Catalog.java | 69 ++
.../org/jclouds/vcloud/domain/CatalogItem.java | 37 +
.../domain/GuestCustomizationSection.java | 440 +++++++++
.../domain/InstantiateVAppTemplateParams.java | 96 ++
.../vcloud/domain/NetworkConnection.java | 233 +++++
.../vcloud/domain/NetworkConnectionSection.java | 218 +++++
.../java/org/jclouds/vcloud/domain/Org.java | 86 ++
.../jclouds/vcloud/domain/ReferenceType.java | 55 ++
.../java/org/jclouds/vcloud/domain/Status.java | 246 +++++
.../java/org/jclouds/vcloud/domain/Task.java | 72 ++
.../org/jclouds/vcloud/domain/TaskStatus.java | 71 ++
.../org/jclouds/vcloud/domain/TasksList.java | 37 +
.../java/org/jclouds/vcloud/domain/VApp.java | 87 ++
.../org/jclouds/vcloud/domain/VAppTemplate.java | 97 ++
.../org/jclouds/vcloud/domain/VCloudError.java | 123 +++
.../jclouds/vcloud/domain/VCloudSession.java | 29 +
.../java/org/jclouds/vcloud/domain/VDC.java | 146 +++
.../org/jclouds/vcloud/domain/VDCStatus.java | 57 ++
.../main/java/org/jclouds/vcloud/domain/Vm.java | 108 +++
.../vcloud/domain/internal/CatalogImpl.java | 193 ++++
.../vcloud/domain/internal/CatalogItemImpl.java | 111 +++
.../vcloud/domain/internal/ErrorImpl.java | 119 +++
.../jclouds/vcloud/domain/internal/OrgImpl.java | 171 ++++
.../domain/internal/ReferenceTypeImpl.java | 103 +++
.../vcloud/domain/internal/TaskImpl.java | 165 ++++
.../vcloud/domain/internal/TasksListImpl.java | 81 ++
.../vcloud/domain/internal/VAppImpl.java | 166 ++++
.../domain/internal/VAppTemplateImpl.java | 205 +++++
.../jclouds/vcloud/domain/internal/VDCImpl.java | 292 ++++++
.../jclouds/vcloud/domain/internal/VmImpl.java | 217 +++++
.../vcloud/domain/network/DhcpService.java | 106 +++
.../jclouds/vcloud/domain/network/Features.java | 95 ++
.../vcloud/domain/network/FenceMode.java | 70 ++
.../vcloud/domain/network/FirewallService.java | 86 ++
.../domain/network/IpAddressAllocationMode.java | 52 ++
.../jclouds/vcloud/domain/network/IpRange.java | 76 ++
.../jclouds/vcloud/domain/network/IpScope.java | 170 ++++
.../vcloud/domain/network/NatService.java | 115 +++
.../vcloud/domain/network/NetworkConfig.java | 167 ++++
.../vcloud/domain/network/OrgNetwork.java | 121 +++
.../domain/network/firewall/FirewallPolicy.java | 54 ++
.../network/firewall/FirewallProtocols.java | 73 ++
.../domain/network/firewall/FirewallRule.java | 125 +++
.../domain/network/internal/OrgNetworkImpl.java | 202 +++++
.../vcloud/domain/network/nat/NatPolicy.java | 54 ++
.../vcloud/domain/network/nat/NatProtocol.java | 48 +
.../vcloud/domain/network/nat/NatRule.java | 35 +
.../vcloud/domain/network/nat/NatType.java | 61 ++
.../domain/network/nat/rules/MappingMode.java | 54 ++
.../network/nat/rules/OneToOneVmRule.java | 110 +++
.../network/nat/rules/PortForwardingRule.java | 111 +++
.../vcloud/domain/network/nat/rules/VmRule.java | 128 +++
.../EditableResourceAllocationSettingData.java | 302 +++++++
.../vcloud/domain/ovf/VCloudHardDisk.java | 330 +++++++
.../vcloud/domain/ovf/VCloudNetworkAdapter.java | 332 +++++++
.../vcloud/domain/ovf/VCloudNetworkSection.java | 80 ++
.../ovf/VCloudOperatingSystemSection.java | 118 +++
.../ovf/VCloudVirtualHardwareSection.java | 179 ++++
.../org/jclouds/vcloud/endpoints/Catalog.java | 37 +
.../org/jclouds/vcloud/endpoints/Network.java | 37 +
.../java/org/jclouds/vcloud/endpoints/Org.java | 37 +
.../org/jclouds/vcloud/endpoints/OrgList.java | 37 +
.../org/jclouds/vcloud/endpoints/TasksList.java | 37 +
.../jclouds/vcloud/endpoints/VCloudLogin.java | 38 +
.../java/org/jclouds/vcloud/endpoints/VDC.java | 37 +
.../org/jclouds/vcloud/features/CatalogApi.java | 144 +++
.../org/jclouds/vcloud/features/NetworkApi.java | 61 ++
.../org/jclouds/vcloud/features/OrgApi.java | 86 ++
.../org/jclouds/vcloud/features/TaskApi.java | 82 ++
.../org/jclouds/vcloud/features/VAppApi.java | 261 ++++++
.../vcloud/features/VAppTemplateApi.java | 180 ++++
.../org/jclouds/vcloud/features/VDCApi.java | 73 ++
.../java/org/jclouds/vcloud/features/VmApi.java | 295 ++++++
...ddVCloudAuthorizationAndCookieToRequest.java | 63 ++
.../vcloud/functions/CatalogItemsInCatalog.java | 64 ++
.../vcloud/functions/CatalogItemsInOrg.java | 57 ++
.../jclouds/vcloud/functions/CatalogsInOrg.java | 73 ++
.../functions/DefaultNetworkNameInTemplate.java | 47 +
.../jclouds/vcloud/functions/NetworksInOrg.java | 57 ++
.../vcloud/functions/OrgNameToEndpoint.java | 57 ++
.../functions/OrgNameToTasksListEndpoint.java | 62 ++
.../vcloud/functions/OrgsForLocations.java | 73 ++
.../jclouds/vcloud/functions/OrgsForNames.java | 56 ++
.../ParseLoginResponseFromHeaders.java | 105 +++
.../functions/VAppTemplatesForCatalogItems.java | 66 ++
.../vcloud/functions/VAppTemplatesInOrg.java | 65 ++
.../org/jclouds/vcloud/functions/VDCsInOrg.java | 57 ++
.../ParseVCloudErrorFromHttpResponse.java | 121 +++
.../http/filters/VCloudBasicAuthentication.java | 58 ++
.../http/filters/VCloudSupportedVersions.java | 35 +
.../jclouds/vcloud/internal/VCloudLoginApi.java | 44 +
.../org/jclouds/vcloud/loaders/OVFLoader.java | 47 +
.../vcloud/loaders/VAppTemplateLoader.java | 47 +
.../org/jclouds/vcloud/location/DefaultVDC.java | 74 ++
.../location/OrgAndVDCToLocationSupplier.java | 93 ++
.../vcloud/options/CaptureVAppOptions.java | 51 ++
.../vcloud/options/CatalogItemOptions.java | 77 ++
.../jclouds/vcloud/options/CloneOptions.java | 53 ++
.../vcloud/options/CloneVAppOptions.java | 88 ++
.../options/CloneVAppTemplateOptions.java | 42 +
.../options/InstantiateVAppTemplateOptions.java | 178 ++++
.../jclouds/vcloud/predicates/TaskSuccess.java | 65 ++
.../vcloud/reference/VCloudConstants.java | 51 ++
.../jclouds/vcloud/reference/package-info.java | 21 +
...thNameMatchingConfigurationKeyOrDefault.java | 99 ++
.../vcloud/suppliers/VAppTemplatesSupplier.java | 86 ++
.../java/org/jclouds/vcloud/util/Utils.java | 71 ++
.../org/jclouds/vcloud/util/VCloudUtils.java | 67 ++
.../org/jclouds/vcloud/xml/CatalogHandler.java | 104 +++
.../jclouds/vcloud/xml/CatalogItemHandler.java | 81 ++
.../org/jclouds/vcloud/xml/ErrorHandler.java | 45 +
.../xml/GuestCustomizationSectionHandler.java | 137 +++
.../vcloud/xml/NetworkConnectionHandler.java | 87 ++
.../xml/NetworkConnectionSectionHandler.java | 103 +++
.../java/org/jclouds/vcloud/xml/OrgHandler.java | 112 +++
.../org/jclouds/vcloud/xml/OrgListHandler.java | 54 ++
.../jclouds/vcloud/xml/OrgNetworkHandler.java | 325 +++++++
.../vcloud/xml/SupportedVersionsHandler.java | 60 ++
.../org/jclouds/vcloud/xml/TaskHandler.java | 128 +++
.../jclouds/vcloud/xml/TasksListHandler.java | 74 ++
.../org/jclouds/vcloud/xml/VAppHandler.java | 151 ++++
.../jclouds/vcloud/xml/VAppTemplateHandler.java | 152 ++++
.../xml/VCloudVirtualHardwareHandler.java | 72 ++
.../java/org/jclouds/vcloud/xml/VDCHandler.java | 167 ++++
.../java/org/jclouds/vcloud/xml/VmHandler.java | 178 ++++
.../xml/ovf/VCloudNetworkSectionHandler.java | 69 ++
.../xml/ovf/VCloudOperatingSystemHandler.java | 81 ++
...oudResourceAllocationSettingDataHandler.java | 89 ++
.../services/org.jclouds.apis.ApiMetadata | 1 +
.../jclouds/vcloud/VCloudApiMetadataTest.java | 32 +
.../java/org/jclouds/vcloud/VCloudApiTest.java | 64 ++
.../vcloud/VCloudSessionRefreshLiveTest.java | 41 +
.../jclouds/vcloud/VCloudVersionsApiTest.java | 69 ++
.../BindCatalogItemToXmlPayloadTest.java | 53 ++
.../BindCloneVAppParamsToXmlPayloadTest.java | 81 ++
...CloneVAppTemplateParamsToXmlPayloadTest.java | 89 ++
.../BindDeployVAppParamsToXmlPayloadTest.java | 61 ++
...tiateVAppTemplateParamsToXmlPayloadTest.java | 179 ++++
...etworkConnectionSectionToXmlPayloadTest.java | 68 ++
.../BindUndeployVAppParamsToXmlPayloadTest.java | 61 ++
.../BaseVCloudComputeServiceExpectTest.java | 160 ++++
.../compute/VCloudComputeServiceLiveTest.java | 54 ++
.../functions/FindLocationForResourceTest.java | 64 ++
.../functions/ListImagesInVCloudExpectTest.java | 89 ++
.../functions/VAppToNodeMetadataTest.java | 228 +++++
.../options/VCloudTemplateOptionsTest.java | 197 ++++
...ThenCustomizeDeployAndPowerOnExpectTest.java | 171 ++++
.../VCloudComputeServiceAdapterTest.java | 89 ++
.../vcloud/features/CatalogApiLiveTest.java | 53 ++
.../jclouds/vcloud/features/CatalogApiTest.java | 131 +++
.../vcloud/features/NetworkApiLiveTest.java | 29 +
.../jclouds/vcloud/features/NetworkApiTest.java | 75 ++
.../jclouds/vcloud/features/OrgApiLiveTest.java | 42 +
.../org/jclouds/vcloud/features/OrgApiTest.java | 91 ++
.../vcloud/features/TaskApiLiveTest.java | 29 +
.../jclouds/vcloud/features/TaskApiTest.java | 108 +++
.../vcloud/features/VAppApiLiveTest.java | 53 ++
.../jclouds/vcloud/features/VAppApiTest.java | 315 +++++++
.../features/VAppTemplateApiLiveTest.java | 168 ++++
.../vcloud/features/VAppTemplateApiTest.java | 238 +++++
.../jclouds/vcloud/features/VDCApiLiveTest.java | 29 +
.../org/jclouds/vcloud/features/VDCApiTest.java | 102 +++
.../jclouds/vcloud/features/VmApiLiveTest.java | 163 ++++
.../org/jclouds/vcloud/features/VmApiTest.java | 320 +++++++
...loudAuthorizationAndCookieToRequestTest.java | 55 ++
.../ParseLoginResponseFromHeadersTest.java | 147 +++
.../ParseVCloudErrorFromHttpResponseTest.java | 96 ++
.../vcloud/internal/BasePayloadTest.java | 51 ++
.../vcloud/internal/BaseVCloudApiLiveTest.java | 59 ++
.../vcloud/internal/BaseVCloudApiTest.java | 272 ++++++
.../vcloud/internal/VCloudLoginApiTest.java | 97 ++
.../InstantiateVAppTemplateOptionsTest.java | 74 ++
...meMatchingConfigurationKeyOrDefaultTest.java | 115 +++
.../org/jclouds/vcloud/utils/TestUtils.java | 32 +
.../jclouds/vcloud/xml/CatalogHandlerTest.java | 135 +++
.../vcloud/xml/CatalogItemHandlerTest.java | 86 ++
.../GuestCustomizationSectionHandlerTest.java | 75 ++
.../xml/NetworkConnectionHandlerTest.java | 57 ++
.../NetworkConnectionSectionHandlerTest.java | 63 ++
.../org/jclouds/vcloud/xml/OrgHandlerTest.java | 124 +++
.../jclouds/vcloud/xml/OrgListHandlerTest.java | 57 ++
.../vcloud/xml/OrgNetworkHandlerTest.java | 104 +++
.../xml/SupportedVersionsHandlerTest.java | 53 ++
.../org/jclouds/vcloud/xml/TaskHandlerTest.java | 135 +++
.../vcloud/xml/TasksListHandlerTest.java | 82 ++
.../org/jclouds/vcloud/xml/VAppHandlerTest.java | 77 ++
.../vcloud/xml/VAppTemplateHandlerTest.java | 164 ++++
.../org/jclouds/vcloud/xml/VDCHandlerTest.java | 136 +++
.../org/jclouds/vcloud/xml/VmHandlerTest.java | 79 ++
...VCloudOperatingSystemSectionHandlerTest.java | 61 ++
...VCloudVirtualHardwareSectionHandlerTest.java | 153 ++++
.../src/test/resources/captureVApp-default.xml | 1 +
.../src/test/resources/captureVApp.xml | 1 +
.../src/test/resources/catalog-blank.xml | 7 +
.../src/test/resources/catalog-hosting.xml | 25 +
.../src/test/resources/catalog.xml | 27 +
.../src/test/resources/catalog1.0-vcd15.xml | 9 +
...alogItem-carrenza-with-default-namespace.xml | 8 +
...talogItem-carrenza-with-vcloud-namespace.xml | 8 +
.../src/test/resources/catalogItem-hosting.xml | 14 +
.../test/resources/catalogItem-terremark.xml | 16 +
.../src/test/resources/catalogItem1.0-vcd15.xml | 8 +
.../src/test/resources/copyVApp-default.xml | 1 +
.../src/test/resources/copyVApp.xml | 1 +
.../test/resources/copyVAppTemplate-default.xml | 1 +
.../src/test/resources/copyVAppTemplate.xml | 1 +
.../src/test/resources/cpuItem.xml | 1 +
.../src/test/resources/guestCustomization.xml | 23 +
.../resources/guestCustomizationSection.xml | 3 +
.../src/test/resources/instantiatedvapp.xml | 13 +
.../instantiationparams-description.xml | 1 +
.../resources/instantiationparams-network.xml | 1 +
.../src/test/resources/instantiationparams.xml | 1 +
.../1.7.1-stratos/src/test/resources/log4j.xml | 151 ++++
.../src/test/resources/memoryItem.xml | 1 +
.../src/test/resources/moveVApp.xml | 1 +
.../src/test/resources/moveVAppTemplate.xml | 1 +
.../src/test/resources/networkconnection.xml | 7 +
.../test/resources/networkconnectionsection.xml | 18 +
.../src/test/resources/org-1.0.xml | 24 +
.../src/test/resources/org-hosting.xml | 12 +
.../src/test/resources/org-savvis.xml | 13 +
.../1.7.1-stratos/src/test/resources/org.xml | 5 +
.../src/test/resources/org1.0-vcd15.xml | 11 +
.../src/test/resources/orgList1.0-vcd15.xml | 4 +
.../src/test/resources/orglist-savvis.xml | 3 +
.../src/test/resources/orglist.xml | 3 +
.../src/test/resources/orgnetwork-bridged.xml | 20 +
.../src/test/resources/orgnetwork-isolated.xml | 31 +
.../1.7.1-stratos/src/test/resources/os.xml | 11 +
.../src/test/resources/ovf-multi-vm.xml | 285 ++++++
.../src/test/resources/ovf-ubuntu64.xml | 148 +++
.../src/test/resources/task-1.0.xml | 9 +
.../src/test/resources/task-error.xml | 9 +
.../src/test/resources/task-hosting.xml | 12 +
.../src/test/resources/task-self.xml | 11 +
.../src/test/resources/task-vcd15.xml | 5 +
.../1.7.1-stratos/src/test/resources/task.xml | 8 +
.../src/test/resources/taskslist-hosting.xml | 14 +
.../src/test/resources/taskslist.xml | 27 +
.../resources/template1.0-vcd15-multi-vm.xml | 68 ++
.../src/test/resources/template1.0-vcd15.xml | 72 ++
.../src/test/resources/vAppTemplate-copying.xml | 41 +
.../src/test/resources/vAppTemplate.xml | 143 +++
.../vAppTemplate1.0-vcd15_withNewlines.xml | 109 +++
.../src/test/resources/vapp-hosting.xml | 235 +++++
.../src/test/resources/vapp-none.xml | 237 +++++
.../src/test/resources/vapp-pool.xml | 227 +++++
.../src/test/resources/vapp-rhel-off-static.xml | 325 +++++++
.../src/test/resources/vapp-ubuntu-off-dhcp.xml | 213 +++++
.../src/test/resources/vapp-unresolved.xml | 21 +
.../src/test/resources/vapp-win-off-static.xml | 219 +++++
.../src/test/resources/vdc-1.0.xml | 49 +
.../src/test/resources/vdc-hosting.xml | 60 ++
.../src/test/resources/vdc-nonet.xml | 22 +
.../1.7.1-stratos/src/test/resources/vdc.xml | 36 +
.../src/test/resources/vdc1.0-vcd15.xml | 47 +
.../src/test/resources/versions-vcd15.xml | 906 +++++++++++++++++++
.../src/test/resources/versions.xml | 7 +
.../test/resources/virtualhardwaresection.xml | 118 +++
.../src/test/resources/vm-rhel-off-static.xml | 197 ++++
.../openstack-nova/1.7.1-stratos/README.txt | 3 -
.../openstack-nova/1.7.1-stratos/pom.xml | 143 ---
.../jclouds/openstack/nova/v2_0/NovaApi.java | 208 -----
.../openstack/nova/v2_0/NovaApiMetadata.java | 125 ---
.../openstack/nova/v2_0/NovaAsyncApi.java | 214 -----
.../v2_0/binders/BindKeyPairToJsonPayload.java | 47 -
.../v2_0/binders/BindMetadataToJsonPayload.java | 47 -
.../BindSecurityGroupRuleToJsonPayload.java | 71 --
.../nova/v2_0/compute/NovaComputeService.java | 183 ----
.../v2_0/compute/NovaComputeServiceAdapter.java | 288 ------
.../config/NovaComputeServiceContextModule.java | 286 ------
.../compute/extensions/NovaImageExtension.java | 140 ---
.../extensions/NovaSecurityGroupExtension.java | 373 --------
.../AllocateAndAddFloatingIpToNode.java | 112 ---
.../functions/CreateSecurityGroupIfNeeded.java | 93 --
.../functions/FlavorInZoneToHardware.java | 60 --
.../compute/functions/ImageInZoneToImage.java | 70 --
.../functions/ImageToOperatingSystem.java | 128 ---
.../NovaSecurityGroupInZoneToSecurityGroup.java | 75 --
.../NovaSecurityGroupToSecurityGroup.java | 69 --
.../functions/OrphanedGroupsByZoneId.java | 77 --
.../RemoveFloatingIpFromNodeAndDeallocate.java | 74 --
.../SecurityGroupRuleToIpPermission.java | 99 --
.../functions/ServerInZoneToNodeMetadata.java | 199 ----
.../compute/loaders/CreateUniqueKeyPair.java | 79 --
.../loaders/FindSecurityGroupOrCreate.java | 86 --
.../loaders/LoadFloatingIpsForInstance.java | 63 --
.../compute/options/NovaTemplateOptions.java | 649 -------------
.../predicates/AllNodesInGroupTerminated.java | 56 --
...desWithGroupEncodedIntoNameThenAddToSet.java | 165 ----
.../nova/v2_0/config/NovaParserModule.java | 159 ----
.../nova/v2_0/config/NovaProperties.java | 43 -
.../nova/v2_0/config/NovaRestClientModule.java | 191 ----
.../openstack/nova/v2_0/domain/Address.java | 138 ---
.../openstack/nova/v2_0/domain/BackupType.java | 41 -
.../openstack/nova/v2_0/domain/Flavor.java | 211 -----
.../openstack/nova/v2_0/domain/FloatingIP.java | 173 ----
.../openstack/nova/v2_0/domain/Host.java | 127 ---
.../nova/v2_0/domain/HostAggregate.java | 250 -----
.../nova/v2_0/domain/HostResourceUsage.java | 180 ----
.../openstack/nova/v2_0/domain/Image.java | 303 -------
.../openstack/nova/v2_0/domain/Ingress.java | 160 ----
.../openstack/nova/v2_0/domain/KeyPair.java | 189 ----
.../openstack/nova/v2_0/domain/Network.java | 173 ----
.../openstack/nova/v2_0/domain/Quota.java | 356 --------
.../openstack/nova/v2_0/domain/QuotaClass.java | 62 --
.../openstack/nova/v2_0/domain/RebootType.java | 35 -
.../nova/v2_0/domain/SecurityGroup.java | 188 ----
.../nova/v2_0/domain/SecurityGroupRule.java | 174 ----
.../openstack/nova/v2_0/domain/Server.java | 476 ----------
.../nova/v2_0/domain/ServerCreated.java | 127 ---
.../v2_0/domain/ServerExtendedAttributes.java | 156 ----
.../nova/v2_0/domain/ServerExtendedStatus.java | 155 ----
.../v2_0/domain/ServerWithSecurityGroups.java | 128 ---
.../nova/v2_0/domain/SimpleServerUsage.java | 312 -------
.../nova/v2_0/domain/SimpleTenantUsage.java | 245 -----
.../nova/v2_0/domain/TenantIdAndName.java | 127 ---
.../nova/v2_0/domain/VirtualInterface.java | 128 ---
.../openstack/nova/v2_0/domain/Volume.java | 346 -------
.../nova/v2_0/domain/VolumeAttachment.java | 172 ----
.../nova/v2_0/domain/VolumeSnapshot.java | 239 -----
.../openstack/nova/v2_0/domain/VolumeType.java | 192 ----
.../domain/zonescoped/AvailabilityZone.java | 73 --
.../v2_0/domain/zonescoped/FlavorInZone.java | 46 -
.../v2_0/domain/zonescoped/ImageInZone.java | 46 -
.../domain/zonescoped/SecurityGroupInZone.java | 46 -
.../v2_0/domain/zonescoped/ServerInZone.java | 46 -
.../nova/v2_0/domain/zonescoped/ZoneAndId.java | 86 --
.../v2_0/domain/zonescoped/ZoneAndName.java | 111 ---
.../ZoneSecurityGroupNameAndPorts.java | 62 --
.../nova/v2_0/domain/zonescoped/ZoneState.java | 61 --
.../v2_0/extensions/AvailabilityZoneAPI.java | 40 -
.../extensions/AvailabilityZoneAsyncApi.java | 58 --
.../v2_0/extensions/ExtensionNamespaces.java | 110 ---
.../v2_0/extensions/FlavorExtraSpecsApi.java | 77 --
.../extensions/FlavorExtraSpecsAsyncApi.java | 118 ---
.../nova/v2_0/extensions/FloatingIPApi.java | 98 --
.../v2_0/extensions/FloatingIPAsyncApi.java | 145 ---
.../v2_0/extensions/HostAdministrationApi.java | 103 ---
.../extensions/HostAdministrationAsyncApi.java | 157 ----
.../nova/v2_0/extensions/HostAggregateApi.java | 87 --
.../v2_0/extensions/HostAggregateAsyncApi.java | 161 ----
.../nova/v2_0/extensions/KeyPairApi.java | 65 --
.../nova/v2_0/extensions/KeyPairAsyncApi.java | 101 ---
.../nova/v2_0/extensions/QuotaApi.java | 57 --
.../nova/v2_0/extensions/QuotaAsyncApi.java | 89 --
.../nova/v2_0/extensions/QuotaClassApi.java | 51 --
.../v2_0/extensions/QuotaClassAsyncApi.java | 78 --
.../nova/v2_0/extensions/SecurityGroupApi.java | 89 --
.../v2_0/extensions/SecurityGroupAsyncApi.java | 152 ----
.../nova/v2_0/extensions/ServerAdminApi.java | 120 ---
.../v2_0/extensions/ServerAdminAsyncApi.java | 175 ----
.../extensions/ServerWithSecurityGroupsApi.java | 49 -
.../ServerWithSecurityGroupsAsyncApi.java | 62 --
.../v2_0/extensions/SimpleTenantUsageApi.java | 50 -
.../extensions/SimpleTenantUsageAsyncApi.java | 77 --
.../v2_0/extensions/VirtualInterfaceApi.java | 43 -
.../extensions/VirtualInterfaceAsyncApi.java | 59 --
.../nova/v2_0/extensions/VolumeApi.java | 147 ---
.../nova/v2_0/extensions/VolumeAsyncApi.java | 254 ------
.../v2_0/extensions/VolumeAttachmentApi.java | 87 --
.../extensions/VolumeAttachmentAsyncApi.java | 107 ---
.../nova/v2_0/extensions/VolumeTypeApi.java | 101 ---
.../v2_0/extensions/VolumeTypeAsyncApi.java | 161 ----
.../openstack/nova/v2_0/features/FlavorApi.java | 78 --
.../nova/v2_0/features/FlavorAsyncApi.java | 144 ---
.../openstack/nova/v2_0/features/ImageApi.java | 142 ---
.../nova/v2_0/features/ImageAsyncApi.java | 206 -----
.../openstack/nova/v2_0/features/ServerApi.java | 276 ------
.../nova/v2_0/features/ServerAsyncApi.java | 356 --------
.../functions/FieldValueResponseParsers.java | 105 ---
.../nova/v2_0/functions/OverLimitParser.java | 92 --
.../ParseImageIdFromLocationHeader.java | 39 -
.../internal/OnlyMetadataValueOrNull.java | 63 --
.../functions/internal/ParseDiagnostics.java | 47 -
.../functions/internal/ParseFlavorDetails.java | 94 --
.../v2_0/functions/internal/ParseFlavors.java | 96 --
.../functions/internal/ParseImageDetails.java | 95 --
.../v2_0/functions/internal/ParseImages.java | 96 --
.../v2_0/functions/internal/ParseKeyPairs.java | 64 --
.../functions/internal/ParseServerDetails.java | 94 --
.../v2_0/functions/internal/ParseServers.java | 96 --
.../nova/v2_0/handlers/NovaErrorHandler.java | 129 ---
.../options/CreateBackupOfServerOptions.java | 105 ---
.../nova/v2_0/options/CreateServerOptions.java | 557 ------------
.../nova/v2_0/options/CreateVolumeOptions.java | 220 -----
.../options/CreateVolumeSnapshotOptions.java | 138 ---
.../v2_0/options/CreateVolumeTypeOptions.java | 101 ---
.../nova/v2_0/options/ListOptions.java | 107 ---
.../nova/v2_0/options/RebuildServerOptions.java | 142 ---
.../FindSecurityGroupWithNameAndReturnTrue.java | 84 --
.../nova/v2_0/predicates/ImagePredicates.java | 55 --
.../nova/v2_0/predicates/KeyPairPredicates.java | 77 --
.../predicates/SecurityGroupPredicates.java | 213 -----
.../services/org.jclouds.apis.ApiMetadata | 1 -
...tKeyAndTenantIdAuthenticationExpectTest.java | 75 --
...antNamePropertyAuthenticationExpectTest.java | 75 --
...KeyAndSecretKeyAuthenticationExpectTest.java | 69 --
.../nova/v2_0/EndpointIdIsRandomExpectTest.java | 72 --
.../nova/v2_0/NovaApiMetadataTest.java | 32 -
.../v2_0/PasswordAuthenticationExpectTest.java | 60 --
...dAuthenticationWithTenantNameExpectTest.java | 69 --
.../NovaComputeServiceAdapterExpectTest.java | 321 -------
.../compute/NovaComputeServiceExpectTest.java | 382 --------
.../compute/NovaComputeServiceLiveTest.java | 96 --
.../NovaImageExtensionExpectTest.java | 92 --
.../extensions/NovaImageExtensionLiveTest.java | 43 -
.../NovaSecurityGroupExtensionExpectTest.java | 433 ---------
.../NovaSecurityGroupExtensionLiveTest.java | 35 -
...llocateAndAddFloatingIpToNodeExpectTest.java | 133 ---
.../functions/FlavorInZoneToHardwareTest.java | 90 --
.../functions/ImageInZoneToImageTest.java | 95 --
.../functions/ImageToOperatingSystemTest.java | 192 ----
...aSecurityGroupInZoneToSecurityGroupTest.java | 94 --
.../NovaSecurityGroupToSecurityGroupTest.java | 155 ----
.../functions/OrphanedGroupsByZoneIdTest.java | 96 --
.../SecurityGroupRuleToIpPermissionTest.java | 81 --
.../ServerInZoneToNodeMetadataTest.java | 311 -------
.../loaders/CreateUniqueKeyPairTest.java | 111 ---
.../loaders/FindSecurityGroupOrCreateTest.java | 144 ---
.../loaders/LoadFloatingIpsForInstanceTest.java | 108 ---
.../options/NovaTemplateOptionsTest.java | 263 ------
.../extensions/AdminActionsApiExpectTest.java | 350 -------
.../extensions/AdminActionsApiLiveTest.java | 195 ----
.../AvailabilityZoneApiExpectTest.java | 64 --
.../AvailabilityZonesApiLiveTest.java | 45 -
.../FlavorExtraSpecsApiExpectTest.java | 142 ---
.../extensions/FlavorExtraSpecsApiLiveTest.java | 123 ---
.../extensions/FloatingIPApiExpectTest.java | 191 ----
.../v2_0/extensions/FloatingIPApiLiveTest.java | 171 ----
.../HostAdministrationApiExpectTest.java | 241 -----
.../HostAdministrationApiLiveTest.java | 116 ---
.../extensions/HostAggregateApiExpectTest.java | 179 ----
.../extensions/HostAggregateApiLiveTest.java | 148 ---
.../v2_0/extensions/KeyPairApiExpectTest.java | 142 ---
.../v2_0/extensions/KeyPairApiLiveTest.java | 76 --
.../v2_0/extensions/QuotaApiExpectTest.java | 125 ---
.../nova/v2_0/extensions/QuotaApiLiveTest.java | 100 --
.../extensions/QuotaClassApiExpectTest.java | 105 ---
.../v2_0/extensions/QuotaClassApiLiveTest.java | 73 --
.../extensions/SecurityGroupApiExpectTest.java | 235 -----
.../extensions/SecurityGroupApiLiveTest.java | 100 --
.../ServerWithSecurityGroupsApiExpectTest.java | 63 --
.../ServerWithSecurityGroupsApiLiveTest.java | 80 --
.../SimpleTenantUsageApiExpectTest.java | 99 --
.../SimpleTenantUsageApiLiveTest.java | 51 --
.../VirtualInterfaceApiExpectTest.java | 64 --
.../extensions/VirtualInterfaceApiLiveTest.java | 68 --
.../v2_0/extensions/VolumeApiExpectTest.java | 460 ----------
.../nova/v2_0/extensions/VolumeApiLiveTest.java | 274 ------
.../VolumeAttachmentApiExpectTest.java | 168 ----
.../extensions/VolumeAttachmentApiLiveTest.java | 156 ----
.../extensions/VolumeTypeApiExpectTest.java | 259 ------
.../v2_0/extensions/VolumeTypeApiLiveTest.java | 126 ---
.../v2_0/features/ExtensionApiExpectTest.java | 115 ---
.../v2_0/features/ExtensionApiLiveTest.java | 84 --
.../nova/v2_0/features/FlavorApiExpectTest.java | 164 ----
.../nova/v2_0/features/FlavorApiLiveTest.java | 105 ---
.../nova/v2_0/features/ImageApiExpectTest.java | 377 --------
.../nova/v2_0/features/ImageApiLiveTest.java | 101 ---
.../nova/v2_0/features/ServerApiExpectTest.java | 746 ---------------
.../nova/v2_0/features/ServerApiLiveTest.java | 206 -----
.../CreateSecurityGroupIfNeededTest.java | 168 ----
...ityGroupWithNameAndReturnTrueExpectTest.java | 102 ---
.../v2_0/functions/InternalURLLiveTest.java | 64 --
.../v2_0/handlers/NovaErrorHandlerTest.java | 225 -----
.../v2_0/internal/BaseNovaApiExpectTest.java | 28 -
.../nova/v2_0/internal/BaseNovaApiLiveTest.java | 120 ---
...BaseNovaComputeServiceContextExpectTest.java | 87 --
.../BaseNovaComputeServiceExpectTest.java | 35 -
.../nova/v2_0/internal/BaseNovaExpectTest.java | 84 --
...eComputeServiceTypicalSecurityGroupTest.java | 76 --
.../nova/v2_0/parse/ParseCreateFlavorTest.java | 58 --
.../nova/v2_0/parse/ParseCreatedServerTest.java | 80 --
.../parse/ParseExtensionListNormalTest.java | 76 --
.../nova/v2_0/parse/ParseExtensionListTest.java | 88 --
.../nova/v2_0/parse/ParseExtensionTest.java | 71 --
.../nova/v2_0/parse/ParseFlavorListTest.java | 85 --
.../nova/v2_0/parse/ParseFlavorTest.java | 70 --
.../v2_0/parse/ParseFloatingIPListTest.java | 59 --
.../nova/v2_0/parse/ParseFloatingIPTest.java | 53 --
.../nova/v2_0/parse/ParseImageListTest.java | 85 --
.../nova/v2_0/parse/ParseImageTest.java | 98 --
.../nova/v2_0/parse/ParseKeyPairListTest.java | 68 --
.../nova/v2_0/parse/ParseKeyPairTest.java | 61 --
.../nova/v2_0/parse/ParseMetadataItemTest.java | 58 --
.../nova/v2_0/parse/ParseMetadataListTest.java | 63 --
.../v2_0/parse/ParseMetadataUpdateTest.java | 64 --
.../v2_0/parse/ParseSecurityGroupListTest.java | 72 --
.../nova/v2_0/parse/ParseSecurityGroupTest.java | 69 --
.../v2_0/parse/ParseServerDetailsEssexTest.java | 170 ----
.../nova/v2_0/parse/ParseServerDiagnostics.java | 57 --
.../nova/v2_0/parse/ParseServerListTest.java | 85 --
.../nova/v2_0/parse/ParseServerTest.java | 117 ---
.../parse/ParseServerWithAllExtensionsTest.java | 104 ---
.../ParseServerWithInternetAddressesTest.java | 99 --
...ublicIpsInPrivateAddressBlockExpectTest.java | 99 --
.../v2_0/predicates/ImagePredicatesTest.java | 44 -
.../predicates/SecurityGroupPredicatesTest.java | 129 ---
.../src/test/resources/attachment_details.json | 1 -
.../src/test/resources/attachment_list.json | 1 -
.../src/test/resources/extension_details.json | 21 -
.../src/test/resources/extension_list.json | 42 -
.../src/test/resources/extension_list_full.json | 281 ------
.../test/resources/extension_list_normal.json | 31 -
.../resources/extension_list_openstack.json | 115 ---
.../src/test/resources/flavor_details.json | 19 -
.../src/test/resources/flavor_list.json | 32 -
.../src/test/resources/flavor_list_detail.json | 1 -
.../resources/flavor_list_detail_openstack.json | 83 --
.../src/test/resources/flavor_new.json | 10 -
.../src/test/resources/floatingip_details.json | 9 -
.../src/test/resources/floatingip_list.json | 16 -
.../1.7.1-stratos/src/test/resources/host.json | 1 -
.../test/resources/host_aggregate_details.json | 1 -
.../src/test/resources/host_aggregate_list.json | 1 -
.../host_aggregate_with_host_details.json | 1 -
.../src/test/resources/hosts_list.json | 1 -
.../src/test/resources/image_active.json | 41 -
.../src/test/resources/image_details.json | 41 -
.../src/test/resources/image_list.json | 32 -
.../src/test/resources/image_list_detail.json | 1 -
.../image_list_detail_imageextension.json | 121 ---
.../resources/image_list_detail_openstack.json | 81 --
.../src/test/resources/keypair_created.json | 9 -
.../keypair_created_computeservice.json | 9 -
.../src/test/resources/keypair_list.json | 18 -
.../test/resources/listAvailabilityZones.json | 11 -
.../src/test/resources/metadata_item.json | 5 -
.../src/test/resources/metadata_list.json | 6 -
.../src/test/resources/metadata_updated.json | 7 -
.../src/test/resources/new_server.json | 41 -
.../resources/new_server_disk_config_auto.json | 42 -
.../new_server_disk_config_manual.json | 42 -
.../src/test/resources/new_server_in_zone.json | 41 -
.../resources/new_server_networks_response.json | 42 -
.../test/resources/new_server_no_adminpass.json | 40 -
.../resources/new_server_nova_networks.json | 41 -
.../src/test/resources/quota_class.json | 15 -
.../src/test/resources/quotas.json | 15 -
.../test/resources/securitygroup_created.json | 9 -
.../test/resources/securitygroup_details.json | 34 -
...itygroup_details_computeservice_typical.json | 51 --
.../securitygroup_details_extension.json | 34 -
...securitygroup_details_extension_norules.json | 10 -
.../resources/securitygroup_details_port22.json | 19 -
.../src/test/resources/securitygroup_list.json | 51 --
...oup_list_details_computeservice_typical.json | 53 --
.../resources/securitygroup_list_extension.json | 51 --
.../resources/securitygrouprule_created.json | 12 -
.../securitygrouprule_created_cidr.json | 13 -
.../securitygrouprule_created_group.json | 14 -
.../src/test/resources/server_details.json | 86 --
.../test/resources/server_details_devstack.json | 44 -
.../resources/server_details_openstack.json | 46 -
.../src/test/resources/server_diagnostics.json | 17 -
.../src/test/resources/server_list.json | 32 -
.../src/test/resources/server_list_details.json | 79 --
.../resources/server_list_details_essex.json | 152 ----
.../resources/server_public_ip_in_private.json | 51 --
.../resources/server_with_security_groups.json | 1 -
.../server_with_security_groups_extension.json | 1 -
.../src/test/resources/simple_tenant_usage.json | 1 -
.../test/resources/simple_tenant_usages.json | 1 -
.../src/test/resources/snapshot_details.json | 1 -
.../src/test/resources/snapshot_list.json | 1 -
.../test/resources/snapshot_list_detail.json | 1 -
.../test/resources/virtual_interfaces_list.json | 1 -
.../src/test/resources/volume_details.json | 1 -
.../src/test/resources/volume_list.json | 1 -
.../src/test/resources/volume_list_detail.json | 1 -
.../src/test/resources/volume_type.json | 9 -
.../test/resources/volume_type_extra_specs.json | 1 -
.../src/test/resources/volume_type_list.json | 1 -
.../provider/aws-ec2/1.7.1-stratos/pom.xml | 29 +-
.../org/jclouds/aws/ec2/AWSEC2ApiMetadata.java | 2 +-
.../BindLaunchSpecificationToFormParams.java | 13 +-
.../aws/ec2/compute/AWSEC2TemplateOptions.java | 59 +-
.../AWSEC2CreateNodesInGroupThenAddToSet.java | 39 +-
...curityGroupsAsNeededAndReturnRunOptions.java | 16 +-
.../aws/ec2/domain/AWSRunningInstance.java | 29 +-
.../aws/ec2/domain/LaunchSpecification.java | 43 +-
.../aws/ec2/options/AWSRunInstancesOptions.java | 27 +-
.../aws/ec2/xml/LaunchSpecificationHandler.java | 20 +-
.../features/PlacementGroupApiExpectTest.java | 4 +-
.../ec2/features/SpotInstanceApiExpectTest.java | 4 +-
...InstanceRequestToAWSRunningInstanceTest.java | 4 +-
.../src/test/resources/describe_instances_1.xml | 2 +-
.../src/test/resources/describe_instances_2.xml | 2 +-
.../src/test/resources/describe_instances_3.xml | 2 +-
.../resources/describe_instances_latest.xml | 2 +-
.../resources/describe_instances_pending.xml | 2 +-
.../resources/describe_security_groups_vpc.xml | 2 +-
.../test/resources/describe_spot_instance.xml | 2 +-
.../describe_spot_instance_requests.xml | 2 +-
.../resources/describe_spot_instance_tags.xml | 2 +-
.../resources/describe_spot_instances_1.xml | 2 +-
.../resources/describe_spot_price_history.xml | 2 +-
.../resources/request_spot_instances-ebs.xml | 2 +-
.../test/resources/request_spot_instances.xml | 2 +-
.../src/test/resources/run_instances_1.xml | 2 +-
.../jclouds/vcloud/1.7.1-stratos/README.txt | 6 -
.../jclouds/vcloud/1.7.1-stratos/pom.xml | 129 ---
.../vcloud/TaskInErrorStateException.java | 39 -
.../vcloud/TaskStillRunningException.java | 39 -
.../main/java/org/jclouds/vcloud/VCloudApi.java | 91 --
.../org/jclouds/vcloud/VCloudApiMetadata.java | 103 ---
.../org/jclouds/vcloud/VCloudMediaType.java | 221 -----
.../jclouds/vcloud/VCloudResponseException.java | 69 --
.../java/org/jclouds/vcloud/VCloudToken.java | 37 -
.../org/jclouds/vcloud/VCloudVersionsApi.java | 38 -
.../binders/BindCPUCountToXmlPayload.java | 79 --
.../BindCaptureVAppParamsToXmlPayload.java | 124 ---
.../binders/BindCatalogItemToXmlPayload.java | 126 ---
.../binders/BindCloneParamsToXmlPayload.java | 133 ---
.../BindCloneVAppParamsToXmlPayload.java | 65 --
...BindCloneVAppTemplateParamsToXmlPayload.java | 60 --
.../BindDeployVAppParamsToXmlPayload.java | 42 -
...ndGuestCustomizationSectionToXmlPayload.java | 112 ---
...stantiateVAppTemplateParamsToXmlPayload.java | 221 -----
.../vcloud/binders/BindMemoryToXmlPayload.java | 80 --
...indNetworkConnectionSectionToXmlPayload.java | 106 ---
.../vcloud/binders/BindParamsToXmlPayload.java | 81 --
.../BindUndeployVAppParamsToXmlPayload.java | 42 -
.../OrgNameAndCatalogNameToEndpoint.java | 79 --
.../binders/OrgNameAndVDCNameToEndpoint.java | 78 --
.../OrgNameCatalogNameItemNameToEndpoint.java | 77 --
...meCatalogNameVAppTemplateNameToEndpoint.java | 90 --
.../OrgNameVDCNameNetworkNameToEndpoint.java | 54 --
...NameVDCNameResourceEntityNameToEndpoint.java | 54 --
.../OrgNameVDCNameResourceNameToEndpoint.java | 81 --
.../VCloudComputeServiceContextModule.java | 39 -
.../VCloudComputeServiceDependenciesModule.java | 154 ----
.../functions/FindLocationForResource.java | 69 --
.../compute/functions/HardwareForVApp.java | 71 --
.../functions/HardwareForVAppTemplate.java | 84 --
.../compute/functions/ImageForVAppTemplate.java | 82 --
.../compute/functions/VAppToNodeMetadata.java | 112 ---
...dHardwareBuilderFromResourceAllocations.java | 43 -
...EnvelopeOrThrowIllegalArgumentException.java | 77 --
.../internal/VCloudTemplateBuilderImpl.java | 48 -
.../compute/options/VCloudTemplateOptions.java | 350 -------
...edIntoNameThenCustomizeDeployAndPowerOn.java | 302 -------
...etworkConfigurationForNetworkAndOptions.java | 80 --
.../strategy/VCloudComputeServiceAdapter.java | 263 ------
.../vcloud/compute/util/VCloudComputeUtils.java | 116 ---
.../vcloud/config/DefaultCatalogForOrg.java | 63 --
.../vcloud/config/DefaultNetworkForVDC.java | 65 --
.../vcloud/config/DefaultOrgForUser.java | 58 --
.../vcloud/config/DefaultTasksListForOrg.java | 53 --
.../config/DefaultVCloudReferencesModule.java | 165 ----
.../jclouds/vcloud/config/DefaultVDCForOrg.java | 63 --
.../vcloud/config/VCloudHttpApiModule.java | 538 -----------
.../jclouds/vcloud/domain/AllocationModel.java | 70 --
.../org/jclouds/vcloud/domain/Capacity.java | 108 ---
.../java/org/jclouds/vcloud/domain/Catalog.java | 69 --
.../org/jclouds/vcloud/domain/CatalogItem.java | 37 -
.../domain/GuestCustomizationSection.java | 440 ---------
.../domain/InstantiateVAppTemplateParams.java | 96 --
.../vcloud/domain/NetworkConnection.java | 233 -----
.../vcloud/domain/NetworkConnectionSection.java | 218 -----
.../java/org/jclouds/vcloud/domain/Org.java | 86 --
.../jclouds/vcloud/domain/ReferenceType.java | 55 --
.../java/org/jclouds/vcloud/domain/Status.java | 246 -----
.../java/org/jclouds/vcloud/domain/Task.java | 72 --
.../org/jclouds/vcloud/domain/TaskStatus.java | 71 --
.../org/jclouds/vcloud/domain/TasksList.java | 37 -
.../java/org/jclouds/vcloud/domain/VApp.java | 87 --
.../org/jclouds/vcloud/domain/VAppTemplate.java | 97 --
.../org/jclouds/vcloud/domain/VCloudError.java | 123 ---
.../jclouds/vcloud/domain/VCloudSession.java | 29 -
.../java/org/jclouds/vcloud/domain/VDC.java | 146 ---
.../org/jclouds/vcloud/domain/VDCStatus.java | 57 --
.../main/java/org/jclouds/vcloud/domain/Vm.java | 108 ---
.../vcloud/domain/internal/CatalogImpl.java | 193 ----
.../vcloud/domain/internal/CatalogItemImpl.java | 111 ---
.../vcloud/domain/internal/ErrorImpl.java | 119 ---
.../jclouds/vcloud/domain/internal/OrgImpl.java | 171 ----
.../domain/internal/ReferenceTypeImpl.java | 103 ---
.../vcloud/domain/internal/TaskImpl.java | 165 ----
.../vcloud/domain/internal/TasksListImpl.java | 81 --
.../vcloud/domain/internal/VAppImpl.java | 166 ----
.../domain/internal/VAppTemplateImpl.java | 205 -----
.../jclouds/vcloud/domain/internal/VDCImpl.java | 292 ------
.../jclouds/vcloud/domain/internal/VmImpl.java | 217 -----
.../vcloud/domain/network/DhcpService.java | 106 ---
.../jclouds/vcloud/domain/network/Features.java | 95 --
.../vcloud/domain/network/FenceMode.java | 70 --
.../vcloud/domain/network/FirewallService.java | 86 --
.../domain/network/IpAddressAllocationMode.java | 52 --
.../jclouds/vcloud/domain/network/IpRange.java | 76 --
.../jclouds/vcloud/domain/network/IpScope.java | 170 ----
.../vcloud/domain/network/NatService.java | 115 ---
.../vcloud/domain/network/NetworkConfig.java | 167 ----
.../vcloud/domain/network/OrgNetwork.java | 121 ---
.../domain/network/firewall/FirewallPolicy.java | 54 --
.../network/firewall/FirewallProtocols.java | 73 --
.../domain/network/firewall/FirewallRule.java | 125 ---
.../domain/network/internal/OrgNetworkImpl.java | 202 -----
.../vcloud/domain/network/nat/NatPolicy.java | 54 --
.../vcloud/domain/network/nat/NatProtocol.java | 48 -
.../vcloud/domain/network/nat/NatRule.java | 35 -
.../vcloud/domain/network/nat/NatType.java | 61 --
.../domain/network/nat/rules/MappingMode.java | 54 --
.../network/nat/rules/OneToOneVmRule.java | 110 ---
.../network/nat/rules/PortForwardingRule.java | 111 ---
.../vcloud/domain/network/nat/rules/VmRule.java | 128 ---
.../EditableResourceAllocationSettingData.java | 302 -------
.../vcloud/domain/ovf/VCloudHardDisk.java | 330 -------
.../vcloud/domain/ovf/VCloudNetworkAdapter.java | 332 -------
.../vcloud/domain/ovf/VCloudNetworkSection.java | 80 --
.../ovf/VCloudOperatingSystemSection.java | 118 ---
.../ovf/VCloudVirtualHardwareSection.java | 179 ----
.../org/jclouds/vcloud/endpoints/Catalog.java | 37 -
.../org/jclouds/vcloud/endpoints/Network.java | 37 -
.../java/org/jclouds/vcloud/endpoints/Org.java | 37 -
.../org/jclouds/vcloud/endpoints/OrgList.java | 37 -
.../org/jclouds/vcloud/endpoints/TasksList.java | 37 -
.../jclouds/vcloud/endpoints/VCloudLogin.java | 38 -
.../java/org/jclouds/vcloud/endpoints/VDC.java | 37 -
.../org/jclouds/vcloud/features/CatalogApi.java | 144 ---
.../org/jclouds/vcloud/features/NetworkApi.java | 61 --
.../org/jclouds/vcloud/features/OrgApi.java | 86 --
.../org/jclouds/vcloud/features/TaskApi.java | 82 --
.../org/jclouds/vcloud/features/VAppApi.java | 261 ------
.../vcloud/features/VAppTemplateApi.java | 180 ----
.../org/jclouds/vcloud/features/VDCApi.java | 73 --
.../java/org/jclouds/vcloud/features/VmApi.java | 295 ------
...ddVCloudAuthorizationAndCookieToRequest.java | 63 --
.../vcloud/functions/CatalogItemsInCatalog.java | 64 --
.../vcloud/functions/CatalogItemsInOrg.java | 57 --
.../jclouds/vcloud/functions/CatalogsInOrg.java | 73 --
.../functions/DefaultNetworkNameInTemplate.java | 47 -
.../jclouds/vcloud/functions/NetworksInOrg.java | 57 --
.../vcloud/functions/OrgNameToEndpoint.java | 57 --
.../functions/OrgNameToTasksListEndpoint.java | 62 --
.../vcloud/functions/OrgsForLocations.java | 73 --
.../jclouds/vcloud/functions/OrgsForNames.java | 56 --
.../ParseLoginResponseFromHeaders.java | 105 ---
.../functions/VAppTemplatesForCatalogItems.java | 66 --
.../vcloud/functions/VAppTemplatesInOrg.java | 65 --
.../org/jclouds/vcloud/functions/VDCsInOrg.java | 57 --
.../ParseVCloudErrorFromHttpResponse.java | 121 ---
.../http/filters/VCloudBasicAuthentication.java | 58 --
.../http/filters/VCloudSupportedVersions.java | 35 -
.../jclouds/vcloud/internal/VCloudLoginApi.java | 44 -
.../org/jclouds/vcloud/loaders/OVFLoader.java | 47 -
.../vcloud/loaders/VAppTemplateLoader.java | 47 -
.../org/jclouds/vcloud/location/DefaultVDC.java | 74 --
.../location/OrgAndVDCToLocationSupplier.java | 93 --
.../vcloud/options/CaptureVAppOptions.java | 51 --
.../vcloud/options/CatalogItemOptions.java | 77 --
.../jclouds/vcloud/options/CloneOptions.java | 53 --
.../vcloud/options/CloneVAppOptions.java | 88 --
.../options/CloneVAppTemplateOptions.java | 42 -
.../options/InstantiateVAppTemplateOptions.java | 178 ----
.../jclouds/vcloud/predicates/TaskSuccess.java | 65 --
.../vcloud/reference/VCloudConstants.java | 51 --
.../jclouds/vcloud/reference/package-info.java | 21 -
...thNameMatchingConfigurationKeyOrDefault.java | 99 --
.../vcloud/suppliers/VAppTemplatesSupplier.java | 86 --
.../java/org/jclouds/vcloud/util/Utils.java | 71 --
.../org/jclouds/vcloud/util/VCloudUtils.java | 67 --
.../org/jclouds/vcloud/xml/CatalogHandler.java | 104 ---
.../jclouds/vcloud/xml/CatalogItemHandler.java | 81 --
.../org/jclouds/vcloud/xml/ErrorHandler.java | 45 -
.../xml/GuestCustomizationSectionHandler.java | 137 ---
.../vcloud/xml/NetworkConnectionHandler.java | 87 --
.../xml/NetworkConnectionSectionHandler.java | 103 ---
.../java/org/jclouds/vcloud/xml/OrgHandler.java | 112 ---
.../org/jclouds/vcloud/xml/OrgListHandler.java | 54 --
.../jclouds/vcloud/xml/OrgNetworkHandler.java | 325 -------
.../vcloud/xml/SupportedVersionsHandler.java | 60 --
.../org/jclouds/vcloud/xml/TaskHandler.java | 128 ---
.../jclouds/vcloud/xml/TasksListHandler.java | 74 --
.../org/jclouds/vcloud/xml/VAppHandler.java | 151 ----
.../jclouds/vcloud/xml/VAppTemplateHandler.java | 152 ----
.../xml/VCloudVirtualHardwareHandler.java | 72 --
.../java/org/jclouds/vcloud/xml/VDCHandler.java | 167 ----
.../java/org/jclouds/vcloud/xml/VmHandler.java | 178 ----
.../xml/ovf/VCloudNetworkSectionHandler.java | 69 --
.../xml/ovf/VCloudOperatingSystemHandler.java | 81 --
...oudResourceAllocationSettingDataHandler.java | 89 --
.../services/org.jclouds.apis.ApiMetadata | 1 -
.../jclouds/vcloud/VCloudApiMetadataTest.java | 32 -
.../java/org/jclouds/vcloud/VCloudApiTest.java | 64 --
.../vcloud/VCloudSessionRefreshLiveTest.java | 41 -
.../jclouds/vcloud/VCloudVersionsApiTest.java | 69 --
.../BindCatalogItemToXmlPayloadTest.java | 53 --
.../BindCloneVAppParamsToXmlPayloadTest.java | 81 --
...CloneVAppTemplateParamsToXmlPayloadTest.java | 89 --
.../BindDeployVAppParamsToXmlPayloadTest.java | 61 --
...tiateVAppTemplateParamsToXmlPayloadTest.java | 179 ----
...etworkConnectionSectionToXmlPayloadTest.java | 68 --
.../BindUndeployVAppParamsToXmlPayloadTest.java | 61 --
.../BaseVCloudComputeServiceExpectTest.java | 160 ----
.../compute/VCloudComputeServiceLiveTest.java | 54 --
.../functions/FindLocationForResourceTest.java | 64 --
.../functions/ListImagesInVCloudExpectTest.java | 89 --
.../functions/VAppToNodeMetadataTest.java | 228 -----
.../options/VCloudTemplateOptionsTest.java | 197 ----
...ThenCustomizeDeployAndPowerOnExpectTest.java | 171 ----
.../VCloudComputeServiceAdapterTest.java | 89 --
.../vcloud/features/CatalogApiLiveTest.java | 53 --
.../jclouds/vcloud/features/CatalogApiTest.java | 131 ---
.../vcloud/features/NetworkApiLiveTest.java | 29 -
.../jclouds/vcloud/features/NetworkApiTest.java | 75 --
.../jclouds/vcloud/features/OrgApiLiveTest.java | 42 -
.../org/jclouds/vcloud/features/OrgApiTest.java | 91 --
.../vcloud/features/TaskApiLiveTest.java | 29 -
.../jclouds/vcloud/features/TaskApiTest.java | 108 ---
.../vcloud/features/VAppApiLiveTest.java | 53 --
.../jclouds/vcloud/features/VAppApiTest.java | 315 -------
.../features/VAppTemplateApiLiveTest.java | 168 ----
.../vcloud/features/VAppTemplateApiTest.java | 238 -----
.../jclouds/vcloud/features/VDCApiLiveTest.java | 29 -
.../org/jclouds/vcloud/features/VDCApiTest.java | 102 ---
.../jclouds/vcloud/features/VmApiLiveTest.java | 163 ----
.../org/jclouds/vcloud/features/VmApiTest.java | 320 -------
...loudAuthorizationAndCookieToRequestTest.java | 55 --
.../ParseLoginResponseFromHeadersTest.java | 147 ---
.../ParseVCloudErrorFromHttpResponseTest.java | 96 --
.../vcloud/internal/BasePayloadTest.java | 51 --
.../vcloud/internal/BaseVCloudApiLiveTest.java | 59 --
.../vcloud/internal/BaseVCloudApiTest.java | 272 ------
.../vcloud/internal/VCloudLoginApiTest.java | 97 --
.../InstantiateVAppTemplateOptionsTest.java | 74 --
...meMatchingConfigurationKeyOrDefaultTest.java | 115 ---
.../org/jclouds/vcloud/utils/TestUtils.java | 32 -
.../jclouds/vcloud/xml/CatalogHandlerTest.java | 135 ---
.../vcloud/xml/CatalogItemHandlerTest.java | 86 --
.../GuestCustomizationSectionHandlerTest.java | 75 --
.../xml/NetworkConnectionHandlerTest.java | 57 --
.../NetworkConnectionSectionHandlerTest.java | 63 --
.../org/jclouds/vcloud/xml/OrgHandlerTest.java | 124 ---
.../jclouds/vcloud/xml/OrgListHandlerTest.java | 57 --
.../vcloud/xml/OrgNetworkHandlerTest.java | 104 ---
.../xml/SupportedVersionsHandlerTest.java | 53 --
.../org/jclouds/vcloud/xml/TaskHandlerTest.java | 135 ---
.../vcloud/xml/TasksListHandlerTest.java | 82 --
.../org/jclouds/vcloud/xml/VAppHandlerTest.java | 77 --
.../vcloud/xml/VAppTemplateHandlerTest.java | 164 ----
.../org/jclouds/vcloud/xml/VDCHandlerTest.java | 136 ---
.../org/jclouds/vcloud/xml/VmHandlerTest.java | 79 --
...VCloudOperatingSystemSectionHandlerTest.java | 61 --
...VCloudVirtualHardwareSectionHandlerTest.java | 153 ----
.../src/test/resources/captureVApp-default.xml | 1 -
.../src/test/resources/captureVApp.xml | 1 -
.../src/test/resources/catalog-blank.xml | 7 -
.../src/test/resources/catalog-hosting.xml | 25 -
.../src/test/resources/catalog.xml | 27 -
.../src/test/resources/catalog1.0-vcd15.xml | 9 -
...alogItem-carrenza-with-default-namespace.xml | 8 -
...talogItem-carrenza-with-vcloud-namespace.xml | 8 -
.../src/test/resources/catalogItem-hosting.xml | 14 -
.../test/resources/catalogItem-terremark.xml | 16 -
.../src/test/resources/catalogItem1.0-vcd15.xml | 8 -
.../src/test/resources/copyVApp-default.xml | 1 -
.../src/test/resources/copyVApp.xml | 1 -
.../test/resources/copyVAppTemplate-default.xml | 1 -
.../src/test/resources/copyVAppTemplate.xml | 1 -
.../src/test/resources/cpuItem.xml | 1 -
.../src/test/resources/guestCustomization.xml | 23 -
.../resources/guestCustomizationSection.xml | 3 -
.../src/test/resources/instantiatedvapp.xml | 13 -
.../instantiationparams-description.xml | 1 -
.../resources/instantiationparams-network.xml | 1 -
.../src/test/resources/instantiationparams.xml | 1 -
.../1.7.1-stratos/src/test/resources/log4j.xml | 151 ----
.../src/test/resources/memoryItem.xml | 1 -
.../src/test/resources/moveVApp.xml | 1 -
.../src/test/resources/moveVAppTemplate.xml | 1 -
.../src/test/resources/networkconnection.xml | 7 -
.../test/resources/networkconnectionsection.xml | 18 -
.../src/test/resources/org-1.0.xml | 24 -
.../src/test/resources/org-hosting.xml | 12 -
.../src/test/resources/org-savvis.xml | 13 -
.../1.7.1-stratos/src/test/resources/org.xml | 5 -
.../src/test/resources/org1.0-vcd15.xml | 11 -
.../src/test/resources/orgList1.0-vcd15.xml | 4 -
.../src/test/resources/orglist-savvis.xml | 3 -
.../src/test/resources/orglist.xml | 3 -
.../src/test/resources/orgnetwork-bridged.xml | 20 -
.../src/test/resources/orgnetwork-isolated.xml | 31 -
.../1.7.1-stratos/src/test/resources/os.xml | 11 -
.../src/test/resources/ovf-multi-vm.xml | 285 ------
.../src/test/resources/ovf-ubuntu64.xml | 148 ---
.../src/test/resources/task-1.0.xml | 9 -
.../src/test/resources/task-error.xml | 9 -
.../src/test/resources/task-hosting.xml | 12 -
.../src/test/resources/task-self.xml | 11 -
.../src/test/resources/task-vcd15.xml | 5 -
.../1.7.1-stratos/src/test/resources/task.xml | 8 -
.../src/test/resources/taskslist-hosting.xml | 14 -
.../src/test/resources/taskslist.xml | 27 -
.../resources/template1.0-vcd15-multi-vm.xml | 68 --
.../src/test/resources/template1.0-vcd15.xml | 72 --
.../src/test/resources/vAppTemplate-copying.xml | 41 -
.../src/test/resources/vAppTemplate.xml | 143 ---
.../vAppTemplate1.0-vcd15_withNewlines.xml | 109 ---
.../src/test/resources/vapp-hosting.xml | 235 -----
.../src/test/resources/vapp-none.xml | 237 -----
.../src/test/resources/vapp-pool.xml | 227 -----
.../src/test/resources/vapp-rhel-off-static.xml | 325 -------
.../src/test/resources/vapp-ubuntu-off-dhcp.xml | 213 -----
.../src/test/resources/vapp-unresolved.xml | 21 -
.../src/test/resources/vapp-win-off-static.xml | 219 -----
.../src/test/resources/vdc-1.0.xml | 49 -
.../src/test/resources/vdc-hosting.xml | 60 --
.../src/test/resources/vdc-nonet.xml | 22 -
.../1.7.1-stratos/src/test/resources/vdc.xml | 36 -
.../src/test/resources/vdc1.0-vcd15.xml | 47 -
.../src/test/resources/versions-vcd15.xml | 906 -------------------
.../src/test/resources/versions.xml | 7 -
.../test/resources/virtualhardwaresection.xml | 118 ---
.../src/test/resources/vm-rhel-off-static.xml | 197 ----
dependencies/pom.xml | 4 +-
1286 files changed, 64401 insertions(+), 64290 deletions(-)
----------------------------------------------------------------------