You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by rm...@apache.org on 2015/09/21 22:34:14 UTC

[05/18] incubator-trafodion git commit: copuright header changes set 2

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/client/Response.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/client/Response.java b/core/rest/src/main/java/org/trafodion/rest/client/Response.java
index fa95743..99302f9 100644
--- a/core/rest/src/main/java/org/trafodion/rest/client/Response.java
+++ b/core/rest/src/main/java/org/trafodion/rest/client/Response.java
@@ -1,17 +1,24 @@
 /**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
+* @@@ START COPYRIGHT @@@
+
+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.
+
+* @@@ END COPYRIGHT @@@
  */
 
 package org.trafodion.rest.client;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/model/VersionModel.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/model/VersionModel.java b/core/rest/src/main/java/org/trafodion/rest/model/VersionModel.java
index 1eab4d9..11f0d29 100644
--- a/core/rest/src/main/java/org/trafodion/rest/model/VersionModel.java
+++ b/core/rest/src/main/java/org/trafodion/rest/model/VersionModel.java
@@ -1,17 +1,24 @@
 /**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
+* @@@ START COPYRIGHT @@@
+
+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.
+
+* @@@ END COPYRIGHT @@@
  */
 
 package org.trafodion.rest.model;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/provider/JAXBContextResolver.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/provider/JAXBContextResolver.java b/core/rest/src/main/java/org/trafodion/rest/provider/JAXBContextResolver.java
index 48a0cc4..70d1696 100644
--- a/core/rest/src/main/java/org/trafodion/rest/provider/JAXBContextResolver.java
+++ b/core/rest/src/main/java/org/trafodion/rest/provider/JAXBContextResolver.java
@@ -30,10 +30,26 @@ import com.sun.jersey.api.json.JSONConfiguration;
 import com.sun.jersey.api.json.JSONJAXBContext;
 
 /**
- * Plumbing for hooking up Jersey's JSON entity body encoding and decoding
- * support to JAXB. Modify how the context is created (by using e.g. a 
- * different configuration builder) to control how JSON is processed and
- * created.
+* @@@ START COPYRIGHT @@@
+
+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.
+
+* @@@ END COPYRIGHT @@@
  */
 @Provider
 public class JAXBContextResolver implements ContextResolver<JAXBContext> {

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/provider/producer/PlainTextMessageBodyProducer.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/provider/producer/PlainTextMessageBodyProducer.java b/core/rest/src/main/java/org/trafodion/rest/provider/producer/PlainTextMessageBodyProducer.java
index 6261a2a..8bb6abe 100644
--- a/core/rest/src/main/java/org/trafodion/rest/provider/producer/PlainTextMessageBodyProducer.java
+++ b/core/rest/src/main/java/org/trafodion/rest/provider/producer/PlainTextMessageBodyProducer.java
@@ -31,10 +31,26 @@ import javax.ws.rs.ext.Provider;
 import org.trafodion.rest.RestConstants;
 
 /**
- * An adapter between Jersey and Object.toString(). Hooks up plain text output
- * to the Jersey content handling framework. 
- * Jersey will first call getSize() to learn the number of bytes that will be
- * sent, then writeTo to perform the actual I/O.
+* @@@ START COPYRIGHT @@@
+
+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.
+
+* @@@ END COPYRIGHT @@@
  */
 @Provider
 @Produces(RestConstants.MIMETYPE_TEXT)

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/script/ScriptContext.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/script/ScriptContext.java b/core/rest/src/main/java/org/trafodion/rest/script/ScriptContext.java
index d091bb2..f478c64 100644
--- a/core/rest/src/main/java/org/trafodion/rest/script/ScriptContext.java
+++ b/core/rest/src/main/java/org/trafodion/rest/script/ScriptContext.java
@@ -1,17 +1,24 @@
 /**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
+* @@@ START COPYRIGHT @@@
+
+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.
+
+* @@@ END COPYRIGHT @@@
  */
 package org.trafodion.rest.script;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/script/ScriptManager.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/script/ScriptManager.java b/core/rest/src/main/java/org/trafodion/rest/script/ScriptManager.java
index 232bea7..5d1b594 100644
--- a/core/rest/src/main/java/org/trafodion/rest/script/ScriptManager.java
+++ b/core/rest/src/main/java/org/trafodion/rest/script/ScriptManager.java
@@ -1,17 +1,24 @@
 /**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
+* @@@ START COPYRIGHT @@@
+
+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.
+
+* @@@ END COPYRIGHT @@@
  */
 package org.trafodion.rest.script;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/script/ScriptManagerWatcher.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/script/ScriptManagerWatcher.java b/core/rest/src/main/java/org/trafodion/rest/script/ScriptManagerWatcher.java
index 0099e73..7c41e14 100644
--- a/core/rest/src/main/java/org/trafodion/rest/script/ScriptManagerWatcher.java
+++ b/core/rest/src/main/java/org/trafodion/rest/script/ScriptManagerWatcher.java
@@ -1,17 +1,24 @@
 /**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
+* @@@ START COPYRIGHT @@@
+
+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.
+
+* @@@ END COPYRIGHT @@@
  */
 package org.trafodion.rest.script;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/util/Base64.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/util/Base64.java b/core/rest/src/main/java/org/trafodion/rest/util/Base64.java
index e949e88..511d183 100644
--- a/core/rest/src/main/java/org/trafodion/rest/util/Base64.java
+++ b/core/rest/src/main/java/org/trafodion/rest/util/Base64.java
@@ -1,17 +1,24 @@
 /**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
+* @@@ START COPYRIGHT @@@
+
+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.
+
+* @@@ END COPYRIGHT @@@
  */
 
 package org.trafodion.rest.util;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/util/Bytes.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/util/Bytes.java b/core/rest/src/main/java/org/trafodion/rest/util/Bytes.java
index 52dfe1c..a0521cf 100644
--- a/core/rest/src/main/java/org/trafodion/rest/util/Bytes.java
+++ b/core/rest/src/main/java/org/trafodion/rest/util/Bytes.java
@@ -1,17 +1,24 @@
 /**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
+* @@@ START COPYRIGHT @@@
+
+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.
+
+* @@@ END COPYRIGHT @@@
  */
 
 package org.trafodion.rest.util;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/util/ConfTool.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/util/ConfTool.java b/core/rest/src/main/java/org/trafodion/rest/util/ConfTool.java
index 06a9d0d..124b8ed 100644
--- a/core/rest/src/main/java/org/trafodion/rest/util/ConfTool.java
+++ b/core/rest/src/main/java/org/trafodion/rest/util/ConfTool.java
@@ -1,17 +1,24 @@
 /**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
+* @@@ START COPYRIGHT @@@
+
+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.
+
+* @@@ END COPYRIGHT @@@
  */
 
 package org.trafodion.dcs.util;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/util/GetJavaProperty.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/util/GetJavaProperty.java b/core/rest/src/main/java/org/trafodion/rest/util/GetJavaProperty.java
index fa599a0..cbc0d6e 100644
--- a/core/rest/src/main/java/org/trafodion/rest/util/GetJavaProperty.java
+++ b/core/rest/src/main/java/org/trafodion/rest/util/GetJavaProperty.java
@@ -1,17 +1,24 @@
 /**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
+* @@@ START COPYRIGHT @@@
+
+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.
+
+* @@@ END COPYRIGHT @@@
  */
 
 package org.trafodion.rest.util;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/util/JdbcT2Util.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/util/JdbcT2Util.java b/core/rest/src/main/java/org/trafodion/rest/util/JdbcT2Util.java
index a237419..c717ee0 100644
--- a/core/rest/src/main/java/org/trafodion/rest/util/JdbcT2Util.java
+++ b/core/rest/src/main/java/org/trafodion/rest/util/JdbcT2Util.java
@@ -1,17 +1,24 @@
 /**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
+* @@@ START COPYRIGHT @@@
+
+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.
+
+* @@@ END COPYRIGHT @@@
  */
 package org.trafodion.rest.util;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/util/JdbcT4Util.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/util/JdbcT4Util.java b/core/rest/src/main/java/org/trafodion/rest/util/JdbcT4Util.java
index 5c080ec..2145d31 100644
--- a/core/rest/src/main/java/org/trafodion/rest/util/JdbcT4Util.java
+++ b/core/rest/src/main/java/org/trafodion/rest/util/JdbcT4Util.java
@@ -1,17 +1,24 @@
 /**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
+* @@@ START COPYRIGHT @@@
+
+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.
+
+* @@@ END COPYRIGHT @@@
  */
 package org.trafodion.rest.util;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/util/NetworkConfiguration.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/util/NetworkConfiguration.java b/core/rest/src/main/java/org/trafodion/rest/util/NetworkConfiguration.java
index bd175f9..dcdfb6a 100644
--- a/core/rest/src/main/java/org/trafodion/rest/util/NetworkConfiguration.java
+++ b/core/rest/src/main/java/org/trafodion/rest/util/NetworkConfiguration.java
@@ -1,17 +1,24 @@
 /**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
+* @@@ START COPYRIGHT @@@
+
+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.
+
+* @@@ END COPYRIGHT @@@
  */
 
 package org.trafodion.rest.util;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/util/RestConfiguration.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/util/RestConfiguration.java b/core/rest/src/main/java/org/trafodion/rest/util/RestConfiguration.java
index 508bfc3..a990ccc 100644
--- a/core/rest/src/main/java/org/trafodion/rest/util/RestConfiguration.java
+++ b/core/rest/src/main/java/org/trafodion/rest/util/RestConfiguration.java
@@ -1,17 +1,24 @@
 /**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
+* @@@ START COPYRIGHT @@@
+
+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.
+
+* @@@ END COPYRIGHT @@@
  */
 
 package org.trafodion.rest.util;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/util/RetryCounter.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/util/RetryCounter.java b/core/rest/src/main/java/org/trafodion/rest/util/RetryCounter.java
index ea325e5..d0bc9f9 100644
--- a/core/rest/src/main/java/org/trafodion/rest/util/RetryCounter.java
+++ b/core/rest/src/main/java/org/trafodion/rest/util/RetryCounter.java
@@ -1,17 +1,24 @@
 /**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
+* @@@ START COPYRIGHT @@@
+
+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.
+
+* @@@ END COPYRIGHT @@@
  */
 
 package org.trafodion.rest.util;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/util/RetryCounterFactory.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/util/RetryCounterFactory.java b/core/rest/src/main/java/org/trafodion/rest/util/RetryCounterFactory.java
index 8c897c7..fbf00f7 100644
--- a/core/rest/src/main/java/org/trafodion/rest/util/RetryCounterFactory.java
+++ b/core/rest/src/main/java/org/trafodion/rest/util/RetryCounterFactory.java
@@ -1,17 +1,24 @@
 /**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
+* @@@ START COPYRIGHT @@@
+
+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.
+
+* @@@ END COPYRIGHT @@@
  */
 
 package org.trafodion.rest.util;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/util/Strings.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/util/Strings.java b/core/rest/src/main/java/org/trafodion/rest/util/Strings.java
index d8bc5ab..d969e20 100644
--- a/core/rest/src/main/java/org/trafodion/rest/util/Strings.java
+++ b/core/rest/src/main/java/org/trafodion/rest/util/Strings.java
@@ -1,17 +1,24 @@
 /**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
+* @@@ START COPYRIGHT @@@
+
+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.
+
+* @@@ END COPYRIGHT @@@
  */
 
 package org.trafodion.rest.util;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/util/VersionInfo.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/util/VersionInfo.java b/core/rest/src/main/java/org/trafodion/rest/util/VersionInfo.java
index 9af352c..24e7a58 100644
--- a/core/rest/src/main/java/org/trafodion/rest/util/VersionInfo.java
+++ b/core/rest/src/main/java/org/trafodion/rest/util/VersionInfo.java
@@ -1,17 +1,24 @@
 /**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
+* @@@ START COPYRIGHT @@@
+
+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.
+
+* @@@ END COPYRIGHT @@@
  */
 
 package org.trafodion.rest.util;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/version/util/VerGen.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/version/util/VerGen.java b/core/rest/src/main/java/org/trafodion/rest/version/util/VerGen.java
index ab3d5fb..6e64d01 100644
--- a/core/rest/src/main/java/org/trafodion/rest/version/util/VerGen.java
+++ b/core/rest/src/main/java/org/trafodion/rest/version/util/VerGen.java
@@ -1,17 +1,24 @@
 /**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
+* @@@ START COPYRIGHT @@@
+
+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.
+
+* @@@ END COPYRIGHT @@@
  */
 
 package org.trafodion.rest.version.util;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZKConfig.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZKConfig.java b/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZKConfig.java
index a3da7b1..ad88bea 100644
--- a/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZKConfig.java
+++ b/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZKConfig.java
@@ -1,17 +1,24 @@
 /**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
+* @@@ START COPYRIGHT @@@
+
+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.
+
+* @@@ END COPYRIGHT @@@
  */
 
 package org.trafodion.rest.zookeeper;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZKServerTool.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZKServerTool.java b/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZKServerTool.java
index a059d20..1b88777 100644
--- a/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZKServerTool.java
+++ b/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZKServerTool.java
@@ -1,17 +1,24 @@
 /**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
+* @@@ START COPYRIGHT @@@
+
+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.
+
+* @@@ END COPYRIGHT @@@
  */
 
 package org.trafodion.rest.zookeeper;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZkClient.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZkClient.java b/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZkClient.java
index e32054b..ef78d8e 100644
--- a/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZkClient.java
+++ b/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZkClient.java
@@ -1,17 +1,24 @@
 /**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
+* @@@ START COPYRIGHT @@@
+
+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.
+
+* @@@ END COPYRIGHT @@@
  */
 
 package org.trafodion.rest.zookeeper;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZkQuorumPeer.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZkQuorumPeer.java b/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZkQuorumPeer.java
index 3aaf8d5..38c890b 100644
--- a/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZkQuorumPeer.java
+++ b/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZkQuorumPeer.java
@@ -1,17 +1,24 @@
 /**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
+* @@@ START COPYRIGHT @@@
+
+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.
+
+* @@@ END COPYRIGHT @@@
  */
 
 package org.trafodion.rest.zookeeper;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZkUtil.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZkUtil.java b/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZkUtil.java
index b8e3f3f..a568afb 100644
--- a/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZkUtil.java
+++ b/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZkUtil.java
@@ -1,17 +1,24 @@
 /**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
+* @@@ START COPYRIGHT @@@
+
+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.
+
+* @@@ END COPYRIGHT @@@
  */
 
 package org.trafodion.rest.zookeeper;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZooKeeperMainServerArg.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZooKeeperMainServerArg.java b/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZooKeeperMainServerArg.java
index 6d840f6..3a62dc6 100644
--- a/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZooKeeperMainServerArg.java
+++ b/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZooKeeperMainServerArg.java
@@ -1,17 +1,24 @@
 /**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
+* @@@ START COPYRIGHT @@@
+
+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.
+
+* @@@ END COPYRIGHT @@@
  */
 
 package org.trafodion.rest.zookeeper;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/resources/rest-default.xml
----------------------------------------------------------------------
diff --git a/core/rest/src/main/resources/rest-default.xml b/core/rest/src/main/resources/rest-default.xml
index 5a5a77e..9b7c7e5 100644
--- a/core/rest/src/main/resources/rest-default.xml
+++ b/core/rest/src/main/resources/rest-default.xml
@@ -1,22 +1,26 @@
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--  
-/**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
- */
- -->
+<!-- 
+* @@@ START COPYRIGHT @@@                                                       
+*
+* 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.
+*
+* @@@ END COPYRIGHT @@@                                                           -->
 
 <configuration>
 <!--  

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/saveVersion.sh
----------------------------------------------------------------------
diff --git a/core/rest/src/saveVersion.sh b/core/rest/src/saveVersion.sh
index 032630b..f534b2f 100644
--- a/core/rest/src/saveVersion.sh
+++ b/core/rest/src/saveVersion.sh
@@ -1,23 +1,27 @@
 #!/bin/sh
 
-# This file is used to generate the annotation of package info that
-# records the user, url, revision and timestamp.
-
-#
-# (C) Copyright 2015 Hewlett-Packard Development Company, L.P.
-# 
-#   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.
-#
+#/**
+#* @@@ START COPYRIGHT @@@
+#*
+#* 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.
+#*
+#* @@@ END COPYRIGHT @@@
+# */
 
 unset LANG
 unset LC_CTYPE

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/test/java/org/trafodion/rest/IntegrationTests.java
----------------------------------------------------------------------
diff --git a/core/rest/src/test/java/org/trafodion/rest/IntegrationTests.java b/core/rest/src/test/java/org/trafodion/rest/IntegrationTests.java
index 1b5b197..eb64c24 100644
--- a/core/rest/src/test/java/org/trafodion/rest/IntegrationTests.java
+++ b/core/rest/src/test/java/org/trafodion/rest/IntegrationTests.java
@@ -1,17 +1,24 @@
 /**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
+* @@@ START COPYRIGHT @@@
+
+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.
+
+* @@@ END COPYRIGHT @@@
  */
 
 package org.trafodion.rest;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/test/java/org/trafodion/rest/LargeTests.java
----------------------------------------------------------------------
diff --git a/core/rest/src/test/java/org/trafodion/rest/LargeTests.java b/core/rest/src/test/java/org/trafodion/rest/LargeTests.java
index 2fa690d..c723298 100644
--- a/core/rest/src/test/java/org/trafodion/rest/LargeTests.java
+++ b/core/rest/src/test/java/org/trafodion/rest/LargeTests.java
@@ -1,17 +1,24 @@
 /**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
+* @@@ START COPYRIGHT @@@
+
+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.
+
+* @@@ END COPYRIGHT @@@
  */
 
 package org.trafodion.rest;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/test/java/org/trafodion/rest/MediumTests.java
----------------------------------------------------------------------
diff --git a/core/rest/src/test/java/org/trafodion/rest/MediumTests.java b/core/rest/src/test/java/org/trafodion/rest/MediumTests.java
index 5c09d09..ae1da06 100644
--- a/core/rest/src/test/java/org/trafodion/rest/MediumTests.java
+++ b/core/rest/src/test/java/org/trafodion/rest/MediumTests.java
@@ -1,17 +1,24 @@
 /**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
+* @@@ START COPYRIGHT @@@
+
+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.
+
+* @@@ END COPYRIGHT @@@
  */
 
 package org.trafodion.rest;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/test/java/org/trafodion/rest/ResourceChecker.java
----------------------------------------------------------------------
diff --git a/core/rest/src/test/java/org/trafodion/rest/ResourceChecker.java b/core/rest/src/test/java/org/trafodion/rest/ResourceChecker.java
index 5e0db88..a849dcc 100644
--- a/core/rest/src/test/java/org/trafodion/rest/ResourceChecker.java
+++ b/core/rest/src/test/java/org/trafodion/rest/ResourceChecker.java
@@ -1,17 +1,24 @@
 /**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
+* @@@ START COPYRIGHT @@@
+
+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.
+
+* @@@ END COPYRIGHT @@@
  */
 
 package org.trafodion.rest;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/test/java/org/trafodion/rest/ResourceCheckerJUnitRule.java
----------------------------------------------------------------------
diff --git a/core/rest/src/test/java/org/trafodion/rest/ResourceCheckerJUnitRule.java b/core/rest/src/test/java/org/trafodion/rest/ResourceCheckerJUnitRule.java
index fdd60ce..9f1c175 100644
--- a/core/rest/src/test/java/org/trafodion/rest/ResourceCheckerJUnitRule.java
+++ b/core/rest/src/test/java/org/trafodion/rest/ResourceCheckerJUnitRule.java
@@ -1,17 +1,24 @@
 /**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
+* @@@ START COPYRIGHT @@@
+
+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.
+
+* @@@ END COPYRIGHT @@@
  */
 
 package org.trafodion.rest;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/test/java/org/trafodion/rest/SmallTests.java
----------------------------------------------------------------------
diff --git a/core/rest/src/test/java/org/trafodion/rest/SmallTests.java b/core/rest/src/test/java/org/trafodion/rest/SmallTests.java
index 7a5a94d..18c195f 100644
--- a/core/rest/src/test/java/org/trafodion/rest/SmallTests.java
+++ b/core/rest/src/test/java/org/trafodion/rest/SmallTests.java
@@ -1,17 +1,24 @@
 /**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
+* @@@ START COPYRIGHT @@@
+
+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.
+
+* @@@ END COPYRIGHT @@@
  */
 
 package org.trafodion.rest;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/test/resources/rest-default.xml
----------------------------------------------------------------------
diff --git a/core/rest/src/test/resources/rest-default.xml b/core/rest/src/test/resources/rest-default.xml
index 77ca6fd..e8107e8 100644
--- a/core/rest/src/test/resources/rest-default.xml
+++ b/core/rest/src/test/resources/rest-default.xml
@@ -2,19 +2,26 @@
 <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
 <!--  
 /**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
+* @@@ START COPYRIGHT @@@
+
+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.
+
+* @@@ END COPYRIGHT @@@
  */
  -->
  

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionObserver.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionObserver.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionObserver.java
index abe7b4c..95a02f8 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionObserver.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionObserver.java
@@ -1,22 +1,24 @@
-/**
- * (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
- */
+/*
+* @@@ START COPYRIGHT @@@                                                     
+*
+* 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.
+*
+* @@@ END COPYRIGHT @@@                                                          */
 
 package org.apache.hadoop.hbase.coprocessor.transactional;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sqf/src/tm/tmddlrequests.cpp
----------------------------------------------------------------------
diff --git a/core/sqf/src/tm/tmddlrequests.cpp b/core/sqf/src/tm/tmddlrequests.cpp
index c51e65b..5c45609 100644
--- a/core/sqf/src/tm/tmddlrequests.cpp
+++ b/core/sqf/src/tm/tmddlrequests.cpp
@@ -1,18 +1,24 @@
-// (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.
-//
-//  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.
-//
-// @@@ END COPYRIGHT @@@
+/*
+* @@@ START COPYRIGHT @@@                                                     
+*
+* 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.
+*
+* @@@ END COPYRIGHT @@@                                                          */
 
 #include "tmddlrequests.h"
 #include "dtm/tm.h"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV215C
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV215C b/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV215C
index d35e6a6..db780cd 100644
--- a/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV215C
+++ b/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV215C
@@ -20,21 +20,6 @@
 -- @@@ END COPYRIGHT @@@
 -- @@@ START COPYRIGHT @@@
 --
--- (C) Copyright 2014 Hewlett-Packard Development Company, L.P.
---
---  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.
---
--- @@@ END COPYRIGHT @@@
 >>-- Run Tests
 >>	set schema cat.tpcd;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV215N
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV215N b/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV215N
index 8f91fc1..9509517 100644
--- a/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV215N
+++ b/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV215N
@@ -20,21 +20,6 @@
 -- @@@ END COPYRIGHT @@@
 -- @@@ START COPYRIGHT @@@
 --
--- (C) Copyright 2014 Hewlett-Packard Development Company, L.P.
---
---  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.
---
--- @@@ END COPYRIGHT @@@
 >>-- Run Tests
 >>	set schema cat.tpcd;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV640
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV640 b/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV640
index e696b43..20ed269 100644
--- a/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV640
+++ b/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV640
@@ -20,21 +20,6 @@
 -- @@@ END COPYRIGHT @@@
 -- @@@ START COPYRIGHT @@@
 --
--- (C) Copyright 2014 Hewlett-Packard Development Company, L.P.
---
---  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.
---
--- @@@ END COPYRIGHT @@@
 >>
 >>-- Run Tests
 >>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/TESTMV215C
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/TESTMV215C b/core/sql/regress/newregr/mvs/BIG/TESTMV215C
index 15b669c..9d99f3f 100644
--- a/core/sql/regress/newregr/mvs/BIG/TESTMV215C
+++ b/core/sql/regress/newregr/mvs/BIG/TESTMV215C
@@ -20,21 +20,6 @@
 -- @@@ END COPYRIGHT @@@
 -- @@@ START COPYRIGHT @@@
 --
--- (C) Copyright 2014 Hewlett-Packard Development Company, L.P.
---
---  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.
---
--- @@@ END COPYRIGHT @@@
 ------------------------------------------------------
 --- TestMV215c
 --- 2.4.4.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/TESTMV640
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/TESTMV640 b/core/sql/regress/newregr/mvs/BIG/TESTMV640
index 7402f1e..8f8fc83 100644
--- a/core/sql/regress/newregr/mvs/BIG/TESTMV640
+++ b/core/sql/regress/newregr/mvs/BIG/TESTMV640
@@ -20,21 +20,6 @@
 -- @@@ END COPYRIGHT @@@
 -- @@@ START COPYRIGHT @@@
 --
--- (C) Copyright 2014 Hewlett-Packard Development Company, L.P.
---
---  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.
---
--- @@@ END COPYRIGHT @@@
 --=======================================================================
 -- TestMV640 - This test checks correctness of Majv over 3 tables,
 --             where iud changes effect rows in the majv. It uses 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/TestMV215
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/TestMV215 b/core/sql/regress/newregr/mvs/BIG/TestMV215
index a56ce08..0dc7054 100644
--- a/core/sql/regress/newregr/mvs/BIG/TestMV215
+++ b/core/sql/regress/newregr/mvs/BIG/TestMV215
@@ -20,21 +20,6 @@
 -- @@@ END COPYRIGHT @@@
 -- @@@ START COPYRIGHT @@@
 --
--- (C) Copyright 2014 Hewlett-Packard Development Company, L.P.
---
---  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.
---
--- @@@ END COPYRIGHT @@@
 ------------------------------------------------------
 --- TestMV215
 --- 2.4.4.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/TestMV215IR
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/TestMV215IR b/core/sql/regress/newregr/mvs/BIG/TestMV215IR
index 3b4f86d..d28dceb 100644
--- a/core/sql/regress/newregr/mvs/BIG/TestMV215IR
+++ b/core/sql/regress/newregr/mvs/BIG/TestMV215IR
@@ -20,21 +20,6 @@
 -- @@@ END COPYRIGHT @@@
 -- @@@ START COPYRIGHT @@@
 --
--- (C) Copyright 2014 Hewlett-Packard Development Company, L.P.
---
---  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.
---
--- @@@ END COPYRIGHT @@@
 ------------------------------------------------------
 --- TestMV215IR
 --- 2.4.4.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/TestMV215_DE
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/TestMV215_DE b/core/sql/regress/newregr/mvs/BIG/TestMV215_DE
index 4b49c7a..db35ccc 100644
--- a/core/sql/regress/newregr/mvs/BIG/TestMV215_DE
+++ b/core/sql/regress/newregr/mvs/BIG/TestMV215_DE
@@ -20,21 +20,6 @@
 -- @@@ END COPYRIGHT @@@
 -- @@@ START COPYRIGHT @@@
 --
--- (C) Copyright 2014 Hewlett-Packard Development Company, L.P.
---
---  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.
---
--- @@@ END COPYRIGHT @@@
 ------------------------------------------------------
 --- TestMV215_DE
 --- 2.4.4.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/TestMV215_RU
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/TestMV215_RU b/core/sql/regress/newregr/mvs/BIG/TestMV215_RU
index b14ba99..3185aa2 100644
--- a/core/sql/regress/newregr/mvs/BIG/TestMV215_RU
+++ b/core/sql/regress/newregr/mvs/BIG/TestMV215_RU
@@ -20,21 +20,6 @@
 -- @@@ END COPYRIGHT @@@
 -- @@@ START COPYRIGHT @@@
 --
--- (C) Copyright 2014 Hewlett-Packard Development Company, L.P.
---
---  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.
---
--- @@@ END COPYRIGHT @@@
 ------------------------------------------------------
 --- TestMV215_RU
 --- 2.4.4.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/TestMV215_With_RefreshUtilty
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/TestMV215_With_RefreshUtilty b/core/sql/regress/newregr/mvs/BIG/TestMV215_With_RefreshUtilty
index 17c6fa6..faab04c 100644
--- a/core/sql/regress/newregr/mvs/BIG/TestMV215_With_RefreshUtilty
+++ b/core/sql/regress/newregr/mvs/BIG/TestMV215_With_RefreshUtilty
@@ -20,21 +20,6 @@
 -- @@@ END COPYRIGHT @@@
 -- @@@ START COPYRIGHT @@@
 --
--- (C) Copyright 2014 Hewlett-Packard Development Company, L.P.
---
---  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.
---
--- @@@ END COPYRIGHT @@@
 ------------------------------------------------------
 --- TestMV215
 --- 2.4.4.