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:11 UTC

[02/18] incubator-trafodion git commit: Copyright headers set #1

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ClientData.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ClientData.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ClientData.java
index 7f38055..0dd9a97 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ClientData.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ClientData.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.servermt.serverHandler;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/DataEvent.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/DataEvent.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/DataEvent.java
index 4b40ccb..18b2411 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/DataEvent.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/DataEvent.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.servermt.serverHandler;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/PendingRequest.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/PendingRequest.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/PendingRequest.java
index 8f3d0b2..cf33a3d 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/PendingRequest.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/PendingRequest.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.servermt.serverHandler;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiGetCatalogs.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiGetCatalogs.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiGetCatalogs.java
index 9da2e85..18895a5 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiGetCatalogs.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiGetCatalogs.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.servermt.serverHandler;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlClose.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlClose.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlClose.java
index c031cff..f583f72 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlClose.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlClose.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.servermt.serverHandler;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlConnect.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlConnect.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlConnect.java
index fa726c2..eb3f5b2 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlConnect.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlConnect.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.servermt.serverHandler;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlDisconnect.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlDisconnect.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlDisconnect.java
index a598cbd..fa489d8 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlDisconnect.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlDisconnect.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.servermt.serverHandler;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlEndTransact.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlEndTransact.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlEndTransact.java
index c2bc1a7..dc1a323 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlEndTransact.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlEndTransact.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.servermt.serverHandler;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlExecDirect.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlExecDirect.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlExecDirect.java
index e03d1ed..4a62eff 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlExecDirect.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlExecDirect.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.servermt.serverHandler;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlExecute.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlExecute.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlExecute.java
index 5331887..2044bb1 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlExecute.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlExecute.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.servermt.serverHandler;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlFetch.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlFetch.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlFetch.java
index c9b54f2..f07e20d 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlFetch.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlFetch.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.servermt.serverHandler;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlPrepare.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlPrepare.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlPrepare.java
index fd6219f..6472a43 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlPrepare.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlPrepare.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.servermt.serverHandler;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlSetConnectAttr.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlSetConnectAttr.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlSetConnectAttr.java
index 351b754..6da2db6 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlSetConnectAttr.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlSetConnectAttr.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.servermt.serverHandler;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerHandler.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerHandler.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerHandler.java
index daa198b..8d9b48b 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerHandler.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerHandler.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.servermt.serverHandler;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerWorker.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerWorker.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerWorker.java
index 217bdad..f11ccde 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerWorker.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerWorker.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.servermt.serverHandler;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverSql/TrafConnection.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverSql/TrafConnection.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverSql/TrafConnection.java
index 7ef1ec8..35129ef 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverSql/TrafConnection.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverSql/TrafConnection.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.servermt.serverSql;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverSql/TrafStatement.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverSql/TrafStatement.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverSql/TrafStatement.java
index 474dec9..484aaba 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverSql/TrafStatement.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverSql/TrafStatement.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.servermt.serverSql;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/util/Base64.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/util/Base64.java b/dcs/src/main/java/org/trafodion/dcs/util/Base64.java
index f4a6fb4..3cfc0c1 100644
--- a/dcs/src/main/java/org/trafodion/dcs/util/Base64.java
+++ b/dcs/src/main/java/org/trafodion/dcs/util/Base64.java
@@ -1,18 +1,4 @@
 /**
- *(C) Copyright 2013 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.
- */
 /**
  * Copyright 2007 The Apache Software Foundation
  *

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/util/Bytes.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/util/Bytes.java b/dcs/src/main/java/org/trafodion/dcs/util/Bytes.java
index 1e116cc..f7ab41b 100644
--- a/dcs/src/main/java/org/trafodion/dcs/util/Bytes.java
+++ b/dcs/src/main/java/org/trafodion/dcs/util/Bytes.java
@@ -1,18 +1,4 @@
 /**
- *(C) Copyright 2013 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.
- */
 /**
  * Copyright 2007 The Apache Software Foundation
  *

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/util/DcsConfTool.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/util/DcsConfTool.java b/dcs/src/main/java/org/trafodion/dcs/util/DcsConfTool.java
index 5fcacef..e82995d 100644
--- a/dcs/src/main/java/org/trafodion/dcs/util/DcsConfTool.java
+++ b/dcs/src/main/java/org/trafodion/dcs/util/DcsConfTool.java
@@ -1,18 +1,4 @@
 /**
- *(C) Copyright 2013 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.
- */
 /**
  * Copyright 2007 The Apache Software Foundation
  *

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/util/DcsConfiguration.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/util/DcsConfiguration.java b/dcs/src/main/java/org/trafodion/dcs/util/DcsConfiguration.java
index a552246..93298ce 100644
--- a/dcs/src/main/java/org/trafodion/dcs/util/DcsConfiguration.java
+++ b/dcs/src/main/java/org/trafodion/dcs/util/DcsConfiguration.java
@@ -1,18 +1,4 @@
 /**
- *(C) Copyright 2013 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.
- */
 /**
  * Copyright 2007 The Apache Software Foundation
  *

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/util/GetJavaProperty.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/util/GetJavaProperty.java b/dcs/src/main/java/org/trafodion/dcs/util/GetJavaProperty.java
index 5ee8718..c9a4f17 100644
--- a/dcs/src/main/java/org/trafodion/dcs/util/GetJavaProperty.java
+++ b/dcs/src/main/java/org/trafodion/dcs/util/GetJavaProperty.java
@@ -1,18 +1,4 @@
 /**
- *(C) Copyright 2013 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.
- */
 /**
  * Copyright 2007 The Apache Software Foundation
  *

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/util/InfoServer.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/util/InfoServer.java b/dcs/src/main/java/org/trafodion/dcs/util/InfoServer.java
index e687a39..6b02eef 100644
--- a/dcs/src/main/java/org/trafodion/dcs/util/InfoServer.java
+++ b/dcs/src/main/java/org/trafodion/dcs/util/InfoServer.java
@@ -1,18 +1,4 @@
 /**
- *(C) Copyright 2013 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.
- */
 /**
  * Copyright 2007 The Apache Software Foundation
  *

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/util/RetryCounter.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/util/RetryCounter.java b/dcs/src/main/java/org/trafodion/dcs/util/RetryCounter.java
index 4cf8ee2..8acb750 100644
--- a/dcs/src/main/java/org/trafodion/dcs/util/RetryCounter.java
+++ b/dcs/src/main/java/org/trafodion/dcs/util/RetryCounter.java
@@ -1,18 +1,4 @@
 /**
- *(C) Copyright 2013 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.
- */
 /**
  * Copyright 2011 The Apache Software Foundation
  *

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/util/RetryCounterFactory.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/util/RetryCounterFactory.java b/dcs/src/main/java/org/trafodion/dcs/util/RetryCounterFactory.java
index 50d1e0b..cd83693 100644
--- a/dcs/src/main/java/org/trafodion/dcs/util/RetryCounterFactory.java
+++ b/dcs/src/main/java/org/trafodion/dcs/util/RetryCounterFactory.java
@@ -1,18 +1,4 @@
 /**
- *(C) Copyright 2013 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.
- */
 /**
  * Copyright 2011 The Apache Software Foundation
  *

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/util/Strings.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/util/Strings.java b/dcs/src/main/java/org/trafodion/dcs/util/Strings.java
index a2ddea2..9558d65 100644
--- a/dcs/src/main/java/org/trafodion/dcs/util/Strings.java
+++ b/dcs/src/main/java/org/trafodion/dcs/util/Strings.java
@@ -1,18 +1,4 @@
 /**
- *(C) Copyright 2013 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.
- */
 /**
  * Copyright 2011 The Apache Software Foundation
  *

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/util/VersionInfo.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/util/VersionInfo.java b/dcs/src/main/java/org/trafodion/dcs/util/VersionInfo.java
index ee7f944..75958f6 100644
--- a/dcs/src/main/java/org/trafodion/dcs/util/VersionInfo.java
+++ b/dcs/src/main/java/org/trafodion/dcs/util/VersionInfo.java
@@ -1,18 +1,4 @@
 /**
- *(C) Copyright 2013 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.
- */
 /**
  * Copyright 2011 The Apache Software Foundation
  *

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/resources/dcs-webapps/master/aggr_querystats.html
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/master/aggr_querystats.html b/dcs/src/main/resources/dcs-webapps/master/aggr_querystats.html
index 642655e..76545ae 100644
--- a/dcs/src/main/resources/dcs-webapps/master/aggr_querystats.html
+++ b/dcs/src/main/resources/dcs-webapps/master/aggr_querystats.html
@@ -1,19 +1,22 @@
 <!-- @@@ START COPYRIGHT @@@                                                         -->
-<!--                                                                                 -->
-<!-- (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.                                                  -->
-<!--                                                                                 -->
+<!--
+<!-- 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 @@@                                                           -->
 <head>
 	<link type="text/css" href="datatables/css/jquery.dataTables_themeroller.css" rel="stylesheet" />

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/resources/dcs-webapps/master/aggr_querystats.jsp
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/master/aggr_querystats.jsp b/dcs/src/main/resources/dcs-webapps/master/aggr_querystats.jsp
index 23a3049..ff80698 100644
--- a/dcs/src/main/resources/dcs-webapps/master/aggr_querystats.jsp
+++ b/dcs/src/main/resources/dcs-webapps/master/aggr_querystats.jsp
@@ -2,20 +2,23 @@
 /**
  * @@@ START COPYRIGHT @@@  
  *
- * (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.                                                
- *                                                                                 
+ * 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/61030521/dcs/src/main/resources/dcs-webapps/master/css/Spacetree.css
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/master/css/Spacetree.css b/dcs/src/main/resources/dcs-webapps/master/css/Spacetree.css
index e11013e..f928074 100644
--- a/dcs/src/main/resources/dcs-webapps/master/css/Spacetree.css
+++ b/dcs/src/main/resources/dcs-webapps/master/css/Spacetree.css
@@ -1,19 +1,22 @@
 /* @@@ START COPYRIGHT @@@
-**
-** (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.
-**
+/*
+/* 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 @@@ */
 .jit-autoadjust-label {
   padding: 15px;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/resources/dcs-webapps/master/css/base.css
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/master/css/base.css b/dcs/src/main/resources/dcs-webapps/master/css/base.css
index f664e9d..039a55a 100644
--- a/dcs/src/main/resources/dcs-webapps/master/css/base.css
+++ b/dcs/src/main/resources/dcs-webapps/master/css/base.css
@@ -1,19 +1,22 @@
 /* @@@ START COPYRIGHT @@@
-**
-** (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.
-**
+/*
+/* 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 @@@ */
 
 /*html, body {

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/resources/dcs-webapps/master/executeQuery.jsp
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/master/executeQuery.jsp b/dcs/src/main/resources/dcs-webapps/master/executeQuery.jsp
index ddae091..0ce2171 100644
--- a/dcs/src/main/resources/dcs-webapps/master/executeQuery.jsp
+++ b/dcs/src/main/resources/dcs-webapps/master/executeQuery.jsp
@@ -2,20 +2,23 @@
 /**
  * @@@ START COPYRIGHT @@@  
  *
- * (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.                                                
- *                                                                                 
+ * 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/61030521/dcs/src/main/resources/dcs-webapps/master/explain.html
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/master/explain.html b/dcs/src/main/resources/dcs-webapps/master/explain.html
index 03fad4c..d8ddd12 100644
--- a/dcs/src/main/resources/dcs-webapps/master/explain.html
+++ b/dcs/src/main/resources/dcs-webapps/master/explain.html
@@ -1,19 +1,22 @@
 <!-- @@@ START COPYRIGHT @@@                                                         -->
-<!--                                                                                 -->
-<!-- (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.                                                  -->
-<!--                                                                                 -->
+<!--
+<!-- 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 @@@                                                           -->
 
 <head>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/resources/dcs-webapps/master/index.html
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/master/index.html b/dcs/src/main/resources/dcs-webapps/master/index.html
index 69d5c75..a0661e1 100644
--- a/dcs/src/main/resources/dcs-webapps/master/index.html
+++ b/dcs/src/main/resources/dcs-webapps/master/index.html
@@ -1,19 +1,5 @@
 <!--
 /**
- *(C) Copyright 2013 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.
- */
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/resources/dcs-webapps/master/js/ExplainPlanView.js
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/master/js/ExplainPlanView.js b/dcs/src/main/resources/dcs-webapps/master/js/ExplainPlanView.js
index efb1c15..697dc02 100644
--- a/dcs/src/main/resources/dcs-webapps/master/js/ExplainPlanView.js
+++ b/dcs/src/main/resources/dcs-webapps/master/js/ExplainPlanView.js
@@ -1,20 +1,23 @@
 /**
  * @@@ START COPYRIGHT @@@  
- *
- * (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.                                                
- *                                                                                 
+ *
+ * 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 @@@     
  */
 var setRootNode = false;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/resources/dcs-webapps/master/logs.html
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/master/logs.html b/dcs/src/main/resources/dcs-webapps/master/logs.html
index aa9d7d2..8f00c51 100644
--- a/dcs/src/main/resources/dcs-webapps/master/logs.html
+++ b/dcs/src/main/resources/dcs-webapps/master/logs.html
@@ -1,19 +1,22 @@
 <!-- @@@ START COPYRIGHT @@@                                                         -->
-<!--                                                                                 -->
-<!-- (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.                                                  -->
-<!--                                                                                 -->
+<!--
+<!-- 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 @@@                                                           -->
 <body>
 <p> Place holder for log data </p>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/resources/dcs-webapps/master/master.jsp
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/master/master.jsp b/dcs/src/main/resources/dcs-webapps/master/master.jsp
index e23f39b..0fe30fa 100644
--- a/dcs/src/main/resources/dcs-webapps/master/master.jsp
+++ b/dcs/src/main/resources/dcs-webapps/master/master.jsp
@@ -1,19 +1,5 @@
 <%--
 /**
- *(C) Copyright 2013 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.
- */
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/resources/dcs-webapps/master/queryPlan.jsp
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/master/queryPlan.jsp b/dcs/src/main/resources/dcs-webapps/master/queryPlan.jsp
index d30c86b..51f74ce 100644
--- a/dcs/src/main/resources/dcs-webapps/master/queryPlan.jsp
+++ b/dcs/src/main/resources/dcs-webapps/master/queryPlan.jsp
@@ -2,20 +2,23 @@
 /**
  * @@@ START COPYRIGHT @@@  
  *
- * (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.                                                
- *                                                                                 
+ * 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/61030521/dcs/src/main/resources/dcs-webapps/master/querystats.html
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/master/querystats.html b/dcs/src/main/resources/dcs-webapps/master/querystats.html
index bbd7735..d7f2fdb 100644
--- a/dcs/src/main/resources/dcs-webapps/master/querystats.html
+++ b/dcs/src/main/resources/dcs-webapps/master/querystats.html
@@ -1,19 +1,22 @@
 <!-- @@@ START COPYRIGHT @@@                                                         -->
-<!--                                                                                 -->
-<!-- (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.                                                  -->
-<!--                                                                                 -->
+<!--
+<!-- 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 @@@                                                           -->
 <head>
 	<link type="text/css" href="datatables/css/jquery.dataTables_themeroller.css" rel="stylesheet" />

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/resources/dcs-webapps/master/querystats.jsp
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/master/querystats.jsp b/dcs/src/main/resources/dcs-webapps/master/querystats.jsp
index da83d53..4f1e668 100644
--- a/dcs/src/main/resources/dcs-webapps/master/querystats.jsp
+++ b/dcs/src/main/resources/dcs-webapps/master/querystats.jsp
@@ -1,22 +1,25 @@
 <%--
 /**
- * @@@ START COPYRIGHT @@@  
+ *@@@ START COPYRIGHT @@@
  *
- * (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.                                                
- *                                                                                 
- * @@@ END 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 @@@
  */
 --%>
 <%@ taglib uri="http://displaytag.sf.net" prefix="display" %>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/resources/dcs-webapps/master/repository.jsp
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/master/repository.jsp b/dcs/src/main/resources/dcs-webapps/master/repository.jsp
index d94b954..bf748fa 100644
--- a/dcs/src/main/resources/dcs-webapps/master/repository.jsp
+++ b/dcs/src/main/resources/dcs-webapps/master/repository.jsp
@@ -2,20 +2,23 @@
 /**
  * @@@ START COPYRIGHT @@@  
  *
- * (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.                                                
- *                                                                                 
+ * 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/61030521/dcs/src/main/resources/dcs-webapps/master/servers.jsp
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/master/servers.jsp b/dcs/src/main/resources/dcs-webapps/master/servers.jsp
index 472449b..0e6316d 100644
--- a/dcs/src/main/resources/dcs-webapps/master/servers.jsp
+++ b/dcs/src/main/resources/dcs-webapps/master/servers.jsp
@@ -1,20 +1,7 @@
 <%--
 /**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
+ * @@@ START COPYRIGHT @@@
  *
- * 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.
- */
-/**
  * 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
@@ -23,13 +10,16 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * @@@ END COPYRIGHT @@@
  */
 --%>
 <%@ taglib uri="http://displaytag.sf.net" prefix="display" %>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/resources/dcs-webapps/master/sessions.html
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/master/sessions.html b/dcs/src/main/resources/dcs-webapps/master/sessions.html
index 6f2795b..c2af17f 100644
--- a/dcs/src/main/resources/dcs-webapps/master/sessions.html
+++ b/dcs/src/main/resources/dcs-webapps/master/sessions.html
@@ -1,19 +1,22 @@
 <!-- @@@ START COPYRIGHT @@@                                                         -->
-<!--                                                                                 -->
-<!-- (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.                                                  -->
-<!--                                                                                 -->
+<!--
+<!-- 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 @@@                                                           -->
 <head>
 	<link type="text/css" href="datatables/css/jquery.dataTables_themeroller.css" rel="stylesheet" />