You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by ra...@apache.org on 2017/07/01 01:39:22 UTC
[incubator-openwhisk] branch master updated: Update remaining files
to ASF license incl. bash, js files. (#2423)
This is an automated email from the ASF dual-hosted git repository.
rabbah pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git
The following commit(s) were added to refs/heads/master by this push:
new 41a8251 Update remaining files to ASF license incl. bash, js files. (#2423)
41a8251 is described below
commit 41a8251ae248221434884d5387557f98da52af97
Author: Matt Rutkowski <mr...@us.ibm.com>
AuthorDate: Fri Jun 30 20:39:19 2017 -0500
Update remaining files to ASF license incl. bash, js files. (#2423)
---
README.md | 19 +++----
core/nodejsActionBase/app.js | 13 ++---
core/nodejsActionBase/runner.js | 13 ++---
core/nodejsActionBase/src/logger.js | 13 ++---
core/nodejsActionBase/src/service.js | 13 ++---
core/nodejsActionBase/test.js | 13 ++---
core/routemgmt/common/apigw-utils.js | 25 ++++-----
core/routemgmt/common/utils.js | 44 ++++++++-------
core/routemgmt/createApi/createApi.js | 90 ++++++++++++++++---------------
core/routemgmt/deleteApi/deleteApi.js | 64 +++++++++++-----------
core/routemgmt/getApi/getApi.js | 69 ++++++++++++------------
core/swift3Action/epilogue.swift | 18 +++----
core/swift3Action/spm-build/Package.swift | 13 ++---
core/swift3Action/spm-build/_Whisk.swift | 13 ++---
tools/admin/wskadmin | 13 ++---
tools/build/citool | 13 ++---
tools/build/redo | 13 ++---
tools/db/cleanUpActivations.py | 33 ++++++------
tools/db/deleteLogsFromActivations.py | 35 ++++++------
tools/docker/cleanAllDockers.sh | 13 ++---
tools/docker/cleanDocker.sh | 13 ++---
tools/docker/listAllDockerHosts.sh | 13 ++---
tools/health/isAlive | 13 ++---
tools/health/killComponent | 13 ++---
tools/health/kvstore | 13 ++---
25 files changed, 316 insertions(+), 289 deletions(-)
diff --git a/README.md b/README.md
index 97a7a18..4a000be 100644
--- a/README.md
+++ b/README.md
@@ -4,14 +4,14 @@
[](http://www.apache.org/licenses/LICENSE-2.0)
[](http://slack.openwhisk.org/)
-OpenWhisk is a cloud-first distributed event-based programming service. It provides a programming model to upload event handlers to a cloud service, and register the handlers to respond to various events. Learn more at http://openwhisk.org or try it on [IBM Bluemix](https://ibm.biz/openwhisk).
+OpenWhisk is a cloud-first distributed event-based programming service. It provides a programming model to upload event handlers to a cloud service, and register the handlers to respond to various events. Learn more at [http://openwhisk.incubator.apache.org](http://openwhisk.incubator.apache.org).
* [Quick Start](#quick-start) (Vagrant)
* [Native development](#native-development) (Mac and Ubuntu)
* [Learn concepts and commands](#learn-concepts-and-commands)
-* [License](#license)
* [Issues](#issues)
+* [Slack](#slack)
### Quick Start
@@ -42,7 +42,7 @@ These steps were tested on Mac OS X El Capitan, Ubuntu 14.04.3 LTS and Windows u
For more information about using OpenWhisk on Vagrant see the [tools/vagrant/README.md](tools/vagrant/README.md)
### Native development
-
+
Docker must be natively installed in order to build and deploy OpenWhisk.
If you plan to make contributions to OpenWhisk, we recommend either a Mac or Ubuntu environment.
@@ -64,17 +64,10 @@ interested in:
- [OpenWhisk system details](docs/reference.md)
- [Implementing feeds](docs/feeds.md)
-
-### License
-
-Copyright 2015-2016 IBM Corporation
-
-Licensed under the [Apache License, Version 2.0 (the "License")](http://www.apache.org/licenses/LICENSE-2.0.html).
-
-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.
-
### Issues
Report bugs, ask questions and request features [here on GitHub](../../issues).
-You can also join our slack channel and chat with developers. To get access to our slack channel, request an invite [here](http://slack.openwhisk.org).
+### Slack
+
+You can also join the OpenWhisk Team on Slack [https://openwhisk-team.slack.com](https://openwhisk-team.slack.com) and chat with developers. To get access to our public slack team, request an invite [https://openwhisk.incubator.apache.org/slack.html](https://openwhisk.incubator.apache.org/slack.html).
diff --git a/core/nodejsActionBase/app.js b/core/nodejsActionBase/app.js
index ac026e5..eb81856 100644
--- a/core/nodejsActionBase/app.js
+++ b/core/nodejsActionBase/app.js
@@ -1,11 +1,12 @@
/*
- * Copyright 2015-2016 IBM Corporation
+ * 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
*
- * 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
+ * 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,
diff --git a/core/nodejsActionBase/runner.js b/core/nodejsActionBase/runner.js
index 0d577ea..43893f5 100644
--- a/core/nodejsActionBase/runner.js
+++ b/core/nodejsActionBase/runner.js
@@ -1,11 +1,12 @@
/*
- * Copyright 2015-2016 IBM Corporation
+ * 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
*
- * 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
+ * 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,
diff --git a/core/nodejsActionBase/src/logger.js b/core/nodejsActionBase/src/logger.js
index 26daef0..bb59857 100644
--- a/core/nodejsActionBase/src/logger.js
+++ b/core/nodejsActionBase/src/logger.js
@@ -1,11 +1,12 @@
/*
- * Copyright 2015-2016 IBM Corporation
+ * 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
*
- * 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
+ * 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,
diff --git a/core/nodejsActionBase/src/service.js b/core/nodejsActionBase/src/service.js
index baf469c..73aac46 100644
--- a/core/nodejsActionBase/src/service.js
+++ b/core/nodejsActionBase/src/service.js
@@ -1,11 +1,12 @@
/*
- * Copyright 2015-2016 IBM Corporation
+ * 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
*
- * 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
+ * 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,
diff --git a/core/nodejsActionBase/test.js b/core/nodejsActionBase/test.js
index 94ac828..69d82c0 100644
--- a/core/nodejsActionBase/test.js
+++ b/core/nodejsActionBase/test.js
@@ -1,11 +1,12 @@
/*
- * Copyright 2015-2016 IBM Corporation
+ * 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
*
- * 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
+ * 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,
diff --git a/core/routemgmt/common/apigw-utils.js b/core/routemgmt/common/apigw-utils.js
index ef9c1b5..c903f0d 100644
--- a/core/routemgmt/common/apigw-utils.js
+++ b/core/routemgmt/common/apigw-utils.js
@@ -1,21 +1,23 @@
-/**
- * Copyright 2015-2017 IBM Corporation
- *
- * 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
+/*
+ * 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
+ * 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.
- *
+ */
+
+/**
* Route management action common API GW utilities
- *
- **/
+ */
var request = require('request');
var _ = require('lodash');
@@ -131,7 +133,7 @@ function deleteApiFromGateway(gwInfo, spaceGuid, apiId) {
});
}
-/*
+/**
* Return an array of APIs
*/
function getApis(gwInfo, spaceGuid, bpOrApiName) {
@@ -641,7 +643,6 @@ function getHostFromActionUrl(actionUrl) {
* result[1] : action name
* result[2] : ''
* result[3] : ''
-
*/
function parseActionName(fqname) {
console.log('parseActionName: parsing action: '+fqname);
diff --git a/core/routemgmt/common/utils.js b/core/routemgmt/common/utils.js
index ac848c1..2f626b0 100644
--- a/core/routemgmt/common/utils.js
+++ b/core/routemgmt/common/utils.js
@@ -1,25 +1,27 @@
-/**
- * Copyright 2015-2016 IBM Corporation
- *
- * 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
+/*
+ * 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
+ * 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.
- *
+ */
+
+/**
* Route management action common utilities
- *
- **/
+ */
var request = require('request');
var utils2 = require('./apigw-utils.js');
-/*
+/**
* Register a tenant with the API GW.
* A new tenant is created for each unique namespace/tenantinstance. If the
* tenant already exists, the tenant is left as-is
@@ -266,7 +268,7 @@ function deleteApiFromGateway(gwInfo, gwApiId) {
});
}
-/*
+/**
* Return an array of APIs
*/
function getApis(gwInfo, tenantId, bpOrApiName) {
@@ -336,7 +338,7 @@ function getApis(gwInfo, tenantId, bpOrApiName) {
});
}
-/*
+/**
* Convert API object array into specified format
* Parameters:
* apis : array of 0 or more APIs
@@ -366,7 +368,7 @@ function transformApis(apis, format) {
return apisOutput;
}
-/*
+/**
* Convert API object into swagger JSON format
* Parameters:
* gwApi : API object as returned from the API Gateway
@@ -426,7 +428,7 @@ function generateSwaggerApiFromGwApi(gwApi) {
return swaggerApi;
}
-/*
+/**
* Create a base swagger API object containing the API basepath, but no endpoints
* Parameters:
* basepath - Required. API basepath
@@ -447,7 +449,7 @@ function generateBaseSwaggerApi(basepath, apiname) {
return swaggerApi;
}
-/*
+/**
* Take an API in JSON swagger format and create an API GW compatible
* API configuration JSON object
* Parameters:
@@ -476,7 +478,7 @@ function generateGwApiFromSwaggerApi(swaggerApi) {
return gwApi;
}
-/*
+/**
* Take an existing API in JSON swagger format, and update it with a single path/operation.
* The addition can be an entirely new path or a new operation under an existing path.
* Parameters:
@@ -579,7 +581,7 @@ function addEndpointToSwaggerApi(swaggerApi, endpoint) {
return swaggerApi;
}
-/*
+/**
* Update an existing DB API document by removing the specified relpath/operation section.
* swaggerApi - API from which to remove the specified endpoint. This object will be updated.
* endpoint - JSON object describing new path/operation. Required fields
@@ -632,7 +634,8 @@ function confidentialPrint(str) {
return printStr;
}
-/* Create the CLI response payload from an array of GW API objects
+/**
+ * Create the CLI response payload from an array of GW API objects
* Parameters:
* gwApis - Array of JSON GW API objects
* Returns:
@@ -651,7 +654,8 @@ function generateCliResponse(gwApis) {
return respApis;
}
-/* Use the specified GW API object to create an API JSON object in for format the CLI expects.
+/**
+ * Use the specified GW API object to create an API JSON object in for format the CLI expects.
* Parameters:
* gwApi - JSON GW API object
* Returns:
diff --git a/core/routemgmt/createApi/createApi.js b/core/routemgmt/createApi/createApi.js
index e9649ad..4a72dcb 100644
--- a/core/routemgmt/createApi/createApi.js
+++ b/core/routemgmt/createApi/createApi.js
@@ -1,54 +1,56 @@
-/**
+/*
+ * 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
*
- * Copyright 2015-2016 IBM Corporation
- *
- * 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
+ * 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.
- *
- * Add a new or update an existing API configuration in the API Gateway
- * https://docs.cloudant.com/document.html#documentCreate
- *
- * Parameters (all as fields in the message JSON object)
- * gwUrlV2 Required when accesstoken is provided. The V2 API Gateway base path (i.e. http://gw.com)
- * gwUrl Required. The API Gateway base path (i.e. http://gw.com)
- * gwUser Optional. The API Gateway authentication
- * gwPwd Optional. The API Gateway authentication
- * __ow_user Required. Namespace of API author. Set by controller
- * The value overrides namespace values in the apidoc
- * Don't override namespace values in the swagger though
- * tenantInstance Optional. Instance identifier used when creating the specific API GW Tenant
- * accesstoken Optional. Dynamic API GW auth. Overrides gwUser/gwPwd
- * spaceguid Optional. Namespace unique id.
- * responsetype Optional. web action response .extension to use. default to json
- * apidoc Required. The API Gateway mapping document
- * namespace Required. Namespace of user/caller
- * apiName Optional if swagger not specified. API descriptive name
- * gatewayBasePath Required if swagger not specified. API base path
- * gatewayPath Required if swagger not specified. Specific API path (relative to base path)
- * gatewayMethod Required if swagger not specified. API path operation
- * id Optional if swagger not specified. Unique id of API
- * action Required. if swagger not specified
- * name Required. Action name (includes package)
- * namespace Required. Action namespace
- * backendMethod Required. Action invocation REST verb. "POST"
- * backendUrl Required. Action invocation REST url
- * authkey Required. Action invocation auth key
- * swagger Required if gatewayBasePath not provided. API swagger JSON
- *
- * NOTE: The package containing this action will be bound to the following values:
- * gwUrl, gwAuth
- * As such, the caller to this action should normally avoid explicitly setting
- * these values
- **/
+ */
+
+ /*
+ * Add a new or update an existing API configuration in the API Gateway
+ * https://docs.cloudant.com/document.html#documentCreate
+ *
+ * Parameters (all as fields in the message JSON object)
+ * gwUrlV2 Required when accesstoken is provided. The V2 API Gateway base path (i.e. http://gw.com)
+ * gwUrl Required. The API Gateway base path (i.e. http://gw.com)
+ * gwUser Optional. The API Gateway authentication
+ * gwPwd Optional. The API Gateway authentication
+ * __ow_user Required. Namespace of API author. Set by controller
+ * The value overrides namespace values in the apidoc
+ * Don't override namespace values in the swagger though
+ * tenantInstance Optional. Instance identifier used when creating the specific API GW Tenant
+ * accesstoken Optional. Dynamic API GW auth. Overrides gwUser/gwPwd
+ * spaceguid Optional. Namespace unique id.
+ * responsetype Optional. web action response .extension to use. default to json
+ * apidoc Required. The API Gateway mapping document
+ * namespace Required. Namespace of user/caller
+ * apiName Optional if swagger not specified. API descriptive name
+ * gatewayBasePath Required if swagger not specified. API base path
+ * gatewayPath Required if swagger not specified. Specific API path (relative to base path)
+ * gatewayMethod Required if swagger not specified. API path operation
+ * id Optional if swagger not specified. Unique id of API
+ * action Required. if swagger not specified
+ * name Required. Action name (includes package)
+ * namespace Required. Action namespace
+ * backendMethod Required. Action invocation REST verb. "POST"
+ * backendUrl Required. Action invocation REST url
+ * authkey Required. Action invocation auth key
+ * swagger Required if gatewayBasePath not provided. API swagger JSON
+ *
+ * NOTE: The package containing this action will be bound to the following values:
+ * gwUrl, gwAuth
+ * As such, the caller to this action should normally avoid explicitly setting
+ * these values
+ */
var utils = require('./utils.js');
var utils2 = require('./apigw-utils.js');
diff --git a/core/routemgmt/deleteApi/deleteApi.js b/core/routemgmt/deleteApi/deleteApi.js
index 62baf22..b29d95a 100644
--- a/core/routemgmt/deleteApi/deleteApi.js
+++ b/core/routemgmt/deleteApi/deleteApi.js
@@ -1,41 +1,43 @@
-/**
+/*
+ * 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
*
- * Copyright 2015-2016 IBM Corporation
- *
- * 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
+ * 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.
- *
- * Delete an API Gateway to action mapping document from the database:
- * https://docs.cloudant.com/document.html#delete
- *
- * Parameters (all as fields in the message JSON object)
- * gwUrlV2 Required when accesstoken is provided. The V2 API Gateway base path (i.e. http://gw.com)
- * gwUrl Required. The API Gateway base path (i.e. http://gw.com)
- * gwUser Optional. The API Gateway authentication
- * gwPwd Optional. The API Gateway authentication
- * namespace Required if __ow_user not specified. Namespace of API author
- * __ow_user Required. Namespace of API author
- * accesstoken Optional. Dynamic API GW auth. Overrides gwUser/gwPwd
- * spaceguid Optional. Namespace unique id.
- * tenantInstance Optional. Instance identifier used when creating the specific API GW Tenant
- * basepath Required. Base path or API name of the API
- * relpath Optional. Delete just this relative path from the API. Required if operation is specified
- * operation Optional. Delete just this relpath's operation from the API.
- *
- * NOTE: The package containing this action will be bound to the following values:
- * gwUrl, gwAuth
- * As such, the caller to this action should normally avoid explicitly setting
- * these values
- **/
+ */
+
+ /**
+ * Delete an API Gateway to action mapping document from the database:
+ * https://docs.cloudant.com/document.html#delete
+ *
+ * Parameters (all as fields in the message JSON object)
+ * gwUrlV2 Required when accesstoken is provided. The V2 API Gateway base path (i.e. http://gw.com)
+ * gwUrl Required. The API Gateway base path (i.e. http://gw.com)
+ * gwUser Optional. The API Gateway authentication
+ * gwPwd Optional. The API Gateway authentication
+ * namespace Required if __ow_user not specified. Namespace of API author
+ * __ow_user Required. Namespace of API author
+ * accesstoken Optional. Dynamic API GW auth. Overrides gwUser/gwPwd
+ * spaceguid Optional. Namespace unique id.
+ * tenantInstance Optional. Instance identifier used when creating the specific API GW Tenant
+ * basepath Required. Base path or API name of the API
+ * relpath Optional. Delete just this relative path from the API. Required if operation is specified
+ * operation Optional. Delete just this relpath's operation from the API.
+ *
+ * NOTE: The package containing this action will be bound to the following values:
+ * gwUrl, gwAuth
+ * As such, the caller to this action should normally avoid explicitly setting
+ * these values
+ */
var utils = require('./utils.js');
var utils2 = require('./apigw-utils.js');
var _ = require('lodash');
diff --git a/core/routemgmt/getApi/getApi.js b/core/routemgmt/getApi/getApi.js
index a3e7f36..53ffc4e 100644
--- a/core/routemgmt/getApi/getApi.js
+++ b/core/routemgmt/getApi/getApi.js
@@ -1,43 +1,46 @@
-/**
- * Copyright 2015-2016 IBM Corporation
+/*
+ * 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
*
- * 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
+ * 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.
- *
- * Retrieve API configuration from the API Gateway:
- *
- * Parameters (all as fields in the message JSON object)
- * gwUrlV2 Required when accesstoken is provided. The V2 API Gateway base path (i.e. http://gw.com)
- * gwUrl Required. The API Gateway base path (i.e. http://gw.com)
- * gwUser Optional. The API Gateway authentication
- * gwPwd Optional. The API Gateway authentication
- * namespace Optional. Input value is now overwritten by __ow_user. Namespace of API author
- * __ow_user Required. Namespace of API author
- * tenantInstance Optional. Instance identifier used when creating the specific API GW Tenant
- * accesstoken Optional. Dynamic API GW auth. Overrides gwUser/gwPwd
- * spaceguid Optional. Namespace unique id.
- * basepath Optional. Base path or API name of the API.
- * If not provided, all APIs for the namespace are returned
- * relpath Optional. Must be defined with 'operation'. Filters API result to path/operation
- * operation Optional. Must be defined with 'relpath'. Filters API result to path/operation
- * outputFormat Optional. Defaults to 'swagger'. Possible values:
- * 'apigw' = return API as obtained from the API Gateway
- * 'swagger' = return API as swagger compliant JSON
- *
- * NOTE: The package containing this action will be bound to the following values:
- * gwUrl, gwAuth
- * As such, the caller to this action should normally avoid explicitly setting
- * these values
- **/
+ */
+
+ /**
+ * Retrieve API configuration from the API Gateway:
+ *
+ * Parameters (all as fields in the message JSON object)
+ * gwUrlV2 Required when accesstoken is provided. The V2 API Gateway base path (i.e. http://gw.com)
+ * gwUrl Required. The API Gateway base path (i.e. http://gw.com)
+ * gwUser Optional. The API Gateway authentication
+ * gwPwd Optional. The API Gateway authentication
+ * namespace Optional. Input value is now overwritten by __ow_user. Namespace of API author
+ * __ow_user Required. Namespace of API author
+ * tenantInstance Optional. Instance identifier used when creating the specific API GW Tenant
+ * accesstoken Optional. Dynamic API GW auth. Overrides gwUser/gwPwd
+ * spaceguid Optional. Namespace unique id.
+ * basepath Optional. Base path or API name of the API.
+ * If not provided, all APIs for the namespace are returned
+ * relpath Optional. Must be defined with 'operation'. Filters API result to path/operation
+ * operation Optional. Must be defined with 'relpath'. Filters API result to path/operation
+ * outputFormat Optional. Defaults to 'swagger'. Possible values:
+ * 'apigw' = return API as obtained from the API Gateway
+ * 'swagger' = return API as swagger compliant JSON
+ *
+ * NOTE: The package containing this action will be bound to the following values:
+ * gwUrl, gwAuth
+ * As such, the caller to this action should normally avoid explicitly setting
+ * these values
+ */
var request = require('request');
var utils = require('./utils.js');
var utils2 = require('./apigw-utils.js');
diff --git a/core/swift3Action/epilogue.swift b/core/swift3Action/epilogue.swift
index 9107234..fd1b6a8 100644
--- a/core/swift3Action/epilogue.swift
+++ b/core/swift3Action/epilogue.swift
@@ -1,12 +1,12 @@
-
/*
- * Copyright 2015-2016 IBM Corporation
- *
- * 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
+ * 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
+ * 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,
@@ -43,10 +43,10 @@ func _whisk_json2dict(txt: String) -> [String:Any]? {
func _run_main(mainFunction: ([String: Any]) -> [String: Any]) -> Void {
let env = ProcessInfo.processInfo.environment
let inputStr: String = env["WHISK_INPUT"] ?? "{}"
-
+
if let parsed = _whisk_json2dict(txt: inputStr) {
let result = mainFunction(parsed)
-
+
if result is [String:Any] {
do {
if let respString = WhiskJsonUtils.dictionaryToJsonString(jsonDict: result) {
diff --git a/core/swift3Action/spm-build/Package.swift b/core/swift3Action/spm-build/Package.swift
index 2be072b..62fe16b 100644
--- a/core/swift3Action/spm-build/Package.swift
+++ b/core/swift3Action/spm-build/Package.swift
@@ -1,11 +1,12 @@
/*
- * Copyright 2015-2016 IBM Corporation
+ * 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
*
- * 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
+ * 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,
diff --git a/core/swift3Action/spm-build/_Whisk.swift b/core/swift3Action/spm-build/_Whisk.swift
index d1124ed..2bdda05 100644
--- a/core/swift3Action/spm-build/_Whisk.swift
+++ b/core/swift3Action/spm-build/_Whisk.swift
@@ -1,11 +1,12 @@
/*
- * Copyright 2015-2016 IBM Corporation
+ * 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
*
- * 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
+ * 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,
diff --git a/tools/admin/wskadmin b/tools/admin/wskadmin
index 3e4b342..0e98c43 100755
--- a/tools/admin/wskadmin
+++ b/tools/admin/wskadmin
@@ -1,13 +1,14 @@
#!/usr/bin/env python
#
-# Copyright 2015-2016 IBM Corporation
+# 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
#
-# 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
+# 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,
diff --git a/tools/build/citool b/tools/build/citool
index 91ca70a..371b646 100755
--- a/tools/build/citool
+++ b/tools/build/citool
@@ -1,13 +1,14 @@
#!/usr/bin/env python
#
-# Copyright 2015-2016 IBM Corporation
+# 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
#
-# 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
+# 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,
diff --git a/tools/build/redo b/tools/build/redo
index 0396648..d0acc8f 100755
--- a/tools/build/redo
+++ b/tools/build/redo
@@ -1,13 +1,14 @@
#!/usr/bin/env python
#
-# Copyright 2015-2016 IBM Corporation
+# 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
#
-# 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
+# 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,
diff --git a/tools/db/cleanUpActivations.py b/tools/db/cleanUpActivations.py
index 0aef30c..d6c0cf3 100755
--- a/tools/db/cleanUpActivations.py
+++ b/tools/db/cleanUpActivations.py
@@ -1,20 +1,23 @@
#!/usr/bin/env python
+"""Python script to delete old Activations.
-#
-# Copyright 2015-2016 IBM Corporation
-#
-# 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.
+ */
+"""
import argparse
import time
diff --git a/tools/db/deleteLogsFromActivations.py b/tools/db/deleteLogsFromActivations.py
old mode 100644
new mode 100755
index aa4a188..ac2b424
--- a/tools/db/deleteLogsFromActivations.py
+++ b/tools/db/deleteLogsFromActivations.py
@@ -1,20 +1,23 @@
#!/usr/bin/env python
-
-#
-# Copyright 2015-2016 IBM Corporation
-#
-# 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.
-#
+"""Python script to delete logs from old Activations.
+
+/*
+ * 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 argparse
import time
diff --git a/tools/docker/cleanAllDockers.sh b/tools/docker/cleanAllDockers.sh
index 38e173b..4a19fcf 100755
--- a/tools/docker/cleanAllDockers.sh
+++ b/tools/docker/cleanAllDockers.sh
@@ -1,13 +1,14 @@
#!/bin/bash
#
-# Copyright 2015-2016 IBM Corporation
+# 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
#
-# 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
+# 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,
diff --git a/tools/docker/cleanDocker.sh b/tools/docker/cleanDocker.sh
index 91439be..e7f583c 100755
--- a/tools/docker/cleanDocker.sh
+++ b/tools/docker/cleanDocker.sh
@@ -1,13 +1,14 @@
#!/bin/bash
#
-# Copyright 2015-2016 IBM Corporation
+# 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
#
-# 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
+# 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,
diff --git a/tools/docker/listAllDockerHosts.sh b/tools/docker/listAllDockerHosts.sh
index b0133d2..e100a93 100755
--- a/tools/docker/listAllDockerHosts.sh
+++ b/tools/docker/listAllDockerHosts.sh
@@ -1,13 +1,14 @@
#!/bin/bash
#
-# Copyright 2015-2016 IBM Corporation
+# 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
#
-# 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
+# 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,
diff --git a/tools/health/isAlive b/tools/health/isAlive
index 92695c9..86c39f8 100755
--- a/tools/health/isAlive
+++ b/tools/health/isAlive
@@ -1,13 +1,14 @@
#!/usr/bin/env python
#
-# Copyright 2015-2016 IBM Corporation
+# 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
#
-# 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
+# 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,
diff --git a/tools/health/killComponent b/tools/health/killComponent
index 3eb52b0..d9e23f4 100755
--- a/tools/health/killComponent
+++ b/tools/health/killComponent
@@ -1,13 +1,14 @@
#!/usr/bin/env python
#
-# Copyright 2015-2016 IBM Corporation
+# 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
#
-# 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
+# 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,
diff --git a/tools/health/kvstore b/tools/health/kvstore
index c63df4a..cc991a0 100755
--- a/tools/health/kvstore
+++ b/tools/health/kvstore
@@ -1,13 +1,14 @@
#!/usr/bin/env python
#
-# Copyright 2015-2016 IBM Corporation
+# 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
#
-# 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
+# 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,
--
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].