This is an automated email from the ASF dual-hosted git repository.
pdesai pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-openwhisk-devtools.git
The following commit(s) were added to refs/heads/master by this push:
new ec09726 Update repo. files to pass scancode tests/fix Travis (#205)
ec09726 is described below
commit ec097266768ae49bba7343de5e2845ebf671bfa1
Author: Matt Rutkowski <mrutk...@us.ibm.com>
AuthorDate: Thu Mar 14 13:57:10 2019 -0500
Update repo. files to pass scancode tests/fix Travis (#205)
* Update repo. files to pass scancode tests/fix Travis
* Update repo. files to pass scancode tests/fix Travis
---
.travis.yml | 3 +++
CONTRIBUTING.md | 31 +++++++++++-----------
README.md | 19 +++++++++++++
docker-compose/.travis/build.sh | 2 ++
docker-compose/.travis/setup.sh | 3 +++
docker-compose/README.md | 31 +++++++++++++++++-----
.../env.conf/api-gateway-env-vars.server.conf | 19 ++++++++++++-
.../apigateway/env.conf/api-gateway-env.http.conf | 19 ++++++++++++-
.../env.conf/api-gateway-upstreams.http.conf | 18 ++++++++++++-
.../generated-conf.d/whisk-docker-compose.conf | 17 ++++++++++++
docker-compose/apigateway/rclone/rclone.conf | 19 ++++++++++++-
docker-compose/docker-compose.packages.yml | 4 ++-
docker-compose/docker-compose.yml | 2 ++
java-action-archetype/.travis/build.sh | 2 ++
java-action-archetype/.travis/setup.sh | 3 +++
java-action-archetype/README.md | 25 ++++++++++++++---
.../resources/projects/basic/archetype.properties | 4 ++-
java-local/README.md | 28 +++++++++++++++----
.../gradle/wrapper/gradle-wrapper.properties | 3 +++
.../openwhisk/java/local/JavaCompilerLoader.java | 2 +-
java-local/src/test/resources/aproject/App.java | 16 +++++++++++
maven-java/.mvn/wrapper/maven-wrapper.properties | 5 +++-
maven-java/README.md | 25 ++++++++++++++---
node-local/README.md | 21 ++++++++++++++-
node-local/runtest.sh | 2 ++
terraform-wskdeploy-plugin/README.md | 19 +++++++++++++
terraform-wskdeploy-plugin/main.go | 17 ++++++++++++
terraform-wskdeploy-plugin/provider.go | 17 ++++++++++++
terraform-wskdeploy-plugin/resource_server.go | 17 ++++++++++++
tools/travis/scancode.sh | 4 ++-
tools/travis/setupscan.sh | 3 ++-
31 files changed, 357 insertions(+), 43 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 8748b27..301289e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,6 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+
sudo: required
env:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c32a97e..ab2f597 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,18 +1,19 @@
<!--
#
-# 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 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.
+# 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.
#
-->
@@ -35,18 +36,18 @@ Instructions on how to do this can be found here:
[http://www.apache.org/licenses/#clas](http://www.apache.org/licenses/#clas)
Once submitted, you will receive a confirmation email from the Apache Software
Foundation (ASF) and be added to
-the following list: http://people.apache.org/unlistedclas.html.
+the following list: http://people.apache.org/unlistedclas.html.
Project committers will use this list to verify pull requests (PRs) come from
contributors that have signed a CLA.
-We look forward to your contributions!
+We look forward to your contributions!
## Raising issues
-Please raise any bug reports on the respective project repository's GitHub
issue tracker. Be sure to search the
+Please raise any bug reports on the respective project repository's GitHub
issue tracker. Be sure to search the
list to see if your issue has already been raised.
-A good bug report is one that make it easy for us to understand what you were
trying to do and what went wrong.
+A good bug report is one that make it easy for us to understand what you were
trying to do and what went wrong.
Provide as much context as possible so we can try to recreate the issue.
### Discussion
diff --git a/README.md b/README.md
index fae5917..2903649 100644
--- a/README.md
+++ b/README.md
@@ -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.
+#
+-->
+
# Developer tools for OpenWhisk
[](http://www.apache.org/licenses/LICENSE-2.0)
diff --git a/docker-compose/.travis/build.sh b/docker-compose/.travis/build.sh
index 8dc41f2..91eda7c 100755
--- a/docker-compose/.travis/build.sh
+++ b/docker-compose/.travis/build.sh
@@ -1,4 +1,6 @@
#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one or more
contributor
+# license agreements; and to You under the Apache License, Version 2.0.
SCRIPTDIR=$(cd $(dirname "$0") && pwd)
ROOTDIR="$SCRIPTDIR/../"
diff --git a/docker-compose/.travis/setup.sh b/docker-compose/.travis/setup.sh
index 4fd7aeb..96b3649 100755
--- a/docker-compose/.travis/setup.sh
+++ b/docker-compose/.travis/setup.sh
@@ -1,4 +1,7 @@
#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one or more
contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+
set -x -e
uname -sm
diff --git a/docker-compose/README.md b/docker-compose/README.md
index c0c3607..cfabb8a 100644
--- a/docker-compose/README.md
+++ b/docker-compose/README.md
@@ -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.
+#
+-->
+
# How to setup OpenWhisk with Docker Compose
[](https://travis-ci.org/apache/incubator-openwhisk-devtools)
@@ -200,24 +219,24 @@ wsk package list /whisk.system
- Action output such as stdout or console.log(): `wsk -i activation logs
<activationId>`
## Debugging OpenWhisk Invoker and Controller
-Both invoker and controller can be remotely debugged using any preferred IDE
by setting these command line arguments for the remote JVM:
+Both invoker and controller can be remotely debugged using any preferred IDE
by setting these command line arguments for the remote JVM:
```
-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=$port
```
-These ports are available for debugging on `localhost`:
+These ports are available for debugging on `localhost`:
- `9333` for the Invoker
- `9222` for the Controller
Using IntelliJ:
-Follow these steps to create a new `Run/Debug Configuration` for the
`Invoker`. Same can be done for the `Controller`:
+Follow these steps to create a new `Run/Debug Configuration` for the
`Invoker`. Same can be done for the `Controller`:
- Go to `Run` -> `Edit Configurations` -> `Add new Configuration` -> `Remote`
- Change port to `9333` and leave the host as `localhost`
-- You can now debug the `Invoker` remotely by setting breakpoints inside the
code
+- You can now debug the `Invoker` remotely by setting breakpoints inside the
code
+
+> Please be aware that changes done in the code are not automatically
deployed. In order to be able to debug new changes, you need to rebuild the
application and redeploy it with `docker-compose`.
-> Please be aware that changes done in the code are not automatically
deployed. In order to be able to debug new changes, you need to rebuild the
application and redeploy it with `docker-compose`.
-
## Custom Docker containers for actions
diff --git
a/docker-compose/apigateway/env.conf/api-gateway-env-vars.server.conf
b/docker-compose/apigateway/env.conf/api-gateway-env-vars.server.conf
index 8ea5af0..3a193a0 100644
--- a/docker-compose/apigateway/env.conf/api-gateway-env-vars.server.conf
+++ b/docker-compose/apigateway/env.conf/api-gateway-env-vars.server.conf
@@ -1,4 +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 BE INCLUDED FOR EACH VHOST
# Use this file to overwrite any nginx variables based on the environment
-# set $my_var my_value;
\ No newline at end of file
+# set $my_var my_value;
diff --git a/docker-compose/apigateway/env.conf/api-gateway-env.http.conf
b/docker-compose/apigateway/env.conf/api-gateway-env.http.conf
index 08a1c1f..cfecfaa 100644
--- a/docker-compose/apigateway/env.conf/api-gateway-env.http.conf
+++ b/docker-compose/apigateway/env.conf/api-gateway-env.http.conf
@@ -1,2 +1,19 @@
+#
+# 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.
+#
+
# INCLUDED IN HTTP BLOCK
-more_set_headers 'Server: openwhisk/api-gateway-1.9.3.1';
\ No newline at end of file
+more_set_headers 'Server: openwhisk/api-gateway-1.9.3.1';
diff --git a/docker-compose/apigateway/env.conf/api-gateway-upstreams.http.conf
b/docker-compose/apigateway/env.conf/api-gateway-upstreams.http.conf
index 4b5591a..aef93fa 100644
--- a/docker-compose/apigateway/env.conf/api-gateway-upstreams.http.conf
+++ b/docker-compose/apigateway/env.conf/api-gateway-upstreams.http.conf
@@ -1,3 +1,19 @@
+#
+# 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.
+#
upstream api-gateway-redis {
# redis.docker is defined by docker-compose
server redis.docker:6379;
@@ -6,4 +22,4 @@ upstream api-gateway-redis {
upstream api-gateway-redis-replica {
# redis.docker is defined by docker-compose
server redis.docker:6379;
-}
\ No newline at end of file
+}
diff --git
a/docker-compose/apigateway/generated-conf.d/whisk-docker-compose.conf
b/docker-compose/apigateway/generated-conf.d/whisk-docker-compose.conf
index 462fae5..7f26798 100644
--- a/docker-compose/apigateway/generated-conf.d/whisk-docker-compose.conf
+++ b/docker-compose/apigateway/generated-conf.d/whisk-docker-compose.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.
+#
+
# virtual host loaded by the API Gateway for local development with
docker-compose
# NOTE: This upstream should come from a service discovery component
diff --git a/docker-compose/apigateway/rclone/rclone.conf
b/docker-compose/apigateway/rclone/rclone.conf
index a967648..5efc5d9 100644
--- a/docker-compose/apigateway/rclone/rclone.conf
+++ b/docker-compose/apigateway/rclone/rclone.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.
+#
+
[minio]
type = s3
provider = Minio
@@ -8,4 +25,4 @@ region = us-east-1
endpoint = http://minio.docker:9000
location_constraint =
server_side_encryption =
-acl = public-read
\ No newline at end of file
+acl = public-read
diff --git a/docker-compose/docker-compose.packages.yml
b/docker-compose/docker-compose.packages.yml
index c91e98c..52e54aa 100644
--- a/docker-compose/docker-compose.packages.yml
+++ b/docker-compose/docker-compose.packages.yml
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
contributor
+# license agreements; and to You under the Apache License, Version 2.0.
version: '3'
services:
alarmsprovider:
@@ -54,7 +56,7 @@ services:
DB_USER: whisk_admin
DB_PASS: some_passw0rd
DB_PREFIX: ${OPEN_WHISK_DB_PREFIX:-local_}
- LOCAL_DEV: "True"
+ LOCAL_DEV: "True"
HOST_MACHINE: ${HOST_MACHINE}
ROUTER_HOST: apigateway.docker
ENDPOINT_AUTH: ${ENDPOINT_AUTH}
diff --git a/docker-compose/docker-compose.yml
b/docker-compose/docker-compose.yml
index 3060f2f..a9d6977 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
contributor
+# license agreements; and to You under the Apache License, Version 2.0.
version: '3'
services:
db:
diff --git a/java-action-archetype/.travis/build.sh
b/java-action-archetype/.travis/build.sh
index d29d3fc..0fcb42a 100755
--- a/java-action-archetype/.travis/build.sh
+++ b/java-action-archetype/.travis/build.sh
@@ -1,4 +1,6 @@
#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one or more
contributor
+# license agreements; and to You under the Apache License, Version 2.0.
SCRIPTDIR=$(cd $(dirname "$0") && pwd)
TOOLDIR="$SCRIPTDIR/../"
diff --git a/java-action-archetype/.travis/setup.sh
b/java-action-archetype/.travis/setup.sh
index f2c7951..9470f94 100755
--- a/java-action-archetype/.travis/setup.sh
+++ b/java-action-archetype/.travis/setup.sh
@@ -1,4 +1,7 @@
#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one or more
contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+
set -x -e
uname -sm
diff --git a/java-action-archetype/README.md b/java-action-archetype/README.md
index d3929f5..8dea9da 100644
--- a/java-action-archetype/README.md
+++ b/java-action-archetype/README.md
@@ -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.
+#
+-->
+
# Maven Archetype for Java Action
This archetype helps to generate the Java Action template project.
@@ -9,14 +28,14 @@ The following softwares are required to build and deploy a
Java Action to OpenWh
* (Maven v3.3.x)[https://maven.apache.org] or above
* Java 8 or above
-[WSK
CLI](https://github.com/apache/incubator-openwhisk/blob/master/docs/cli.md) is
configured
+[WSK
CLI](https://github.com/apache/incubator-openwhisk/blob/master/docs/cli.md) is
configured
## Install the archetype
```sh
mvn -DskipTests=true -Dmaven.javadoc.skip=true -B -V clean install
```
-## Generate project
+## Generate project
```sh
mvn archetype:generate \
@@ -41,4 +60,4 @@ After successful deployment of the function, we can invoke
the same via `wsk act
```json
{"greetings": "Hello! Welcome to OpenWhisk" }
-```
\ No newline at end of file
+```
diff --git
a/java-action-archetype/src/test/resources/projects/basic/archetype.properties
b/java-action-archetype/src/test/resources/projects/basic/archetype.properties
index 4ae957e..4b77273 100644
---
a/java-action-archetype/src/test/resources/projects/basic/archetype.properties
+++
b/java-action-archetype/src/test/resources/projects/basic/archetype.properties
@@ -1,4 +1,6 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
contributor
+# license agreements; and to You under the Apache License, Version 2.0.
groupId=com.example
artifactId=java-demo-fn
version=0.1-SNAPSHOT
-artifactId=basic
\ No newline at end of file
+artifactId=basic
diff --git a/java-local/README.md b/java-local/README.md
index e232eea..0a69d77 100644
--- a/java-local/README.md
+++ b/java-local/README.md
@@ -1,6 +1,25 @@
-# Testing Java functions locally
-
-## Building CLI
+<!--
+#
+# 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.
+#
+-->
+
+# Testing Java functions locally
+
+## Building CLI
```bash
./gradlew jar
```
@@ -21,7 +40,7 @@ Will invoke the `main` function of `myproject.Myfunction`
class from `path-to-fu
Alternatively, you can test a single Java file by directly invoking it. In
this case the Java file should not require any third party libraries.
```bash
-java -jar ./build/libs/java-local.jar ./myproject/Myfunction.java
parameter=value parameter2=value2
+java -jar ./build/libs/java-local.jar ./myproject/Myfunction.java
parameter=value parameter2=value2
```
This will always return a JSON formatted result that can be post-processed
@@ -33,4 +52,3 @@ objects that would be inconvenient to edit on the command
line or passing non-st
echo '{"name": "value"}' | java -jar ./build/libs/java-local.jar
./path-to-function.jar --main=myproject.Myfunction
cat input.json | java -jar ./build/libs/java-local.jar
../myproject/Myfunction.java
```
-
diff --git a/java-local/gradle/wrapper/gradle-wrapper.properties
b/java-local/gradle/wrapper/gradle-wrapper.properties
index 0e680f3..f6fe73b 100644
--- a/java-local/gradle/wrapper/gradle-wrapper.properties
+++ b/java-local/gradle/wrapper/gradle-wrapper.properties
@@ -1,3 +1,6 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
diff --git
a/java-local/src/main/java/openwhisk/java/local/JavaCompilerLoader.java
b/java-local/src/main/java/openwhisk/java/local/JavaCompilerLoader.java
index b084d67..903c538 100644
--- a/java-local/src/main/java/openwhisk/java/local/JavaCompilerLoader.java
+++ b/java-local/src/main/java/openwhisk/java/local/JavaCompilerLoader.java
@@ -95,7 +95,7 @@ public class JavaCompilerLoader extends ClassLoader
implements Invoker {
} catch (IOException | ClassNotFoundException | NoSuchMethodException |
SecurityException e) {
e.printStackTrace();
- }
+ }
}
@Override
diff --git a/java-local/src/test/resources/aproject/App.java
b/java-local/src/test/resources/aproject/App.java
index 6eefc63..11de21a 100644
--- a/java-local/src/test/resources/aproject/App.java
+++ b/java-local/src/test/resources/aproject/App.java
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
package aproject;
import com.google.gson.JsonObject;
diff --git a/maven-java/.mvn/wrapper/maven-wrapper.properties
b/maven-java/.mvn/wrapper/maven-wrapper.properties
index a447c9f..7bbf49a 100755
--- a/maven-java/.mvn/wrapper/maven-wrapper.properties
+++ b/maven-java/.mvn/wrapper/maven-wrapper.properties
@@ -1 +1,4 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.2/apache-maven-3.5.2-bin.zip
\ No newline at end of file
+# Licensed to the Apache Software Foundation (ASF) under one or more
contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.2/apache-maven-3.5.2-bin.zip
diff --git a/maven-java/README.md b/maven-java/README.md
index 8d0a6e9..ef0ad12 100644
--- a/maven-java/README.md
+++ b/maven-java/README.md
@@ -1,10 +1,29 @@
+<!--
+#
+# 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.
+#
+-->
+
# Maven Example
-This example shows how to deploy a Java Action which has external dependency.
This
+This example shows how to deploy a Java Action which has external dependency.
This
example uses Maven as the dependency manager.
-## Build
+## Build
```
./mvnw clean install
@@ -19,7 +38,7 @@ wsk -i action create md5hasher target/maven-java.jar --main
org.apache.openwhisk
## Invoking Action
```
-wsk -i action invoke md5hasher --result -p text openwhisk
+wsk -i action invoke md5hasher --result -p text openwhisk
```
Invoking the above action will return an JSON output which will have original
plain text and MD5 hash of the same.
diff --git a/node-local/README.md b/node-local/README.md
index f59190e..1e4c6f9 100644
--- a/node-local/README.md
+++ b/node-local/README.md
@@ -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.
+#
+-->
+
# Testing node.js functions locally
Usage:
@@ -38,6 +57,6 @@ In this case you can run the docker image that open whisk
uses to launch your ac
Usage:
* --debug : enable request debugging (by adding NODE_DEBUG=request)
-* --action : action js file you are trying to test
+* --action : action js file you are trying to test
* --param : parameter to pass to main (multiple allowed)
* --image : the action image used to run node (default is
openwhisk/nodejs6action:latest)
diff --git a/node-local/runtest.sh b/node-local/runtest.sh
index 63c680e..928ec24 100755
--- a/node-local/runtest.sh
+++ b/node-local/runtest.sh
@@ -1,4 +1,6 @@
#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one or more
contributor
+# license agreements; and to You under the Apache License, Version 2.0.
abs_path()
{
diff --git a/terraform-wskdeploy-plugin/README.md
b/terraform-wskdeploy-plugin/README.md
index 654a98a..a846951 100644
--- a/terraform-wskdeploy-plugin/README.md
+++ b/terraform-wskdeploy-plugin/README.md
@@ -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.
+#
+-->
+
# (Experimental)Terraform Wskdeploy Plugin
A sample app to demo how to implement Terraform Plugin. The purpose
is to try to integrate Terraform with
[wskdeploy](https://github.com/apache/incubator-openwhisk-wskdeploy)
diff --git a/terraform-wskdeploy-plugin/main.go
b/terraform-wskdeploy-plugin/main.go
index 5ecf31e..4356119 100644
--- a/terraform-wskdeploy-plugin/main.go
+++ b/terraform-wskdeploy-plugin/main.go
@@ -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.
+ */
+
package main
import (
diff --git a/terraform-wskdeploy-plugin/provider.go
b/terraform-wskdeploy-plugin/provider.go
index 39d7df4..25bc038 100644
--- a/terraform-wskdeploy-plugin/provider.go
+++ b/terraform-wskdeploy-plugin/provider.go
@@ -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.
+ */
+
package main
import "github.com/hashicorp/terraform/helper/schema"
diff --git a/terraform-wskdeploy-plugin/resource_server.go
b/terraform-wskdeploy-plugin/resource_server.go
index 6898a2a..b0d9679 100644
--- a/terraform-wskdeploy-plugin/resource_server.go
+++ b/terraform-wskdeploy-plugin/resource_server.go
@@ -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.
+ */
+
package main
import (
diff --git a/tools/travis/scancode.sh b/tools/travis/scancode.sh
index 2202c45..44bf2c2 100755
--- a/tools/travis/scancode.sh
+++ b/tools/travis/scancode.sh
@@ -1,4 +1,6 @@
#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one or more
contributor
+# license agreements; and to You under the Apache License, Version 2.0.
set -e
# Build script for Travis-CI.
@@ -8,4 +10,4 @@ UTIL_DIR="$ROOTDIR/../incubator-openwhisk-utilities"
# run scancode
cd $UTIL_DIR
-scancode/scanCode.py $ROOTDIR
\ No newline at end of file
+scancode/scanCode.py $ROOTDIR
diff --git a/tools/travis/setupscan.sh b/tools/travis/setupscan.sh
index 35f070f..586f262 100755
--- a/tools/travis/setupscan.sh
+++ b/tools/travis/setupscan.sh
@@ -1,5 +1,6 @@
#!/bin/bash
-
+# Licensed to the Apache Software Foundation (ASF) under one or more
contributor
+# license agreements; and to You under the Apache License, Version 2.0.
SCRIPTDIR=$(cd $(dirname "$0") && pwd)
HOMEDIR="$SCRIPTDIR/../../../"
