aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Mayer <am803u@att.com>2018-04-11 14:01:00 +0000
committerGerrit Code Review <gerrit@onap.org>2018-04-11 14:01:00 +0000
commite2cfc77754b0a38f23f9988525f3caa8ee228a1f (patch)
tree1cdc9653bfceb13270085ea49a57a1b3298aaa05
parentc19393b8e17e520d7fa474da552e86e6cbd41add (diff)
parentb5fb07d04fec092faf966ca488e754558126be47 (diff)
Merge "Add license in missing .http and .properties files"
-rw-r--r--LICENSE.TXT1
-rw-r--r--pom.xml7
-rw-r--r--restclient/onap.http16
-rw-r--r--restclient/serviceOrder.http16
-rw-r--r--src/main/resources/application-docker.properties16
-rw-r--r--src/main/resources/application-localhost.properties16
-rw-r--r--src/main/resources/application.properties16
-rw-r--r--src/test/resources/application.properties16
8 files changed, 101 insertions, 3 deletions
diff --git a/LICENSE.TXT b/LICENSE.TXT
index 6c885dd..38ee766 100644
--- a/LICENSE.TXT
+++ b/LICENSE.TXT
@@ -1,4 +1,3 @@
-
Copyright (c) 2017 Orange. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pom.xml b/pom.xml
index 80f0002..555a218 100644
--- a/pom.xml
+++ b/pom.xml
@@ -274,12 +274,15 @@
<configuration>
<header>LICENSE.TXT</header>
<includes>
- <include>src/main/java/**</include>
- <include>src/test/java/**</include>
+ <include>restclient/**</include>
+ <include>src/**</include>
<include>pom.xml</include>
</includes>
<skipExistingHeaders>true</skipExistingHeaders>
<skip>false</skip>
+ <mapping>
+ <http>SCRIPT_STYLE</http>
+ </mapping>
</configuration>
<executions>
<execution>
diff --git a/restclient/onap.http b/restclient/onap.http
index cbec294..846df6d 100644
--- a/restclient/onap.http
+++ b/restclient/onap.http
@@ -1,3 +1,19 @@
+#
+# Copyright (c) 2017 Orange. All rights reserved.
+#
+# 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.
+#
+
## SDC Get catalog service list
diff --git a/restclient/serviceOrder.http b/restclient/serviceOrder.http
index c8c6905..f6d69b9 100644
--- a/restclient/serviceOrder.http
+++ b/restclient/serviceOrder.http
@@ -1,3 +1,19 @@
+#
+# Copyright (c) 2017 Orange. All rights reserved.
+#
+# 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.
+#
+
### Create REJECTED
POST {{serviceOrder.url}}/serviceOrder
?fields=id,state,description,relatedParty.id,toto
diff --git a/src/main/resources/application-docker.properties b/src/main/resources/application-docker.properties
index 01070d4..4a2a15e 100644
--- a/src/main/resources/application-docker.properties
+++ b/src/main/resources/application-docker.properties
@@ -1,3 +1,19 @@
+#
+# Copyright (c) 2017 Orange. All rights reserved.
+#
+# 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.
+#
+
# LOGGING
logging.level.org.onap.nbi=INFO
diff --git a/src/main/resources/application-localhost.properties b/src/main/resources/application-localhost.properties
index 6a210a7..8470a93 100644
--- a/src/main/resources/application-localhost.properties
+++ b/src/main/resources/application-localhost.properties
@@ -1,3 +1,19 @@
+#
+# Copyright (c) 2017 Orange. All rights reserved.
+#
+# 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.
+#
+
# LOGGING
logging.level.org.onap.nbi=INFO
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 61f2d0c..4917ece 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,3 +1,19 @@
+#
+# Copyright (c) 2017 Orange. All rights reserved.
+#
+# 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.
+#
+
# SERVER
server.contextPath=/nbi/api/v1
server.port = 8080
diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
index 793da56..743f438 100644
--- a/src/test/resources/application.properties
+++ b/src/test/resources/application.properties
@@ -1,3 +1,19 @@
+#
+# Copyright (c) 2017 Orange. All rights reserved.
+#
+# 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.
+#
+
# SERVER
server.contextPath=/nbi/api/v1
server.port = 8080