gh-2562 Change license to Apache …

Update all license text to new Apache version. Fix a few anomolies. Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
RussWhitehead · Aug 28, 2012 · 743e4e5 · 743e4e5
1 parent e020276
commit 743e4e5
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 32 deletions.
diff --git a/README b/README
@@ -1,19 +1,17 @@
-
-Copyright (C) <2011> <LexisNexis Risk Data Management Inc.>
-
+HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems.
+
 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,
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+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.
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-
+
 
 http://hpccsystems.com
 

diff --git a/common/fileview2/fvserver.cpp b/common/fileview2/fvserver.cpp
@@ -15,23 +15,6 @@
     limitations under the License.
 ############################################################################## */
 
-/*##############################################################################
-
-    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems.
-
-    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.
-############################################################################## */
-
 #include <jliball.hpp>
 
 #include "daclient.hpp"

diff --git a/common/remote/uri.cpp b/common/remote/uri.cpp
@@ -1,6 +1,6 @@
 /*##############################################################################
 
-    Copyright (C) 2012 HPCC Systems.
+    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems.
 
     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/common/remote/uri.hpp b/common/remote/uri.hpp
@@ -1,6 +1,6 @@
 /*##############################################################################
 
-    Copyright (C) 2012 HPCC Systems.
+    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems.
 
     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/ecl/ecl-package/CMakeLists.txt b/ecl/ecl-package/CMakeLists.txt
@@ -1,6 +1,18 @@
-##############################################################################
-# HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems.
-##############################################################################
+################################################################################
+#    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems.
+#
+#    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.
+################################################################################
 
 
 # Component: ecl-package

diff --git a/ecl/ecl-package/ecl-package.cpp b/ecl/ecl-package/ecl-package.cpp
@@ -1,5 +1,18 @@
 /*##############################################################################
-HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems.
+
+    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems.
+
+    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.
 ############################################################################## */
 
 #include <stdio.h>