fixing license headers for usage

usage/libexec/usage-runner.in

@@ -1,4 +1,20 @@
 #!/bin/bash
+# Licensed 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
+# 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.
 
 SYSTEMJARS="@SYSTEMJARS@"
 SCP=$(build-classpath $SYSTEMJARS) ; if [ $? != 0 ] ; then SCP="@SYSTEMCLASSPATH@" ; fi

usage/scripts/usageserver.sh

@@ -1,17 +1,20 @@
 #!/usr/bin/env bash
-# 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,
+# 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.
 
 
  

usage/src/com/cloud/usage/UsageAlertManagerImpl.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,
+// 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.usage;
 
 import java.io.UnsupportedEncodingException;

usage/src/com/cloud/usage/UsageManager.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,
+// 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.usage;
 
 import com.cloud.usage.UsageJobVO;

usage/src/com/cloud/usage/UsageManagerImpl.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,
+// 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.usage;
 
 import java.net.InetAddress;

usage/src/com/cloud/usage/UsageSanityChecker.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,
+// 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.usage;
 
 import java.io.BufferedReader;

usage/src/com/cloud/usage/UsageServer.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,
+// 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.usage;
 
 import org.apache.log4j.Logger;

usage/src/com/cloud/usage/parser/IPAddressUsageParser.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,
+// 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.usage.parser;
 
 import java.text.DecimalFormat;

usage/src/com/cloud/usage/parser/LoadBalancerUsageParser.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,
+// 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.usage.parser;
 
 import java.text.DecimalFormat;

usage/src/com/cloud/usage/parser/NetworkOfferingUsageParser.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,
+// 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.usage.parser;
 
 import java.text.DecimalFormat;

usage/src/com/cloud/usage/parser/NetworkUsageParser.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,
+// 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.usage.parser;
 
 import java.util.Date;

usage/src/com/cloud/usage/parser/PortForwardingUsageParser.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,
+// 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.usage.parser;
 
 import java.text.DecimalFormat;

usage/src/com/cloud/usage/parser/SecurityGroupUsageParser.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,
+// 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.usage.parser;
 
 import java.text.DecimalFormat;

usage/src/com/cloud/usage/parser/StorageUsageParser.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,
+// 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.usage.parser;
 
 import java.text.DecimalFormat;

usage/src/com/cloud/usage/parser/UsageParser.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,
+// 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.usage.parser;
 
 import java.util.Date;

usage/src/com/cloud/usage/parser/VMInstanceUsageParser.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,
+// 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.usage.parser;
 
 import java.text.DecimalFormat;

usage/src/com/cloud/usage/parser/VPNUserUsageParser.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,
+// 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.usage.parser;
 
 import java.text.DecimalFormat;

usage/src/com/cloud/usage/parser/VolumeUsageParser.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,
+// 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.usage.parser;
 
 import java.text.DecimalFormat;