merging vmware-base license header updates from Chip Childers

vmware-base/src/com/cloud/hypervisor/vmware/mo/BaseMO.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.mo;
 
 import org.apache.log4j.Logger;

vmware-base/src/com/cloud/hypervisor/vmware/mo/ClusterMO.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.mo;
 
 import java.net.URI;

vmware-base/src/com/cloud/hypervisor/vmware/mo/CustomFieldConstants.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.mo;
 
 public interface CustomFieldConstants {

vmware-base/src/com/cloud/hypervisor/vmware/mo/CustomFieldsManagerMO.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.mo;
 
 import com.cloud.hypervisor.vmware.util.VmwareContext;

vmware-base/src/com/cloud/hypervisor/vmware/mo/DatacenterMO.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.mo;
 

vmware-base/src/com/cloud/hypervisor/vmware/mo/DatastoreFile.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.mo;
 
 public class DatastoreFile {

vmware-base/src/com/cloud/hypervisor/vmware/mo/DatastoreMO.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.mo;
 
 import java.util.ArrayList;

vmware-base/src/com/cloud/hypervisor/vmware/mo/DiskControllerType.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.mo;
 
 public enum DiskControllerType {

vmware-base/src/com/cloud/hypervisor/vmware/mo/HostDatastoreBrowserMO.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.mo;
 
 import org.apache.log4j.Logger;

vmware-base/src/com/cloud/hypervisor/vmware/mo/HostDatastoreSystemMO.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.mo;
 
 import java.net.URI;

vmware-base/src/com/cloud/hypervisor/vmware/mo/HostFirewallSystemMO.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.mo;
 
 import org.apache.log4j.Logger;

vmware-base/src/com/cloud/hypervisor/vmware/mo/HostMO.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.mo;
 
 import java.util.ArrayList;

vmware-base/src/com/cloud/hypervisor/vmware/mo/HostNetworkSystemMO.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.mo;
 
 import org.apache.log4j.Logger;

vmware-base/src/com/cloud/hypervisor/vmware/mo/HostVirtualNicType.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.mo;
 
 public enum HostVirtualNicType {

vmware-base/src/com/cloud/hypervisor/vmware/mo/HttpNfcLeaseMO.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.mo;
 
 import java.io.BufferedReader;

vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.mo;
 
 import java.io.File;

vmware-base/src/com/cloud/hypervisor/vmware/mo/NetworkDetails.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.mo;
 
 import com.vmware.vim25.ManagedObjectReference;

vmware-base/src/com/cloud/hypervisor/vmware/mo/NetworkMO.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.mo;
 
 import com.cloud.hypervisor.vmware.util.VmwareContext;

vmware-base/src/com/cloud/hypervisor/vmware/mo/PerfCounterInfoMapper.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.mo;
 
 import java.util.ArrayList;

vmware-base/src/com/cloud/hypervisor/vmware/mo/PerfManagerMO.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.mo;
 
 import java.util.Calendar;

vmware-base/src/com/cloud/hypervisor/vmware/mo/SnapshotDescriptor.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.mo;
 
 import java.io.BufferedReader;

vmware-base/src/com/cloud/hypervisor/vmware/mo/TaskMO.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.mo;
 
 import com.cloud.hypervisor.vmware.util.VmwareContext;

vmware-base/src/com/cloud/hypervisor/vmware/mo/VersioningContants.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.mo;
 
 public interface VersioningContants {

vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualDiskManagerMO.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.mo;
 
 import org.apache.log4j.Logger;

vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualEthernetCardType.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.mo;
 
 public enum VirtualEthernetCardType {

vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.mo;
 
 import java.io.BufferedReader;

vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualSwitchType.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.mo;
 

vmware-base/src/com/cloud/hypervisor/vmware/mo/VmdkFileDescriptor.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.mo;
 
 import java.io.BufferedReader;

vmware-base/src/com/cloud/hypervisor/vmware/mo/VmwareHostType.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.mo;
 
 public enum VmwareHostType {

vmware-base/src/com/cloud/hypervisor/vmware/mo/VmwareHypervisorHost.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.mo;
 
 import com.cloud.hypervisor.vmware.util.VmwareContext;

vmware-base/src/com/cloud/hypervisor/vmware/mo/VmwareHypervisorHostNetworkSummary.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.mo;
 
 public class VmwareHypervisorHostNetworkSummary {

vmware-base/src/com/cloud/hypervisor/vmware/mo/VmwareHypervisorHostResourceSummary.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.mo;
 
 public class VmwareHypervisorHostResourceSummary {

vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.util;
 
 import java.io.BufferedInputStream;

vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareGuestOsMapper.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.util;
 
 import java.util.HashMap;

vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java

@@ -1,15 +1,19 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-// Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-// file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-// reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-// Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-// distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-// 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.
 //
-// Automatically generated by addcopyright.py at 04/03/2012
+//   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.hypervisor.vmware.util;