Merge pull request #14 from EMCECS/feature-dell-copyrights

Updated all copyrights.
EMCECS · Nov 20, 2018 · 89076cf · 89076cf
2 parents 2c625f7 + 81064b1
commit 89076cf
Show file tree

Hide file tree

Showing 33 changed files with 52 additions and 68 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#   Copyright 2017 EMC Corporation. All Rights Reserved.
+#   Copyright 2017-2018 Dell Inc. or its subsidiaries. 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.

diff --git a/src/main/java/com/emc/ecs/browser/spring/Application.java b/src/main/java/com/emc/ecs/browser/spring/Application.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 EMC Corporation. All Rights Reserved.
+ * Copyright 2017-2018 Dell Inc. or its subsidiaries. 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.

diff --git a/src/main/java/com/emc/ecs/browser/spring/ServiceController.java b/src/main/java/com/emc/ecs/browser/spring/ServiceController.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 EMC Corporation. All Rights Reserved.
+ * Copyright 2017-2018 Dell Inc. or its subsidiaries. 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.

diff --git a/src/main/java/com/emc/ecs/browser/spring/ServiceFilter.java b/src/main/java/com/emc/ecs/browser/spring/ServiceFilter.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2017 EMC Corporation. All Rights Reserved.
+ * Copyright 2016-2018 Dell Inc. or its subsidiaries. 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.

diff --git a/src/main/java/com/emc/ecs/browser/spring/StaticController.java b/src/main/java/com/emc/ecs/browser/spring/StaticController.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 EMC Corporation. All Rights Reserved.
+ * Copyright 2017-2018 Dell Inc. or its subsidiaries. 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.

diff --git a/src/main/java/com/emc/ecs/browser/spring/WebConfiguration.java b/src/main/java/com/emc/ecs/browser/spring/WebConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 EMC Corporation. All Rights Reserved.
+ * Copyright 2017-2018 Dell Inc. or its subsidiaries. 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.

diff --git a/src/main/java/com/emc/ecs/browser/spring/WrappedResponseEntity.java b/src/main/java/com/emc/ecs/browser/spring/WrappedResponseEntity.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 EMC Corporation. All Rights Reserved.
+ * Copyright 2017-2018 Dell Inc. or its subsidiaries. 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.

diff --git a/src/main/java/com/emc/object/s3/bean/ConcreteAccessControlList.java b/src/main/java/com/emc/object/s3/bean/ConcreteAccessControlList.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 EMC Corporation. All Rights Reserved.
+ * Copyright 2018 Dell Inc. or its subsidiaries. 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.

diff --git a/src/main/java/com/emc/object/s3/bean/ConcreteGrant.java b/src/main/java/com/emc/object/s3/bean/ConcreteGrant.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 EMC Corporation. All Rights Reserved.
+ * Copyright 2018 Dell Inc. or its subsidiaries. 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.

diff --git a/src/main/java/com/emc/object/s3/bean/ConcreteGrantee.java b/src/main/java/com/emc/object/s3/bean/ConcreteGrantee.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 EMC Corporation. All Rights Reserved.
+ * Copyright 2018 Dell Inc. or its subsidiaries. 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.

diff --git a/src/main/java/com/emc/object/s3/bean/SlimCopyObjectResult.java b/src/main/java/com/emc/object/s3/bean/SlimCopyObjectResult.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 EMC Corporation. All Rights Reserved.
+ * Copyright 2017-2018 Dell Inc. or its subsidiaries. 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.

diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-Copyright 2011-2017 EMC Corporation. All Rights Reserved.
+Copyright 2011-2018 Dell Inc. or its subsidiaries. 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.
@@ -779,7 +779,7 @@
 </div>
 
 <div id="s3License" onclick="$(this).hide()">
-    Copyright 2011-2017 EMC Corporation. All Rights Reserved.<br/>
+    Copyright 2011-2018 Dell Inc. or its subsidiaries. All rights reserved.<br/>
     <br/>
     Licensed under the Apache License, Version 2.0 (the "License").
     You may not use this file except in compliance with the License.

diff --git a/src/main/resources/static/javascript/AclPage.js b/src/main/resources/static/javascript/AclPage.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 EMC Corporation. All Rights Reserved.
+ * Copyright 2011-2018 Dell Inc. or its subsidiaries. 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.

diff --git a/src/main/resources/static/javascript/BucketCreationPage.js b/src/main/resources/static/javascript/BucketCreationPage.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, EMC Corporation. All rights reserved.
+ * Copyright 2018 Dell Inc. or its subsidiaries. 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.

diff --git a/src/main/resources/static/javascript/ConfigPage.js b/src/main/resources/static/javascript/ConfigPage.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017, EMC Corporation. All rights reserved.
+ * Copyright 2011-2018 Dell Inc. or its subsidiaries. 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.

diff --git a/src/main/resources/static/javascript/ContextMenu.js b/src/main/resources/static/javascript/ContextMenu.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017, EMC Corporation. All rights reserved.
+ * Copyright 2011-2018 Dell Inc. or its subsidiaries. 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.

diff --git a/src/main/resources/static/javascript/DirectoryPage.js b/src/main/resources/static/javascript/DirectoryPage.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2018, EMC Corporation. All rights reserved.
+ * Copyright 2011-2018 Dell Inc. or its subsidiaries. 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.

diff --git a/src/main/resources/static/javascript/FileRow.js b/src/main/resources/static/javascript/FileRow.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017, EMC Corporation. All rights reserved.
+ * Copyright 2011-2018 Dell Inc. or its subsidiaries. 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.

diff --git a/src/main/resources/static/javascript/MetadataSearchPage.js b/src/main/resources/static/javascript/MetadataSearchPage.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, EMC Corporation. All rights reserved.
+ * Copyright 2017-2018 Dell Inc. or its subsidiaries. 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.

diff --git a/src/main/resources/static/javascript/ModalWindow.js b/src/main/resources/static/javascript/ModalWindow.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017, EMC Corporation. All rights reserved.
+ * Copyright 2011-2018 Dell Inc. or its subsidiaries. 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.

diff --git a/src/main/resources/static/javascript/ObjectInfoPage.js b/src/main/resources/static/javascript/ObjectInfoPage.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017, EMC Corporation. All rights reserved.
+ * Copyright 2011-2018 Dell Inc. or its subsidiaries. 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.

diff --git a/src/main/resources/static/javascript/PropertiesPage.js b/src/main/resources/static/javascript/PropertiesPage.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2018, EMC Corporation. All rights reserved.
+ * Copyright 2011-2018 Dell Inc. or its subsidiaries. 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.

diff --git a/src/main/resources/static/javascript/S3Browser.js b/src/main/resources/static/javascript/S3Browser.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2018, EMC Corporation. All rights reserved.
+ * Copyright 2011-2018 Dell Inc. or its subsidiaries. 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.

diff --git a/src/main/resources/static/javascript/S3BrowserUtil.js b/src/main/resources/static/javascript/S3BrowserUtil.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017, EMC Corporation. All rights reserved.
+ * Copyright 2011-2018 Dell Inc. or its subsidiaries. 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.

diff --git a/src/main/resources/static/javascript/S3Template.js b/src/main/resources/static/javascript/S3Template.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017, EMC Corporation. All rights reserved.
+ * Copyright 2011-2018 Dell Inc. or its subsidiaries. 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.

diff --git a/src/main/resources/static/javascript/S3TemplateEngine.js b/src/main/resources/static/javascript/S3TemplateEngine.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017, EMC Corporation. All rights reserved.
+ * Copyright 2011-2018 Dell Inc. or its subsidiaries. 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.

diff --git a/src/main/resources/static/javascript/SharePage.js b/src/main/resources/static/javascript/SharePage.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2018, EMC Corporation. All rights reserved.
+ * Copyright 2011-2018 Dell Inc. or its subsidiaries. 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.

diff --git a/src/main/resources/static/javascript/VersioningPage.js b/src/main/resources/static/javascript/VersioningPage.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 EMC Corporation. All Rights Reserved.
+ * Copyright 2017-2018 Dell Inc. or its subsidiaries. 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.

diff --git a/src/main/resources/static/javascript/VersionsAll.js b/src/main/resources/static/javascript/VersionsAll.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, EMC Corporation. All rights reserved.
+ * Copyright 2018 Dell Inc. or its subsidiaries. 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.

diff --git a/src/main/resources/static/javascript/VersionsPage.js b/src/main/resources/static/javascript/VersionsPage.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2018, EMC Corporation. All rights reserved.
+ * Copyright 2011-2018 Dell Inc. or its subsidiaries. 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.

diff --git a/src/main/resources/static/javascript/ecs-sdk.js b/src/main/resources/static/javascript/ecs-sdk.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 EMC Corporation. All Rights Reserved.
+ * Copyright 2017-2018 Dell Inc. or its subsidiaries. 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.

diff --git a/src/main/resources/static/raw.html b/src/main/resources/static/raw.html
@@ -1,21 +1,17 @@
 <!DOCTYPE html>
 <!--
- Copyright (c) 2017, EMC Corporation
+Copyright 2017-2018 Dell Inc. or its subsidiaries. All rights reserved.
 
- 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.
+A copy of the License is located at
 
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * Neither the name of the EMC Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+http://www.apache.org/licenses/LICENSE-2.0.txt
 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+or in the "license" file accompanying this file. This file 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.
 -->
 <html lang="en" ng-app="ECS-BROWSER">
 <head>

diff --git a/src/main/resources/templates/index.tmpl b/src/main/resources/templates/index.tmpl
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
- Copyright (c) 2011-2017, EMC Corporation. All rights reserved.
+ Copyright 2011-2018 Dell Inc. or its subsidiaries. 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.
@@ -674,30 +674,18 @@ permissions and limitations under the License.
 </div>
 
 <div id="s3License" onclick="$(this).hide()">
-    Copyright (c) 2011-2013, EMC Corporation<br/>
+    Copyright 2011-2018 Dell Inc. or its subsidiaries. All rights reserved.<br/>
     <br/>
-    All rights reserved.<br/>
+    Licensed under the Apache License, Version 2.0 (the "License").
+    You may not use this file except in compliance with the License.
+    A copy of the License is located at<br/>
     <br/>
-    Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
-    following conditions are met:
-    <ul>
-        <li>Redistributions of source code must retain the above copyright notice, this list of conditions and the
-            following disclaimer.
-        </li>
-        <li>Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the
-            following disclaimer in the documentation and/or other materials provided with the distribution.
-        </li>
-        <li>Neither the name of the EMC Corporation nor the names of its contributors may be used to endorse or promote
-            products derived from this software without specific prior written permission.
-        </li>
-    </ul>
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+    <a href="http://www.apache.org/licenses/LICENSE-2.0.txt" target="_blank">http://www.apache.org/licenses/LICENSE-2.0.txt</a><br/>
+    <br/>
+    or in the "license" file accompanying this file. This file 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.<br/>
 </div>
 
 </body>