Skip to content

Commit 6ed90df

Browse files
committed
merging vmware-base license header updates from Chip Childers
1 parent 3ee3e41 commit 6ed90df

35 files changed

Lines changed: 560 additions & 420 deletions

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

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1-
// Copyright 2012 Citrix Systems, Inc. Licensed under the
2-
// Apache License, Version 2.0 (the "License"); you may not use this
3-
// file except in compliance with the License. Citrix Systems, Inc.
4-
// reserves all rights not expressly granted by the License.
5-
// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
6-
// Unless required by applicable law or agreed to in writing, software
7-
// distributed under the License is distributed on an "AS IS" BASIS,
8-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9-
// See the License for the specific language governing permissions and
10-
// limitations under the License.
11-
//
12-
// Automatically generated by addcopyright.py at 04/03/2012
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
1317
package com.cloud.hypervisor.vmware.mo;
1418

1519
import org.apache.log4j.Logger;

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

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1-
// Copyright 2012 Citrix Systems, Inc. Licensed under the
2-
// Apache License, Version 2.0 (the "License"); you may not use this
3-
// file except in compliance with the License. Citrix Systems, Inc.
4-
// reserves all rights not expressly granted by the License.
5-
// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
6-
// Unless required by applicable law or agreed to in writing, software
7-
// distributed under the License is distributed on an "AS IS" BASIS,
8-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9-
// See the License for the specific language governing permissions and
10-
// limitations under the License.
11-
//
12-
// Automatically generated by addcopyright.py at 04/03/2012
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
1317
package com.cloud.hypervisor.vmware.mo;
1418

1519
import java.net.URI;

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

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1-
// Copyright 2012 Citrix Systems, Inc. Licensed under the
2-
// Apache License, Version 2.0 (the "License"); you may not use this
3-
// file except in compliance with the License. Citrix Systems, Inc.
4-
// reserves all rights not expressly granted by the License.
5-
// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
6-
// Unless required by applicable law or agreed to in writing, software
7-
// distributed under the License is distributed on an "AS IS" BASIS,
8-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9-
// See the License for the specific language governing permissions and
10-
// limitations under the License.
11-
//
12-
// Automatically generated by addcopyright.py at 04/03/2012
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
1317
package com.cloud.hypervisor.vmware.mo;
1418

1519
public interface CustomFieldConstants {

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

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1-
// Copyright 2012 Citrix Systems, Inc. Licensed under the
2-
// Apache License, Version 2.0 (the "License"); you may not use this
3-
// file except in compliance with the License. Citrix Systems, Inc.
4-
// reserves all rights not expressly granted by the License.
5-
// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
6-
// Unless required by applicable law or agreed to in writing, software
7-
// distributed under the License is distributed on an "AS IS" BASIS,
8-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9-
// See the License for the specific language governing permissions and
10-
// limitations under the License.
11-
//
12-
// Automatically generated by addcopyright.py at 04/03/2012
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
1317
package com.cloud.hypervisor.vmware.mo;
1418

1519
import com.cloud.hypervisor.vmware.util.VmwareContext;

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

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1-
// Copyright 2012 Citrix Systems, Inc. Licensed under the
2-
// Apache License, Version 2.0 (the "License"); you may not use this
3-
// file except in compliance with the License. Citrix Systems, Inc.
4-
// reserves all rights not expressly granted by the License.
5-
// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
6-
// Unless required by applicable law or agreed to in writing, software
7-
// distributed under the License is distributed on an "AS IS" BASIS,
8-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9-
// See the License for the specific language governing permissions and
10-
// limitations under the License.
11-
//
12-
// Automatically generated by addcopyright.py at 04/03/2012
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
1317

1418
package com.cloud.hypervisor.vmware.mo;
1519

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

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1-
// Copyright 2012 Citrix Systems, Inc. Licensed under the
2-
// Apache License, Version 2.0 (the "License"); you may not use this
3-
// file except in compliance with the License. Citrix Systems, Inc.
4-
// reserves all rights not expressly granted by the License.
5-
// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
6-
// Unless required by applicable law or agreed to in writing, software
7-
// distributed under the License is distributed on an "AS IS" BASIS,
8-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9-
// See the License for the specific language governing permissions and
10-
// limitations under the License.
11-
//
12-
// Automatically generated by addcopyright.py at 04/03/2012
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
1317
package com.cloud.hypervisor.vmware.mo;
1418

1519
public class DatastoreFile {

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

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1-
// Copyright 2012 Citrix Systems, Inc. Licensed under the
2-
// Apache License, Version 2.0 (the "License"); you may not use this
3-
// file except in compliance with the License. Citrix Systems, Inc.
4-
// reserves all rights not expressly granted by the License.
5-
// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
6-
// Unless required by applicable law or agreed to in writing, software
7-
// distributed under the License is distributed on an "AS IS" BASIS,
8-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9-
// See the License for the specific language governing permissions and
10-
// limitations under the License.
11-
//
12-
// Automatically generated by addcopyright.py at 04/03/2012
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
1317
package com.cloud.hypervisor.vmware.mo;
1418

1519
import java.util.ArrayList;

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

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1-
// Copyright 2012 Citrix Systems, Inc. Licensed under the
2-
// Apache License, Version 2.0 (the "License"); you may not use this
3-
// file except in compliance with the License. Citrix Systems, Inc.
4-
// reserves all rights not expressly granted by the License.
5-
// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
6-
// Unless required by applicable law or agreed to in writing, software
7-
// distributed under the License is distributed on an "AS IS" BASIS,
8-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9-
// See the License for the specific language governing permissions and
10-
// limitations under the License.
11-
//
12-
// Automatically generated by addcopyright.py at 04/03/2012
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
1317
package com.cloud.hypervisor.vmware.mo;
1418

1519
public enum DiskControllerType {

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

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1-
// Copyright 2012 Citrix Systems, Inc. Licensed under the
2-
// Apache License, Version 2.0 (the "License"); you may not use this
3-
// file except in compliance with the License. Citrix Systems, Inc.
4-
// reserves all rights not expressly granted by the License.
5-
// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
6-
// Unless required by applicable law or agreed to in writing, software
7-
// distributed under the License is distributed on an "AS IS" BASIS,
8-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9-
// See the License for the specific language governing permissions and
10-
// limitations under the License.
11-
//
12-
// Automatically generated by addcopyright.py at 04/03/2012
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
1317
package com.cloud.hypervisor.vmware.mo;
1418

1519
import org.apache.log4j.Logger;

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

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1-
// Copyright 2012 Citrix Systems, Inc. Licensed under the
2-
// Apache License, Version 2.0 (the "License"); you may not use this
3-
// file except in compliance with the License. Citrix Systems, Inc.
4-
// reserves all rights not expressly granted by the License.
5-
// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
6-
// Unless required by applicable law or agreed to in writing, software
7-
// distributed under the License is distributed on an "AS IS" BASIS,
8-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9-
// See the License for the specific language governing permissions and
10-
// limitations under the License.
11-
//
12-
// Automatically generated by addcopyright.py at 04/03/2012
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
1317
package com.cloud.hypervisor.vmware.mo;
1418

1519
import java.net.URI;

0 commit comments

Comments
 (0)