From 3cbc0e324fa0de31f2c96c02fc121fecd4cc25ab Mon Sep 17 00:00:00 2001 From: Chip Childers Date: Wed, 1 Aug 2012 09:34:12 -0400 Subject: [PATCH] awsapi license header changes --- awsapi/.classpath | 18 ++++++++++++++++ awsapi/.project | 18 ++++++++++++++++ awsapi/.pydevproject | 18 ++++++++++++++++ awsapi/conf/CloudStack.cfg.xml | 18 ++++++++++++++++ awsapi/conf/cloud-bridge.properties | 17 +++++++++++++++ awsapi/conf/ec2-service.properties | 17 +++++++++++++++ awsapi/conf/hibernate.cfg.xml | 18 ++++++++++++++++ awsapi/docs/AmazonEC2/EC2-API-tool-setup.txt | 20 ++++++++++++++++++ .../AmazonEC2/EC2-implementation-guide.html | 18 ++++++++++++++++ .../AmazonEC2/EC2-local-deploy-using-ant.html | 18 ++++++++++++++++ awsapi/docs/AmazonEC2/EC2-users-guide.html | 18 ++++++++++++++++ .../docs/AmazonEC2/wsdl2java-command-line.txt | 21 ++++++++++++++++++- awsapi/docs/AmazonS3/S3-users-guide.html | 20 +++++++++++++++++- awsapi/docs/AmazonS3/notes.txt | 21 ++++++++++++++++++- .../docs/AmazonS3/wsdl2java-command-line.txt | 19 +++++++++++++++++ .../config/debian/cloud-bridge.install | 17 +++++++++++++++ .../config/debian/cloud-bridge.postinst | 17 +++++++++++++++ awsapi/packages/config/rpm/cloudbridge.spec | 17 +++++++++++++++ awsapi/resource/AmazonEC2/crypto.properties | 18 ++++++++++++++++ awsapi/scripts/run.bat | 17 +++++++++++++++ .../src/com/cloud/bridge/auth/ec2/module.xml | 18 ++++++++++++++++ .../src/com/cloud/bridge/auth/s3/module.xml | 18 ++++++++++++++++ .../src/com/cloud/bridge/model/MHost.hbm.xml | 18 ++++++++++++++++ .../com/cloud/bridge/model/MHostMount.hbm.xml | 18 ++++++++++++++++ .../src/com/cloud/bridge/model/SAcl.hbm.xml | 18 ++++++++++++++++ .../com/cloud/bridge/model/SBucket.hbm.xml | 18 ++++++++++++++++ .../src/com/cloud/bridge/model/SHost.hbm.xml | 18 ++++++++++++++++ .../src/com/cloud/bridge/model/SMeta.hbm.xml | 18 ++++++++++++++++ .../com/cloud/bridge/model/SObject.hbm.xml | 18 ++++++++++++++++ .../cloud/bridge/model/SObjectItem.hbm.xml | 18 ++++++++++++++++ .../bridge/model/UserCredentials.hbm.xml | 18 ++++++++++++++++ .../stack/models/CloudStackAccount.hbm.xml | 18 ++++++++++++++++ .../models/CloudStackConfiguration.hbm.xml | 18 ++++++++++++++++ .../models/CloudStackServiceOffering.hbm.xml | 18 ++++++++++++++++ .../com/cloud/gate/util/Xml2JavaTestData.xml | 18 ++++++++++++++++ awsapi/test/html/certSubmit.html | 18 ++++++++++++++++ awsapi/test/html/testRestURL.txt | 21 ++++++++++++++++++- awsapi/wscript | 17 +++++++++++++++ awsapi/wscript_build | 16 ++++++++++++++ awsapi/wscript_configure | 17 +++++++++++++++ 40 files changed, 720 insertions(+), 4 deletions(-) diff --git a/awsapi/.classpath b/awsapi/.classpath index ab9174cbbd4..e814eaefdc6 100644 --- a/awsapi/.classpath +++ b/awsapi/.classpath @@ -1,4 +1,22 @@ + diff --git a/awsapi/.project b/awsapi/.project index d602ee44c58..9ae990a1c4b 100644 --- a/awsapi/.project +++ b/awsapi/.project @@ -1,4 +1,22 @@ + awsapi diff --git a/awsapi/.pydevproject b/awsapi/.pydevproject index a9cca037b33..d4a984a3909 100644 --- a/awsapi/.pydevproject +++ b/awsapi/.pydevproject @@ -1,4 +1,22 @@ + diff --git a/awsapi/conf/CloudStack.cfg.xml b/awsapi/conf/CloudStack.cfg.xml index 3e0c42aab41..511e68f5210 100644 --- a/awsapi/conf/CloudStack.cfg.xml +++ b/awsapi/conf/CloudStack.cfg.xml @@ -1,4 +1,22 @@ + diff --git a/awsapi/conf/cloud-bridge.properties b/awsapi/conf/cloud-bridge.properties index 7bbba7f26bd..123c18d0c38 100644 --- a/awsapi/conf/cloud-bridge.properties +++ b/awsapi/conf/cloud-bridge.properties @@ -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. + host=http://localhost:8080/awsapi storage.root=/Users/john1/S3-Mount storage.multipartDir=__multipart__uploads__ diff --git a/awsapi/conf/ec2-service.properties b/awsapi/conf/ec2-service.properties index fc3329b3dd5..40398cb01b2 100644 --- a/awsapi/conf/ec2-service.properties +++ b/awsapi/conf/ec2-service.properties @@ -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. + managementServer=127.0.0.1 cloudAPIPort=7080 cloudstackVersion=2.2.0 diff --git a/awsapi/conf/hibernate.cfg.xml b/awsapi/conf/hibernate.cfg.xml index bc445bd4f1d..d484849fd07 100644 --- a/awsapi/conf/hibernate.cfg.xml +++ b/awsapi/conf/hibernate.cfg.xml @@ -1,4 +1,22 @@ + diff --git a/awsapi/docs/AmazonEC2/EC2-API-tool-setup.txt b/awsapi/docs/AmazonEC2/EC2-API-tool-setup.txt index d56a982eeb8..d75fcee61c1 100644 --- a/awsapi/docs/AmazonEC2/EC2-API-tool-setup.txt +++ b/awsapi/docs/AmazonEC2/EC2-API-tool-setup.txt @@ -1,3 +1,23 @@ +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. + +----------------------------------------------------------- + + 1. Get the EC2 API tool http://s3.amazonaws.com/ec2-downloads/ec2-api-tools-1.3-62308.zip. Install it by unzipping it diff --git a/awsapi/docs/AmazonEC2/EC2-implementation-guide.html b/awsapi/docs/AmazonEC2/EC2-implementation-guide.html index 5caadf0a329..737c669dcbd 100644 --- a/awsapi/docs/AmazonEC2/EC2-implementation-guide.html +++ b/awsapi/docs/AmazonEC2/EC2-implementation-guide.html @@ -1,4 +1,22 @@ + Cloud.com's EC2 API Implementation Guide diff --git a/awsapi/docs/AmazonEC2/EC2-local-deploy-using-ant.html b/awsapi/docs/AmazonEC2/EC2-local-deploy-using-ant.html index ef0b3fc888b..215e5785c36 100644 --- a/awsapi/docs/AmazonEC2/EC2-local-deploy-using-ant.html +++ b/awsapi/docs/AmazonEC2/EC2-local-deploy-using-ant.html @@ -1,4 +1,22 @@ + Cloud.com's EC2 local deployment Guide diff --git a/awsapi/docs/AmazonEC2/EC2-users-guide.html b/awsapi/docs/AmazonEC2/EC2-users-guide.html index 1177689fa17..a51923cc89d 100644 --- a/awsapi/docs/AmazonEC2/EC2-users-guide.html +++ b/awsapi/docs/AmazonEC2/EC2-users-guide.html @@ -1,4 +1,22 @@ + Cloud.com's EC2 API User's Guide diff --git a/awsapi/docs/AmazonEC2/wsdl2java-command-line.txt b/awsapi/docs/AmazonEC2/wsdl2java-command-line.txt index 5aea3dd5feb..c1b68538e9d 100644 --- a/awsapi/docs/AmazonEC2/wsdl2java-command-line.txt +++ b/awsapi/docs/AmazonEC2/wsdl2java-command-line.txt @@ -1,2 +1,21 @@ +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. + +----------------------------------------------------------- + To generate the Java AXIS2 classes from the Amazon EC2 wsdl use the following command line: -C:\axis2-1.5.1\bin>wsdl2java.bat -ss -sd -ssi -g -p com.amazon.ec2 -ns2p "http://ec2.amazonaws.com/doc/2010-08-31/"=com.amazon.ec2 -uri ec2.wsdl \ No newline at end of file +C:\axis2-1.5.1\bin>wsdl2java.bat -ss -sd -ssi -g -p com.amazon.ec2 -ns2p "http://ec2.amazonaws.com/doc/2010-08-31/"=com.amazon.ec2 -uri ec2.wsdl diff --git a/awsapi/docs/AmazonS3/S3-users-guide.html b/awsapi/docs/AmazonS3/S3-users-guide.html index 124f89729af..adadd8b97fd 100644 --- a/awsapi/docs/AmazonS3/S3-users-guide.html +++ b/awsapi/docs/AmazonS3/S3-users-guide.html @@ -1,4 +1,22 @@ + Cloud.com's S3 API User's Guide @@ -99,4 +117,4 @@ SetObjectAccessControlPolicy
  • DIME
    • - \ No newline at end of file + diff --git a/awsapi/docs/AmazonS3/notes.txt b/awsapi/docs/AmazonS3/notes.txt index ce0f70fc851..e9a796880c9 100644 --- a/awsapi/docs/AmazonS3/notes.txt +++ b/awsapi/docs/AmazonS3/notes.txt @@ -1,3 +1,22 @@ +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. + +----------------------------------------------------------- + Example of headers for a rest call of copyObject Authorization: AWS Mark:djdjdjdjdjdjdjdj\n @@ -7,4 +26,4 @@ x-amz-metadata-directive: REPLACE\n x-amz-meta-hight: 55 feet\n x-amz-meta-width: 13 yards\n x-amz-meta-weight: 4 tons\n -x-amz-acl: public-read\n \ No newline at end of file +x-amz-acl: public-read\n diff --git a/awsapi/docs/AmazonS3/wsdl2java-command-line.txt b/awsapi/docs/AmazonS3/wsdl2java-command-line.txt index fbd134075b1..d22b8529502 100644 --- a/awsapi/docs/AmazonS3/wsdl2java-command-line.txt +++ b/awsapi/docs/AmazonS3/wsdl2java-command-line.txt @@ -1,3 +1,22 @@ +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. + +----------------------------------------------------------- + To generate the Java AXIS2 classes from the Amazon EC2 wsdl use the following command line, assuming source definitions in the local directory: $ wsdl2java.sh -ss -sd -ssi -g -p com.amazon.s3 -ns2p "http://s3.amazonaws.com/doc/2006-03-01/"=com.amazon.s3 -uri cloud-AmazonS3.wsdl diff --git a/awsapi/packages/config/debian/cloud-bridge.install b/awsapi/packages/config/debian/cloud-bridge.install index b3a4ceba50c..0f2f19fc92c 100644 --- a/awsapi/packages/config/debian/cloud-bridge.install +++ b/awsapi/packages/config/debian/cloud-bridge.install @@ -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. + /usr/share/cloud/bridge/* /usr/share/cloud/setup/bridge/* /usr/bin/* diff --git a/awsapi/packages/config/debian/cloud-bridge.postinst b/awsapi/packages/config/debian/cloud-bridge.postinst index 5f04b275bba..5c62459e541 100644 --- a/awsapi/packages/config/debian/cloud-bridge.postinst +++ b/awsapi/packages/config/debian/cloud-bridge.postinst @@ -1,4 +1,21 @@ #!/bin/sh -e +# 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. + case "$1" in configure) diff --git a/awsapi/packages/config/rpm/cloudbridge.spec b/awsapi/packages/config/rpm/cloudbridge.spec index 42b7d4f7521..d3896b39a79 100644 --- a/awsapi/packages/config/rpm/cloudbridge.spec +++ b/awsapi/packages/config/rpm/cloudbridge.spec @@ -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. + %define __os_install_post %{nil} %global debug_package %{nil} diff --git a/awsapi/resource/AmazonEC2/crypto.properties b/awsapi/resource/AmazonEC2/crypto.properties index 38589f09004..f55bea830b7 100644 --- a/awsapi/resource/AmazonEC2/crypto.properties +++ b/awsapi/resource/AmazonEC2/crypto.properties @@ -1,3 +1,21 @@ +# 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. + + org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=jks org.apache.ws.security.crypto.merlin.keystore.password=apache diff --git a/awsapi/scripts/run.bat b/awsapi/scripts/run.bat index 830f5c8260f..437a37f8b83 100644 --- a/awsapi/scripts/run.bat +++ b/awsapi/scripts/run.bat @@ -1 +1,18 @@ +rem Licensed to the Apache Software Foundation (ASF) under one +rem or more contributor license agreements. See the NOTICE file +rem distributed with this work for additional information +rem regarding copyright ownership. The ASF licenses this file +rem to you under the Apache License, Version 2.0 (the +rem "License"); you may not use this file except in compliance +rem with the License. You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, +rem software distributed under the License is distributed on an +rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +rem KIND, either express or implied. See the License for the +rem specific language governing permissions and limitations +rem under the License. + java -cp cloud-tool.jar;./lib/XmlSchema-1.4.3.jar;./lib/antlr-2.7.6.jar;./lib/apache-log4j-extras-1.0.jar;./lib/axiom-api-1.2.8.jar;./lib/axiom-impl-1.2.8.jar;./lib/axis2-adb-1.5.1.jar;./lib/axis2-ant-plugin-1.5.1.jar;./lib/axis2-jaxbri-1.5.1.jar;./lib/axis2-jaxws-1.5.1.jar;./lib/axis2-jibx-1.5.1.jar;./lib/axis2-json-1.5.1.jar;./lib/axis2-kernel-1.5.1.jar;./lib/axis2-transport-http-1.5.1.jar;./lib/axis2-transport-local-1.5.1.jar;./lib/commons-codec-1.3.jar;./lib/commons-collections-3.1.jar;./lib/commons-fileupload-1.2.jar;./lib/commons-httpclient-3.1.jar;./lib/commons-io-1.4.jar;./lib/commons-logging-1.1.1.jar;./lib/dom4j-1.6.1.jar;./lib/hibernate3.jar;./lib/httpcore-4.0.jar;./lib/javassist-3.9.0.GA.jar;./lib/jta-1.1.jar;./lib/junit-4.8.1.jar;./lib/log4j-1.2.15.jar;./lib/mail-1.4.jar;./lib/mysql-connector-java-5.1.7-bin.jar;./lib/neethi-2.0.4.jar;./lib/servlet-api.jar;./lib/slf4j-api-1.5.11.jar;./lib/slf4j-simple-1.5.11.jar;./lib/wsdl4j-1.6.2.jar com.cloud.gate.tool.CloudS3CmdTool %* diff --git a/awsapi/src/com/cloud/bridge/auth/ec2/module.xml b/awsapi/src/com/cloud/bridge/auth/ec2/module.xml index 0cbd8041083..545b8df6f58 100644 --- a/awsapi/src/com/cloud/bridge/auth/ec2/module.xml +++ b/awsapi/src/com/cloud/bridge/auth/ec2/module.xml @@ -1,4 +1,22 @@ + diff --git a/awsapi/src/com/cloud/bridge/auth/s3/module.xml b/awsapi/src/com/cloud/bridge/auth/s3/module.xml index cb22ed2bb4a..86ee25a9e67 100644 --- a/awsapi/src/com/cloud/bridge/auth/s3/module.xml +++ b/awsapi/src/com/cloud/bridge/auth/s3/module.xml @@ -1,4 +1,22 @@ + diff --git a/awsapi/src/com/cloud/bridge/model/MHost.hbm.xml b/awsapi/src/com/cloud/bridge/model/MHost.hbm.xml index f3d857a55ae..e151171ee9a 100644 --- a/awsapi/src/com/cloud/bridge/model/MHost.hbm.xml +++ b/awsapi/src/com/cloud/bridge/model/MHost.hbm.xml @@ -1,4 +1,22 @@ + diff --git a/awsapi/src/com/cloud/bridge/model/MHostMount.hbm.xml b/awsapi/src/com/cloud/bridge/model/MHostMount.hbm.xml index f2a6a769021..c186de56cc4 100644 --- a/awsapi/src/com/cloud/bridge/model/MHostMount.hbm.xml +++ b/awsapi/src/com/cloud/bridge/model/MHostMount.hbm.xml @@ -1,4 +1,22 @@ + diff --git a/awsapi/src/com/cloud/bridge/model/SAcl.hbm.xml b/awsapi/src/com/cloud/bridge/model/SAcl.hbm.xml index de9e97657cc..175e1a7808d 100644 --- a/awsapi/src/com/cloud/bridge/model/SAcl.hbm.xml +++ b/awsapi/src/com/cloud/bridge/model/SAcl.hbm.xml @@ -1,4 +1,22 @@ + diff --git a/awsapi/src/com/cloud/bridge/model/SBucket.hbm.xml b/awsapi/src/com/cloud/bridge/model/SBucket.hbm.xml index 128717935bb..83f495d9ad9 100644 --- a/awsapi/src/com/cloud/bridge/model/SBucket.hbm.xml +++ b/awsapi/src/com/cloud/bridge/model/SBucket.hbm.xml @@ -1,4 +1,22 @@ + diff --git a/awsapi/src/com/cloud/bridge/model/SHost.hbm.xml b/awsapi/src/com/cloud/bridge/model/SHost.hbm.xml index dff852c19af..5308a0837fd 100644 --- a/awsapi/src/com/cloud/bridge/model/SHost.hbm.xml +++ b/awsapi/src/com/cloud/bridge/model/SHost.hbm.xml @@ -1,4 +1,22 @@ + diff --git a/awsapi/src/com/cloud/bridge/model/SMeta.hbm.xml b/awsapi/src/com/cloud/bridge/model/SMeta.hbm.xml index e120884c30c..0f3b12be7f7 100644 --- a/awsapi/src/com/cloud/bridge/model/SMeta.hbm.xml +++ b/awsapi/src/com/cloud/bridge/model/SMeta.hbm.xml @@ -1,4 +1,22 @@ + diff --git a/awsapi/src/com/cloud/bridge/model/SObject.hbm.xml b/awsapi/src/com/cloud/bridge/model/SObject.hbm.xml index 194af330789..3929bcddad7 100644 --- a/awsapi/src/com/cloud/bridge/model/SObject.hbm.xml +++ b/awsapi/src/com/cloud/bridge/model/SObject.hbm.xml @@ -1,4 +1,22 @@ + diff --git a/awsapi/src/com/cloud/bridge/model/SObjectItem.hbm.xml b/awsapi/src/com/cloud/bridge/model/SObjectItem.hbm.xml index 12ee4807926..02297a2afff 100644 --- a/awsapi/src/com/cloud/bridge/model/SObjectItem.hbm.xml +++ b/awsapi/src/com/cloud/bridge/model/SObjectItem.hbm.xml @@ -1,4 +1,22 @@ + diff --git a/awsapi/src/com/cloud/bridge/model/UserCredentials.hbm.xml b/awsapi/src/com/cloud/bridge/model/UserCredentials.hbm.xml index c7f61273012..d2f39190556 100644 --- a/awsapi/src/com/cloud/bridge/model/UserCredentials.hbm.xml +++ b/awsapi/src/com/cloud/bridge/model/UserCredentials.hbm.xml @@ -1,4 +1,22 @@ + diff --git a/awsapi/src/com/cloud/stack/models/CloudStackAccount.hbm.xml b/awsapi/src/com/cloud/stack/models/CloudStackAccount.hbm.xml index 781c677986c..799679798d8 100644 --- a/awsapi/src/com/cloud/stack/models/CloudStackAccount.hbm.xml +++ b/awsapi/src/com/cloud/stack/models/CloudStackAccount.hbm.xml @@ -1,4 +1,22 @@ + diff --git a/awsapi/src/com/cloud/stack/models/CloudStackConfiguration.hbm.xml b/awsapi/src/com/cloud/stack/models/CloudStackConfiguration.hbm.xml index 33f84e1c1d7..134e6f10a3e 100644 --- a/awsapi/src/com/cloud/stack/models/CloudStackConfiguration.hbm.xml +++ b/awsapi/src/com/cloud/stack/models/CloudStackConfiguration.hbm.xml @@ -1,4 +1,22 @@ + diff --git a/awsapi/src/com/cloud/stack/models/CloudStackServiceOffering.hbm.xml b/awsapi/src/com/cloud/stack/models/CloudStackServiceOffering.hbm.xml index f8c9eed270f..2bbcfd16dc6 100644 --- a/awsapi/src/com/cloud/stack/models/CloudStackServiceOffering.hbm.xml +++ b/awsapi/src/com/cloud/stack/models/CloudStackServiceOffering.hbm.xml @@ -1,4 +1,22 @@ + diff --git a/awsapi/test/com/cloud/gate/util/Xml2JavaTestData.xml b/awsapi/test/com/cloud/gate/util/Xml2JavaTestData.xml index f8883839ef1..513db970e71 100644 --- a/awsapi/test/com/cloud/gate/util/Xml2JavaTestData.xml +++ b/awsapi/test/com/cloud/gate/util/Xml2JavaTestData.xml @@ -1,3 +1,21 @@ + baseName baseValue diff --git a/awsapi/test/html/certSubmit.html b/awsapi/test/html/certSubmit.html index 562cee10aaf..00cb5b7f882 100644 --- a/awsapi/test/html/certSubmit.html +++ b/awsapi/test/html/certSubmit.html @@ -1,4 +1,22 @@ + Save the cert into Cloud's EC2 Service:

    diff --git a/awsapi/test/html/testRestURL.txt b/awsapi/test/html/testRestURL.txt index bf4eb224f59..3153aa7715b 100644 --- a/awsapi/test/html/testRestURL.txt +++ b/awsapi/test/html/testRestURL.txt @@ -1,3 +1,22 @@ +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://localhost:8080/gate/rest/AmazonEC2?Action=DescribeInstances&SignatureVersion=2&SignatureMethod=HmacSHA256&Version=2009-11-30&Timestamp=2010-01-07T15%3A23%3A03Z&Expires=2010-11-07T15%3A23%3A03Z&AWSAccessKeyId=O4O0Niu98EvraLKH2o8SFNMQlXZvuE5ueMDR9CHU5WA2-qv4PEQkgMcrtrNs6eHYwpLySev4Hi03_YXiHz4gGg&Signature=lyHOvu2LNxjLHIAlQo3F0JNSDtuCtqHtAX786cCZDFI= @@ -22,4 +41,4 @@ rlQ5ioNns4iT9qav3WzmrQ | CN=AWS Limited-Assurance CA, OU=AWS, O=Amazon.com, C=US , serial=1033226874324 | +----+-------------------------------------------------------------------------- -EmskZDLp5EmwPQDzHtA2CK3heW12keN-YTTrO39Iz2Qfk8fmtkFih95B7xexhAatrlQ5ioNns4iT9qav3WzmrQ \ No newline at end of file +EmskZDLp5EmwPQDzHtA2CK3heW12keN-YTTrO39Iz2Qfk8fmtkFih95B7xexhAatrlQ5ioNns4iT9qav3WzmrQ diff --git a/awsapi/wscript b/awsapi/wscript index 873840e5d34..e4d0fd7e755 100644 --- a/awsapi/wscript +++ b/awsapi/wscript @@ -1,6 +1,23 @@ #! /usr/bin/env python # -*- coding: utf-8 -*- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + # the following two variables are used by the target "waf dist" # if you change 'em here, you need to change it also in cloud.spec, add a %changelog entry there, and add an entry in debian/changelog VERSION = '1.0.8' diff --git a/awsapi/wscript_build b/awsapi/wscript_build index 9b310dc3c49..aa1999c1652 100644 --- a/awsapi/wscript_build +++ b/awsapi/wscript_build @@ -1,4 +1,20 @@ #!/usr/bin/env python +# 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. """builds the entire stack""" #For every matching build change here, that produces new installable diff --git a/awsapi/wscript_configure b/awsapi/wscript_configure index 739a0823bd1..eb8949c145d 100644 --- a/awsapi/wscript_configure +++ b/awsapi/wscript_configure @@ -1,4 +1,21 @@ #!/usr/bin/env python +# 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. + """examines environment, then: - configures classpath as per environment or command-line options - detects Tomcat (on Windows)