Switching to ASF header for Callback

framework/src/com/phonegap/AccelListener.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       to you under the Apache License, Version 2.0 (the
- */
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package com.phonegap;
 
 import java.util.List;

framework/src/com/phonegap/App.java

@@ -1,10 +1,22 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010-2011, IBM Corporation
+       to you under the Apache License, Version 2.0 (the
- */
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
+
 package com.phonegap;
 
 import org.json.JSONArray;

framework/src/com/phonegap/AudioHandler.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       to you under the Apache License, Version 2.0 (the
- */
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package com.phonegap;
 
 import android.content.Context;

framework/src/com/phonegap/AudioPlayer.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       to you under the Apache License, Version 2.0 (the
- */
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package com.phonegap;
 
 import android.media.AudioManager;

framework/src/com/phonegap/BatteryListener.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010-2011, IBM Corporation
+       to you under the Apache License, Version 2.0 (the
- */
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package com.phonegap;
 
 import org.json.JSONArray;

framework/src/com/phonegap/CallbackServer.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       to you under the Apache License, Version 2.0 (the
- */
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package com.phonegap;
 
 import java.io.BufferedReader;

framework/src/com/phonegap/CameraLauncher.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       to you under the Apache License, Version 2.0 (the
- */
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package com.phonegap;
 
 import java.io.ByteArrayOutputStream;
@@ -486,4 +497,4 @@ public class CameraLauncher extends Plugin {
     public void failPicture(String err) {
         this.error(new PluginResult(PluginResult.Status.ERROR, err), this.callbackId);
     }
-}
+}

framework/src/com/phonegap/Capture.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2011, IBM Corporation
+       to you under the Apache License, Version 2.0 (the
- */
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package com.phonegap;
 
 import java.io.File;
@@ -366,4 +377,4 @@ public class Capture extends Plugin {
     public void fail(String err) {
         this.error(new PluginResult(PluginResult.Status.ERROR, err), this.callbackId);
     }
-}
+}

framework/src/com/phonegap/CompassListener.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       to you under the Apache License, Version 2.0 (the
- */
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package com.phonegap;
 
 import java.util.List;

framework/src/com/phonegap/ContactAccessor.java

@@ -1,11 +1,3 @@
-// Taken from Android Tutorials
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */
 /*
  * Copyright (C) 2009 The Android Open Source Project
  *
@@ -42,11 +34,11 @@ import org.json.JSONObject;
  * Eclair or higher, we want to use {@link ContactAccessorSdk5}.
  */
 public abstract class ContactAccessor {
-	
+  
     protected final String LOG_TAG = "ContactsAccessor";
     protected Activity mApp;
     protected WebView mView;
-	
+  
     /**
      * Check to see if the data associated with the key is required to 
      * be populated in the Contact object.
@@ -55,21 +47,21 @@ public abstract class ContactAccessor {
      * @return true if the key data is required
      */
     protected boolean isRequired(String key, HashMap<String,Boolean> map) {
-		Boolean retVal = map.get(key);
+    Boolean retVal = map.get(key);
-		return (retVal == null) ? false : retVal.booleanValue();
+    return (retVal == null) ? false : retVal.booleanValue();
-	}
+  }
     
     /**
      * Create a hash map of what data needs to be populated in the Contact object
      * @param fields the list of fields to populate
      * @return the hash map of required data
      */
-	protected HashMap<String,Boolean> buildPopulationSet(JSONArray fields) {
+  protected HashMap<String,Boolean> buildPopulationSet(JSONArray fields) {
-		HashMap<String,Boolean> map = new HashMap<String,Boolean>();
+    HashMap<String,Boolean> map = new HashMap<String,Boolean>();
-		
+    
-		String key;
+    String key;
-		try {
+    try {
-		    if (fields.length() == 1 && fields.getString(0).equals("*")) {
+        if (fields.length() == 1 && fields.getString(0).equals("*")) {
                 map.put("displayName", true);
                 map.put("name", true);
                 map.put("nickname", true);
@@ -83,89 +75,89 @@ public abstract class ContactAccessor {
                 map.put("urls", true);
                 map.put("photos", true);
                 map.put("categories", true);
-		    } 
+        } 
-		    else {
+        else {
-    			for (int i=0; i<fields.length(); i++) {
+          for (int i=0; i<fields.length(); i++) {
-    				key = fields.getString(i);
+            key = fields.getString(i);
-    				if (key.startsWith("displayName")) {
+            if (key.startsWith("displayName")) {
-    					map.put("displayName", true);
+              map.put("displayName", true);
-    				}
+            }
-    				else if (key.startsWith("name")) {
+            else if (key.startsWith("name")) {
-    					map.put("name", true);
+              map.put("name", true);
-    				}
+            }
-    				else if (key.startsWith("nickname")) {
+            else if (key.startsWith("nickname")) {
-    					map.put("nickname", true);
+              map.put("nickname", true);
-    				}
+            }
-    				else if (key.startsWith("phoneNumbers")) {
+            else if (key.startsWith("phoneNumbers")) {
-    					map.put("phoneNumbers", true);
+              map.put("phoneNumbers", true);
-    				}
+            }
-    				else if (key.startsWith("emails")) {
+            else if (key.startsWith("emails")) {
-    					map.put("emails", true);
+              map.put("emails", true);
-    				}
+            }
-    				else if (key.startsWith("addresses")) {
+            else if (key.startsWith("addresses")) {
-    					map.put("addresses", true);
+              map.put("addresses", true);
-    				}
+            }
-    				else if (key.startsWith("ims")) {
+            else if (key.startsWith("ims")) {
-    					map.put("ims", true);
+              map.put("ims", true);
-    				}
+            }
-    				else if (key.startsWith("organizations")) {
+            else if (key.startsWith("organizations")) {
-    					map.put("organizations", true);
+              map.put("organizations", true);
-    				}
+            }
-    				else if (key.startsWith("birthday")) {
+            else if (key.startsWith("birthday")) {
-    					map.put("birthday", true);
+              map.put("birthday", true);
-    				}
+            }
-    				else if (key.startsWith("note")) {
+            else if (key.startsWith("note")) {
-    					map.put("note", true);
+              map.put("note", true);
-    				}
+            }
-    				else if (key.startsWith("urls")) {
+            else if (key.startsWith("urls")) {
-    					map.put("urls", true);
+              map.put("urls", true);
-    				}
+            }
                     else if (key.startsWith("photos")) {
                         map.put("photos", true);
                     }
                     else if (key.startsWith("categories")) {
                         map.put("categories", true);
                     }
-    			}
+          }
-		    }
+        }
-		}
+    }
-		catch (JSONException e) {
+    catch (JSONException e) {
-			Log.e(LOG_TAG, e.getMessage(), e);
+      Log.e(LOG_TAG, e.getMessage(), e);
-		}
+    }
-		return map;
+    return map;
-	}
+  }
-	
+  
-	/**
+  /**
-	 * Convenience method to get a string from a JSON object.  Saves a 
+   * Convenience method to get a string from a JSON object.  Saves a 
-	 * lot of try/catch writing.
+   * lot of try/catch writing.
-	 * If the property is not found in the object null will be returned.
+   * If the property is not found in the object null will be returned.
-	 * 
+   * 
-	 * @param obj contact object to search
+   * @param obj contact object to search
-	 * @param property to be looked up
+   * @param property to be looked up
-	 * @return The value of the property
+   * @return The value of the property
-	 */
+   */
-	protected String getJsonString(JSONObject obj, String property) {
+  protected String getJsonString(JSONObject obj, String property) {
-		String value = null;
+    String value = null;
-		try {
+    try {
-		    if (obj != null) {
+        if (obj != null) {
-			value = obj.getString(property);
+      value = obj.getString(property);
-    			if (value.equals("null")) {
+          if (value.equals("null")) {
-    				Log.d(LOG_TAG, property + " is string called 'null'");
+            Log.d(LOG_TAG, property + " is string called 'null'");
-    				value = null;
+            value = null;
-    			}
+          }
-		    }
+        }
-		}
+    }
-		catch (JSONException e) {
+    catch (JSONException e) {
-			Log.d(LOG_TAG, "Could not get = " + e.getMessage());
+      Log.d(LOG_TAG, "Could not get = " + e.getMessage());
-		}		
+    }   
-		return value;
+    return value;
-	}
+  }
 
     /**
      * Handles adding a JSON Contact object into the database.
      * @return TODO
      */
-	public abstract String save(JSONObject contact);
+  public abstract String save(JSONObject contact);
 
     /**
      * Handles searching through SDK-specific contacts API.
@@ -181,25 +173,25 @@ public abstract class ContactAccessor {
     /**
      * Handles removing a contact from the database.
      */
-	public abstract boolean remove(String id);
+  public abstract boolean remove(String id);
-	
+  
-	/**
+  /**
-	 * A class that represents the where clause to be used in the database query 
+   * A class that represents the where clause to be used in the database query 
-	 */
+   */
-	class WhereOptions {
+  class WhereOptions {
-		private String where;
+    private String where;
-		private String[] whereArgs;
+    private String[] whereArgs;
-		public void setWhere(String where) {
+    public void setWhere(String where) {
-			this.where = where;
+      this.where = where;
-		}
+    }
-		public String getWhere() {
+    public String getWhere() {
-			return where;
+      return where;
-		}
+    }
-		public void setWhereArgs(String[] whereArgs) {
+    public void setWhereArgs(String[] whereArgs) {
-			this.whereArgs = whereArgs;
+      this.whereArgs = whereArgs;
-		}
+    }
-		public String[] getWhereArgs() {
+    public String[] getWhereArgs() {
-			return whereArgs;
+      return whereArgs;
-		}
+    }
-	}
+  }
-}
+}

framework/src/com/phonegap/ContactManager.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       to you under the Apache License, Version 2.0 (the
- */
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package com.phonegap;
 
 import org.json.JSONArray;

framework/src/com/phonegap/CryptoHandler.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       to you under the Apache License, Version 2.0 (the
- */
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package com.phonegap;
 
 import org.json.JSONArray;
@@ -14,58 +25,58 @@ import com.phonegap.api.Plugin;
 import com.phonegap.api.PluginResult;
 
 public class CryptoHandler extends Plugin {
-		
+    
-	/**
+  /**
-	 * Constructor.
+   * Constructor.
-	 */
+   */
-	public CryptoHandler() {
+  public CryptoHandler() {
-	}
+  }
 
-	/**
+  /**
-	 * Executes the request and returns PluginResult.
+   * Executes the request and returns PluginResult.
-	 * 
+   * 
-	 * @param action 		The action to execute.
+   * @param action    The action to execute.
-	 * @param args 			JSONArry of arguments for the plugin.
+   * @param args      JSONArry of arguments for the plugin.
-	 * @param callbackId	The callback id used when calling back into JavaScript.
+   * @param callbackId  The callback id used when calling back into JavaScript.
-	 * @return 				A PluginResult object with a status and message.
+   * @return        A PluginResult object with a status and message.
-	 */
+   */
-	public PluginResult execute(String action, JSONArray args, String callbackId) {
+  public PluginResult execute(String action, JSONArray args, String callbackId) {
-		PluginResult.Status status = PluginResult.Status.OK;
+    PluginResult.Status status = PluginResult.Status.OK;
-		String result = "";		
+    String result = "";   
-		
+    
-		try {
+    try {
-			if (action.equals("encrypt")) {
+      if (action.equals("encrypt")) {
-				this.encrypt(args.getString(0), args.getString(1));
+        this.encrypt(args.getString(0), args.getString(1));
-			}
+      }
-			else if (action.equals("decrypt")) {
+      else if (action.equals("decrypt")) {
-				this.decrypt(args.getString(0), args.getString(1));
+        this.decrypt(args.getString(0), args.getString(1));
-			}
+      }
-			return new PluginResult(status, result);
+      return new PluginResult(status, result);
-		} catch (JSONException e) {
+    } catch (JSONException e) {
-			return new PluginResult(PluginResult.Status.JSON_EXCEPTION);
+      return new PluginResult(PluginResult.Status.JSON_EXCEPTION);
-		}
+    }
-	}
+  }
 
     //--------------------------------------------------------------------------
     // LOCAL METHODS
     //--------------------------------------------------------------------------
 
-	public void encrypt(String pass, String text) {
+  public void encrypt(String pass, String text) {
-		try {
+    try {
-			String encrypted = SimpleCrypto.encrypt(pass,text);
+      String encrypted = SimpleCrypto.encrypt(pass,text);
-			// TODO: Why not just return text now?
+      // TODO: Why not just return text now?
-			this.sendJavascript("Crypto.gotCryptedString('" + text + "')");
+      this.sendJavascript("Crypto.gotCryptedString('" + text + "')");
-		} catch (Exception e) {
+    } catch (Exception e) {
-			e.printStackTrace();
+      e.printStackTrace();
-		}
+    }
-	}
+  }
-	
+  
-	public void decrypt(String pass, String text) {
+  public void decrypt(String pass, String text) {
-		try {
+    try {
-			String decrypted = SimpleCrypto.decrypt(pass,text);
+      String decrypted = SimpleCrypto.decrypt(pass,text);
-			this.sendJavascript("Crypto.gotPlainString('" + text + "')");
+      this.sendJavascript("Crypto.gotPlainString('" + text + "')");
-		} catch (Exception e) {
+    } catch (Exception e) {
-			e.printStackTrace();
+      e.printStackTrace();
-		}
+    }
-	}
+  }
 }

framework/src/com/phonegap/Device.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       to you under the Apache License, Version 2.0 (the
- */
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package com.phonegap;
 
 import java.util.TimeZone;

framework/src/com/phonegap/DirectoryManager.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       to you under the Apache License, Version 2.0 (the
- */
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package com.phonegap;
 
 import java.io.File;
@@ -139,4 +150,4 @@ public class DirectoryManager {
 
         return cache.getAbsolutePath();
     }
-}
+}

framework/src/com/phonegap/DroidGap.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010-2011, IBM Corporation
+       to you under the Apache License, Version 2.0 (the
- */
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package com.phonegap;
 
 import java.util.HashMap;

framework/src/com/phonegap/ExifHelper.java

@@ -1,9 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2011, IBM Corporation
+       regarding copyright ownership.  The ASF licenses this file
- */
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package com.phonegap;
 
 import java.io.IOException;
@@ -150,4 +162,4 @@ public class ExifHelper {
         
         this.outFile.saveAttributes();
     }
-}
+}

framework/src/com/phonegap/FileTransfer.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       to you under the Apache License, Version 2.0 (the
- */
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package com.phonegap;
 
 import java.io.DataInputStream;
@@ -371,4 +382,4 @@ public class FileTransfer extends Plugin {
     	}
     }  
 
-}
+}

framework/src/com/phonegap/FileUploadResult.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       to you under the Apache License, Version 2.0 (the
- */ 
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package com.phonegap;
 
 import org.json.JSONException;

framework/src/com/phonegap/FileUtils.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010-2011, IBM Corporation
+       to you under the Apache License, Version 2.0 (the
- */
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package com.phonegap;
 
 import java.io.*;

framework/src/com/phonegap/GapView.java

@@ -0,0 +1,38 @@
+package com.phonegap;
+
+import android.content.Context;
+import android.view.View;
+import android.view.ViewGroup;
+import android.webkit.WebView;
+import android.widget.EditText;
+
+public class GapView extends WebView {
+
+	public GapView(Context context) {
+		super(context);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	protected void attachViewToParent(View child, int index, ViewGroup.LayoutParams params)
+	{
+		if(child.getClass() != EditText.class)
+			super.attachViewToParent(child, index, params);
+		else
+		{
+			super.attachViewToParent(child, index, params);
+		}
+	}
+	
+	@Override
+	protected boolean addViewInLayout(View child, int index, ViewGroup.LayoutParams params)
+	{
+		return super.addViewInLayout(child, index, params);
+	}
+	
+	@Override
+	protected boolean addViewInLayout(View child, int index, ViewGroup.LayoutParams params, boolean preventRequestLayout)
+	{
+		return super.addViewInLayout(child, index, params);
+	}
+}

framework/src/com/phonegap/GeoBroker.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       to you under the Apache License, Version 2.0 (the
- */
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package com.phonegap;
 
 import java.util.HashMap;

framework/src/com/phonegap/GeoListener.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       to you under the Apache License, Version 2.0 (the
- */
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package com.phonegap;
 
 import android.content.Context;

framework/src/com/phonegap/GpsListener.java

@@ -1,10 +1,22 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       to you under the Apache License, Version 2.0 (the
- */
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
+
 package com.phonegap;
 
 import com.phonegap.api.PhonegapActivity;

framework/src/com/phonegap/HttpHandler.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       to you under the Apache License, Version 2.0 (the
- */
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package com.phonegap;
 
 import java.io.EOFException;

framework/src/com/phonegap/NetworkListener.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       to you under the Apache License, Version 2.0 (the
- */
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package com.phonegap;
 
 import com.phonegap.api.PhonegapActivity;

framework/src/com/phonegap/NetworkManager.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010-2011, IBM Corporation
+       to you under the Apache License, Version 2.0 (the
- */
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package com.phonegap;
 
 import org.json.JSONArray;

framework/src/com/phonegap/Notification.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       to you under the Apache License, Version 2.0 (the
- */
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package com.phonegap;
 
 import org.json.JSONArray;

framework/src/com/phonegap/StandAlone.java

@@ -1,9 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- */
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package com.phonegap;
 
 import java.lang.reflect.Field;

framework/src/com/phonegap/Storage.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       to you under the Apache License, Version 2.0 (the
- */
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package com.phonegap;
 
 import org.json.JSONArray;
@@ -243,4 +254,4 @@ public class Storage extends Plugin {
 
 	}
 
-}
+}

framework/src/com/phonegap/TempListener.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       to you under the Apache License, Version 2.0 (the
- */
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package com.phonegap;
 
 import java.util.List;
@@ -98,4 +109,4 @@ public class TempListener extends Plugin implements SensorEventListener {
 		this.sendJavascript("gotTemp(" + temp + ");");
 	}
 
-}
+}

framework/src/com/phonegap/WebViewReflect.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       to you under the Apache License, Version 2.0 (the
- */
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package com.phonegap;
 
 import java.io.IOException;

framework/src/com/phonegap/api/IPlugin.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       to you under the Apache License, Version 2.0 (the
- */
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package com.phonegap.api;
 
 import org.json.JSONArray;
@@ -94,4 +105,4 @@ public interface IPlugin {
      * @return					Return true to prevent the URL from loading. Default is false.
      */
     boolean onOverrideUrlLoading(String url);
-}
+}

framework/src/com/phonegap/api/LOG.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       to you under the Apache License, Version 2.0 (the
- */
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package com.phonegap.api;
 
 import android.util.Log;

framework/src/com/phonegap/api/PhonegapActivity.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       to you under the Apache License, Version 2.0 (the
- */
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package com.phonegap.api;
 
 import android.app.Activity;

framework/src/com/phonegap/api/Plugin.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       to you under the Apache License, Version 2.0 (the
- */
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package com.phonegap.api;
 
 import org.json.JSONArray;

framework/src/com/phonegap/api/PluginManager.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       to you under the Apache License, Version 2.0 (the
- */
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package com.phonegap.api;
 
 import java.io.IOException;
@@ -345,4 +356,4 @@ public final class PluginManager {
 		System.err.println("https://raw.github.com/phonegap/phonegap-android/master/framework/res/xml/plugins.xml");        
 		System.err.println("=====================================================================================");
 	}
-}
+}

framework/src/com/phonegap/api/PluginResult.java

@@ -1,10 +1,21 @@
 /*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+       Licensed to the Apache Software Foundation (ASF) under one
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+       or more contributor license agreements.  See the NOTICE file
- * 
+       distributed with this work for additional information
- * Copyright (c) 2005-2010, Nitobi Software Inc.
+       regarding copyright ownership.  The ASF licenses this file
- * Copyright (c) 2010, IBM Corporation
+       to you under the Apache License, Version 2.0 (the
- */
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package com.phonegap.api;
 
 import org.json.JSONArray;

framework/src/com/phonegap/file/EncodingException.java

@@ -1,3 +1,23 @@
+/*
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
+p
+
 package com.phonegap.file;
 
 public class EncodingException extends Exception {

framework/src/com/phonegap/file/FileExistsException.java

@@ -1,3 +1,23 @@
+/*
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
+p
+
 package com.phonegap.file;
 
 public class FileExistsException extends Exception {

framework/src/com/phonegap/file/InvalidModificationException.java

@@ -1,3 +1,23 @@
+/*
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
+p
+
 package com.phonegap.file;
 
 public class InvalidModificationException extends Exception {

framework/src/com/phonegap/file/NoModificationAllowedException.java

@@ -1,3 +1,22 @@
+/*
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
+
 package com.phonegap.file;
 
 public class NoModificationAllowedException extends Exception {

framework/src/com/phonegap/file/TypeMismatchException.java

@@ -1,3 +1,23 @@
+/*
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
+
+
 package com.phonegap.file;
 
 public class TypeMismatchException extends Exception {