You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2014/07/14 16:29:09 UTC

[1/6] Cleanup licenses in core with com.mycila:license-maven-plugin:format

Repository: cloudstack
Updated Branches:
  refs/heads/master 778e04cb7 -> a49bb7e8e


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/storage/template/VmdkProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/VmdkProcessor.java b/core/src/com/cloud/storage/template/VmdkProcessor.java
index 2c08447..ee4f819 100644
--- a/core/src/com/cloud/storage/template/VmdkProcessor.java
+++ b/core/src/com/cloud/storage/template/VmdkProcessor.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.storage.template;
 
 import java.io.BufferedReader;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/org/apache/cloudstack/storage/command/AttachAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/command/AttachAnswer.java b/core/src/org/apache/cloudstack/storage/command/AttachAnswer.java
index 5a26d4a..8073689 100644
--- a/core/src/org/apache/cloudstack/storage/command/AttachAnswer.java
+++ b/core/src/org/apache/cloudstack/storage/command/AttachAnswer.java
@@ -1,21 +1,22 @@
-/*
- * 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.
- */
+//
+// 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.
+//
+
 package org.apache.cloudstack.storage.command;
 
 import com.cloud.agent.api.Answer;
@@ -30,7 +31,7 @@ public class AttachAnswer extends Answer {
 
     public AttachAnswer(DiskTO disk) {
         super(null);
-        this.setDisk(disk);
+        setDisk(disk);
     }
 
     public AttachAnswer(String errMsg) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/org/apache/cloudstack/storage/command/AttachCommand.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/command/AttachCommand.java b/core/src/org/apache/cloudstack/storage/command/AttachCommand.java
index 303457b..795deb2 100644
--- a/core/src/org/apache/cloudstack/storage/command/AttachCommand.java
+++ b/core/src/org/apache/cloudstack/storage/command/AttachCommand.java
@@ -1,21 +1,22 @@
-/*
- * 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.
- */
+//
+// 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.
+//
+
 package org.apache.cloudstack.storage.command;
 
 import com.cloud.agent.api.Command;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreAnswer.java b/core/src/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreAnswer.java
index 6d5bbaf..0c1f170 100644
--- a/core/src/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreAnswer.java
+++ b/core/src/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreAnswer.java
@@ -1,21 +1,22 @@
-/*
- * 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.
- */
+//
+// 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.
+//
+
 package org.apache.cloudstack.storage.command;
 
 import com.cloud.agent.api.Answer;
@@ -35,7 +36,7 @@ public class AttachPrimaryDataStoreAnswer extends Answer {
     }
 
     public String getUuid() {
-        return this.uuid;
+        return uuid;
     }
 
     public void setCapacity(long capacity) {
@@ -43,7 +44,7 @@ public class AttachPrimaryDataStoreAnswer extends Answer {
     }
 
     public long getCapacity() {
-        return this.capacity;
+        return capacity;
     }
 
     public void setAvailable(long avail) {
@@ -51,6 +52,6 @@ public class AttachPrimaryDataStoreAnswer extends Answer {
     }
 
     public long getAvailable() {
-        return this.avail;
+        return avail;
     }
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreCmd.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreCmd.java b/core/src/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreCmd.java
index 25679ba..4a72c97 100644
--- a/core/src/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreCmd.java
+++ b/core/src/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreCmd.java
@@ -1,21 +1,22 @@
-/*
- * 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.
- */
+//
+// 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.
+//
+
 package org.apache.cloudstack.storage.command;
 
 import com.cloud.agent.api.Command;
@@ -30,11 +31,11 @@ public final class AttachPrimaryDataStoreCmd extends Command implements StorageS
 
     public AttachPrimaryDataStoreCmd(String uri) {
         super();
-        this.dataStore = uri;
+        dataStore = uri;
     }
 
     public String getDataStore() {
-        return this.dataStore;
+        return dataStore;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/org/apache/cloudstack/storage/command/CopyCmdAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/command/CopyCmdAnswer.java b/core/src/org/apache/cloudstack/storage/command/CopyCmdAnswer.java
index 95c0e89..9b581de 100644
--- a/core/src/org/apache/cloudstack/storage/command/CopyCmdAnswer.java
+++ b/core/src/org/apache/cloudstack/storage/command/CopyCmdAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package org.apache.cloudstack.storage.command;
 
 import com.cloud.agent.api.Answer;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/org/apache/cloudstack/storage/command/CopyCommand.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/command/CopyCommand.java b/core/src/org/apache/cloudstack/storage/command/CopyCommand.java
index 96822a4..08b4b51 100644
--- a/core/src/org/apache/cloudstack/storage/command/CopyCommand.java
+++ b/core/src/org/apache/cloudstack/storage/command/CopyCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package org.apache.cloudstack.storage.command;
 
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/org/apache/cloudstack/storage/command/CreateObjectAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/command/CreateObjectAnswer.java b/core/src/org/apache/cloudstack/storage/command/CreateObjectAnswer.java
index b0c4744..b6dcfb7 100644
--- a/core/src/org/apache/cloudstack/storage/command/CreateObjectAnswer.java
+++ b/core/src/org/apache/cloudstack/storage/command/CreateObjectAnswer.java
@@ -1,21 +1,22 @@
-/*
- * 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.
- */
+//
+// 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.
+//
+
 package org.apache.cloudstack.storage.command;
 
 import com.cloud.agent.api.Answer;
@@ -34,7 +35,7 @@ public final class CreateObjectAnswer extends Answer {
     }
 
     public DataTO getData() {
-        return this.data;
+        return data;
     }
 
     public CreateObjectAnswer(String errMsg) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/org/apache/cloudstack/storage/command/CreateObjectCommand.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/command/CreateObjectCommand.java b/core/src/org/apache/cloudstack/storage/command/CreateObjectCommand.java
index 8c239b5..6079a95 100644
--- a/core/src/org/apache/cloudstack/storage/command/CreateObjectCommand.java
+++ b/core/src/org/apache/cloudstack/storage/command/CreateObjectCommand.java
@@ -1,21 +1,22 @@
-/*
- * 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.
- */
+//
+// 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.
+//
+
 package org.apache.cloudstack.storage.command;
 
 import com.cloud.agent.api.Command;
@@ -26,7 +27,7 @@ public final class CreateObjectCommand extends Command implements StorageSubSyst
 
     public CreateObjectCommand(DataTO obj) {
         super();
-        this.data = obj;
+        data = obj;
     }
 
     protected CreateObjectCommand() {
@@ -39,7 +40,7 @@ public final class CreateObjectCommand extends Command implements StorageSubSyst
     }
 
     public DataTO getData() {
-        return this.data;
+        return data;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/org/apache/cloudstack/storage/command/CreatePrimaryDataStoreCmd.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/command/CreatePrimaryDataStoreCmd.java b/core/src/org/apache/cloudstack/storage/command/CreatePrimaryDataStoreCmd.java
index 21716cf..0017dd2 100644
--- a/core/src/org/apache/cloudstack/storage/command/CreatePrimaryDataStoreCmd.java
+++ b/core/src/org/apache/cloudstack/storage/command/CreatePrimaryDataStoreCmd.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package org.apache.cloudstack.storage.command;
 
 import com.cloud.agent.api.Command;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/org/apache/cloudstack/storage/command/DeleteCommand.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/command/DeleteCommand.java b/core/src/org/apache/cloudstack/storage/command/DeleteCommand.java
index 7445050..5683f41 100644
--- a/core/src/org/apache/cloudstack/storage/command/DeleteCommand.java
+++ b/core/src/org/apache/cloudstack/storage/command/DeleteCommand.java
@@ -1,21 +1,22 @@
-/*
- * 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.
- */
+//
+// 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.
+//
+
 package org.apache.cloudstack.storage.command;
 
 import com.cloud.agent.api.Command;
@@ -39,7 +40,7 @@ public final class DeleteCommand extends Command implements StorageSubSystemComm
     }
 
     public DataTO getData() {
-        return this.data;
+        return data;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/org/apache/cloudstack/storage/command/DettachAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/command/DettachAnswer.java b/core/src/org/apache/cloudstack/storage/command/DettachAnswer.java
index 62ce246..a28f47c 100644
--- a/core/src/org/apache/cloudstack/storage/command/DettachAnswer.java
+++ b/core/src/org/apache/cloudstack/storage/command/DettachAnswer.java
@@ -1,21 +1,22 @@
-/*
- * 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.
- */
+//
+// 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.
+//
+
 package org.apache.cloudstack.storage.command;
 
 import com.cloud.agent.api.Answer;
@@ -30,7 +31,7 @@ public final class DettachAnswer extends Answer {
 
     public DettachAnswer(DiskTO disk) {
         super(null);
-        this.setDisk(disk);
+        setDisk(disk);
     }
 
     public DettachAnswer(String errMsg) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/org/apache/cloudstack/storage/command/DettachCommand.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/command/DettachCommand.java b/core/src/org/apache/cloudstack/storage/command/DettachCommand.java
index 1e501d9..b699862 100644
--- a/core/src/org/apache/cloudstack/storage/command/DettachCommand.java
+++ b/core/src/org/apache/cloudstack/storage/command/DettachCommand.java
@@ -1,21 +1,22 @@
-/*
- * 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.
- */
+//
+// 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.
+//
+
 package org.apache.cloudstack.storage.command;
 
 import com.cloud.agent.api.Command;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/org/apache/cloudstack/storage/command/DownloadCommand.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/command/DownloadCommand.java b/core/src/org/apache/cloudstack/storage/command/DownloadCommand.java
index c12d4d0..db637c1 100644
--- a/core/src/org/apache/cloudstack/storage/command/DownloadCommand.java
+++ b/core/src/org/apache/cloudstack/storage/command/DownloadCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package org.apache.cloudstack.storage.command;
 
 import org.apache.cloudstack.api.InternalIdentity;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/org/apache/cloudstack/storage/command/DownloadProgressCommand.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/command/DownloadProgressCommand.java b/core/src/org/apache/cloudstack/storage/command/DownloadProgressCommand.java
index 082c932..b6bcfbb 100644
--- a/core/src/org/apache/cloudstack/storage/command/DownloadProgressCommand.java
+++ b/core/src/org/apache/cloudstack/storage/command/DownloadProgressCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package org.apache.cloudstack.storage.command;
 
 public class DownloadProgressCommand extends DownloadCommand {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/org/apache/cloudstack/storage/command/ForgetObjectCmd.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/command/ForgetObjectCmd.java b/core/src/org/apache/cloudstack/storage/command/ForgetObjectCmd.java
index 981a098..9bcaa62 100644
--- a/core/src/org/apache/cloudstack/storage/command/ForgetObjectCmd.java
+++ b/core/src/org/apache/cloudstack/storage/command/ForgetObjectCmd.java
@@ -1,21 +1,22 @@
-/*
- * 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.
- */
+//
+// 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.
+//
+
 package org.apache.cloudstack.storage.command;
 
 import com.cloud.agent.api.Command;
@@ -25,11 +26,11 @@ public class ForgetObjectCmd extends Command implements StorageSubSystemCommand
     private DataTO dataTO;
 
     public ForgetObjectCmd(DataTO data) {
-        this.dataTO = data;
+        dataTO = data;
     }
 
     public DataTO getDataTO() {
-        return this.dataTO;
+        return dataTO;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/org/apache/cloudstack/storage/command/IntroduceObjectAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/command/IntroduceObjectAnswer.java b/core/src/org/apache/cloudstack/storage/command/IntroduceObjectAnswer.java
index 9f76b18..8fa23a4 100644
--- a/core/src/org/apache/cloudstack/storage/command/IntroduceObjectAnswer.java
+++ b/core/src/org/apache/cloudstack/storage/command/IntroduceObjectAnswer.java
@@ -1,21 +1,22 @@
-/*
- * 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.
- */
+//
+// 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.
+//
+
 package org.apache.cloudstack.storage.command;
 
 import com.cloud.agent.api.Answer;
@@ -29,6 +30,6 @@ public class IntroduceObjectAnswer extends Answer {
     }
 
     public DataTO getDataTO() {
-        return this.dataTO;
+        return dataTO;
     }
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/org/apache/cloudstack/storage/command/IntroduceObjectCmd.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/command/IntroduceObjectCmd.java b/core/src/org/apache/cloudstack/storage/command/IntroduceObjectCmd.java
index b463b2c..c20c50f 100644
--- a/core/src/org/apache/cloudstack/storage/command/IntroduceObjectCmd.java
+++ b/core/src/org/apache/cloudstack/storage/command/IntroduceObjectCmd.java
@@ -1,21 +1,22 @@
-/*
- * 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.
- */
+//
+// 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.
+//
+
 package org.apache.cloudstack.storage.command;
 
 import com.cloud.agent.api.Command;
@@ -29,7 +30,7 @@ public class IntroduceObjectCmd extends Command implements StorageSubSystemComma
     }
 
     public DataTO getDataTO() {
-        return this.dataTO;
+        return dataTO;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/org/apache/cloudstack/storage/command/StorageSubSystemCommand.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/command/StorageSubSystemCommand.java b/core/src/org/apache/cloudstack/storage/command/StorageSubSystemCommand.java
index fb7b373..5893f62 100644
--- a/core/src/org/apache/cloudstack/storage/command/StorageSubSystemCommand.java
+++ b/core/src/org/apache/cloudstack/storage/command/StorageSubSystemCommand.java
@@ -1,21 +1,22 @@
-/*
- * 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.
- */
+//
+// 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.
+//
+
 package org.apache.cloudstack.storage.command;
 
 public interface StorageSubSystemCommand {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/org/apache/cloudstack/storage/to/ImageStoreTO.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/to/ImageStoreTO.java b/core/src/org/apache/cloudstack/storage/to/ImageStoreTO.java
index 09ac2d8..046a2ab 100644
--- a/core/src/org/apache/cloudstack/storage/to/ImageStoreTO.java
+++ b/core/src/org/apache/cloudstack/storage/to/ImageStoreTO.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package org.apache.cloudstack.storage.to;
 
 import org.apache.cloudstack.storage.image.datastore.ImageStoreInfo;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/org/apache/cloudstack/storage/to/PrimaryDataStoreTO.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/to/PrimaryDataStoreTO.java b/core/src/org/apache/cloudstack/storage/to/PrimaryDataStoreTO.java
index c3c9f8c..a69f357 100644
--- a/core/src/org/apache/cloudstack/storage/to/PrimaryDataStoreTO.java
+++ b/core/src/org/apache/cloudstack/storage/to/PrimaryDataStoreTO.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package org.apache.cloudstack.storage.to;
 
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java b/core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java
index 7d1ac2d..c62110b 100644
--- a/core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java
+++ b/core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package org.apache.cloudstack.storage.to;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/org/apache/cloudstack/storage/to/TemplateObjectTO.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/to/TemplateObjectTO.java b/core/src/org/apache/cloudstack/storage/to/TemplateObjectTO.java
index b201c38..aa85401 100644
--- a/core/src/org/apache/cloudstack/storage/to/TemplateObjectTO.java
+++ b/core/src/org/apache/cloudstack/storage/to/TemplateObjectTO.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package org.apache.cloudstack.storage.to;
 
 import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/org/apache/cloudstack/storage/to/VolumeObjectTO.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/to/VolumeObjectTO.java b/core/src/org/apache/cloudstack/storage/to/VolumeObjectTO.java
index f700854..509cc3a 100644
--- a/core/src/org/apache/cloudstack/storage/to/VolumeObjectTO.java
+++ b/core/src/org/apache/cloudstack/storage/to/VolumeObjectTO.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package org.apache.cloudstack.storage.to;
 
 import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
----------------------------------------------------------------------
diff --git a/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java b/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
index 908af45..fc1e3f5 100644
--- a/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
+++ b/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.resource.virtualnetwork;
 
 import static org.junit.Assert.assertEquals;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/test/com/cloud/agent/transport/RequestTest.java
----------------------------------------------------------------------
diff --git a/core/test/com/cloud/agent/transport/RequestTest.java b/core/test/com/cloud/agent/transport/RequestTest.java
index 6ee0eda..ee3b082 100644
--- a/core/test/com/cloud/agent/transport/RequestTest.java
+++ b/core/test/com/cloud/agent/transport/RequestTest.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.transport;
 
 import java.nio.ByteBuffer;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/test/com/cloud/network/HAProxyConfiguratorTest.java
----------------------------------------------------------------------
diff --git a/core/test/com/cloud/network/HAProxyConfiguratorTest.java b/core/test/com/cloud/network/HAProxyConfiguratorTest.java
index 33cf50b..67321a4 100644
--- a/core/test/com/cloud/network/HAProxyConfiguratorTest.java
+++ b/core/test/com/cloud/network/HAProxyConfiguratorTest.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.network;
 
 import static org.junit.Assert.assertTrue;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/test/org/apache/cloudstack/api/agent/test/AgentControlAnswerTest.java
----------------------------------------------------------------------
diff --git a/core/test/org/apache/cloudstack/api/agent/test/AgentControlAnswerTest.java b/core/test/org/apache/cloudstack/api/agent/test/AgentControlAnswerTest.java
index d0e8b4c..ffa1be0 100644
--- a/core/test/org/apache/cloudstack/api/agent/test/AgentControlAnswerTest.java
+++ b/core/test/org/apache/cloudstack/api/agent/test/AgentControlAnswerTest.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package org.apache.cloudstack.api.agent.test;
 
 import static org.junit.Assert.assertFalse;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/test/org/apache/cloudstack/api/agent/test/AgentControlCommandTest.java
----------------------------------------------------------------------
diff --git a/core/test/org/apache/cloudstack/api/agent/test/AgentControlCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/AgentControlCommandTest.java
index 24d0fe5..2181add 100644
--- a/core/test/org/apache/cloudstack/api/agent/test/AgentControlCommandTest.java
+++ b/core/test/org/apache/cloudstack/api/agent/test/AgentControlCommandTest.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package org.apache.cloudstack.api.agent.test;
 
 import static org.junit.Assert.assertFalse;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/test/org/apache/cloudstack/api/agent/test/AnswerTest.java
----------------------------------------------------------------------
diff --git a/core/test/org/apache/cloudstack/api/agent/test/AnswerTest.java b/core/test/org/apache/cloudstack/api/agent/test/AnswerTest.java
index 760aa20..c685d68 100644
--- a/core/test/org/apache/cloudstack/api/agent/test/AnswerTest.java
+++ b/core/test/org/apache/cloudstack/api/agent/test/AnswerTest.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package org.apache.cloudstack.api.agent.test;
 
 import static org.junit.Assert.assertFalse;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/test/org/apache/cloudstack/api/agent/test/AttachIsoCommandTest.java
----------------------------------------------------------------------
diff --git a/core/test/org/apache/cloudstack/api/agent/test/AttachIsoCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/AttachIsoCommandTest.java
index d189d9c..124762b 100644
--- a/core/test/org/apache/cloudstack/api/agent/test/AttachIsoCommandTest.java
+++ b/core/test/org/apache/cloudstack/api/agent/test/AttachIsoCommandTest.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package org.apache.cloudstack.api.agent.test;
 
 import static org.junit.Assert.assertEquals;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/test/org/apache/cloudstack/api/agent/test/AttachVolumeAnswerTest.java
----------------------------------------------------------------------
diff --git a/core/test/org/apache/cloudstack/api/agent/test/AttachVolumeAnswerTest.java b/core/test/org/apache/cloudstack/api/agent/test/AttachVolumeAnswerTest.java
index 6f4312d..3390fd1 100644
--- a/core/test/org/apache/cloudstack/api/agent/test/AttachVolumeAnswerTest.java
+++ b/core/test/org/apache/cloudstack/api/agent/test/AttachVolumeAnswerTest.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package org.apache.cloudstack.api.agent.test;
 
 import static org.junit.Assert.assertEquals;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/test/org/apache/cloudstack/api/agent/test/AttachVolumeCommandTest.java
----------------------------------------------------------------------
diff --git a/core/test/org/apache/cloudstack/api/agent/test/AttachVolumeCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/AttachVolumeCommandTest.java
index 68135aa..17dab23 100644
--- a/core/test/org/apache/cloudstack/api/agent/test/AttachVolumeCommandTest.java
+++ b/core/test/org/apache/cloudstack/api/agent/test/AttachVolumeCommandTest.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package org.apache.cloudstack.api.agent.test;
 
 import static org.junit.Assert.assertEquals;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotAnswerTest.java
----------------------------------------------------------------------
diff --git a/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotAnswerTest.java b/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotAnswerTest.java
index 4411c47..14a1865 100644
--- a/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotAnswerTest.java
+++ b/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotAnswerTest.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package org.apache.cloudstack.api.agent.test;
 
 import static org.junit.Assert.assertFalse;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java
----------------------------------------------------------------------
diff --git a/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java
index 33361e8..bdcda38 100644
--- a/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java
+++ b/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package org.apache.cloudstack.api.agent.test;
 
 import static org.junit.Assert.assertEquals;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/test/org/apache/cloudstack/api/agent/test/BumpUpPriorityCommandTest.java
----------------------------------------------------------------------
diff --git a/core/test/org/apache/cloudstack/api/agent/test/BumpUpPriorityCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/BumpUpPriorityCommandTest.java
index f15cc76..cf30463 100644
--- a/core/test/org/apache/cloudstack/api/agent/test/BumpUpPriorityCommandTest.java
+++ b/core/test/org/apache/cloudstack/api/agent/test/BumpUpPriorityCommandTest.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package org.apache.cloudstack.api.agent.test;
 
 import static org.junit.Assert.assertFalse;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/test/org/apache/cloudstack/api/agent/test/CancelCommandTest.java
----------------------------------------------------------------------
diff --git a/core/test/org/apache/cloudstack/api/agent/test/CancelCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/CancelCommandTest.java
index 19827fd..65fc5bc 100644
--- a/core/test/org/apache/cloudstack/api/agent/test/CancelCommandTest.java
+++ b/core/test/org/apache/cloudstack/api/agent/test/CancelCommandTest.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package org.apache.cloudstack.api.agent.test;
 
 import static org.junit.Assert.assertFalse;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/test/org/apache/cloudstack/api/agent/test/ChangeAgentAnswerTest.java
----------------------------------------------------------------------
diff --git a/core/test/org/apache/cloudstack/api/agent/test/ChangeAgentAnswerTest.java b/core/test/org/apache/cloudstack/api/agent/test/ChangeAgentAnswerTest.java
index 4e6b2e2..c170396 100644
--- a/core/test/org/apache/cloudstack/api/agent/test/ChangeAgentAnswerTest.java
+++ b/core/test/org/apache/cloudstack/api/agent/test/ChangeAgentAnswerTest.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package org.apache.cloudstack.api.agent.test;
 
 import static org.junit.Assert.assertFalse;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/test/org/apache/cloudstack/api/agent/test/ChangeAgentCommandTest.java
----------------------------------------------------------------------
diff --git a/core/test/org/apache/cloudstack/api/agent/test/ChangeAgentCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/ChangeAgentCommandTest.java
index 654e4e1..7727606 100644
--- a/core/test/org/apache/cloudstack/api/agent/test/ChangeAgentCommandTest.java
+++ b/core/test/org/apache/cloudstack/api/agent/test/ChangeAgentCommandTest.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package org.apache.cloudstack.api.agent.test;
 
 import static org.junit.Assert.assertEquals;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/test/org/apache/cloudstack/api/agent/test/CheckHealthAnswerTest.java
----------------------------------------------------------------------
diff --git a/core/test/org/apache/cloudstack/api/agent/test/CheckHealthAnswerTest.java b/core/test/org/apache/cloudstack/api/agent/test/CheckHealthAnswerTest.java
index 6fa94f9..9c00f79 100644
--- a/core/test/org/apache/cloudstack/api/agent/test/CheckHealthAnswerTest.java
+++ b/core/test/org/apache/cloudstack/api/agent/test/CheckHealthAnswerTest.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package org.apache.cloudstack.api.agent.test;
 
 import static org.junit.Assert.assertFalse;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/test/org/apache/cloudstack/api/agent/test/CheckHealthCommandTest.java
----------------------------------------------------------------------
diff --git a/core/test/org/apache/cloudstack/api/agent/test/CheckHealthCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/CheckHealthCommandTest.java
index 1b565a5..a330eb4 100644
--- a/core/test/org/apache/cloudstack/api/agent/test/CheckHealthCommandTest.java
+++ b/core/test/org/apache/cloudstack/api/agent/test/CheckHealthCommandTest.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package org.apache.cloudstack.api.agent.test;
 
 import static org.junit.Assert.assertFalse;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java
----------------------------------------------------------------------
diff --git a/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java b/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java
index 66feaec..d6f0bfc 100644
--- a/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java
+++ b/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package org.apache.cloudstack.api.agent.test;
 
 import static org.junit.Assert.assertEquals;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkCommandTest.java
----------------------------------------------------------------------
diff --git a/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkCommandTest.java
index 122cac4..f29b050 100644
--- a/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkCommandTest.java
+++ b/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkCommandTest.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package org.apache.cloudstack.api.agent.test;
 
 import static org.junit.Assert.assertEquals;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java
----------------------------------------------------------------------
diff --git a/core/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java
index 9edbf10..72ec83a 100644
--- a/core/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java
+++ b/core/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package org.apache.cloudstack.api.agent.test;
 
 import static org.junit.Assert.assertFalse;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java
----------------------------------------------------------------------
diff --git a/core/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java
index 114c885..629669a 100644
--- a/core/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java
+++ b/core/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package org.apache.cloudstack.api.agent.test;
 
 import static org.junit.Assert.assertEquals;


[5/6] git commit: updated refs/heads/master to a49bb7e

Posted by hu...@apache.org.
Cleanup licenses in core with com.mycila:license-maven-plugin:format


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a49bb7e8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a49bb7e8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a49bb7e8

Branch: refs/heads/master
Commit: a49bb7e8e3a3f6e7dd7dbc4ac3d8cf55fd696819
Parents: 109d129
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Mon Jul 14 16:24:22 2014 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Mon Jul 14 16:28:29 2014 +0200

----------------------------------------------------------------------
 .../cloudstack/allocator/module.properties      |  3 ++
 .../allocator/spring-core-allocator-context.xml | 30 +++++++-------
 ...-lifecycle-allocator-context-inheritable.xml | 30 +++++++-------
 .../META-INF/cloudstack/api/module.properties   |  3 ++
 ...g-core-lifecycle-api-context-inheritable.xml | 34 ++++++++--------
 .../cloudstack/backend/module.properties        |  3 ++
 .../cloudstack/bootstrap/module.properties      |  3 ++
 .../spring-bootstrap-context-inheritable.xml    | 30 +++++++-------
 .../bootstrap/spring-bootstrap-context.xml      | 30 +++++++-------
 .../cloudstack/compute/module.properties        |  3 ++
 ...re-lifecycle-compute-context-inheritable.xml | 34 ++++++++--------
 .../META-INF/cloudstack/core/module.properties  |  3 ++
 .../cloudstack/core/spring-core-context.xml     | 30 +++++++-------
 ...-core-lifecycle-core-context-inheritable.xml | 30 +++++++-------
 .../core/spring-core-registry-core-context.xml  | 34 ++++++++--------
 .../cloudstack/discoverer/module.properties     |  3 ++
 ...lifecycle-discoverer-context-inheritable.xml | 30 +++++++-------
 .../cloudstack/network/module.properties        |  3 ++
 ...re-lifecycle-network-context-inheritable.xml | 34 ++++++++--------
 .../cloudstack/planner/module.properties        |  3 ++
 ...re-lifecycle-planner-context-inheritable.xml | 34 ++++++++--------
 .../cloudstack/storage/module.properties        |  3 ++
 ...ng-lifecycle-storage-context-inheritable.xml | 30 +++++++-------
 .../cloudstack/system/module.properties         |  3 ++
 .../spring-core-system-context-inheritable.xml  | 30 +++++++-------
 .../system/spring-core-system-context.xml       | 30 +++++++-------
 core/src/com/cloud/agent/IAgentControl.java     |  3 ++
 .../com/cloud/agent/IAgentControlListener.java  |  3 ++
 .../cloud/agent/StartupCommandProcessor.java    |  3 ++
 .../com/cloud/agent/api/AgentControlAnswer.java |  3 ++
 .../cloud/agent/api/AgentControlCommand.java    |  3 ++
 .../com/cloud/agent/api/AttachIsoCommand.java   |  3 ++
 .../com/cloud/agent/api/AttachVolumeAnswer.java |  3 ++
 .../cloud/agent/api/AttachVolumeCommand.java    |  3 ++
 .../cloud/agent/api/BackupSnapshotAnswer.java   |  3 ++
 .../cloud/agent/api/BackupSnapshotCommand.java  |  3 ++
 .../cloud/agent/api/BumpUpPriorityCommand.java  |  3 ++
 core/src/com/cloud/agent/api/CancelCommand.java |  3 ++
 .../com/cloud/agent/api/ChangeAgentAnswer.java  |  3 ++
 .../com/cloud/agent/api/ChangeAgentCommand.java |  3 ++
 .../com/cloud/agent/api/CheckHealthAnswer.java  |  3 ++
 .../com/cloud/agent/api/CheckHealthCommand.java |  3 ++
 .../com/cloud/agent/api/CheckNetworkAnswer.java |  3 ++
 .../cloud/agent/api/CheckNetworkCommand.java    |  3 ++
 .../com/cloud/agent/api/CheckOnHostAnswer.java  |  3 ++
 .../com/cloud/agent/api/CheckOnHostCommand.java |  3 ++
 .../com/cloud/agent/api/CheckRouterAnswer.java  |  3 ++
 .../com/cloud/agent/api/CheckRouterCommand.java |  3 ++
 .../agent/api/CheckS2SVpnConnectionsAnswer.java |  3 ++
 .../api/CheckS2SVpnConnectionsCommand.java      |  3 ++
 .../com/cloud/agent/api/CheckStateAnswer.java   |  3 ++
 .../com/cloud/agent/api/CheckStateCommand.java  |  3 ++
 .../agent/api/CheckVirtualMachineAnswer.java    |  3 ++
 .../agent/api/CheckVirtualMachineCommand.java   |  3 ++
 .../cloud/agent/api/CleanupNetworkRulesCmd.java |  3 ++
 .../agent/api/ClusterVMMetaDataSyncAnswer.java  |  3 ++
 .../agent/api/ClusterVMMetaDataSyncCommand.java |  3 ++
 .../cloud/agent/api/ComputeChecksumCommand.java |  3 ++
 .../api/ConsoleAccessAuthenticationAnswer.java  |  3 ++
 .../api/ConsoleAccessAuthenticationCommand.java |  3 ++
 .../api/ConsoleProxyLoadReportCommand.java      |  3 ++
 ...reatePrivateTemplateFromSnapshotCommand.java |  3 ++
 .../CreatePrivateTemplateFromVolumeCommand.java |  3 ++
 .../agent/api/CreateStoragePoolCommand.java     |  3 ++
 .../cloud/agent/api/CreateVMSnapshotAnswer.java |  2 +
 .../agent/api/CreateVMSnapshotCommand.java      |  3 ++
 .../api/CreateVolumeFromSnapshotAnswer.java     |  3 ++
 .../api/CreateVolumeFromSnapshotCommand.java    |  3 ++
 .../api/CreateVolumeFromVMSnapshotAnswer.java   |  2 +
 .../api/CreateVolumeFromVMSnapshotCommand.java  |  3 ++
 core/src/com/cloud/agent/api/CronCommand.java   |  3 ++
 .../agent/api/DeleteSnapshotsDirCommand.java    |  3 ++
 .../agent/api/DeleteStoragePoolCommand.java     |  3 ++
 .../cloud/agent/api/DeleteVMSnapshotAnswer.java |  3 ++
 .../agent/api/DeleteVMSnapshotCommand.java      |  5 ++-
 .../agent/api/DirectNetworkUsageAnswer.java     |  3 ++
 .../agent/api/DirectNetworkUsageCommand.java    |  3 ++
 .../api/ExternalNetworkResourceUsageAnswer.java |  3 ++
 .../ExternalNetworkResourceUsageCommand.java    |  3 ++
 core/src/com/cloud/agent/api/FenceAnswer.java   |  3 ++
 core/src/com/cloud/agent/api/FenceCommand.java  |  3 ++
 .../cloud/agent/api/GetDomRVersionAnswer.java   |  3 ++
 .../com/cloud/agent/api/GetDomRVersionCmd.java  |  3 ++
 .../com/cloud/agent/api/GetFileStatsAnswer.java |  3 ++
 .../cloud/agent/api/GetFileStatsCommand.java    |  3 ++
 .../com/cloud/agent/api/GetGPUStatsAnswer.java  | 31 +++++++-------
 .../com/cloud/agent/api/GetGPUStatsCommand.java | 31 +++++++-------
 .../com/cloud/agent/api/GetHostStatsAnswer.java |  3 ++
 .../cloud/agent/api/GetHostStatsCommand.java    |  3 ++
 .../cloud/agent/api/GetRouterAlertsAnswer.java  |  2 +
 .../cloud/agent/api/GetStorageStatsAnswer.java  |  3 ++
 .../cloud/agent/api/GetStorageStatsCommand.java |  3 ++
 .../com/cloud/agent/api/GetVmConfigAnswer.java  |  3 ++
 .../com/cloud/agent/api/GetVmConfigCommand.java |  3 ++
 .../cloud/agent/api/GetVmDiskStatsAnswer.java   |  3 ++
 .../cloud/agent/api/GetVmDiskStatsCommand.java  |  3 ++
 .../com/cloud/agent/api/GetVmStatsAnswer.java   |  3 ++
 .../com/cloud/agent/api/GetVmStatsCommand.java  |  3 ++
 .../com/cloud/agent/api/GetVncPortAnswer.java   |  3 ++
 .../com/cloud/agent/api/GetVncPortCommand.java  |  3 ++
 .../src/com/cloud/agent/api/HostStatsEntry.java |  3 ++
 .../src/com/cloud/agent/api/MaintainAnswer.java |  3 ++
 .../com/cloud/agent/api/MaintainCommand.java    |  3 ++
 .../cloud/agent/api/ManageSnapshotAnswer.java   |  3 ++
 .../cloud/agent/api/ManageSnapshotCommand.java  |  3 ++
 core/src/com/cloud/agent/api/MigrateAnswer.java |  3 ++
 .../src/com/cloud/agent/api/MigrateCommand.java |  3 ++
 .../agent/api/MigrateWithStorageAnswer.java     |  3 ++
 .../agent/api/MigrateWithStorageCommand.java    |  3 ++
 .../api/MigrateWithStorageCompleteAnswer.java   |  3 ++
 .../api/MigrateWithStorageCompleteCommand.java  |  3 ++
 .../api/MigrateWithStorageReceiveAnswer.java    |  3 ++
 .../api/MigrateWithStorageReceiveCommand.java   |  3 ++
 .../agent/api/MigrateWithStorageSendAnswer.java |  3 ++
 .../api/MigrateWithStorageSendCommand.java      |  3 ++
 .../cloud/agent/api/ModifySshKeysCommand.java   |  3 ++
 .../agent/api/ModifyStoragePoolAnswer.java      |  3 ++
 .../agent/api/ModifyStoragePoolCommand.java     |  3 ++
 .../agent/api/ModifyVmNicConfigAnswer.java      |  3 ++
 .../agent/api/ModifyVmNicConfigCommand.java     |  3 ++
 .../agent/api/NetworkRulesSystemVmCommand.java  |  3 ++
 .../api/NetworkRulesVmSecondaryIpCommand.java   |  3 ++
 .../com/cloud/agent/api/NetworkUsageAnswer.java |  3 ++
 .../cloud/agent/api/NetworkUsageCommand.java    |  3 ++
 .../agent/api/PerformanceMonitorAnswer.java     |  3 ++
 .../agent/api/PerformanceMonitorCommand.java    |  3 ++
 core/src/com/cloud/agent/api/PingAnswer.java    |  3 ++
 core/src/com/cloud/agent/api/PingCommand.java   |  3 ++
 .../com/cloud/agent/api/PingRoutingCommand.java |  3 ++
 .../api/PingRoutingWithNwGroupsCommand.java     |  3 ++
 .../agent/api/PingRoutingWithOvsCommand.java    |  3 ++
 .../com/cloud/agent/api/PingStorageCommand.java |  3 ++
 .../com/cloud/agent/api/PingTestCommand.java    |  3 ++
 core/src/com/cloud/agent/api/PlugNicAnswer.java |  3 ++
 .../src/com/cloud/agent/api/PlugNicCommand.java |  3 ++
 .../agent/api/PrepareForMigrationAnswer.java    |  3 ++
 .../agent/api/PrepareForMigrationCommand.java   |  3 ++
 .../agent/api/PrepareOCFS2NodesCommand.java     |  3 ++
 .../api/PropagateResourceEventCommand.java      |  3 ++
 core/src/com/cloud/agent/api/ReadyAnswer.java   |  3 ++
 core/src/com/cloud/agent/api/ReadyCommand.java  |  3 ++
 core/src/com/cloud/agent/api/RebootAnswer.java  |  3 ++
 core/src/com/cloud/agent/api/RebootCommand.java |  3 ++
 .../cloud/agent/api/RebootRouterCommand.java    |  3 ++
 .../agent/api/RecurringNetworkUsageAnswer.java  |  3 ++
 .../agent/api/RecurringNetworkUsageCommand.java |  3 ++
 .../agent/api/RevertToVMSnapshotAnswer.java     |  2 +
 .../agent/api/RevertToVMSnapshotCommand.java    |  3 ++
 core/src/com/cloud/agent/api/ScaleVmAnswer.java |  3 ++
 .../src/com/cloud/agent/api/ScaleVmCommand.java |  3 ++
 .../agent/api/ScheduleHostScanTaskCommand.java  |  3 ++
 .../agent/api/SecStorageFirewallCfgCommand.java |  3 ++
 .../cloud/agent/api/SecStorageSetupAnswer.java  |  3 ++
 .../cloud/agent/api/SecStorageSetupCommand.java |  3 ++
 .../agent/api/SecStorageVMSetupCommand.java     |  3 ++
 .../agent/api/SecurityGroupRuleAnswer.java      |  3 ++
 .../cloud/agent/api/SecurityGroupRulesCmd.java  |  3 ++
 core/src/com/cloud/agent/api/SetupAnswer.java   |  3 ++
 core/src/com/cloud/agent/api/SetupCommand.java  |  3 ++
 .../agent/api/SetupGuestNetworkCommand.java     |  3 ++
 .../com/cloud/agent/api/ShutdownCommand.java    |  3 ++
 .../com/cloud/agent/api/SnapshotCommand.java    |  3 ++
 core/src/com/cloud/agent/api/StartAnswer.java   |  3 ++
 core/src/com/cloud/agent/api/StartCommand.java  |  3 ++
 core/src/com/cloud/agent/api/StartupAnswer.java |  3 ++
 .../src/com/cloud/agent/api/StartupCommand.java |  3 ++
 .../agent/api/StartupExternalDhcpCommand.java   |  3 ++
 .../api/StartupExternalFirewallCommand.java     |  3 ++
 .../api/StartupExternalLoadBalancerCommand.java |  3 ++
 .../cloud/agent/api/StartupProxyCommand.java    |  3 ++
 .../agent/api/StartupPxeServerCommand.java      |  3 ++
 .../cloud/agent/api/StartupRoutingCommand.java  |  3 ++
 .../api/StartupSecondaryStorageCommand.java     |  3 ++
 .../cloud/agent/api/StartupStorageCommand.java  |  3 ++
 .../agent/api/StartupTrafficMonitorCommand.java |  3 ++
 .../cloud/agent/api/StartupVMMAgentCommand.java |  3 ++
 core/src/com/cloud/agent/api/StopAnswer.java    |  3 ++
 core/src/com/cloud/agent/api/StopCommand.java   |  3 ++
 .../cloud/agent/api/TransferAgentCommand.java   |  3 ++
 .../com/cloud/agent/api/UnPlugNicAnswer.java    |  3 ++
 .../com/cloud/agent/api/UnPlugNicCommand.java   |  3 ++
 .../cloud/agent/api/UnregisterNicCommand.java   |  3 ++
 .../cloud/agent/api/UnregisterVMCommand.java    |  3 ++
 .../agent/api/UpdateHostPasswordCommand.java    |  3 ++
 .../cloud/agent/api/UpgradeSnapshotCommand.java |  3 ++
 .../cloud/agent/api/VMSnapshotBaseCommand.java  |  2 +
 core/src/com/cloud/agent/api/VMSnapshotTO.java  |  3 ++
 .../cloud/agent/api/ValidateSnapshotAnswer.java |  3 ++
 .../agent/api/ValidateSnapshotCommand.java      |  3 ++
 .../com/cloud/agent/api/VmDiskStatsEntry.java   |  3 ++
 core/src/com/cloud/agent/api/VmStatsEntry.java  |  3 ++
 .../api/baremetal/IpmISetBootDevCommand.java    |  3 ++
 .../api/baremetal/IpmiBootorResetCommand.java   |  3 ++
 .../baremetal/PrepareCreateTemplateCommand.java |  3 ++
 .../api/baremetal/PreparePxeServerAnswer.java   |  3 ++
 .../api/baremetal/PreparePxeServerCommand.java  |  3 ++
 .../cloud/agent/api/check/CheckSshAnswer.java   |  3 ++
 .../cloud/agent/api/check/CheckSshCommand.java  |  3 ++
 .../api/proxy/CheckConsoleProxyLoadCommand.java |  3 ++
 .../agent/api/proxy/ConsoleProxyLoadAnswer.java |  3 ++
 .../com/cloud/agent/api/proxy/ProxyCommand.java |  3 ++
 ...tartConsoleProxyAgentHttpHandlerCommand.java |  3 ++
 .../api/proxy/WatchConsoleProxyLoadCommand.java |  3 ++
 .../api/routing/AggregationControlCommand.java  |  2 +
 .../agent/api/routing/CreateIpAliasCommand.java |  3 ++
 .../CreateLoadBalancerApplianceCommand.java     |  3 ++
 .../agent/api/routing/DeleteIpAliasCommand.java |  3 ++
 .../DestroyLoadBalancerApplianceCommand.java    |  3 ++
 .../agent/api/routing/DhcpEntryCommand.java     |  3 ++
 .../agent/api/routing/DnsMasqConfigCommand.java |  3 ++
 .../api/routing/GetRouterAlertsCommand.java     |  2 +
 .../routing/GlobalLoadBalancerConfigAnswer.java |  3 ++
 .../GlobalLoadBalancerConfigCommand.java        |  2 +
 .../cloud/agent/api/routing/GroupAnswer.java    |  2 +
 .../api/routing/HealthCheckLBConfigAnswer.java  |  3 ++
 .../api/routing/HealthCheckLBConfigCommand.java |  3 ++
 .../com/cloud/agent/api/routing/IpAliasTO.java  |  3 ++
 .../cloud/agent/api/routing/IpAssocAnswer.java  |  3 ++
 .../cloud/agent/api/routing/IpAssocCommand.java |  3 ++
 .../agent/api/routing/IpAssocVpcCommand.java    |  3 ++
 .../api/routing/LoadBalancerConfigCommand.java  |  3 ++
 .../api/routing/NetworkElementCommand.java      |  3 ++
 .../api/routing/RemoteAccessVpnCfgCommand.java  |  3 ++
 .../agent/api/routing/SavePasswordCommand.java  |  3 ++
 .../api/routing/SetFirewallRulesAnswer.java     |  3 ++
 .../api/routing/SetFirewallRulesCommand.java    |  3 ++
 .../api/routing/SetMonitorServiceCommand.java   |  3 ++
 .../agent/api/routing/SetNetworkACLAnswer.java  |  3 ++
 .../agent/api/routing/SetNetworkACLCommand.java |  2 +
 .../routing/SetPortForwardingRulesAnswer.java   |  3 ++
 .../routing/SetPortForwardingRulesCommand.java  |  3 ++
 .../SetPortForwardingRulesVpcCommand.java       |  3 ++
 .../agent/api/routing/SetSourceNatAnswer.java   |  3 ++
 .../agent/api/routing/SetSourceNatCommand.java  |  3 ++
 .../api/routing/SetStaticNatRulesAnswer.java    |  3 ++
 .../api/routing/SetStaticNatRulesCommand.java   |  3 ++
 .../agent/api/routing/SetStaticRouteAnswer.java |  3 ++
 .../api/routing/SetStaticRouteCommand.java      |  2 +
 .../api/routing/Site2SiteVpnCfgCommand.java     |  3 ++
 .../api/routing/SiteLoadBalancerConfig.java     |  2 +
 .../agent/api/routing/UserDataCommand.java      |  3 ++
 .../cloud/agent/api/routing/VmDataCommand.java  |  3 ++
 .../agent/api/routing/VpnUsersCfgCommand.java   |  3 ++
 .../api/storage/AbstractDownloadCommand.java    |  3 ++
 .../api/storage/AbstractUploadCommand.java      |  3 ++
 .../agent/api/storage/CopyVolumeAnswer.java     |  3 ++
 .../agent/api/storage/CopyVolumeCommand.java    |  3 ++
 .../cloud/agent/api/storage/CreateAnswer.java   |  3 ++
 .../cloud/agent/api/storage/CreateCommand.java  |  3 ++
 .../storage/CreateEntityDownloadURLAnswer.java  |  3 ++
 .../storage/CreateEntityDownloadURLCommand.java |  3 ++
 .../storage/CreatePrivateTemplateAnswer.java    |  3 ++
 .../storage/CreatePrivateTemplateCommand.java   |  3 ++
 .../storage/DeleteEntityDownloadURLCommand.java |  3 ++
 .../cloud/agent/api/storage/DestroyAnswer.java  |  3 ++
 .../cloud/agent/api/storage/DestroyCommand.java |  3 ++
 .../cloud/agent/api/storage/DownloadAnswer.java |  3 ++
 .../agent/api/storage/ListTemplateAnswer.java   |  3 ++
 .../agent/api/storage/ListTemplateCommand.java  |  3 ++
 .../agent/api/storage/ListVolumeAnswer.java     |  3 ++
 .../agent/api/storage/ListVolumeCommand.java    |  3 ++
 .../storage/ManageVolumeAvailabilityAnswer.java |  3 ++
 .../ManageVolumeAvailabilityCommand.java        |  3 ++
 .../agent/api/storage/MigrateVolumeAnswer.java  |  3 ++
 .../agent/api/storage/MigrateVolumeCommand.java |  3 ++
 .../storage/PrimaryStorageDownloadAnswer.java   |  3 ++
 .../storage/PrimaryStorageDownloadCommand.java  |  3 ++
 .../agent/api/storage/ResizeVolumeAnswer.java   |  3 ++
 .../agent/api/storage/ResizeVolumeCommand.java  |  3 ++
 .../com/cloud/agent/api/storage/SsCommand.java  |  3 ++
 .../cloud/agent/api/storage/StorageCommand.java |  3 ++
 .../agent/api/storage/UpgradeDiskAnswer.java    |  3 ++
 .../agent/api/storage/UpgradeDiskCommand.java   |  3 ++
 .../cloud/agent/api/storage/UploadAnswer.java   |  3 ++
 .../cloud/agent/api/storage/UploadCommand.java  |  3 ++
 .../api/storage/UploadProgressCommand.java      |  3 ++
 .../resource/virtualnetwork/ConfigHelper.java   |  3 ++
 .../resource/virtualnetwork/ConfigItem.java     |  3 ++
 .../resource/virtualnetwork/FileConfigItem.java |  3 ++
 .../virtualnetwork/ScriptConfigItem.java        |  3 ++
 .../resource/virtualnetwork/VRScripts.java      |  3 ++
 .../virtualnetwork/VirtualRouterDeployer.java   |  3 ++
 .../virtualnetwork/VirtualRoutingResource.java  |  3 ++
 .../cloud/agent/transport/ArrayTypeAdaptor.java |  3 ++
 .../agent/transport/InterfaceTypeAdaptor.java   |  3 ++
 .../transport/LoggingExclusionStrategy.java     |  3 ++
 core/src/com/cloud/agent/transport/Request.java |  3 ++
 .../src/com/cloud/agent/transport/Response.java |  3 ++
 .../exception/UnsupportedVersionException.java  |  3 ++
 .../cloud/exception/UsageServerException.java   |  3 ++
 core/src/com/cloud/host/HostInfo.java           |  3 ++
 .../resource/HypervDummyResourceBase.java       |  3 ++
 .../cloud/info/ConsoleProxyConnectionInfo.java  |  3 ++
 core/src/com/cloud/info/ConsoleProxyInfo.java   |  3 ++
 core/src/com/cloud/info/ConsoleProxyStatus.java |  3 ++
 .../cloud/info/RunningHostInfoAgregator.java    |  3 ++
 .../com/cloud/info/SecStorageVmLoadInfo.java    |  3 ++
 .../com/cloud/network/HAProxyConfigurator.java  |  3 ++
 .../cloud/network/LoadBalancerConfigurator.java |  3 ++
 .../cloud/network/LoadBalancerValidator.java    |  3 ++
 .../CreateLoadBalancerApplianceAnswer.java      |  3 ++
 .../DestroyLoadBalancerApplianceAnswer.java     |  3 ++
 .../resource/TrafficSentinelResource.java       |  3 ++
 .../com/cloud/resource/ResourceListener.java    |  3 ++
 core/src/com/cloud/resource/ServerResource.java |  3 ++
 .../com/cloud/resource/ServerResourceBase.java  |  3 ++
 .../resource/hypervisor/HypervisorResource.java |  3 ++
 core/src/com/cloud/serializer/GsonHelper.java   |  3 ++
 .../com/cloud/serializer/SerializerHelper.java  |  3 ++
 .../src/com/cloud/storage/JavaStorageLayer.java |  3 ++
 core/src/com/cloud/storage/StorageLayer.java    |  3 ++
 .../storage/resource/StoragePoolResource.java   |  3 ++
 .../storage/resource/StorageProcessor.java      | 37 +++++++++--------
 .../StorageSubsystemCommandHandler.java         | 37 +++++++++--------
 .../storage/template/FtpTemplateUploader.java   |  3 ++
 .../template/HttpTemplateDownloader.java        |  3 ++
 .../cloud/storage/template/IsoProcessor.java    |  3 ++
 .../template/LocalTemplateDownloader.java       |  3 ++
 .../cloud/storage/template/OVAProcessor.java    |  3 ++
 .../com/cloud/storage/template/Processor.java   |  3 ++
 .../cloud/storage/template/QCOW2Processor.java  |  3 ++
 .../storage/template/RawImageProcessor.java     |  3 ++
 .../storage/template/S3TemplateDownloader.java  |  3 ++
 .../storage/template/ScpTemplateDownloader.java |  3 ++
 .../storage/template/TemplateConstants.java     |  3 ++
 .../storage/template/TemplateDownloader.java    |  3 ++
 .../template/TemplateDownloaderBase.java        |  3 ++
 .../storage/template/TemplateLocation.java      |  3 ++
 .../storage/template/TemplateUploader.java      |  3 ++
 .../cloud/storage/template/VhdProcessor.java    |  3 ++
 .../cloud/storage/template/VmdkProcessor.java   |  3 ++
 .../storage/command/AttachAnswer.java           | 39 +++++++++---------
 .../storage/command/AttachCommand.java          | 37 +++++++++--------
 .../command/AttachPrimaryDataStoreAnswer.java   | 43 ++++++++++----------
 .../command/AttachPrimaryDataStoreCmd.java      | 41 ++++++++++---------
 .../storage/command/CopyCmdAnswer.java          |  3 ++
 .../cloudstack/storage/command/CopyCommand.java |  3 ++
 .../storage/command/CreateObjectAnswer.java     | 39 +++++++++---------
 .../storage/command/CreateObjectCommand.java    | 41 ++++++++++---------
 .../command/CreatePrimaryDataStoreCmd.java      |  3 ++
 .../storage/command/DeleteCommand.java          | 39 +++++++++---------
 .../storage/command/DettachAnswer.java          | 39 +++++++++---------
 .../storage/command/DettachCommand.java         | 37 +++++++++--------
 .../storage/command/DownloadCommand.java        |  3 ++
 .../command/DownloadProgressCommand.java        |  3 ++
 .../storage/command/ForgetObjectCmd.java        | 41 ++++++++++---------
 .../storage/command/IntroduceObjectAnswer.java  | 39 +++++++++---------
 .../storage/command/IntroduceObjectCmd.java     | 39 +++++++++---------
 .../command/StorageSubSystemCommand.java        | 37 +++++++++--------
 .../cloudstack/storage/to/ImageStoreTO.java     |  3 ++
 .../storage/to/PrimaryDataStoreTO.java          |  3 ++
 .../cloudstack/storage/to/SnapshotObjectTO.java |  3 ++
 .../cloudstack/storage/to/TemplateObjectTO.java |  3 ++
 .../cloudstack/storage/to/VolumeObjectTO.java   |  3 ++
 .../VirtualRoutingResourceTest.java             |  3 ++
 .../com/cloud/agent/transport/RequestTest.java  |  3 ++
 .../cloud/network/HAProxyConfiguratorTest.java  |  3 ++
 .../api/agent/test/AgentControlAnswerTest.java  |  3 ++
 .../api/agent/test/AgentControlCommandTest.java |  3 ++
 .../cloudstack/api/agent/test/AnswerTest.java   |  3 ++
 .../api/agent/test/AttachIsoCommandTest.java    |  3 ++
 .../api/agent/test/AttachVolumeAnswerTest.java  |  3 ++
 .../api/agent/test/AttachVolumeCommandTest.java |  3 ++
 .../agent/test/BackupSnapshotAnswerTest.java    |  3 ++
 .../agent/test/BackupSnapshotCommandTest.java   |  3 ++
 .../agent/test/BumpUpPriorityCommandTest.java   |  3 ++
 .../api/agent/test/CancelCommandTest.java       |  3 ++
 .../api/agent/test/ChangeAgentAnswerTest.java   |  3 ++
 .../api/agent/test/ChangeAgentCommandTest.java  |  3 ++
 .../api/agent/test/CheckHealthAnswerTest.java   |  3 ++
 .../api/agent/test/CheckHealthCommandTest.java  |  3 ++
 .../api/agent/test/CheckNetworkAnswerTest.java  |  3 ++
 .../api/agent/test/CheckNetworkCommandTest.java |  3 ++
 .../api/agent/test/CheckOnHostCommandTest.java  |  3 ++
 .../api/agent/test/SnapshotCommandTest.java     |  3 ++
 375 files changed, 1602 insertions(+), 534 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/allocator/module.properties
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/allocator/module.properties b/core/resources/META-INF/cloudstack/allocator/module.properties
index 7866be0..b99b9af 100644
--- a/core/resources/META-INF/cloudstack/allocator/module.properties
+++ b/core/resources/META-INF/cloudstack/allocator/module.properties
@@ -1,3 +1,4 @@
+#
 # 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
@@ -14,5 +15,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+#
+
 name=allocator
 parent=core

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/allocator/spring-core-allocator-context.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/allocator/spring-core-allocator-context.xml b/core/resources/META-INF/cloudstack/allocator/spring-core-allocator-context.xml
index 65ebc70..700b906 100644
--- a/core/resources/META-INF/cloudstack/allocator/spring-core-allocator-context.xml
+++ b/core/resources/META-INF/cloudstack/allocator/spring-core-allocator-context.xml
@@ -1,20 +1,22 @@
 <!--
-  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
+    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.
 
-  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.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/allocator/spring-core-lifecycle-allocator-context-inheritable.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/allocator/spring-core-lifecycle-allocator-context-inheritable.xml b/core/resources/META-INF/cloudstack/allocator/spring-core-lifecycle-allocator-context-inheritable.xml
index ad00de8..e6ed961 100644
--- a/core/resources/META-INF/cloudstack/allocator/spring-core-lifecycle-allocator-context-inheritable.xml
+++ b/core/resources/META-INF/cloudstack/allocator/spring-core-lifecycle-allocator-context-inheritable.xml
@@ -1,20 +1,22 @@
 <!--
-  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
+    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.
 
-  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.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/api/module.properties
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/api/module.properties b/core/resources/META-INF/cloudstack/api/module.properties
index cc66a09..727b075 100644
--- a/core/resources/META-INF/cloudstack/api/module.properties
+++ b/core/resources/META-INF/cloudstack/api/module.properties
@@ -1,3 +1,4 @@
+#
 # 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
@@ -14,5 +15,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+#
+
 name=api
 parent=core

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/api/spring-core-lifecycle-api-context-inheritable.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/api/spring-core-lifecycle-api-context-inheritable.xml b/core/resources/META-INF/cloudstack/api/spring-core-lifecycle-api-context-inheritable.xml
index f406841..d4dcc80 100644
--- a/core/resources/META-INF/cloudstack/api/spring-core-lifecycle-api-context-inheritable.xml
+++ b/core/resources/META-INF/cloudstack/api/spring-core-lifecycle-api-context-inheritable.xml
@@ -1,20 +1,22 @@
 <!--
-  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.
+
+    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.
+
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/backend/module.properties
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/backend/module.properties b/core/resources/META-INF/cloudstack/backend/module.properties
index ab18ad1..c4e29af 100644
--- a/core/resources/META-INF/cloudstack/backend/module.properties
+++ b/core/resources/META-INF/cloudstack/backend/module.properties
@@ -1,3 +1,4 @@
+#
 # 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
@@ -14,5 +15,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+#
+
 name=backend
 parent=core

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/bootstrap/module.properties
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/bootstrap/module.properties b/core/resources/META-INF/cloudstack/bootstrap/module.properties
index 716bd00..15532c4 100644
--- a/core/resources/META-INF/cloudstack/bootstrap/module.properties
+++ b/core/resources/META-INF/cloudstack/bootstrap/module.properties
@@ -1,3 +1,4 @@
+#
 # 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
@@ -14,4 +15,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+#
+
 name=bootstrap

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/bootstrap/spring-bootstrap-context-inheritable.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/bootstrap/spring-bootstrap-context-inheritable.xml b/core/resources/META-INF/cloudstack/bootstrap/spring-bootstrap-context-inheritable.xml
index adee3ed..84c301c 100644
--- a/core/resources/META-INF/cloudstack/bootstrap/spring-bootstrap-context-inheritable.xml
+++ b/core/resources/META-INF/cloudstack/bootstrap/spring-bootstrap-context-inheritable.xml
@@ -1,20 +1,22 @@
 <!--
-  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
+    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.
 
-  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.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/bootstrap/spring-bootstrap-context.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/bootstrap/spring-bootstrap-context.xml b/core/resources/META-INF/cloudstack/bootstrap/spring-bootstrap-context.xml
index 5ddb66f..7a586a2 100644
--- a/core/resources/META-INF/cloudstack/bootstrap/spring-bootstrap-context.xml
+++ b/core/resources/META-INF/cloudstack/bootstrap/spring-bootstrap-context.xml
@@ -1,20 +1,22 @@
 <!--
-  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
+    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.
 
-  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.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/compute/module.properties
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/compute/module.properties b/core/resources/META-INF/cloudstack/compute/module.properties
index 0a12aae..3549c98 100644
--- a/core/resources/META-INF/cloudstack/compute/module.properties
+++ b/core/resources/META-INF/cloudstack/compute/module.properties
@@ -1,3 +1,4 @@
+#
 # 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
@@ -14,5 +15,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+#
+
 name=compute
 parent=backend

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/compute/spring-core-lifecycle-compute-context-inheritable.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/compute/spring-core-lifecycle-compute-context-inheritable.xml b/core/resources/META-INF/cloudstack/compute/spring-core-lifecycle-compute-context-inheritable.xml
index b57f52f..f757e7e 100644
--- a/core/resources/META-INF/cloudstack/compute/spring-core-lifecycle-compute-context-inheritable.xml
+++ b/core/resources/META-INF/cloudstack/compute/spring-core-lifecycle-compute-context-inheritable.xml
@@ -1,20 +1,22 @@
 <!--
-  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.
+
+    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.
+
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/core/module.properties
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/core/module.properties b/core/resources/META-INF/cloudstack/core/module.properties
index fd5ecb7..6ccd650 100644
--- a/core/resources/META-INF/cloudstack/core/module.properties
+++ b/core/resources/META-INF/cloudstack/core/module.properties
@@ -1,3 +1,4 @@
+#
 # 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
@@ -14,5 +15,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+#
+
 name=core
 parent=system

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/core/spring-core-context.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/core/spring-core-context.xml b/core/resources/META-INF/cloudstack/core/spring-core-context.xml
index 6cd00a4..242f72c 100644
--- a/core/resources/META-INF/cloudstack/core/spring-core-context.xml
+++ b/core/resources/META-INF/cloudstack/core/spring-core-context.xml
@@ -1,20 +1,22 @@
 <!--
-  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
+    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.
 
-  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.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/core/spring-core-lifecycle-core-context-inheritable.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/core/spring-core-lifecycle-core-context-inheritable.xml b/core/resources/META-INF/cloudstack/core/spring-core-lifecycle-core-context-inheritable.xml
index 06b9f5e..515249d 100644
--- a/core/resources/META-INF/cloudstack/core/spring-core-lifecycle-core-context-inheritable.xml
+++ b/core/resources/META-INF/cloudstack/core/spring-core-lifecycle-core-context-inheritable.xml
@@ -1,20 +1,22 @@
 <!--
-  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
+    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.
 
-  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.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml b/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
index 819fb83..908d8f0 100644
--- a/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
+++ b/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
@@ -1,20 +1,22 @@
 <!--
-  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.
+
+    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.
+
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/discoverer/module.properties
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/discoverer/module.properties b/core/resources/META-INF/cloudstack/discoverer/module.properties
index e511fb5..6af75af 100644
--- a/core/resources/META-INF/cloudstack/discoverer/module.properties
+++ b/core/resources/META-INF/cloudstack/discoverer/module.properties
@@ -1,3 +1,4 @@
+#
 # 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
@@ -14,5 +15,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+#
+
 name=discoverer
 parent=core

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/discoverer/spring-core-lifecycle-discoverer-context-inheritable.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/discoverer/spring-core-lifecycle-discoverer-context-inheritable.xml b/core/resources/META-INF/cloudstack/discoverer/spring-core-lifecycle-discoverer-context-inheritable.xml
index 2c83a10..640d17e 100644
--- a/core/resources/META-INF/cloudstack/discoverer/spring-core-lifecycle-discoverer-context-inheritable.xml
+++ b/core/resources/META-INF/cloudstack/discoverer/spring-core-lifecycle-discoverer-context-inheritable.xml
@@ -1,20 +1,22 @@
 <!--
-  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
+    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.
 
-  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.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/network/module.properties
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/network/module.properties b/core/resources/META-INF/cloudstack/network/module.properties
index 1a15fb0..5d2cc44 100644
--- a/core/resources/META-INF/cloudstack/network/module.properties
+++ b/core/resources/META-INF/cloudstack/network/module.properties
@@ -1,3 +1,4 @@
+#
 # 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
@@ -14,5 +15,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+#
+
 name=network
 parent=backend

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/network/spring-core-lifecycle-network-context-inheritable.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/network/spring-core-lifecycle-network-context-inheritable.xml b/core/resources/META-INF/cloudstack/network/spring-core-lifecycle-network-context-inheritable.xml
index a54d588..e5086d2 100644
--- a/core/resources/META-INF/cloudstack/network/spring-core-lifecycle-network-context-inheritable.xml
+++ b/core/resources/META-INF/cloudstack/network/spring-core-lifecycle-network-context-inheritable.xml
@@ -1,20 +1,22 @@
 <!--
-  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.
+
+    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.
+
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/planner/module.properties
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/planner/module.properties b/core/resources/META-INF/cloudstack/planner/module.properties
index 96359fb..26c61d9 100644
--- a/core/resources/META-INF/cloudstack/planner/module.properties
+++ b/core/resources/META-INF/cloudstack/planner/module.properties
@@ -1,3 +1,4 @@
+#
 # 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
@@ -14,5 +15,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+#
+
 name=planner
 parent=allocator
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/planner/spring-core-lifecycle-planner-context-inheritable.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/planner/spring-core-lifecycle-planner-context-inheritable.xml b/core/resources/META-INF/cloudstack/planner/spring-core-lifecycle-planner-context-inheritable.xml
index 80779e4..2548308 100644
--- a/core/resources/META-INF/cloudstack/planner/spring-core-lifecycle-planner-context-inheritable.xml
+++ b/core/resources/META-INF/cloudstack/planner/spring-core-lifecycle-planner-context-inheritable.xml
@@ -1,20 +1,22 @@
 <!--
-  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.
+
+    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.
+
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/storage/module.properties
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/storage/module.properties b/core/resources/META-INF/cloudstack/storage/module.properties
index 564e85e..f35ed85 100644
--- a/core/resources/META-INF/cloudstack/storage/module.properties
+++ b/core/resources/META-INF/cloudstack/storage/module.properties
@@ -1,3 +1,4 @@
+#
 # 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
@@ -14,5 +15,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+#
+
 name=storage
 parent=backend

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/storage/spring-lifecycle-storage-context-inheritable.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/storage/spring-lifecycle-storage-context-inheritable.xml b/core/resources/META-INF/cloudstack/storage/spring-lifecycle-storage-context-inheritable.xml
index ad78cad..7b86e93 100644
--- a/core/resources/META-INF/cloudstack/storage/spring-lifecycle-storage-context-inheritable.xml
+++ b/core/resources/META-INF/cloudstack/storage/spring-lifecycle-storage-context-inheritable.xml
@@ -1,20 +1,22 @@
 <!--
-  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
+    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.
 
-  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.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/system/module.properties
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/system/module.properties b/core/resources/META-INF/cloudstack/system/module.properties
index 0b07ebe..cc2dabc 100644
--- a/core/resources/META-INF/cloudstack/system/module.properties
+++ b/core/resources/META-INF/cloudstack/system/module.properties
@@ -1,3 +1,4 @@
+#
 # 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
@@ -14,5 +15,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+#
+
 name=system
 parent=bootstrap

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/system/spring-core-system-context-inheritable.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/system/spring-core-system-context-inheritable.xml b/core/resources/META-INF/cloudstack/system/spring-core-system-context-inheritable.xml
index 80c5da7..2d454ac 100644
--- a/core/resources/META-INF/cloudstack/system/spring-core-system-context-inheritable.xml
+++ b/core/resources/META-INF/cloudstack/system/spring-core-system-context-inheritable.xml
@@ -1,20 +1,22 @@
 <!--
-  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
+    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.
 
-  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.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/system/spring-core-system-context.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/system/spring-core-system-context.xml b/core/resources/META-INF/cloudstack/system/spring-core-system-context.xml
index c2d540c..a1950f6 100644
--- a/core/resources/META-INF/cloudstack/system/spring-core-system-context.xml
+++ b/core/resources/META-INF/cloudstack/system/spring-core-system-context.xml
@@ -1,20 +1,22 @@
 <!--
-  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
+    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.
 
-  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.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/IAgentControl.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/IAgentControl.java b/core/src/com/cloud/agent/IAgentControl.java
index 36ea598..0a826ae 100644
--- a/core/src/com/cloud/agent/IAgentControl.java
+++ b/core/src/com/cloud/agent/IAgentControl.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent;
 
 import com.cloud.agent.api.AgentControlAnswer;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/IAgentControlListener.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/IAgentControlListener.java b/core/src/com/cloud/agent/IAgentControlListener.java
index 1983e28..a98f004 100644
--- a/core/src/com/cloud/agent/IAgentControlListener.java
+++ b/core/src/com/cloud/agent/IAgentControlListener.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent;
 
 import com.cloud.agent.api.AgentControlAnswer;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/StartupCommandProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/StartupCommandProcessor.java b/core/src/com/cloud/agent/StartupCommandProcessor.java
index 8efe143..774f65a 100644
--- a/core/src/com/cloud/agent/StartupCommandProcessor.java
+++ b/core/src/com/cloud/agent/StartupCommandProcessor.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent;
 
 import com.cloud.agent.api.StartupCommand;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/AgentControlAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/AgentControlAnswer.java b/core/src/com/cloud/agent/api/AgentControlAnswer.java
index 58377e6..119623d 100644
--- a/core/src/com/cloud/agent/api/AgentControlAnswer.java
+++ b/core/src/com/cloud/agent/api/AgentControlAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class AgentControlAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/AgentControlCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/AgentControlCommand.java b/core/src/com/cloud/agent/api/AgentControlCommand.java
index 5d3de86..8baf2f9 100644
--- a/core/src/com/cloud/agent/api/AgentControlCommand.java
+++ b/core/src/com/cloud/agent/api/AgentControlCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class AgentControlCommand extends Command {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/AttachIsoCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/AttachIsoCommand.java b/core/src/com/cloud/agent/api/AttachIsoCommand.java
index 2b7dd13..0767687 100644
--- a/core/src/com/cloud/agent/api/AttachIsoCommand.java
+++ b/core/src/com/cloud/agent/api/AttachIsoCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class AttachIsoCommand extends Command {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/AttachVolumeAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/AttachVolumeAnswer.java b/core/src/com/cloud/agent/api/AttachVolumeAnswer.java
index 0471003..3e869ab 100644
--- a/core/src/com/cloud/agent/api/AttachVolumeAnswer.java
+++ b/core/src/com/cloud/agent/api/AttachVolumeAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class AttachVolumeAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/AttachVolumeCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/AttachVolumeCommand.java b/core/src/com/cloud/agent/api/AttachVolumeCommand.java
index a0ee419..af44d72 100644
--- a/core/src/com/cloud/agent/api/AttachVolumeCommand.java
+++ b/core/src/com/cloud/agent/api/AttachVolumeCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.storage.Storage.StoragePoolType;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/BackupSnapshotAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/BackupSnapshotAnswer.java b/core/src/com/cloud/agent/api/BackupSnapshotAnswer.java
index a8557e0..59a2ed3 100644
--- a/core/src/com/cloud/agent/api/BackupSnapshotAnswer.java
+++ b/core/src/com/cloud/agent/api/BackupSnapshotAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class BackupSnapshotAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/BackupSnapshotCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/BackupSnapshotCommand.java b/core/src/com/cloud/agent/api/BackupSnapshotCommand.java
index 6e1e3be..2a46610 100644
--- a/core/src/com/cloud/agent/api/BackupSnapshotCommand.java
+++ b/core/src/com/cloud/agent/api/BackupSnapshotCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.LogLevel.Log4jLevel;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/BumpUpPriorityCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/BumpUpPriorityCommand.java b/core/src/com/cloud/agent/api/BumpUpPriorityCommand.java
index 5d3f10f..dfde6e1 100644
--- a/core/src/com/cloud/agent/api/BumpUpPriorityCommand.java
+++ b/core/src/com/cloud/agent/api/BumpUpPriorityCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.routing.NetworkElementCommand;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CancelCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CancelCommand.java b/core/src/com/cloud/agent/api/CancelCommand.java
index 8ac2998..5adace2 100644
--- a/core/src/com/cloud/agent/api/CancelCommand.java
+++ b/core/src/com/cloud/agent/api/CancelCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class CancelCommand extends Command {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/ChangeAgentAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/ChangeAgentAnswer.java b/core/src/com/cloud/agent/api/ChangeAgentAnswer.java
index a1a8737..1d43325 100644
--- a/core/src/com/cloud/agent/api/ChangeAgentAnswer.java
+++ b/core/src/com/cloud/agent/api/ChangeAgentAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class ChangeAgentAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/ChangeAgentCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/ChangeAgentCommand.java b/core/src/com/cloud/agent/api/ChangeAgentCommand.java
index 6c11de8..61cc943 100644
--- a/core/src/com/cloud/agent/api/ChangeAgentCommand.java
+++ b/core/src/com/cloud/agent/api/ChangeAgentCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.host.Status.Event;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CheckHealthAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CheckHealthAnswer.java b/core/src/com/cloud/agent/api/CheckHealthAnswer.java
index 9db912c..80414d2 100644
--- a/core/src/com/cloud/agent/api/CheckHealthAnswer.java
+++ b/core/src/com/cloud/agent/api/CheckHealthAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class CheckHealthAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CheckHealthCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CheckHealthCommand.java b/core/src/com/cloud/agent/api/CheckHealthCommand.java
index b8df7c6..1292811 100644
--- a/core/src/com/cloud/agent/api/CheckHealthCommand.java
+++ b/core/src/com/cloud/agent/api/CheckHealthCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class CheckHealthCommand extends Command {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CheckNetworkAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CheckNetworkAnswer.java b/core/src/com/cloud/agent/api/CheckNetworkAnswer.java
index 2075849..392ad35 100644
--- a/core/src/com/cloud/agent/api/CheckNetworkAnswer.java
+++ b/core/src/com/cloud/agent/api/CheckNetworkAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class CheckNetworkAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CheckNetworkCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CheckNetworkCommand.java b/core/src/com/cloud/agent/api/CheckNetworkCommand.java
index 8e1be56..717af2a 100644
--- a/core/src/com/cloud/agent/api/CheckNetworkCommand.java
+++ b/core/src/com/cloud/agent/api/CheckNetworkCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CheckOnHostAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CheckOnHostAnswer.java b/core/src/com/cloud/agent/api/CheckOnHostAnswer.java
index e5325e3..5a26b22 100644
--- a/core/src/com/cloud/agent/api/CheckOnHostAnswer.java
+++ b/core/src/com/cloud/agent/api/CheckOnHostAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class CheckOnHostAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CheckOnHostCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CheckOnHostCommand.java b/core/src/com/cloud/agent/api/CheckOnHostCommand.java
index be05bd4..b405517 100644
--- a/core/src/com/cloud/agent/api/CheckOnHostCommand.java
+++ b/core/src/com/cloud/agent/api/CheckOnHostCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.to.HostTO;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CheckRouterAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CheckRouterAnswer.java b/core/src/com/cloud/agent/api/CheckRouterAnswer.java
index 7df0cfb..b084d4b 100644
--- a/core/src/com/cloud/agent/api/CheckRouterAnswer.java
+++ b/core/src/com/cloud/agent/api/CheckRouterAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.network.router.VirtualRouter.RedundantState;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CheckRouterCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CheckRouterCommand.java b/core/src/com/cloud/agent/api/CheckRouterCommand.java
index c89cdf7..51a4493 100644
--- a/core/src/com/cloud/agent/api/CheckRouterCommand.java
+++ b/core/src/com/cloud/agent/api/CheckRouterCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.routing.NetworkElementCommand;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java b/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java
index 0e9db96..3ee5eac 100644
--- a/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java
+++ b/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.HashMap;


[6/6] git commit: updated refs/heads/master to a49bb7e

Posted by hu...@apache.org.
Enforce licenses and license format in cloud-core


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/109d1290
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/109d1290
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/109d1290

Branch: refs/heads/master
Commit: 109d1290960d6215c32db8a241d027f82a0eb908
Parents: 778e04c
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Mon Jul 14 16:22:53 2014 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Mon Jul 14 16:28:29 2014 +0200

----------------------------------------------------------------------
 core/pom.xml                                    | 44 +++++++++++++-------
 .../StorageSubsystemCommandHandlerBase.java     | 37 ++++++++--------
 2 files changed, 49 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/109d1290/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 4adf996..429e131 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1,20 +1,22 @@
 <!--
-  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
+    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.
 
-  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.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
@@ -53,7 +55,21 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-pmd-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>com.mycila</groupId>
+        <artifactId>license-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>cloudstack-checklicence</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
+
   </build>
 
 </project>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/109d1290/core/src/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java b/core/src/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java
index 61af4d9..16fb153 100644
--- a/core/src/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java
+++ b/core/src/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java
@@ -1,21 +1,22 @@
-/*
- * 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.
- */
+//
+// 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.
+//
+
 package com.cloud.storage.resource;
 
 import org.apache.log4j.Logger;


[3/6] Cleanup licenses in core with com.mycila:license-maven-plugin:format

Posted by hu...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/RebootRouterCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/RebootRouterCommand.java b/core/src/com/cloud/agent/api/RebootRouterCommand.java
index ec56a60..149ac5d 100644
--- a/core/src/com/cloud/agent/api/RebootRouterCommand.java
+++ b/core/src/com/cloud/agent/api/RebootRouterCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class RebootRouterCommand extends RebootCommand {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/RecurringNetworkUsageAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/RecurringNetworkUsageAnswer.java b/core/src/com/cloud/agent/api/RecurringNetworkUsageAnswer.java
index 3c68628..94e798e 100644
--- a/core/src/com/cloud/agent/api/RecurringNetworkUsageAnswer.java
+++ b/core/src/com/cloud/agent/api/RecurringNetworkUsageAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class RecurringNetworkUsageAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/RecurringNetworkUsageCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/RecurringNetworkUsageCommand.java b/core/src/com/cloud/agent/api/RecurringNetworkUsageCommand.java
index f6e8804..1c9d162 100644
--- a/core/src/com/cloud/agent/api/RecurringNetworkUsageCommand.java
+++ b/core/src/com/cloud/agent/api/RecurringNetworkUsageCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class RecurringNetworkUsageCommand extends Command implements CronCommand {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/RevertToVMSnapshotAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/RevertToVMSnapshotAnswer.java b/core/src/com/cloud/agent/api/RevertToVMSnapshotAnswer.java
index 7168b89..b67d9dd 100644
--- a/core/src/com/cloud/agent/api/RevertToVMSnapshotAnswer.java
+++ b/core/src/com/cloud/agent/api/RevertToVMSnapshotAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
 
 package com.cloud.agent.api;
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/RevertToVMSnapshotCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/RevertToVMSnapshotCommand.java b/core/src/com/cloud/agent/api/RevertToVMSnapshotCommand.java
index b744ced..7a7d3d4 100644
--- a/core/src/com/cloud/agent/api/RevertToVMSnapshotCommand.java
+++ b/core/src/com/cloud/agent/api/RevertToVMSnapshotCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/ScaleVmAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/ScaleVmAnswer.java b/core/src/com/cloud/agent/api/ScaleVmAnswer.java
index 04f8b1f..1e49830 100644
--- a/core/src/com/cloud/agent/api/ScaleVmAnswer.java
+++ b/core/src/com/cloud/agent/api/ScaleVmAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class ScaleVmAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/ScaleVmCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/ScaleVmCommand.java b/core/src/com/cloud/agent/api/ScaleVmCommand.java
index 4ef60ce..1c763dd 100644
--- a/core/src/com/cloud/agent/api/ScaleVmCommand.java
+++ b/core/src/com/cloud/agent/api/ScaleVmCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.to.VirtualMachineTO;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/ScheduleHostScanTaskCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/ScheduleHostScanTaskCommand.java b/core/src/com/cloud/agent/api/ScheduleHostScanTaskCommand.java
index e938de7..24c821b 100644
--- a/core/src/com/cloud/agent/api/ScheduleHostScanTaskCommand.java
+++ b/core/src/com/cloud/agent/api/ScheduleHostScanTaskCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 /*

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/SecStorageFirewallCfgCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/SecStorageFirewallCfgCommand.java b/core/src/com/cloud/agent/api/SecStorageFirewallCfgCommand.java
index 8264334..653635c 100755
--- a/core/src/com/cloud/agent/api/SecStorageFirewallCfgCommand.java
+++ b/core/src/com/cloud/agent/api/SecStorageFirewallCfgCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/SecStorageSetupAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/SecStorageSetupAnswer.java b/core/src/com/cloud/agent/api/SecStorageSetupAnswer.java
index ac946da..92c13b3 100644
--- a/core/src/com/cloud/agent/api/SecStorageSetupAnswer.java
+++ b/core/src/com/cloud/agent/api/SecStorageSetupAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class SecStorageSetupAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/SecStorageSetupCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/SecStorageSetupCommand.java b/core/src/com/cloud/agent/api/SecStorageSetupCommand.java
index 1871032..2c29cde 100644
--- a/core/src/com/cloud/agent/api/SecStorageSetupCommand.java
+++ b/core/src/com/cloud/agent/api/SecStorageSetupCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import org.apache.cloudstack.framework.security.keystore.KeystoreManager;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/SecStorageVMSetupCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/SecStorageVMSetupCommand.java b/core/src/com/cloud/agent/api/SecStorageVMSetupCommand.java
index a7f2843..7753f70 100644
--- a/core/src/com/cloud/agent/api/SecStorageVMSetupCommand.java
+++ b/core/src/com/cloud/agent/api/SecStorageVMSetupCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class SecStorageVMSetupCommand extends Command {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/SecurityGroupRuleAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/SecurityGroupRuleAnswer.java b/core/src/com/cloud/agent/api/SecurityGroupRuleAnswer.java
index 574d98a..b2740b9 100644
--- a/core/src/com/cloud/agent/api/SecurityGroupRuleAnswer.java
+++ b/core/src/com/cloud/agent/api/SecurityGroupRuleAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class SecurityGroupRuleAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/SecurityGroupRulesCmd.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/SecurityGroupRulesCmd.java b/core/src/com/cloud/agent/api/SecurityGroupRulesCmd.java
index cfde80e..b9bdef5 100644
--- a/core/src/com/cloud/agent/api/SecurityGroupRulesCmd.java
+++ b/core/src/com/cloud/agent/api/SecurityGroupRulesCmd.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.io.ByteArrayOutputStream;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/SetupAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/SetupAnswer.java b/core/src/com/cloud/agent/api/SetupAnswer.java
index 88bccf3..6965071 100644
--- a/core/src/com/cloud/agent/api/SetupAnswer.java
+++ b/core/src/com/cloud/agent/api/SetupAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class SetupAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/SetupCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/SetupCommand.java b/core/src/com/cloud/agent/api/SetupCommand.java
index ee43c59..c3c9847 100644
--- a/core/src/com/cloud/agent/api/SetupCommand.java
+++ b/core/src/com/cloud/agent/api/SetupCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.host.HostEnvironment;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/SetupGuestNetworkCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/SetupGuestNetworkCommand.java b/core/src/com/cloud/agent/api/SetupGuestNetworkCommand.java
index 853a068..26d4781 100644
--- a/core/src/com/cloud/agent/api/SetupGuestNetworkCommand.java
+++ b/core/src/com/cloud/agent/api/SetupGuestNetworkCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.routing.NetworkElementCommand;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/ShutdownCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/ShutdownCommand.java b/core/src/com/cloud/agent/api/ShutdownCommand.java
index 5412f35..3c0571c 100644
--- a/core/src/com/cloud/agent/api/ShutdownCommand.java
+++ b/core/src/com/cloud/agent/api/ShutdownCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 /**

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/SnapshotCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/SnapshotCommand.java b/core/src/com/cloud/agent/api/SnapshotCommand.java
index a92b68a..a4975e6 100644
--- a/core/src/com/cloud/agent/api/SnapshotCommand.java
+++ b/core/src/com/cloud/agent/api/SnapshotCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.to.StorageFilerTO;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/StartAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/StartAnswer.java b/core/src/com/cloud/agent/api/StartAnswer.java
index 3bd7bff..6f63f20 100644
--- a/core/src/com/cloud/agent/api/StartAnswer.java
+++ b/core/src/com/cloud/agent/api/StartAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/StartCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/StartCommand.java b/core/src/com/cloud/agent/api/StartCommand.java
index 88810c6..d411cba 100644
--- a/core/src/com/cloud/agent/api/StartCommand.java
+++ b/core/src/com/cloud/agent/api/StartCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.to.VirtualMachineTO;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/StartupAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/StartupAnswer.java b/core/src/com/cloud/agent/api/StartupAnswer.java
index e18fb34..7165226 100755
--- a/core/src/com/cloud/agent/api/StartupAnswer.java
+++ b/core/src/com/cloud/agent/api/StartupAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class StartupAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/StartupCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/StartupCommand.java b/core/src/com/cloud/agent/api/StartupCommand.java
index 3ae9583..1de51ad 100755
--- a/core/src/com/cloud/agent/api/StartupCommand.java
+++ b/core/src/com/cloud/agent/api/StartupCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.host.Host;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/StartupExternalDhcpCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/StartupExternalDhcpCommand.java b/core/src/com/cloud/agent/api/StartupExternalDhcpCommand.java
index ba60e6d..46fdc95 100644
--- a/core/src/com/cloud/agent/api/StartupExternalDhcpCommand.java
+++ b/core/src/com/cloud/agent/api/StartupExternalDhcpCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.host.Host;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/StartupExternalFirewallCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/StartupExternalFirewallCommand.java b/core/src/com/cloud/agent/api/StartupExternalFirewallCommand.java
index c4ed107..70afea9 100644
--- a/core/src/com/cloud/agent/api/StartupExternalFirewallCommand.java
+++ b/core/src/com/cloud/agent/api/StartupExternalFirewallCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.host.Host;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/StartupExternalLoadBalancerCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/StartupExternalLoadBalancerCommand.java b/core/src/com/cloud/agent/api/StartupExternalLoadBalancerCommand.java
index 1e7a5f1..50187b2 100644
--- a/core/src/com/cloud/agent/api/StartupExternalLoadBalancerCommand.java
+++ b/core/src/com/cloud/agent/api/StartupExternalLoadBalancerCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.host.Host;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/StartupProxyCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/StartupProxyCommand.java b/core/src/com/cloud/agent/api/StartupProxyCommand.java
index ba31d25..3a65d70 100644
--- a/core/src/com/cloud/agent/api/StartupProxyCommand.java
+++ b/core/src/com/cloud/agent/api/StartupProxyCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.host.Host;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/StartupPxeServerCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/StartupPxeServerCommand.java b/core/src/com/cloud/agent/api/StartupPxeServerCommand.java
index 4385fc2..98d0765 100644
--- a/core/src/com/cloud/agent/api/StartupPxeServerCommand.java
+++ b/core/src/com/cloud/agent/api/StartupPxeServerCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.host.Host;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/StartupRoutingCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/StartupRoutingCommand.java b/core/src/com/cloud/agent/api/StartupRoutingCommand.java
index 52814ea..8601e92 100755
--- a/core/src/com/cloud/agent/api/StartupRoutingCommand.java
+++ b/core/src/com/cloud/agent/api/StartupRoutingCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/StartupSecondaryStorageCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/StartupSecondaryStorageCommand.java b/core/src/com/cloud/agent/api/StartupSecondaryStorageCommand.java
index 26f7fdc..b480d3c 100644
--- a/core/src/com/cloud/agent/api/StartupSecondaryStorageCommand.java
+++ b/core/src/com/cloud/agent/api/StartupSecondaryStorageCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.host.Host;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/StartupStorageCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/StartupStorageCommand.java b/core/src/com/cloud/agent/api/StartupStorageCommand.java
index 4109960..12a60a1 100755
--- a/core/src/com/cloud/agent/api/StartupStorageCommand.java
+++ b/core/src/com/cloud/agent/api/StartupStorageCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/StartupTrafficMonitorCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/StartupTrafficMonitorCommand.java b/core/src/com/cloud/agent/api/StartupTrafficMonitorCommand.java
index bb8f3d7..e746a01 100644
--- a/core/src/com/cloud/agent/api/StartupTrafficMonitorCommand.java
+++ b/core/src/com/cloud/agent/api/StartupTrafficMonitorCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.host.Host;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/StartupVMMAgentCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/StartupVMMAgentCommand.java b/core/src/com/cloud/agent/api/StartupVMMAgentCommand.java
index 2911d2e..7c9ad1a 100644
--- a/core/src/com/cloud/agent/api/StartupVMMAgentCommand.java
+++ b/core/src/com/cloud/agent/api/StartupVMMAgentCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.host.Host;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/StopAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/StopAnswer.java b/core/src/com/cloud/agent/api/StopAnswer.java
index ff2cd19..9713cd9 100755
--- a/core/src/com/cloud/agent/api/StopAnswer.java
+++ b/core/src/com/cloud/agent/api/StopAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class StopAnswer extends RebootAnswer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/StopCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/StopCommand.java b/core/src/com/cloud/agent/api/StopCommand.java
index 61d13e0..90b8a04 100755
--- a/core/src/com/cloud/agent/api/StopCommand.java
+++ b/core/src/com/cloud/agent/api/StopCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.to.GPUDeviceTO;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/TransferAgentCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/TransferAgentCommand.java b/core/src/com/cloud/agent/api/TransferAgentCommand.java
index 0dfde7e..ab74d9b 100644
--- a/core/src/com/cloud/agent/api/TransferAgentCommand.java
+++ b/core/src/com/cloud/agent/api/TransferAgentCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.host.Status.Event;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/UnPlugNicAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/UnPlugNicAnswer.java b/core/src/com/cloud/agent/api/UnPlugNicAnswer.java
index e09ee71..7e438d0 100644
--- a/core/src/com/cloud/agent/api/UnPlugNicAnswer.java
+++ b/core/src/com/cloud/agent/api/UnPlugNicAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class UnPlugNicAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/UnPlugNicCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/UnPlugNicCommand.java b/core/src/com/cloud/agent/api/UnPlugNicCommand.java
index eb980d0..984a0a4 100644
--- a/core/src/com/cloud/agent/api/UnPlugNicCommand.java
+++ b/core/src/com/cloud/agent/api/UnPlugNicCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.to.NicTO;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/UnregisterNicCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/UnregisterNicCommand.java b/core/src/com/cloud/agent/api/UnregisterNicCommand.java
index 0256d64..f3c0383 100644
--- a/core/src/com/cloud/agent/api/UnregisterNicCommand.java
+++ b/core/src/com/cloud/agent/api/UnregisterNicCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.UUID;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/UnregisterVMCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/UnregisterVMCommand.java b/core/src/com/cloud/agent/api/UnregisterVMCommand.java
index 466505f..a0085e0 100644
--- a/core/src/com/cloud/agent/api/UnregisterVMCommand.java
+++ b/core/src/com/cloud/agent/api/UnregisterVMCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class UnregisterVMCommand extends Command {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/UpdateHostPasswordCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/UpdateHostPasswordCommand.java b/core/src/com/cloud/agent/api/UpdateHostPasswordCommand.java
index 15fb714..e8dfa13 100644
--- a/core/src/com/cloud/agent/api/UpdateHostPasswordCommand.java
+++ b/core/src/com/cloud/agent/api/UpdateHostPasswordCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.LogLevel.Log4jLevel;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/UpgradeSnapshotCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/UpgradeSnapshotCommand.java b/core/src/com/cloud/agent/api/UpgradeSnapshotCommand.java
index 141a145..1353dbc 100644
--- a/core/src/com/cloud/agent/api/UpgradeSnapshotCommand.java
+++ b/core/src/com/cloud/agent/api/UpgradeSnapshotCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.storage.StoragePool;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/VMSnapshotBaseCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/VMSnapshotBaseCommand.java b/core/src/com/cloud/agent/api/VMSnapshotBaseCommand.java
index d2abd54..3625dc9 100644
--- a/core/src/com/cloud/agent/api/VMSnapshotBaseCommand.java
+++ b/core/src/com/cloud/agent/api/VMSnapshotBaseCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
 
 package com.cloud.agent.api;
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/VMSnapshotTO.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/VMSnapshotTO.java b/core/src/com/cloud/agent/api/VMSnapshotTO.java
index 8f42e0c..cb679e7 100644
--- a/core/src/com/cloud/agent/api/VMSnapshotTO.java
+++ b/core/src/com/cloud/agent/api/VMSnapshotTO.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/ValidateSnapshotAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/ValidateSnapshotAnswer.java b/core/src/com/cloud/agent/api/ValidateSnapshotAnswer.java
index ee637d1..a4e661f 100644
--- a/core/src/com/cloud/agent/api/ValidateSnapshotAnswer.java
+++ b/core/src/com/cloud/agent/api/ValidateSnapshotAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class ValidateSnapshotAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/ValidateSnapshotCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/ValidateSnapshotCommand.java b/core/src/com/cloud/agent/api/ValidateSnapshotCommand.java
index 2497265..a3b6521 100644
--- a/core/src/com/cloud/agent/api/ValidateSnapshotCommand.java
+++ b/core/src/com/cloud/agent/api/ValidateSnapshotCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class ValidateSnapshotCommand extends Command {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/VmDiskStatsEntry.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/VmDiskStatsEntry.java b/core/src/com/cloud/agent/api/VmDiskStatsEntry.java
index e5d7841..ead1e80 100644
--- a/core/src/com/cloud/agent/api/VmDiskStatsEntry.java
+++ b/core/src/com/cloud/agent/api/VmDiskStatsEntry.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.vm.VmDiskStats;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/VmStatsEntry.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/VmStatsEntry.java b/core/src/com/cloud/agent/api/VmStatsEntry.java
index a7a1968..0f30b6a 100755
--- a/core/src/com/cloud/agent/api/VmStatsEntry.java
+++ b/core/src/com/cloud/agent/api/VmStatsEntry.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.vm.VmStats;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/baremetal/IpmISetBootDevCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/baremetal/IpmISetBootDevCommand.java b/core/src/com/cloud/agent/api/baremetal/IpmISetBootDevCommand.java
index 1ca0dbd..81b3652 100644
--- a/core/src/com/cloud/agent/api/baremetal/IpmISetBootDevCommand.java
+++ b/core/src/com/cloud/agent/api/baremetal/IpmISetBootDevCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.baremetal;
 
 import com.cloud.agent.api.Command;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/baremetal/IpmiBootorResetCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/baremetal/IpmiBootorResetCommand.java b/core/src/com/cloud/agent/api/baremetal/IpmiBootorResetCommand.java
index 4f8dcaf..1ba24ee 100644
--- a/core/src/com/cloud/agent/api/baremetal/IpmiBootorResetCommand.java
+++ b/core/src/com/cloud/agent/api/baremetal/IpmiBootorResetCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.baremetal;
 
 import com.cloud.agent.api.Command;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/baremetal/PrepareCreateTemplateCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/baremetal/PrepareCreateTemplateCommand.java b/core/src/com/cloud/agent/api/baremetal/PrepareCreateTemplateCommand.java
index f88526a..f6e80c5 100644
--- a/core/src/com/cloud/agent/api/baremetal/PrepareCreateTemplateCommand.java
+++ b/core/src/com/cloud/agent/api/baremetal/PrepareCreateTemplateCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.baremetal;
 
 import com.cloud.agent.api.Command;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/baremetal/PreparePxeServerAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/baremetal/PreparePxeServerAnswer.java b/core/src/com/cloud/agent/api/baremetal/PreparePxeServerAnswer.java
index 6a7e6d5..4896681 100644
--- a/core/src/com/cloud/agent/api/baremetal/PreparePxeServerAnswer.java
+++ b/core/src/com/cloud/agent/api/baremetal/PreparePxeServerAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.baremetal;
 
 import com.cloud.agent.api.Answer;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/baremetal/PreparePxeServerCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/baremetal/PreparePxeServerCommand.java b/core/src/com/cloud/agent/api/baremetal/PreparePxeServerCommand.java
index 0dfbbdc..b4da7ee 100644
--- a/core/src/com/cloud/agent/api/baremetal/PreparePxeServerCommand.java
+++ b/core/src/com/cloud/agent/api/baremetal/PreparePxeServerCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.baremetal;
 
 import com.cloud.agent.api.Command;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/check/CheckSshAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/check/CheckSshAnswer.java b/core/src/com/cloud/agent/api/check/CheckSshAnswer.java
index 3414eb0..acbc6fa 100644
--- a/core/src/com/cloud/agent/api/check/CheckSshAnswer.java
+++ b/core/src/com/cloud/agent/api/check/CheckSshAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.check;
 
 import com.cloud.agent.api.Answer;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/check/CheckSshCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/check/CheckSshCommand.java b/core/src/com/cloud/agent/api/check/CheckSshCommand.java
index e384983..750d211 100644
--- a/core/src/com/cloud/agent/api/check/CheckSshCommand.java
+++ b/core/src/com/cloud/agent/api/check/CheckSshCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.check;
 
 import com.cloud.agent.api.Command;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java b/core/src/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java
index d9b1f2a..6190485 100644
--- a/core/src/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java
+++ b/core/src/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.proxy;
 
 /**

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java b/core/src/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java
index 34f7339..0869003 100644
--- a/core/src/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java
+++ b/core/src/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.proxy;
 
 import com.cloud.agent.api.Answer;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/proxy/ProxyCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/proxy/ProxyCommand.java b/core/src/com/cloud/agent/api/proxy/ProxyCommand.java
index b283eb8..6b9fa7b 100644
--- a/core/src/com/cloud/agent/api/proxy/ProxyCommand.java
+++ b/core/src/com/cloud/agent/api/proxy/ProxyCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.proxy;
 
 import com.cloud.agent.api.Command;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/proxy/StartConsoleProxyAgentHttpHandlerCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/proxy/StartConsoleProxyAgentHttpHandlerCommand.java b/core/src/com/cloud/agent/api/proxy/StartConsoleProxyAgentHttpHandlerCommand.java
index fef8fe1..223cf8a 100644
--- a/core/src/com/cloud/agent/api/proxy/StartConsoleProxyAgentHttpHandlerCommand.java
+++ b/core/src/com/cloud/agent/api/proxy/StartConsoleProxyAgentHttpHandlerCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.proxy;
 
 import com.cloud.agent.api.Command;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java b/core/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java
index 267ed8b..55d0459 100644
--- a/core/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java
+++ b/core/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.proxy;
 
 import com.cloud.agent.api.CronCommand;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/AggregationControlCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/AggregationControlCommand.java b/core/src/com/cloud/agent/api/routing/AggregationControlCommand.java
index ef75360..6a8291e 100644
--- a/core/src/com/cloud/agent/api/routing/AggregationControlCommand.java
+++ b/core/src/com/cloud/agent/api/routing/AggregationControlCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
 
 package com.cloud.agent.api.routing;
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/CreateIpAliasCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/CreateIpAliasCommand.java b/core/src/com/cloud/agent/api/routing/CreateIpAliasCommand.java
index d754e3c..5e2fdf6 100644
--- a/core/src/com/cloud/agent/api/routing/CreateIpAliasCommand.java
+++ b/core/src/com/cloud/agent/api/routing/CreateIpAliasCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.routing;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/CreateLoadBalancerApplianceCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/CreateLoadBalancerApplianceCommand.java b/core/src/com/cloud/agent/api/routing/CreateLoadBalancerApplianceCommand.java
index dc7f1a1..fdd2532 100644
--- a/core/src/com/cloud/agent/api/routing/CreateLoadBalancerApplianceCommand.java
+++ b/core/src/com/cloud/agent/api/routing/CreateLoadBalancerApplianceCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.routing;
 
 /** NetworkElementCommand to spin a load balancer appliance */

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/DeleteIpAliasCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/DeleteIpAliasCommand.java b/core/src/com/cloud/agent/api/routing/DeleteIpAliasCommand.java
index 36862ca..dd6b9b9 100644
--- a/core/src/com/cloud/agent/api/routing/DeleteIpAliasCommand.java
+++ b/core/src/com/cloud/agent/api/routing/DeleteIpAliasCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.routing;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/DestroyLoadBalancerApplianceCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/DestroyLoadBalancerApplianceCommand.java b/core/src/com/cloud/agent/api/routing/DestroyLoadBalancerApplianceCommand.java
index 5f46d82..9f2ebe3 100644
--- a/core/src/com/cloud/agent/api/routing/DestroyLoadBalancerApplianceCommand.java
+++ b/core/src/com/cloud/agent/api/routing/DestroyLoadBalancerApplianceCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 /** NetworkElementCommand to destroy a VPX instance on the Netscaler SDX load balancer appliance */
 //TODO: fill in the Nitro API parameters required
 package com.cloud.agent.api.routing;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/DhcpEntryCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/DhcpEntryCommand.java b/core/src/com/cloud/agent/api/routing/DhcpEntryCommand.java
index 24035a3..b942806 100644
--- a/core/src/com/cloud/agent/api/routing/DhcpEntryCommand.java
+++ b/core/src/com/cloud/agent/api/routing/DhcpEntryCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.routing;
 
 public class DhcpEntryCommand extends NetworkElementCommand {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/DnsMasqConfigCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/DnsMasqConfigCommand.java b/core/src/com/cloud/agent/api/routing/DnsMasqConfigCommand.java
index 49adc9e..044dcc4 100644
--- a/core/src/com/cloud/agent/api/routing/DnsMasqConfigCommand.java
+++ b/core/src/com/cloud/agent/api/routing/DnsMasqConfigCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.routing;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/GetRouterAlertsCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/GetRouterAlertsCommand.java b/core/src/com/cloud/agent/api/routing/GetRouterAlertsCommand.java
index a6769ef..0fc0a65 100644
--- a/core/src/com/cloud/agent/api/routing/GetRouterAlertsCommand.java
+++ b/core/src/com/cloud/agent/api/routing/GetRouterAlertsCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
 
 package com.cloud.agent.api.routing;
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigAnswer.java b/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigAnswer.java
index 901bc6c..4999ef3 100644
--- a/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigAnswer.java
+++ b/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.routing;
 
 import com.cloud.agent.api.Answer;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java b/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java
index 9c5244a..94e5c46 100644
--- a/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java
+++ b/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
 
 package com.cloud.agent.api.routing;
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/GroupAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/GroupAnswer.java b/core/src/com/cloud/agent/api/routing/GroupAnswer.java
index 293934b..accb911 100644
--- a/core/src/com/cloud/agent/api/routing/GroupAnswer.java
+++ b/core/src/com/cloud/agent/api/routing/GroupAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
 
 package com.cloud.agent.api.routing;
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/HealthCheckLBConfigAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/HealthCheckLBConfigAnswer.java b/core/src/com/cloud/agent/api/routing/HealthCheckLBConfigAnswer.java
index ee8033a..fc60ee4 100644
--- a/core/src/com/cloud/agent/api/routing/HealthCheckLBConfigAnswer.java
+++ b/core/src/com/cloud/agent/api/routing/HealthCheckLBConfigAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.routing;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/HealthCheckLBConfigCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/HealthCheckLBConfigCommand.java b/core/src/com/cloud/agent/api/routing/HealthCheckLBConfigCommand.java
index 7206d2f..d30fed4 100644
--- a/core/src/com/cloud/agent/api/routing/HealthCheckLBConfigCommand.java
+++ b/core/src/com/cloud/agent/api/routing/HealthCheckLBConfigCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.routing;
 
 import com.cloud.agent.api.to.LoadBalancerTO;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/IpAliasTO.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/IpAliasTO.java b/core/src/com/cloud/agent/api/routing/IpAliasTO.java
index 3876e14..a229d9a 100644
--- a/core/src/com/cloud/agent/api/routing/IpAliasTO.java
+++ b/core/src/com/cloud/agent/api/routing/IpAliasTO.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.routing;
 
 public class IpAliasTO {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/IpAssocAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/IpAssocAnswer.java b/core/src/com/cloud/agent/api/routing/IpAssocAnswer.java
index 473c5c8..eb9b85c 100644
--- a/core/src/com/cloud/agent/api/routing/IpAssocAnswer.java
+++ b/core/src/com/cloud/agent/api/routing/IpAssocAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.routing;
 
 import com.cloud.agent.api.Answer;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/IpAssocCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/IpAssocCommand.java b/core/src/com/cloud/agent/api/routing/IpAssocCommand.java
index fe6ab6f..0c9fb62 100644
--- a/core/src/com/cloud/agent/api/routing/IpAssocCommand.java
+++ b/core/src/com/cloud/agent/api/routing/IpAssocCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.routing;
 
 import com.cloud.agent.api.to.IpAddressTO;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/IpAssocVpcCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/IpAssocVpcCommand.java b/core/src/com/cloud/agent/api/routing/IpAssocVpcCommand.java
index d4996a5..da1060f 100644
--- a/core/src/com/cloud/agent/api/routing/IpAssocVpcCommand.java
+++ b/core/src/com/cloud/agent/api/routing/IpAssocVpcCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.routing;
 
 import com.cloud.agent.api.to.IpAddressTO;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java b/core/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
index 06ef62b..d8cc748 100644
--- a/core/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
+++ b/core/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.routing;
 
 import com.cloud.agent.api.to.LoadBalancerTO;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/NetworkElementCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/NetworkElementCommand.java b/core/src/com/cloud/agent/api/routing/NetworkElementCommand.java
index 120c717..e4105c1 100644
--- a/core/src/com/cloud/agent/api/routing/NetworkElementCommand.java
+++ b/core/src/com/cloud/agent/api/routing/NetworkElementCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.routing;
 
 import com.cloud.agent.api.Command;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java b/core/src/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java
index a85fcbe..c7dabe5 100644
--- a/core/src/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java
+++ b/core/src/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.routing;
 
 public class RemoteAccessVpnCfgCommand extends NetworkElementCommand {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/SavePasswordCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/SavePasswordCommand.java b/core/src/com/cloud/agent/api/routing/SavePasswordCommand.java
index ee20aa4..8bb72e4 100644
--- a/core/src/com/cloud/agent/api/routing/SavePasswordCommand.java
+++ b/core/src/com/cloud/agent/api/routing/SavePasswordCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.routing;
 
 public class SavePasswordCommand extends NetworkElementCommand {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/SetFirewallRulesAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/SetFirewallRulesAnswer.java b/core/src/com/cloud/agent/api/routing/SetFirewallRulesAnswer.java
index 5268c3d..a96f121 100644
--- a/core/src/com/cloud/agent/api/routing/SetFirewallRulesAnswer.java
+++ b/core/src/com/cloud/agent/api/routing/SetFirewallRulesAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.routing;
 
 import com.cloud.agent.api.Answer;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java b/core/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java
index 36771b9..be85887 100644
--- a/core/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java
+++ b/core/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.routing;
 
 import com.cloud.agent.api.to.FirewallRuleTO;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/SetMonitorServiceCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/SetMonitorServiceCommand.java b/core/src/com/cloud/agent/api/routing/SetMonitorServiceCommand.java
index 12f57dc..a537703 100644
--- a/core/src/com/cloud/agent/api/routing/SetMonitorServiceCommand.java
+++ b/core/src/com/cloud/agent/api/routing/SetMonitorServiceCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.routing;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/SetNetworkACLAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/SetNetworkACLAnswer.java b/core/src/com/cloud/agent/api/routing/SetNetworkACLAnswer.java
index dc192ad..547ec55 100644
--- a/core/src/com/cloud/agent/api/routing/SetNetworkACLAnswer.java
+++ b/core/src/com/cloud/agent/api/routing/SetNetworkACLAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.routing;
 
 import com.cloud.agent.api.Answer;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java b/core/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java
index 0b9fec5..0cb1c3e 100644
--- a/core/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java
+++ b/core/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
 
 package com.cloud.agent.api.routing;
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/SetPortForwardingRulesAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/SetPortForwardingRulesAnswer.java b/core/src/com/cloud/agent/api/routing/SetPortForwardingRulesAnswer.java
index 8807e9a..731cbfa 100644
--- a/core/src/com/cloud/agent/api/routing/SetPortForwardingRulesAnswer.java
+++ b/core/src/com/cloud/agent/api/routing/SetPortForwardingRulesAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.routing;
 
 import com.cloud.agent.api.Answer;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java b/core/src/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java
index d93ccaf..cb2669a 100644
--- a/core/src/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java
+++ b/core/src/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.routing;
 
 import com.cloud.agent.api.to.PortForwardingRuleTO;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java b/core/src/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java
index 1bce50d..5b23012 100644
--- a/core/src/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java
+++ b/core/src/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.routing;
 
 import com.cloud.agent.api.to.PortForwardingRuleTO;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/SetSourceNatAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/SetSourceNatAnswer.java b/core/src/com/cloud/agent/api/routing/SetSourceNatAnswer.java
index 809182b..9606e46 100644
--- a/core/src/com/cloud/agent/api/routing/SetSourceNatAnswer.java
+++ b/core/src/com/cloud/agent/api/routing/SetSourceNatAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.routing;
 
 import com.cloud.agent.api.Answer;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/SetSourceNatCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/SetSourceNatCommand.java b/core/src/com/cloud/agent/api/routing/SetSourceNatCommand.java
index 473a3bb..06c8334 100644
--- a/core/src/com/cloud/agent/api/routing/SetSourceNatCommand.java
+++ b/core/src/com/cloud/agent/api/routing/SetSourceNatCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.routing;
 
 import com.cloud.agent.api.to.IpAddressTO;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/SetStaticNatRulesAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/SetStaticNatRulesAnswer.java b/core/src/com/cloud/agent/api/routing/SetStaticNatRulesAnswer.java
index de1356d..68786f7 100644
--- a/core/src/com/cloud/agent/api/routing/SetStaticNatRulesAnswer.java
+++ b/core/src/com/cloud/agent/api/routing/SetStaticNatRulesAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.routing;
 
 import com.cloud.agent.api.Answer;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/SetStaticNatRulesCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/SetStaticNatRulesCommand.java b/core/src/com/cloud/agent/api/routing/SetStaticNatRulesCommand.java
index 64c7660..213fa47 100644
--- a/core/src/com/cloud/agent/api/routing/SetStaticNatRulesCommand.java
+++ b/core/src/com/cloud/agent/api/routing/SetStaticNatRulesCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.routing;
 
 import com.cloud.agent.api.to.StaticNatRuleTO;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/SetStaticRouteAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/SetStaticRouteAnswer.java b/core/src/com/cloud/agent/api/routing/SetStaticRouteAnswer.java
index cf2b952..56f2dce 100644
--- a/core/src/com/cloud/agent/api/routing/SetStaticRouteAnswer.java
+++ b/core/src/com/cloud/agent/api/routing/SetStaticRouteAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.routing;
 
 import java.util.Arrays;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java b/core/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java
index 1e4f0c8..2352364 100644
--- a/core/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java
+++ b/core/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
 
 package com.cloud.agent.api.routing;
 


[2/6] Cleanup licenses in core with com.mycila:license-maven-plugin:format

Posted by hu...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/Site2SiteVpnCfgCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/Site2SiteVpnCfgCommand.java b/core/src/com/cloud/agent/api/routing/Site2SiteVpnCfgCommand.java
index 84ff47b..68b3809 100644
--- a/core/src/com/cloud/agent/api/routing/Site2SiteVpnCfgCommand.java
+++ b/core/src/com/cloud/agent/api/routing/Site2SiteVpnCfgCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.routing;
 
 public class Site2SiteVpnCfgCommand extends NetworkElementCommand {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/SiteLoadBalancerConfig.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/SiteLoadBalancerConfig.java b/core/src/com/cloud/agent/api/routing/SiteLoadBalancerConfig.java
index 3480600..a908c08 100644
--- a/core/src/com/cloud/agent/api/routing/SiteLoadBalancerConfig.java
+++ b/core/src/com/cloud/agent/api/routing/SiteLoadBalancerConfig.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
 
 package com.cloud.agent.api.routing;
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/UserDataCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/UserDataCommand.java b/core/src/com/cloud/agent/api/routing/UserDataCommand.java
index aa05c7f..c04bb17 100644
--- a/core/src/com/cloud/agent/api/routing/UserDataCommand.java
+++ b/core/src/com/cloud/agent/api/routing/UserDataCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.routing;
 
 public class UserDataCommand extends NetworkElementCommand {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/VmDataCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/VmDataCommand.java b/core/src/com/cloud/agent/api/routing/VmDataCommand.java
index e48ea17..733866c 100644
--- a/core/src/com/cloud/agent/api/routing/VmDataCommand.java
+++ b/core/src/com/cloud/agent/api/routing/VmDataCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.routing;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/routing/VpnUsersCfgCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/VpnUsersCfgCommand.java b/core/src/com/cloud/agent/api/routing/VpnUsersCfgCommand.java
index dd103c5..3510d14 100644
--- a/core/src/com/cloud/agent/api/routing/VpnUsersCfgCommand.java
+++ b/core/src/com/cloud/agent/api/routing/VpnUsersCfgCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.routing;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/storage/AbstractDownloadCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/AbstractDownloadCommand.java b/core/src/com/cloud/agent/api/storage/AbstractDownloadCommand.java
index 097af66..0bde5e3 100644
--- a/core/src/com/cloud/agent/api/storage/AbstractDownloadCommand.java
+++ b/core/src/com/cloud/agent/api/storage/AbstractDownloadCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.storage;
 
 import com.cloud.storage.Storage.ImageFormat;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/storage/AbstractUploadCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/AbstractUploadCommand.java b/core/src/com/cloud/agent/api/storage/AbstractUploadCommand.java
index 3eb6e25..b8e28ae 100644
--- a/core/src/com/cloud/agent/api/storage/AbstractUploadCommand.java
+++ b/core/src/com/cloud/agent/api/storage/AbstractUploadCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.storage;
 
 import com.cloud.storage.Storage.ImageFormat;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/storage/CopyVolumeAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/CopyVolumeAnswer.java b/core/src/com/cloud/agent/api/storage/CopyVolumeAnswer.java
index 3012749..4d84310 100644
--- a/core/src/com/cloud/agent/api/storage/CopyVolumeAnswer.java
+++ b/core/src/com/cloud/agent/api/storage/CopyVolumeAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.storage;
 
 import com.cloud.agent.api.Answer;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java b/core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java
index 7f1916c..43c84ee 100644
--- a/core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java
+++ b/core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.storage;
 
 import com.cloud.agent.api.Command;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/storage/CreateAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/CreateAnswer.java b/core/src/com/cloud/agent/api/storage/CreateAnswer.java
index dbe7510..acefb51 100644
--- a/core/src/com/cloud/agent/api/storage/CreateAnswer.java
+++ b/core/src/com/cloud/agent/api/storage/CreateAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.storage;
 
 import com.cloud.agent.api.Answer;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/storage/CreateCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/CreateCommand.java b/core/src/com/cloud/agent/api/storage/CreateCommand.java
index cb45550..76480ab 100644
--- a/core/src/com/cloud/agent/api/storage/CreateCommand.java
+++ b/core/src/com/cloud/agent/api/storage/CreateCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.storage;
 
 import com.cloud.agent.api.Command;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/storage/CreateEntityDownloadURLAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/CreateEntityDownloadURLAnswer.java b/core/src/com/cloud/agent/api/storage/CreateEntityDownloadURLAnswer.java
index 920d2ee..cdcb3c0 100644
--- a/core/src/com/cloud/agent/api/storage/CreateEntityDownloadURLAnswer.java
+++ b/core/src/com/cloud/agent/api/storage/CreateEntityDownloadURLAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.storage;
 
 import com.cloud.agent.api.Answer;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/storage/CreateEntityDownloadURLCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/CreateEntityDownloadURLCommand.java b/core/src/com/cloud/agent/api/storage/CreateEntityDownloadURLCommand.java
index 11b93d5..c84eceb 100755
--- a/core/src/com/cloud/agent/api/storage/CreateEntityDownloadURLCommand.java
+++ b/core/src/com/cloud/agent/api/storage/CreateEntityDownloadURLCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.storage;
 
 import com.cloud.agent.api.to.DataTO;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java b/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java
index 250405e..e04537f 100644
--- a/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java
+++ b/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.storage;
 
 import com.cloud.agent.api.Answer;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateCommand.java b/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateCommand.java
index 203a4b6..b636dab 100644
--- a/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateCommand.java
+++ b/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.storage;
 
 public class CreatePrivateTemplateCommand extends StorageCommand {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLCommand.java b/core/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLCommand.java
index c1787ee..67d6784 100755
--- a/core/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLCommand.java
+++ b/core/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.storage;
 
 import com.cloud.storage.Upload;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/storage/DestroyAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/DestroyAnswer.java b/core/src/com/cloud/agent/api/storage/DestroyAnswer.java
index ac60015..4af320a 100644
--- a/core/src/com/cloud/agent/api/storage/DestroyAnswer.java
+++ b/core/src/com/cloud/agent/api/storage/DestroyAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.storage;
 
 import com.cloud.agent.api.Answer;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/storage/DestroyCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/DestroyCommand.java b/core/src/com/cloud/agent/api/storage/DestroyCommand.java
index 315ad25..dea8190 100755
--- a/core/src/com/cloud/agent/api/storage/DestroyCommand.java
+++ b/core/src/com/cloud/agent/api/storage/DestroyCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.storage;
 
 import com.cloud.agent.api.to.VolumeTO;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/storage/DownloadAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/DownloadAnswer.java b/core/src/com/cloud/agent/api/storage/DownloadAnswer.java
index c49c4b5..fdc47b4 100755
--- a/core/src/com/cloud/agent/api/storage/DownloadAnswer.java
+++ b/core/src/com/cloud/agent/api/storage/DownloadAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.storage;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/storage/ListTemplateAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/ListTemplateAnswer.java b/core/src/com/cloud/agent/api/storage/ListTemplateAnswer.java
index 6869cf2..558094d 100644
--- a/core/src/com/cloud/agent/api/storage/ListTemplateAnswer.java
+++ b/core/src/com/cloud/agent/api/storage/ListTemplateAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.storage;
 
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/storage/ListTemplateCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/ListTemplateCommand.java b/core/src/com/cloud/agent/api/storage/ListTemplateCommand.java
index 7bd7753..8550952 100644
--- a/core/src/com/cloud/agent/api/storage/ListTemplateCommand.java
+++ b/core/src/com/cloud/agent/api/storage/ListTemplateCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.storage;
 
 import com.cloud.agent.api.to.DataStoreTO;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/storage/ListVolumeAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/ListVolumeAnswer.java b/core/src/com/cloud/agent/api/storage/ListVolumeAnswer.java
index 104bba4..6ecde0d 100755
--- a/core/src/com/cloud/agent/api/storage/ListVolumeAnswer.java
+++ b/core/src/com/cloud/agent/api/storage/ListVolumeAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.storage;
 
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/storage/ListVolumeCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/ListVolumeCommand.java b/core/src/com/cloud/agent/api/storage/ListVolumeCommand.java
index 8c8b1bf..3550609 100755
--- a/core/src/com/cloud/agent/api/storage/ListVolumeCommand.java
+++ b/core/src/com/cloud/agent/api/storage/ListVolumeCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.storage;
 
 import com.cloud.agent.api.to.DataStoreTO;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityAnswer.java b/core/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityAnswer.java
index abfe2b6..c1a71d2 100644
--- a/core/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityAnswer.java
+++ b/core/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.storage;
 
 import com.cloud.agent.api.Answer;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityCommand.java b/core/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityCommand.java
index 27f1cc9..0cd402c 100644
--- a/core/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityCommand.java
+++ b/core/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.storage;
 
 import com.cloud.agent.api.Command;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/storage/MigrateVolumeAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/MigrateVolumeAnswer.java b/core/src/com/cloud/agent/api/storage/MigrateVolumeAnswer.java
index d5efa95..3db3e86 100644
--- a/core/src/com/cloud/agent/api/storage/MigrateVolumeAnswer.java
+++ b/core/src/com/cloud/agent/api/storage/MigrateVolumeAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.storage;
 
 import com.cloud.agent.api.Answer;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/storage/MigrateVolumeCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/MigrateVolumeCommand.java b/core/src/com/cloud/agent/api/storage/MigrateVolumeCommand.java
index b73a48a..85f0bf4 100644
--- a/core/src/com/cloud/agent/api/storage/MigrateVolumeCommand.java
+++ b/core/src/com/cloud/agent/api/storage/MigrateVolumeCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.storage;
 
 import com.cloud.agent.api.Command;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadAnswer.java b/core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadAnswer.java
index af2235e..bde1188 100644
--- a/core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadAnswer.java
+++ b/core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.storage;
 
 import com.cloud.agent.api.Answer;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java b/core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
index 22a72d8..f8b88c9 100644
--- a/core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
+++ b/core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.storage;
 
 import com.cloud.agent.api.to.StorageFilerTO;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/storage/ResizeVolumeAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/ResizeVolumeAnswer.java b/core/src/com/cloud/agent/api/storage/ResizeVolumeAnswer.java
index 9d4c974..bf3e692 100644
--- a/core/src/com/cloud/agent/api/storage/ResizeVolumeAnswer.java
+++ b/core/src/com/cloud/agent/api/storage/ResizeVolumeAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.storage;
 
 import com.cloud.agent.api.Answer;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/storage/ResizeVolumeCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/ResizeVolumeCommand.java b/core/src/com/cloud/agent/api/storage/ResizeVolumeCommand.java
index 4cd633e..3b121e1 100644
--- a/core/src/com/cloud/agent/api/storage/ResizeVolumeCommand.java
+++ b/core/src/com/cloud/agent/api/storage/ResizeVolumeCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.storage;
 
 import com.cloud.agent.api.Command;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/storage/SsCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/SsCommand.java b/core/src/com/cloud/agent/api/storage/SsCommand.java
index d4a6e5b7..187ae03 100644
--- a/core/src/com/cloud/agent/api/storage/SsCommand.java
+++ b/core/src/com/cloud/agent/api/storage/SsCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.storage;
 
 import com.cloud.agent.api.Command;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/storage/StorageCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/StorageCommand.java b/core/src/com/cloud/agent/api/storage/StorageCommand.java
index 270143b..a6719c4 100644
--- a/core/src/com/cloud/agent/api/storage/StorageCommand.java
+++ b/core/src/com/cloud/agent/api/storage/StorageCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.storage;
 
 import com.cloud.agent.api.Command;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/storage/UpgradeDiskAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/UpgradeDiskAnswer.java b/core/src/com/cloud/agent/api/storage/UpgradeDiskAnswer.java
index b328c90..d57625b 100644
--- a/core/src/com/cloud/agent/api/storage/UpgradeDiskAnswer.java
+++ b/core/src/com/cloud/agent/api/storage/UpgradeDiskAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.storage;
 
 import com.cloud.agent.api.Answer;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/storage/UpgradeDiskCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/UpgradeDiskCommand.java b/core/src/com/cloud/agent/api/storage/UpgradeDiskCommand.java
index bc83ff1..49d63be 100644
--- a/core/src/com/cloud/agent/api/storage/UpgradeDiskCommand.java
+++ b/core/src/com/cloud/agent/api/storage/UpgradeDiskCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.storage;
 
 public class UpgradeDiskCommand extends StorageCommand {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/storage/UploadAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/UploadAnswer.java b/core/src/com/cloud/agent/api/storage/UploadAnswer.java
index 56c7b4f..6acbdbe 100755
--- a/core/src/com/cloud/agent/api/storage/UploadAnswer.java
+++ b/core/src/com/cloud/agent/api/storage/UploadAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.storage;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/storage/UploadCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/UploadCommand.java b/core/src/com/cloud/agent/api/storage/UploadCommand.java
index 5cf4db0..6160f2e 100644
--- a/core/src/com/cloud/agent/api/storage/UploadCommand.java
+++ b/core/src/com/cloud/agent/api/storage/UploadCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.storage;
 
 import org.apache.cloudstack.api.InternalIdentity;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/storage/UploadProgressCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/UploadProgressCommand.java b/core/src/com/cloud/agent/api/storage/UploadProgressCommand.java
index bbb7896..1a8c7cd 100644
--- a/core/src/com/cloud/agent/api/storage/UploadProgressCommand.java
+++ b/core/src/com/cloud/agent/api/storage/UploadProgressCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api.storage;
 
 public class UploadProgressCommand extends UploadCommand {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/resource/virtualnetwork/ConfigHelper.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/ConfigHelper.java b/core/src/com/cloud/agent/resource/virtualnetwork/ConfigHelper.java
index 358fa2c..25a2bd9 100644
--- a/core/src/com/cloud/agent/resource/virtualnetwork/ConfigHelper.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/ConfigHelper.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.resource.virtualnetwork;
 
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/resource/virtualnetwork/ConfigItem.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/ConfigItem.java b/core/src/com/cloud/agent/resource/virtualnetwork/ConfigItem.java
index a57eb79..2d52ada 100644
--- a/core/src/com/cloud/agent/resource/virtualnetwork/ConfigItem.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/ConfigItem.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.resource.virtualnetwork;
 
 public abstract class ConfigItem {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/resource/virtualnetwork/FileConfigItem.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/FileConfigItem.java b/core/src/com/cloud/agent/resource/virtualnetwork/FileConfigItem.java
index e54c4f0..beb0942 100644
--- a/core/src/com/cloud/agent/resource/virtualnetwork/FileConfigItem.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/FileConfigItem.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.resource.virtualnetwork;
 
 public class FileConfigItem extends ConfigItem {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/resource/virtualnetwork/ScriptConfigItem.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/ScriptConfigItem.java b/core/src/com/cloud/agent/resource/virtualnetwork/ScriptConfigItem.java
index 1e0bcbc..3398074 100644
--- a/core/src/com/cloud/agent/resource/virtualnetwork/ScriptConfigItem.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/ScriptConfigItem.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.resource.virtualnetwork;
 
 public class ScriptConfigItem extends ConfigItem {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/resource/virtualnetwork/VRScripts.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VRScripts.java b/core/src/com/cloud/agent/resource/virtualnetwork/VRScripts.java
index 7acad14..4fd5aa5 100644
--- a/core/src/com/cloud/agent/resource/virtualnetwork/VRScripts.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/VRScripts.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.resource.virtualnetwork;
 
 public class VRScripts {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRouterDeployer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRouterDeployer.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRouterDeployer.java
index 1feaaea..f6a1694 100644
--- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRouterDeployer.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRouterDeployer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.resource.virtualnetwork;
 
 import com.cloud.agent.api.routing.NetworkElementCommand;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
index bb2dac9..1fa5bf2 100755
--- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.resource.virtualnetwork;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java b/core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java
index 1debdc8..aff28a4 100755
--- a/core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java
+++ b/core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.transport;
 
 import java.lang.reflect.Array;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/transport/InterfaceTypeAdaptor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/transport/InterfaceTypeAdaptor.java b/core/src/com/cloud/agent/transport/InterfaceTypeAdaptor.java
index 8e25cc0..92b1e97 100644
--- a/core/src/com/cloud/agent/transport/InterfaceTypeAdaptor.java
+++ b/core/src/com/cloud/agent/transport/InterfaceTypeAdaptor.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.transport;
 
 import java.lang.reflect.Type;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/transport/LoggingExclusionStrategy.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/transport/LoggingExclusionStrategy.java b/core/src/com/cloud/agent/transport/LoggingExclusionStrategy.java
index ce3f21a..90e964e 100644
--- a/core/src/com/cloud/agent/transport/LoggingExclusionStrategy.java
+++ b/core/src/com/cloud/agent/transport/LoggingExclusionStrategy.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.transport;
 
 import org.apache.log4j.Logger;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/transport/Request.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/transport/Request.java b/core/src/com/cloud/agent/transport/Request.java
index b5890d9..3db9ae8 100755
--- a/core/src/com/cloud/agent/transport/Request.java
+++ b/core/src/com/cloud/agent/transport/Request.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.transport;
 
 import java.io.ByteArrayInputStream;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/transport/Response.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/transport/Response.java b/core/src/com/cloud/agent/transport/Response.java
index b04bde7..ef85e32 100755
--- a/core/src/com/cloud/agent/transport/Response.java
+++ b/core/src/com/cloud/agent/transport/Response.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.transport;
 
 import com.cloud.agent.api.Answer;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/exception/UnsupportedVersionException.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/exception/UnsupportedVersionException.java b/core/src/com/cloud/exception/UnsupportedVersionException.java
index 713c7f0..5ee8d8e 100755
--- a/core/src/com/cloud/exception/UnsupportedVersionException.java
+++ b/core/src/com/cloud/exception/UnsupportedVersionException.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.exception;
 
 import com.cloud.utils.SerialVersionUID;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/exception/UsageServerException.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/exception/UsageServerException.java b/core/src/com/cloud/exception/UsageServerException.java
index 1c5d436..be107a6 100644
--- a/core/src/com/cloud/exception/UsageServerException.java
+++ b/core/src/com/cloud/exception/UsageServerException.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.exception;
 
 public class UsageServerException extends CloudException {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/host/HostInfo.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/host/HostInfo.java b/core/src/com/cloud/host/HostInfo.java
index 4a95aa8..edbad07 100644
--- a/core/src/com/cloud/host/HostInfo.java
+++ b/core/src/com/cloud/host/HostInfo.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.host;
 
 public final class HostInfo {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/hypervisor/hyperv/resource/HypervDummyResourceBase.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/hypervisor/hyperv/resource/HypervDummyResourceBase.java b/core/src/com/cloud/hypervisor/hyperv/resource/HypervDummyResourceBase.java
index 44f45e2..5c9aecd 100644
--- a/core/src/com/cloud/hypervisor/hyperv/resource/HypervDummyResourceBase.java
+++ b/core/src/com/cloud/hypervisor/hyperv/resource/HypervDummyResourceBase.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.hypervisor.hyperv.resource;
 
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/info/ConsoleProxyConnectionInfo.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/info/ConsoleProxyConnectionInfo.java b/core/src/com/cloud/info/ConsoleProxyConnectionInfo.java
index 2d2c36d..48819f4 100644
--- a/core/src/com/cloud/info/ConsoleProxyConnectionInfo.java
+++ b/core/src/com/cloud/info/ConsoleProxyConnectionInfo.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.info;
 
 public class ConsoleProxyConnectionInfo {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/info/ConsoleProxyInfo.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/info/ConsoleProxyInfo.java b/core/src/com/cloud/info/ConsoleProxyInfo.java
index 0e57b75..b15abcb 100644
--- a/core/src/com/cloud/info/ConsoleProxyInfo.java
+++ b/core/src/com/cloud/info/ConsoleProxyInfo.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.info;
 
 public class ConsoleProxyInfo {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/info/ConsoleProxyStatus.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/info/ConsoleProxyStatus.java b/core/src/com/cloud/info/ConsoleProxyStatus.java
index fcbf493..3d3dda9 100644
--- a/core/src/com/cloud/info/ConsoleProxyStatus.java
+++ b/core/src/com/cloud/info/ConsoleProxyStatus.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.info;
 
 public class ConsoleProxyStatus {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/info/RunningHostInfoAgregator.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/info/RunningHostInfoAgregator.java b/core/src/com/cloud/info/RunningHostInfoAgregator.java
index cec8037..458b329 100644
--- a/core/src/com/cloud/info/RunningHostInfoAgregator.java
+++ b/core/src/com/cloud/info/RunningHostInfoAgregator.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.info;
 
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/info/SecStorageVmLoadInfo.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/info/SecStorageVmLoadInfo.java b/core/src/com/cloud/info/SecStorageVmLoadInfo.java
index 4eaab34..e10d5cc 100644
--- a/core/src/com/cloud/info/SecStorageVmLoadInfo.java
+++ b/core/src/com/cloud/info/SecStorageVmLoadInfo.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.info;
 
 public class SecStorageVmLoadInfo {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/network/HAProxyConfigurator.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/network/HAProxyConfigurator.java b/core/src/com/cloud/network/HAProxyConfigurator.java
index e5fa787..c3c35f3 100644
--- a/core/src/com/cloud/network/HAProxyConfigurator.java
+++ b/core/src/com/cloud/network/HAProxyConfigurator.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.network;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/network/LoadBalancerConfigurator.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/network/LoadBalancerConfigurator.java b/core/src/com/cloud/network/LoadBalancerConfigurator.java
index 6dbbcc7..0e19b1e 100644
--- a/core/src/com/cloud/network/LoadBalancerConfigurator.java
+++ b/core/src/com/cloud/network/LoadBalancerConfigurator.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.network;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/network/LoadBalancerValidator.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/network/LoadBalancerValidator.java b/core/src/com/cloud/network/LoadBalancerValidator.java
index f318899..98db543 100644
--- a/core/src/com/cloud/network/LoadBalancerValidator.java
+++ b/core/src/com/cloud/network/LoadBalancerValidator.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.network;
 
 import com.cloud.network.lb.LoadBalancingRule;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/network/resource/CreateLoadBalancerApplianceAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/network/resource/CreateLoadBalancerApplianceAnswer.java b/core/src/com/cloud/network/resource/CreateLoadBalancerApplianceAnswer.java
index 2eec7ed..e631897 100644
--- a/core/src/com/cloud/network/resource/CreateLoadBalancerApplianceAnswer.java
+++ b/core/src/com/cloud/network/resource/CreateLoadBalancerApplianceAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.network.resource;
 
 import com.cloud.agent.api.Answer;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/network/resource/DestroyLoadBalancerApplianceAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/network/resource/DestroyLoadBalancerApplianceAnswer.java b/core/src/com/cloud/network/resource/DestroyLoadBalancerApplianceAnswer.java
index 29c9ca0..80e2fe3 100644
--- a/core/src/com/cloud/network/resource/DestroyLoadBalancerApplianceAnswer.java
+++ b/core/src/com/cloud/network/resource/DestroyLoadBalancerApplianceAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.network.resource;
 
 import com.cloud.agent.api.Answer;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/network/resource/TrafficSentinelResource.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/network/resource/TrafficSentinelResource.java b/core/src/com/cloud/network/resource/TrafficSentinelResource.java
index 67c0dd4..cac3ae3 100644
--- a/core/src/com/cloud/network/resource/TrafficSentinelResource.java
+++ b/core/src/com/cloud/network/resource/TrafficSentinelResource.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.network.resource;
 
 import java.io.BufferedReader;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/resource/ResourceListener.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/resource/ResourceListener.java b/core/src/com/cloud/resource/ResourceListener.java
index a911bc5..968217d 100755
--- a/core/src/com/cloud/resource/ResourceListener.java
+++ b/core/src/com/cloud/resource/ResourceListener.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.resource;
 
 import java.net.URI;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/resource/ServerResource.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/resource/ServerResource.java b/core/src/com/cloud/resource/ServerResource.java
index 9080e94..1bbcbff 100755
--- a/core/src/com/cloud/resource/ServerResource.java
+++ b/core/src/com/cloud/resource/ServerResource.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.resource;
 
 import com.cloud.agent.IAgentControl;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/resource/ServerResourceBase.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/resource/ServerResourceBase.java b/core/src/com/cloud/resource/ServerResourceBase.java
index 4da9944..d3992a3 100755
--- a/core/src/com/cloud/resource/ServerResourceBase.java
+++ b/core/src/com/cloud/resource/ServerResourceBase.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.resource;
 
 import java.io.PrintWriter;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/resource/hypervisor/HypervisorResource.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/resource/hypervisor/HypervisorResource.java b/core/src/com/cloud/resource/hypervisor/HypervisorResource.java
index dedd9e0..dd55b04 100644
--- a/core/src/com/cloud/resource/hypervisor/HypervisorResource.java
+++ b/core/src/com/cloud/resource/hypervisor/HypervisorResource.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.resource.hypervisor;
 
 import com.cloud.agent.api.RebootAnswer;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/serializer/GsonHelper.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/serializer/GsonHelper.java b/core/src/com/cloud/serializer/GsonHelper.java
index 4349b4a..7ac85d3 100644
--- a/core/src/com/cloud/serializer/GsonHelper.java
+++ b/core/src/com/cloud/serializer/GsonHelper.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.serializer;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/serializer/SerializerHelper.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/serializer/SerializerHelper.java b/core/src/com/cloud/serializer/SerializerHelper.java
index 1ba55fc..60a978d 100644
--- a/core/src/com/cloud/serializer/SerializerHelper.java
+++ b/core/src/com/cloud/serializer/SerializerHelper.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.serializer;
 
 import java.lang.reflect.Field;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/storage/JavaStorageLayer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/JavaStorageLayer.java b/core/src/com/cloud/storage/JavaStorageLayer.java
index e8c4053..6b61ad0 100644
--- a/core/src/com/cloud/storage/JavaStorageLayer.java
+++ b/core/src/com/cloud/storage/JavaStorageLayer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.storage;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/storage/StorageLayer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/StorageLayer.java b/core/src/com/cloud/storage/StorageLayer.java
index e2a1995..8daa392 100644
--- a/core/src/com/cloud/storage/StorageLayer.java
+++ b/core/src/com/cloud/storage/StorageLayer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.storage;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/storage/resource/StoragePoolResource.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/resource/StoragePoolResource.java b/core/src/com/cloud/storage/resource/StoragePoolResource.java
index a87dfec..a618e00 100644
--- a/core/src/com/cloud/storage/resource/StoragePoolResource.java
+++ b/core/src/com/cloud/storage/resource/StoragePoolResource.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.storage.resource;
 
 import com.cloud.agent.api.Answer;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/storage/resource/StorageProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/resource/StorageProcessor.java b/core/src/com/cloud/storage/resource/StorageProcessor.java
index d49a64b..b673d70 100644
--- a/core/src/com/cloud/storage/resource/StorageProcessor.java
+++ b/core/src/com/cloud/storage/resource/StorageProcessor.java
@@ -1,21 +1,22 @@
-/*
- * 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.
- */
+//
+// 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.
+//
+
 package com.cloud.storage.resource;
 
 import org.apache.cloudstack.storage.command.AttachCommand;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/storage/resource/StorageSubsystemCommandHandler.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/resource/StorageSubsystemCommandHandler.java b/core/src/com/cloud/storage/resource/StorageSubsystemCommandHandler.java
index 5ac601e..09393e5 100644
--- a/core/src/com/cloud/storage/resource/StorageSubsystemCommandHandler.java
+++ b/core/src/com/cloud/storage/resource/StorageSubsystemCommandHandler.java
@@ -1,21 +1,22 @@
-/*
- * 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.
- */
+//
+// 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.
+//
+
 package com.cloud.storage.resource;
 
 import org.apache.cloudstack.storage.command.StorageSubSystemCommand;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/storage/template/FtpTemplateUploader.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/FtpTemplateUploader.java b/core/src/com/cloud/storage/template/FtpTemplateUploader.java
index 425c857..eb0c4f8 100755
--- a/core/src/com/cloud/storage/template/FtpTemplateUploader.java
+++ b/core/src/com/cloud/storage/template/FtpTemplateUploader.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.storage.template;
 
 import java.io.BufferedInputStream;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/storage/template/HttpTemplateDownloader.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/HttpTemplateDownloader.java b/core/src/com/cloud/storage/template/HttpTemplateDownloader.java
index 43904aa..5bfa1f7 100644
--- a/core/src/com/cloud/storage/template/HttpTemplateDownloader.java
+++ b/core/src/com/cloud/storage/template/HttpTemplateDownloader.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.storage.template;
 
 import java.io.BufferedInputStream;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/storage/template/IsoProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/IsoProcessor.java b/core/src/com/cloud/storage/template/IsoProcessor.java
index 2dbfb48..f706430 100644
--- a/core/src/com/cloud/storage/template/IsoProcessor.java
+++ b/core/src/com/cloud/storage/template/IsoProcessor.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.storage.template;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/storage/template/LocalTemplateDownloader.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/LocalTemplateDownloader.java b/core/src/com/cloud/storage/template/LocalTemplateDownloader.java
index 13e7f82..0edfb13 100644
--- a/core/src/com/cloud/storage/template/LocalTemplateDownloader.java
+++ b/core/src/com/cloud/storage/template/LocalTemplateDownloader.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.storage.template;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/storage/template/OVAProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/OVAProcessor.java b/core/src/com/cloud/storage/template/OVAProcessor.java
index 0db3bb0..d87ca18 100644
--- a/core/src/com/cloud/storage/template/OVAProcessor.java
+++ b/core/src/com/cloud/storage/template/OVAProcessor.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.storage.template;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/storage/template/Processor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/Processor.java b/core/src/com/cloud/storage/template/Processor.java
index 4887e4e..7d6f6ce 100644
--- a/core/src/com/cloud/storage/template/Processor.java
+++ b/core/src/com/cloud/storage/template/Processor.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.storage.template;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/storage/template/QCOW2Processor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/QCOW2Processor.java b/core/src/com/cloud/storage/template/QCOW2Processor.java
index b3c0cc9..c387a9b 100644
--- a/core/src/com/cloud/storage/template/QCOW2Processor.java
+++ b/core/src/com/cloud/storage/template/QCOW2Processor.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.storage.template;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/storage/template/RawImageProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/RawImageProcessor.java b/core/src/com/cloud/storage/template/RawImageProcessor.java
index 77448f2..030c405 100644
--- a/core/src/com/cloud/storage/template/RawImageProcessor.java
+++ b/core/src/com/cloud/storage/template/RawImageProcessor.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.storage.template;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/storage/template/S3TemplateDownloader.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/S3TemplateDownloader.java b/core/src/com/cloud/storage/template/S3TemplateDownloader.java
index 21b7a59..ec44d8d 100644
--- a/core/src/com/cloud/storage/template/S3TemplateDownloader.java
+++ b/core/src/com/cloud/storage/template/S3TemplateDownloader.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.storage.template;
 
 import static com.cloud.utils.StringUtils.join;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/storage/template/ScpTemplateDownloader.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/ScpTemplateDownloader.java b/core/src/com/cloud/storage/template/ScpTemplateDownloader.java
index 3af1bb9..912809c 100644
--- a/core/src/com/cloud/storage/template/ScpTemplateDownloader.java
+++ b/core/src/com/cloud/storage/template/ScpTemplateDownloader.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.storage.template;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/storage/template/TemplateConstants.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/TemplateConstants.java b/core/src/com/cloud/storage/template/TemplateConstants.java
index 3f21465..25c2d5b 100644
--- a/core/src/com/cloud/storage/template/TemplateConstants.java
+++ b/core/src/com/cloud/storage/template/TemplateConstants.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.storage.template;
 
 public final class TemplateConstants {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/storage/template/TemplateDownloader.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/TemplateDownloader.java b/core/src/com/cloud/storage/template/TemplateDownloader.java
index 0e0acce..da9787d 100644
--- a/core/src/com/cloud/storage/template/TemplateDownloader.java
+++ b/core/src/com/cloud/storage/template/TemplateDownloader.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.storage.template;
 
 public interface TemplateDownloader extends Runnable {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/storage/template/TemplateDownloaderBase.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/TemplateDownloaderBase.java b/core/src/com/cloud/storage/template/TemplateDownloaderBase.java
index e3fec8e..f56e491 100644
--- a/core/src/com/cloud/storage/template/TemplateDownloaderBase.java
+++ b/core/src/com/cloud/storage/template/TemplateDownloaderBase.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.storage.template;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/storage/template/TemplateLocation.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/TemplateLocation.java b/core/src/com/cloud/storage/template/TemplateLocation.java
index 48b040a..87f56b8 100644
--- a/core/src/com/cloud/storage/template/TemplateLocation.java
+++ b/core/src/com/cloud/storage/template/TemplateLocation.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.storage.template;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/storage/template/TemplateUploader.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/TemplateUploader.java b/core/src/com/cloud/storage/template/TemplateUploader.java
index d44244b..ebe567a 100755
--- a/core/src/com/cloud/storage/template/TemplateUploader.java
+++ b/core/src/com/cloud/storage/template/TemplateUploader.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.storage.template;
 
 public interface TemplateUploader extends Runnable {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/storage/template/VhdProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/VhdProcessor.java b/core/src/com/cloud/storage/template/VhdProcessor.java
index 2e4ac44..ac0fa7e 100644
--- a/core/src/com/cloud/storage/template/VhdProcessor.java
+++ b/core/src/com/cloud/storage/template/VhdProcessor.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.storage.template;
 
 import java.io.File;


[4/6] Cleanup licenses in core with com.mycila:license-maven-plugin:format

Posted by hu...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsCommand.java b/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsCommand.java
index bbd7c5f..e7eea54 100644
--- a/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsCommand.java
+++ b/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.routing.NetworkElementCommand;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CheckStateAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CheckStateAnswer.java b/core/src/com/cloud/agent/api/CheckStateAnswer.java
index 78dd471..5e3a709 100755
--- a/core/src/com/cloud/agent/api/CheckStateAnswer.java
+++ b/core/src/com/cloud/agent/api/CheckStateAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.vm.VirtualMachine.State;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CheckStateCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CheckStateCommand.java b/core/src/com/cloud/agent/api/CheckStateCommand.java
index 0d0c2e8..bf55a5d 100755
--- a/core/src/com/cloud/agent/api/CheckStateCommand.java
+++ b/core/src/com/cloud/agent/api/CheckStateCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 /**

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CheckVirtualMachineAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CheckVirtualMachineAnswer.java b/core/src/com/cloud/agent/api/CheckVirtualMachineAnswer.java
index 825eacc..539d18a 100644
--- a/core/src/com/cloud/agent/api/CheckVirtualMachineAnswer.java
+++ b/core/src/com/cloud/agent/api/CheckVirtualMachineAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.vm.VirtualMachine.State;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CheckVirtualMachineCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CheckVirtualMachineCommand.java b/core/src/com/cloud/agent/api/CheckVirtualMachineCommand.java
index 62f4420..1754950 100644
--- a/core/src/com/cloud/agent/api/CheckVirtualMachineCommand.java
+++ b/core/src/com/cloud/agent/api/CheckVirtualMachineCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class CheckVirtualMachineCommand extends Command {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CleanupNetworkRulesCmd.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CleanupNetworkRulesCmd.java b/core/src/com/cloud/agent/api/CleanupNetworkRulesCmd.java
index a0be01b..0323f75 100644
--- a/core/src/com/cloud/agent/api/CleanupNetworkRulesCmd.java
+++ b/core/src/com/cloud/agent/api/CleanupNetworkRulesCmd.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class CleanupNetworkRulesCmd extends Command implements CronCommand {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/ClusterVMMetaDataSyncAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/ClusterVMMetaDataSyncAnswer.java b/core/src/com/cloud/agent/api/ClusterVMMetaDataSyncAnswer.java
index 04fd967..b0dc44c 100644
--- a/core/src/com/cloud/agent/api/ClusterVMMetaDataSyncAnswer.java
+++ b/core/src/com/cloud/agent/api/ClusterVMMetaDataSyncAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/ClusterVMMetaDataSyncCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/ClusterVMMetaDataSyncCommand.java b/core/src/com/cloud/agent/api/ClusterVMMetaDataSyncCommand.java
index 0f6ca50..971493c 100644
--- a/core/src/com/cloud/agent/api/ClusterVMMetaDataSyncCommand.java
+++ b/core/src/com/cloud/agent/api/ClusterVMMetaDataSyncCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/ComputeChecksumCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/ComputeChecksumCommand.java b/core/src/com/cloud/agent/api/ComputeChecksumCommand.java
index 8c654d7..5c8c929 100755
--- a/core/src/com/cloud/agent/api/ComputeChecksumCommand.java
+++ b/core/src/com/cloud/agent/api/ComputeChecksumCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.storage.SsCommand;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/ConsoleAccessAuthenticationAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/ConsoleAccessAuthenticationAnswer.java b/core/src/com/cloud/agent/api/ConsoleAccessAuthenticationAnswer.java
index 9cc56d8..78ef336 100644
--- a/core/src/com/cloud/agent/api/ConsoleAccessAuthenticationAnswer.java
+++ b/core/src/com/cloud/agent/api/ConsoleAccessAuthenticationAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class ConsoleAccessAuthenticationAnswer extends AgentControlAnswer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/ConsoleAccessAuthenticationCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/ConsoleAccessAuthenticationCommand.java b/core/src/com/cloud/agent/api/ConsoleAccessAuthenticationCommand.java
index b8462f2..dd533d8 100644
--- a/core/src/com/cloud/agent/api/ConsoleAccessAuthenticationCommand.java
+++ b/core/src/com/cloud/agent/api/ConsoleAccessAuthenticationCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class ConsoleAccessAuthenticationCommand extends AgentControlCommand {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/ConsoleProxyLoadReportCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/ConsoleProxyLoadReportCommand.java b/core/src/com/cloud/agent/api/ConsoleProxyLoadReportCommand.java
index 7e26dab..c53f741 100644
--- a/core/src/com/cloud/agent/api/ConsoleProxyLoadReportCommand.java
+++ b/core/src/com/cloud/agent/api/ConsoleProxyLoadReportCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class ConsoleProxyLoadReportCommand extends AgentControlCommand {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java b/core/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java
index fd9e057..7ac2dde 100644
--- a/core/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java
+++ b/core/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.storage.StoragePool;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java b/core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java
index 7880554..3025147 100644
--- a/core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java
+++ b/core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.to.StorageFilerTO;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CreateStoragePoolCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CreateStoragePoolCommand.java b/core/src/com/cloud/agent/api/CreateStoragePoolCommand.java
index f2f742a..90a5e39 100644
--- a/core/src/com/cloud/agent/api/CreateStoragePoolCommand.java
+++ b/core/src/com/cloud/agent/api/CreateStoragePoolCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.storage.StoragePool;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CreateVMSnapshotAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CreateVMSnapshotAnswer.java b/core/src/com/cloud/agent/api/CreateVMSnapshotAnswer.java
index ea0384e..ad6765f 100644
--- a/core/src/com/cloud/agent/api/CreateVMSnapshotAnswer.java
+++ b/core/src/com/cloud/agent/api/CreateVMSnapshotAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
 
 package com.cloud.agent.api;
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CreateVMSnapshotCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CreateVMSnapshotCommand.java b/core/src/com/cloud/agent/api/CreateVMSnapshotCommand.java
index 7f49155..c1d2561 100644
--- a/core/src/com/cloud/agent/api/CreateVMSnapshotCommand.java
+++ b/core/src/com/cloud/agent/api/CreateVMSnapshotCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CreateVolumeFromSnapshotAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CreateVolumeFromSnapshotAnswer.java b/core/src/com/cloud/agent/api/CreateVolumeFromSnapshotAnswer.java
index ddfb2e8..4353944 100644
--- a/core/src/com/cloud/agent/api/CreateVolumeFromSnapshotAnswer.java
+++ b/core/src/com/cloud/agent/api/CreateVolumeFromSnapshotAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class CreateVolumeFromSnapshotAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CreateVolumeFromSnapshotCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CreateVolumeFromSnapshotCommand.java b/core/src/com/cloud/agent/api/CreateVolumeFromSnapshotCommand.java
index 0228239..fa9a4d5 100644
--- a/core/src/com/cloud/agent/api/CreateVolumeFromSnapshotCommand.java
+++ b/core/src/com/cloud/agent/api/CreateVolumeFromSnapshotCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.storage.StoragePool;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotAnswer.java b/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotAnswer.java
index ad4031a..92ea529 100644
--- a/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotAnswer.java
+++ b/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
 
 package com.cloud.agent.api;
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java b/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java
index f36ad3d..69196af 100644
--- a/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java
+++ b/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.to.StorageFilerTO;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CronCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CronCommand.java b/core/src/com/cloud/agent/api/CronCommand.java
index c43237c..f179397 100755
--- a/core/src/com/cloud/agent/api/CronCommand.java
+++ b/core/src/com/cloud/agent/api/CronCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public interface CronCommand {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/DeleteSnapshotsDirCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/DeleteSnapshotsDirCommand.java b/core/src/com/cloud/agent/api/DeleteSnapshotsDirCommand.java
index 7b4f882..351dc5d 100644
--- a/core/src/com/cloud/agent/api/DeleteSnapshotsDirCommand.java
+++ b/core/src/com/cloud/agent/api/DeleteSnapshotsDirCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.to.DataStoreTO;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/DeleteStoragePoolCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/DeleteStoragePoolCommand.java b/core/src/com/cloud/agent/api/DeleteStoragePoolCommand.java
index dae5678..969dd2e 100644
--- a/core/src/com/cloud/agent/api/DeleteStoragePoolCommand.java
+++ b/core/src/com/cloud/agent/api/DeleteStoragePoolCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/DeleteVMSnapshotAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/DeleteVMSnapshotAnswer.java b/core/src/com/cloud/agent/api/DeleteVMSnapshotAnswer.java
index 798cd54..d5b8ab7 100644
--- a/core/src/com/cloud/agent/api/DeleteVMSnapshotAnswer.java
+++ b/core/src/com/cloud/agent/api/DeleteVMSnapshotAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/DeleteVMSnapshotCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/DeleteVMSnapshotCommand.java b/core/src/com/cloud/agent/api/DeleteVMSnapshotCommand.java
index 0d20050..cd18697 100644
--- a/core/src/com/cloud/agent/api/DeleteVMSnapshotCommand.java
+++ b/core/src/com/cloud/agent/api/DeleteVMSnapshotCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -13,7 +14,9 @@
 // "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
+// under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/DirectNetworkUsageAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/DirectNetworkUsageAnswer.java b/core/src/com/cloud/agent/api/DirectNetworkUsageAnswer.java
index c230daa..76ef420 100644
--- a/core/src/com/cloud/agent/api/DirectNetworkUsageAnswer.java
+++ b/core/src/com/cloud/agent/api/DirectNetworkUsageAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/DirectNetworkUsageCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/DirectNetworkUsageCommand.java b/core/src/com/cloud/agent/api/DirectNetworkUsageCommand.java
index c3f5038..79200a6 100644
--- a/core/src/com/cloud/agent/api/DirectNetworkUsageCommand.java
+++ b/core/src/com/cloud/agent/api/DirectNetworkUsageCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.Date;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/ExternalNetworkResourceUsageAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/ExternalNetworkResourceUsageAnswer.java b/core/src/com/cloud/agent/api/ExternalNetworkResourceUsageAnswer.java
index b122c2f..900aa99 100644
--- a/core/src/com/cloud/agent/api/ExternalNetworkResourceUsageAnswer.java
+++ b/core/src/com/cloud/agent/api/ExternalNetworkResourceUsageAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/ExternalNetworkResourceUsageCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/ExternalNetworkResourceUsageCommand.java b/core/src/com/cloud/agent/api/ExternalNetworkResourceUsageCommand.java
index 652f184..09dc80b 100644
--- a/core/src/com/cloud/agent/api/ExternalNetworkResourceUsageCommand.java
+++ b/core/src/com/cloud/agent/api/ExternalNetworkResourceUsageCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class ExternalNetworkResourceUsageCommand extends Command {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/FenceAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/FenceAnswer.java b/core/src/com/cloud/agent/api/FenceAnswer.java
index 7af18f5..fd1e4b5 100644
--- a/core/src/com/cloud/agent/api/FenceAnswer.java
+++ b/core/src/com/cloud/agent/api/FenceAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class FenceAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/FenceCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/FenceCommand.java b/core/src/com/cloud/agent/api/FenceCommand.java
index 8977278..88e508a 100644
--- a/core/src/com/cloud/agent/api/FenceCommand.java
+++ b/core/src/com/cloud/agent/api/FenceCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.host.Host;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/GetDomRVersionAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/GetDomRVersionAnswer.java b/core/src/com/cloud/agent/api/GetDomRVersionAnswer.java
index 7487b57..d8fbcf3 100644
--- a/core/src/com/cloud/agent/api/GetDomRVersionAnswer.java
+++ b/core/src/com/cloud/agent/api/GetDomRVersionAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class GetDomRVersionAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/GetDomRVersionCmd.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/GetDomRVersionCmd.java b/core/src/com/cloud/agent/api/GetDomRVersionCmd.java
index 7a73fac..ad1339b 100644
--- a/core/src/com/cloud/agent/api/GetDomRVersionCmd.java
+++ b/core/src/com/cloud/agent/api/GetDomRVersionCmd.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.routing.NetworkElementCommand;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/GetFileStatsAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/GetFileStatsAnswer.java b/core/src/com/cloud/agent/api/GetFileStatsAnswer.java
index 0c975d4..5c3f006 100755
--- a/core/src/com/cloud/agent/api/GetFileStatsAnswer.java
+++ b/core/src/com/cloud/agent/api/GetFileStatsAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.LogLevel.Log4jLevel;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/GetFileStatsCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/GetFileStatsCommand.java b/core/src/com/cloud/agent/api/GetFileStatsCommand.java
index c6dc213..b2da1c3 100755
--- a/core/src/com/cloud/agent/api/GetFileStatsCommand.java
+++ b/core/src/com/cloud/agent/api/GetFileStatsCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.LogLevel.Log4jLevel;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/GetGPUStatsAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/GetGPUStatsAnswer.java b/core/src/com/cloud/agent/api/GetGPUStatsAnswer.java
index 583326b..dbe9ae1 100644
--- a/core/src/com/cloud/agent/api/GetGPUStatsAnswer.java
+++ b/core/src/com/cloud/agent/api/GetGPUStatsAnswer.java
@@ -1,19 +1,22 @@
-//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
+// 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
 //
-//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.
+//   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.
+//
+
 package com.cloud.agent.api;
 
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/GetGPUStatsCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/GetGPUStatsCommand.java b/core/src/com/cloud/agent/api/GetGPUStatsCommand.java
index 047f562..1219094 100644
--- a/core/src/com/cloud/agent/api/GetGPUStatsCommand.java
+++ b/core/src/com/cloud/agent/api/GetGPUStatsCommand.java
@@ -1,19 +1,22 @@
-//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
+// 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
 //
-//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.
+//   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.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.LogLevel.Log4jLevel;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/GetHostStatsAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/GetHostStatsAnswer.java b/core/src/com/cloud/agent/api/GetHostStatsAnswer.java
index 6a52e76..05a7e3e 100755
--- a/core/src/com/cloud/agent/api/GetHostStatsAnswer.java
+++ b/core/src/com/cloud/agent/api/GetHostStatsAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.LogLevel.Log4jLevel;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/GetHostStatsCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/GetHostStatsCommand.java b/core/src/com/cloud/agent/api/GetHostStatsCommand.java
index 18c0faf..d39b118 100755
--- a/core/src/com/cloud/agent/api/GetHostStatsCommand.java
+++ b/core/src/com/cloud/agent/api/GetHostStatsCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.LogLevel.Log4jLevel;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/GetRouterAlertsAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/GetRouterAlertsAnswer.java b/core/src/com/cloud/agent/api/GetRouterAlertsAnswer.java
index 3148539..fb90b6a 100644
--- a/core/src/com/cloud/agent/api/GetRouterAlertsAnswer.java
+++ b/core/src/com/cloud/agent/api/GetRouterAlertsAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
 
 package com.cloud.agent.api;
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/GetStorageStatsAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/GetStorageStatsAnswer.java b/core/src/com/cloud/agent/api/GetStorageStatsAnswer.java
index 1773e7c..26e7b74 100755
--- a/core/src/com/cloud/agent/api/GetStorageStatsAnswer.java
+++ b/core/src/com/cloud/agent/api/GetStorageStatsAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.LogLevel.Log4jLevel;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/GetStorageStatsCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/GetStorageStatsCommand.java b/core/src/com/cloud/agent/api/GetStorageStatsCommand.java
index a1842a8..23e8f9e 100755
--- a/core/src/com/cloud/agent/api/GetStorageStatsCommand.java
+++ b/core/src/com/cloud/agent/api/GetStorageStatsCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.LogLevel.Log4jLevel;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/GetVmConfigAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/GetVmConfigAnswer.java b/core/src/com/cloud/agent/api/GetVmConfigAnswer.java
index e0d1536..d7b65f7 100644
--- a/core/src/com/cloud/agent/api/GetVmConfigAnswer.java
+++ b/core/src/com/cloud/agent/api/GetVmConfigAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/GetVmConfigCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/GetVmConfigCommand.java b/core/src/com/cloud/agent/api/GetVmConfigCommand.java
index 9133bd6..2a625c7 100644
--- a/core/src/com/cloud/agent/api/GetVmConfigCommand.java
+++ b/core/src/com/cloud/agent/api/GetVmConfigCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/GetVmDiskStatsAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/GetVmDiskStatsAnswer.java b/core/src/com/cloud/agent/api/GetVmDiskStatsAnswer.java
index a0ee4a3..77fe8ae 100644
--- a/core/src/com/cloud/agent/api/GetVmDiskStatsAnswer.java
+++ b/core/src/com/cloud/agent/api/GetVmDiskStatsAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/GetVmDiskStatsCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/GetVmDiskStatsCommand.java b/core/src/com/cloud/agent/api/GetVmDiskStatsCommand.java
index 71370ee..4b2b2e8 100644
--- a/core/src/com/cloud/agent/api/GetVmDiskStatsCommand.java
+++ b/core/src/com/cloud/agent/api/GetVmDiskStatsCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/GetVmStatsAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/GetVmStatsAnswer.java b/core/src/com/cloud/agent/api/GetVmStatsAnswer.java
index c02eb9a..cc277af 100755
--- a/core/src/com/cloud/agent/api/GetVmStatsAnswer.java
+++ b/core/src/com/cloud/agent/api/GetVmStatsAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/GetVmStatsCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/GetVmStatsCommand.java b/core/src/com/cloud/agent/api/GetVmStatsCommand.java
index 13a25b9..26d98d2 100755
--- a/core/src/com/cloud/agent/api/GetVmStatsCommand.java
+++ b/core/src/com/cloud/agent/api/GetVmStatsCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/GetVncPortAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/GetVncPortAnswer.java b/core/src/com/cloud/agent/api/GetVncPortAnswer.java
index 6a3e500..7ebd61a 100644
--- a/core/src/com/cloud/agent/api/GetVncPortAnswer.java
+++ b/core/src/com/cloud/agent/api/GetVncPortAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class GetVncPortAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/GetVncPortCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/GetVncPortCommand.java b/core/src/com/cloud/agent/api/GetVncPortCommand.java
index 06165dc..f1d05d9 100644
--- a/core/src/com/cloud/agent/api/GetVncPortCommand.java
+++ b/core/src/com/cloud/agent/api/GetVncPortCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class GetVncPortCommand extends Command {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/HostStatsEntry.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/HostStatsEntry.java b/core/src/com/cloud/agent/api/HostStatsEntry.java
index c9d25a0..a7eb524 100644
--- a/core/src/com/cloud/agent/api/HostStatsEntry.java
+++ b/core/src/com/cloud/agent/api/HostStatsEntry.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.host.HostStats;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/MaintainAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/MaintainAnswer.java b/core/src/com/cloud/agent/api/MaintainAnswer.java
index 44b2192..fb41b7a 100644
--- a/core/src/com/cloud/agent/api/MaintainAnswer.java
+++ b/core/src/com/cloud/agent/api/MaintainAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class MaintainAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/MaintainCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/MaintainCommand.java b/core/src/com/cloud/agent/api/MaintainCommand.java
index 2a9b9a5..264b6f2 100644
--- a/core/src/com/cloud/agent/api/MaintainCommand.java
+++ b/core/src/com/cloud/agent/api/MaintainCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class MaintainCommand extends Command {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/ManageSnapshotAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/ManageSnapshotAnswer.java b/core/src/com/cloud/agent/api/ManageSnapshotAnswer.java
index 1217961..4eae168 100644
--- a/core/src/com/cloud/agent/api/ManageSnapshotAnswer.java
+++ b/core/src/com/cloud/agent/api/ManageSnapshotAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class ManageSnapshotAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/ManageSnapshotCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/ManageSnapshotCommand.java b/core/src/com/cloud/agent/api/ManageSnapshotCommand.java
index fb2d0d5..688f7a8 100644
--- a/core/src/com/cloud/agent/api/ManageSnapshotCommand.java
+++ b/core/src/com/cloud/agent/api/ManageSnapshotCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.to.StorageFilerTO;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/MigrateAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/MigrateAnswer.java b/core/src/com/cloud/agent/api/MigrateAnswer.java
index 19d690a..ebc360c 100644
--- a/core/src/com/cloud/agent/api/MigrateAnswer.java
+++ b/core/src/com/cloud/agent/api/MigrateAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class MigrateAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/MigrateCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/MigrateCommand.java b/core/src/com/cloud/agent/api/MigrateCommand.java
index e79c8a5..9d1f83a 100644
--- a/core/src/com/cloud/agent/api/MigrateCommand.java
+++ b/core/src/com/cloud/agent/api/MigrateCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.to.VirtualMachineTO;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/MigrateWithStorageAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageAnswer.java b/core/src/com/cloud/agent/api/MigrateWithStorageAnswer.java
index 6468884..d863cb0 100644
--- a/core/src/com/cloud/agent/api/MigrateWithStorageAnswer.java
+++ b/core/src/com/cloud/agent/api/MigrateWithStorageAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/MigrateWithStorageCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageCommand.java b/core/src/com/cloud/agent/api/MigrateWithStorageCommand.java
index 43ae854..515dd2d 100644
--- a/core/src/com/cloud/agent/api/MigrateWithStorageCommand.java
+++ b/core/src/com/cloud/agent/api/MigrateWithStorageCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/MigrateWithStorageCompleteAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageCompleteAnswer.java b/core/src/com/cloud/agent/api/MigrateWithStorageCompleteAnswer.java
index ec8bd0f..ffaf872 100644
--- a/core/src/com/cloud/agent/api/MigrateWithStorageCompleteAnswer.java
+++ b/core/src/com/cloud/agent/api/MigrateWithStorageCompleteAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/MigrateWithStorageCompleteCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageCompleteCommand.java b/core/src/com/cloud/agent/api/MigrateWithStorageCompleteCommand.java
index 1303c07..62dc189 100644
--- a/core/src/com/cloud/agent/api/MigrateWithStorageCompleteCommand.java
+++ b/core/src/com/cloud/agent/api/MigrateWithStorageCompleteCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.to.VirtualMachineTO;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java b/core/src/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java
index ebb0db5..37d4312 100644
--- a/core/src/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java
+++ b/core/src/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java b/core/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java
index 0d1e7f6..f75d1ee 100644
--- a/core/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java
+++ b/core/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/MigrateWithStorageSendAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageSendAnswer.java b/core/src/com/cloud/agent/api/MigrateWithStorageSendAnswer.java
index 314c876..9bd56ff 100644
--- a/core/src/com/cloud/agent/api/MigrateWithStorageSendAnswer.java
+++ b/core/src/com/cloud/agent/api/MigrateWithStorageSendAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.Set;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/MigrateWithStorageSendCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageSendCommand.java b/core/src/com/cloud/agent/api/MigrateWithStorageSendCommand.java
index 6231b16b..47a09c8 100644
--- a/core/src/com/cloud/agent/api/MigrateWithStorageSendCommand.java
+++ b/core/src/com/cloud/agent/api/MigrateWithStorageSendCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/ModifySshKeysCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/ModifySshKeysCommand.java b/core/src/com/cloud/agent/api/ModifySshKeysCommand.java
index 8f3ede0..bbb43ca 100644
--- a/core/src/com/cloud/agent/api/ModifySshKeysCommand.java
+++ b/core/src/com/cloud/agent/api/ModifySshKeysCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.LogLevel.Log4jLevel;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java b/core/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java
index 5163c48..c5c6215 100644
--- a/core/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java
+++ b/core/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/ModifyStoragePoolCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/ModifyStoragePoolCommand.java b/core/src/com/cloud/agent/api/ModifyStoragePoolCommand.java
index f18df46..136eb09 100644
--- a/core/src/com/cloud/agent/api/ModifyStoragePoolCommand.java
+++ b/core/src/com/cloud/agent/api/ModifyStoragePoolCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/ModifyVmNicConfigAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/ModifyVmNicConfigAnswer.java b/core/src/com/cloud/agent/api/ModifyVmNicConfigAnswer.java
index 1140485..5acf6aa 100644
--- a/core/src/com/cloud/agent/api/ModifyVmNicConfigAnswer.java
+++ b/core/src/com/cloud/agent/api/ModifyVmNicConfigAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class ModifyVmNicConfigAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/ModifyVmNicConfigCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/ModifyVmNicConfigCommand.java b/core/src/com/cloud/agent/api/ModifyVmNicConfigCommand.java
index 54c0eb0..c7c54b8 100644
--- a/core/src/com/cloud/agent/api/ModifyVmNicConfigCommand.java
+++ b/core/src/com/cloud/agent/api/ModifyVmNicConfigCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/NetworkRulesSystemVmCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/NetworkRulesSystemVmCommand.java b/core/src/com/cloud/agent/api/NetworkRulesSystemVmCommand.java
index 58d39ad..2df7d11 100644
--- a/core/src/com/cloud/agent/api/NetworkRulesSystemVmCommand.java
+++ b/core/src/com/cloud/agent/api/NetworkRulesSystemVmCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.vm.VirtualMachine;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/NetworkRulesVmSecondaryIpCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/NetworkRulesVmSecondaryIpCommand.java b/core/src/com/cloud/agent/api/NetworkRulesVmSecondaryIpCommand.java
index dc58f21..c0752a1 100644
--- a/core/src/com/cloud/agent/api/NetworkRulesVmSecondaryIpCommand.java
+++ b/core/src/com/cloud/agent/api/NetworkRulesVmSecondaryIpCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.vm.VirtualMachine;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/NetworkUsageAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/NetworkUsageAnswer.java b/core/src/com/cloud/agent/api/NetworkUsageAnswer.java
index efd7a52..08e4438 100644
--- a/core/src/com/cloud/agent/api/NetworkUsageAnswer.java
+++ b/core/src/com/cloud/agent/api/NetworkUsageAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.LogLevel.Log4jLevel;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/NetworkUsageCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/NetworkUsageCommand.java b/core/src/com/cloud/agent/api/NetworkUsageCommand.java
index 27450c1..66d44e9 100644
--- a/core/src/com/cloud/agent/api/NetworkUsageCommand.java
+++ b/core/src/com/cloud/agent/api/NetworkUsageCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.LogLevel.Log4jLevel;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/PerformanceMonitorAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/PerformanceMonitorAnswer.java b/core/src/com/cloud/agent/api/PerformanceMonitorAnswer.java
index f8ec05d..ba24bd0 100644
--- a/core/src/com/cloud/agent/api/PerformanceMonitorAnswer.java
+++ b/core/src/com/cloud/agent/api/PerformanceMonitorAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class PerformanceMonitorAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/PerformanceMonitorCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/PerformanceMonitorCommand.java b/core/src/com/cloud/agent/api/PerformanceMonitorCommand.java
index d0a6eb1..9462bb5 100644
--- a/core/src/com/cloud/agent/api/PerformanceMonitorCommand.java
+++ b/core/src/com/cloud/agent/api/PerformanceMonitorCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/PingAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/PingAnswer.java b/core/src/com/cloud/agent/api/PingAnswer.java
index d9ed89c..3524238 100644
--- a/core/src/com/cloud/agent/api/PingAnswer.java
+++ b/core/src/com/cloud/agent/api/PingAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class PingAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/PingCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/PingCommand.java b/core/src/com/cloud/agent/api/PingCommand.java
index 718dda5..8136c3d 100755
--- a/core/src/com/cloud/agent/api/PingCommand.java
+++ b/core/src/com/cloud/agent/api/PingCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.host.Host;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/PingRoutingCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/PingRoutingCommand.java b/core/src/com/cloud/agent/api/PingRoutingCommand.java
index ce068a3..3e68ab4 100755
--- a/core/src/com/cloud/agent/api/PingRoutingCommand.java
+++ b/core/src/com/cloud/agent/api/PingRoutingCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/PingRoutingWithNwGroupsCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/PingRoutingWithNwGroupsCommand.java b/core/src/com/cloud/agent/api/PingRoutingWithNwGroupsCommand.java
index d1b76b2..6526748 100644
--- a/core/src/com/cloud/agent/api/PingRoutingWithNwGroupsCommand.java
+++ b/core/src/com/cloud/agent/api/PingRoutingWithNwGroupsCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java b/core/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java
index 23cdcca..b415ac7 100644
--- a/core/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java
+++ b/core/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/PingStorageCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/PingStorageCommand.java b/core/src/com/cloud/agent/api/PingStorageCommand.java
index 438ab50..16ce78c 100755
--- a/core/src/com/cloud/agent/api/PingStorageCommand.java
+++ b/core/src/com/cloud/agent/api/PingStorageCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/PingTestCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/PingTestCommand.java b/core/src/com/cloud/agent/api/PingTestCommand.java
index fa5da18..128b88a 100644
--- a/core/src/com/cloud/agent/api/PingTestCommand.java
+++ b/core/src/com/cloud/agent/api/PingTestCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class PingTestCommand extends Command {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/PlugNicAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/PlugNicAnswer.java b/core/src/com/cloud/agent/api/PlugNicAnswer.java
index 2fc4b7f..a284569 100644
--- a/core/src/com/cloud/agent/api/PlugNicAnswer.java
+++ b/core/src/com/cloud/agent/api/PlugNicAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class PlugNicAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/PlugNicCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/PlugNicCommand.java b/core/src/com/cloud/agent/api/PlugNicCommand.java
index d10c680..e68931d 100644
--- a/core/src/com/cloud/agent/api/PlugNicCommand.java
+++ b/core/src/com/cloud/agent/api/PlugNicCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.to.NicTO;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/PrepareForMigrationAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/PrepareForMigrationAnswer.java b/core/src/com/cloud/agent/api/PrepareForMigrationAnswer.java
index 1b215bc..c9f23d6 100644
--- a/core/src/com/cloud/agent/api/PrepareForMigrationAnswer.java
+++ b/core/src/com/cloud/agent/api/PrepareForMigrationAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class PrepareForMigrationAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/PrepareForMigrationCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/PrepareForMigrationCommand.java b/core/src/com/cloud/agent/api/PrepareForMigrationCommand.java
index 7227c4f..6b89654 100644
--- a/core/src/com/cloud/agent/api/PrepareForMigrationCommand.java
+++ b/core/src/com/cloud/agent/api/PrepareForMigrationCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.to.VirtualMachineTO;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/PrepareOCFS2NodesCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/PrepareOCFS2NodesCommand.java b/core/src/com/cloud/agent/api/PrepareOCFS2NodesCommand.java
index 0c80bfa..81f0275 100755
--- a/core/src/com/cloud/agent/api/PrepareOCFS2NodesCommand.java
+++ b/core/src/com/cloud/agent/api/PrepareOCFS2NodesCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/PropagateResourceEventCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/PropagateResourceEventCommand.java b/core/src/com/cloud/agent/api/PropagateResourceEventCommand.java
index 45cd4b3..ed33788 100755
--- a/core/src/com/cloud/agent/api/PropagateResourceEventCommand.java
+++ b/core/src/com/cloud/agent/api/PropagateResourceEventCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.resource.ResourceState;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/ReadyAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/ReadyAnswer.java b/core/src/com/cloud/agent/api/ReadyAnswer.java
index 70484fa..700f64b 100644
--- a/core/src/com/cloud/agent/api/ReadyAnswer.java
+++ b/core/src/com/cloud/agent/api/ReadyAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class ReadyAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/ReadyCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/ReadyCommand.java b/core/src/com/cloud/agent/api/ReadyCommand.java
index 52cb12b..b02b004 100644
--- a/core/src/com/cloud/agent/api/ReadyCommand.java
+++ b/core/src/com/cloud/agent/api/ReadyCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class ReadyCommand extends Command {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/RebootAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/RebootAnswer.java b/core/src/com/cloud/agent/api/RebootAnswer.java
index 15bec80..0cadcf1 100644
--- a/core/src/com/cloud/agent/api/RebootAnswer.java
+++ b/core/src/com/cloud/agent/api/RebootAnswer.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class RebootAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/RebootCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/RebootCommand.java b/core/src/com/cloud/agent/api/RebootCommand.java
index 299e61b..d8f1ce9 100755
--- a/core/src/com/cloud/agent/api/RebootCommand.java
+++ b/core/src/com/cloud/agent/api/RebootCommand.java
@@ -1,3 +1,4 @@
+//
 // 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
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.vm.VirtualMachine;