You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/08/20 18:41:08 UTC

[1/2] git commit: USERGRID-218 Add license headers for all x-c scripts

Repository: incubator-usergrid
Updated Branches:
  refs/heads/master 3bf7bc168 -> bfc6f551a


USERGRID-218 Add license headers for all x-c scripts


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/5c6802f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5c6802f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5c6802f5

Branch: refs/heads/master
Commit: 5c6802f5ee89c3dd5b02dce6659c7a7a90dc3ecf
Parents: 900f145
Author: Lewis John McGibbney <le...@jpl.nasa.gov>
Authored: Tue Aug 19 22:46:05 2014 -0700
Committer: Lewis John McGibbney <le...@jpl.nasa.gov>
Committed: Tue Aug 19 22:46:05 2014 -0700

----------------------------------------------------------------------
 NOTICE                                          | 34 ++++++++++++++++++++
 .../samples/Books/books/AddBookViewController.h | 14 ++++++++
 sdks/ios/samples/Books/books/AppDelegate.h      | 14 ++++++++
 .../samples/Books/books/BooksViewController.h   | 14 ++++++++
 .../Books/books/UGSignInViewController.h        | 14 ++++++++
 .../ios/samples/Browser/browser/UGAppDelegate.h | 14 ++++++++
 .../Browser/browser/UGAppViewController.h       | 14 ++++++++
 .../browser/UGCollectionViewController.h        | 14 ++++++++
 .../Browser/browser/UGEntityViewController.h    | 14 ++++++++
 .../Browser/browser/UGSignInViewController.h    | 14 ++++++++
 .../Browser/browser/UGTextViewController.h      | 14 ++++++++
 sdks/ios/samples/parties/parties/AppDelegate.h  | 14 +++++++-
 .../parties/parties/PartiesViewController.h     | 14 +++++++-
 .../parties/parties/PartyViewController.h       | 14 +++++++-
 14 files changed, 213 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5c6802f5/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index d58fb32..3b4c11e 100644
--- a/NOTICE
+++ b/NOTICE
@@ -25,3 +25,37 @@ This product bundles with jquery-ui-1.8.9. Licensed under MIT license.
 This product bundles with mocha.
 All rights reserved. Licensed under MIT.
 Copyright (c) 2011-2014 TJ Holowaychuk <tj...@vision-media.ca>
+
+This product bundles a number of files within the /sdks/ios
+package.
+
+ Copyright (C) 2009 Stig Brautaset. All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ 
+ * Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+ 
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+ 
+ * Neither the name of the author nor the names of its contributors may be used
+   to endorse or promote products derived from this software without specific
+   prior written permission.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+This product bundles SSToolkit Copyright (c) 2009-2011 Sam Soffes. All rights reserved.
+These files can be located within the /sdks/ios package.
+ 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5c6802f5/sdks/ios/samples/Books/books/AddBookViewController.h
----------------------------------------------------------------------
diff --git a/sdks/ios/samples/Books/books/AddBookViewController.h b/sdks/ios/samples/Books/books/AddBookViewController.h
index 30a96e4..cd86281 100644
--- a/sdks/ios/samples/Books/books/AddBookViewController.h
+++ b/sdks/ios/samples/Books/books/AddBookViewController.h
@@ -2,6 +2,20 @@
 //  AddBookViewController.h
 //  books
 //
+// Licensed 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.
 
 #import <UIKit/UIKit.h>
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5c6802f5/sdks/ios/samples/Books/books/AppDelegate.h
----------------------------------------------------------------------
diff --git a/sdks/ios/samples/Books/books/AppDelegate.h b/sdks/ios/samples/Books/books/AppDelegate.h
index b022c3f..ab2f6fa 100644
--- a/sdks/ios/samples/Books/books/AppDelegate.h
+++ b/sdks/ios/samples/Books/books/AppDelegate.h
@@ -2,6 +2,20 @@
 //  AppDelegate.h
 //  books
 //
+// Licensed 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.
 
 #import <UIKit/UIKit.h>
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5c6802f5/sdks/ios/samples/Books/books/BooksViewController.h
----------------------------------------------------------------------
diff --git a/sdks/ios/samples/Books/books/BooksViewController.h b/sdks/ios/samples/Books/books/BooksViewController.h
index 2b8bbe9..9c917c5 100644
--- a/sdks/ios/samples/Books/books/BooksViewController.h
+++ b/sdks/ios/samples/Books/books/BooksViewController.h
@@ -2,6 +2,20 @@
 //  BooksViewController.h
 //  books
 //
+// Licensed 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.
 
 #import <UIKit/UIKit.h>
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5c6802f5/sdks/ios/samples/Books/books/UGSignInViewController.h
----------------------------------------------------------------------
diff --git a/sdks/ios/samples/Books/books/UGSignInViewController.h b/sdks/ios/samples/Books/books/UGSignInViewController.h
index 669d047..b831869 100644
--- a/sdks/ios/samples/Books/books/UGSignInViewController.h
+++ b/sdks/ios/samples/Books/books/UGSignInViewController.h
@@ -2,6 +2,20 @@
 //  UGSignInViewController.h
 //  books
 //
+// Licensed 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.
 
 @class UGAppViewController;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5c6802f5/sdks/ios/samples/Browser/browser/UGAppDelegate.h
----------------------------------------------------------------------
diff --git a/sdks/ios/samples/Browser/browser/UGAppDelegate.h b/sdks/ios/samples/Browser/browser/UGAppDelegate.h
index da295e9..fb1453f 100644
--- a/sdks/ios/samples/Browser/browser/UGAppDelegate.h
+++ b/sdks/ios/samples/Browser/browser/UGAppDelegate.h
@@ -2,6 +2,20 @@
 //  UGAppDelegate.h
 //  Browser
 //
+// Licensed 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.
 
 @interface UGAppDelegate : UIResponder <UIApplicationDelegate>
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5c6802f5/sdks/ios/samples/Browser/browser/UGAppViewController.h
----------------------------------------------------------------------
diff --git a/sdks/ios/samples/Browser/browser/UGAppViewController.h b/sdks/ios/samples/Browser/browser/UGAppViewController.h
index e4f6cff..7f26de9 100644
--- a/sdks/ios/samples/Browser/browser/UGAppViewController.h
+++ b/sdks/ios/samples/Browser/browser/UGAppViewController.h
@@ -2,6 +2,20 @@
 //  UGAppViewController.h
 //  Browser
 //
+// Licensed 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.
 
 @interface UGAppViewController : UITableViewController
 @property (nonatomic, strong) NSDictionary *application;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5c6802f5/sdks/ios/samples/Browser/browser/UGCollectionViewController.h
----------------------------------------------------------------------
diff --git a/sdks/ios/samples/Browser/browser/UGCollectionViewController.h b/sdks/ios/samples/Browser/browser/UGCollectionViewController.h
index 966f630..1b0074b 100644
--- a/sdks/ios/samples/Browser/browser/UGCollectionViewController.h
+++ b/sdks/ios/samples/Browser/browser/UGCollectionViewController.h
@@ -2,6 +2,20 @@
 //  UGCollectionViewController.h
 //  Browser
 //
+// Licensed 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.
 
 @interface UGCollectionViewController : UITableViewController
 @property (nonatomic, strong) NSDictionary *collection;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5c6802f5/sdks/ios/samples/Browser/browser/UGEntityViewController.h
----------------------------------------------------------------------
diff --git a/sdks/ios/samples/Browser/browser/UGEntityViewController.h b/sdks/ios/samples/Browser/browser/UGEntityViewController.h
index dac9bc8..af95c4c 100644
--- a/sdks/ios/samples/Browser/browser/UGEntityViewController.h
+++ b/sdks/ios/samples/Browser/browser/UGEntityViewController.h
@@ -2,6 +2,20 @@
 //  UGEntityViewController.h
 //  Browser
 //
+// Licensed 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.
 
 @interface UGEntityViewController : UITableViewController
 @property (nonatomic, strong) NSDictionary *entity;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5c6802f5/sdks/ios/samples/Browser/browser/UGSignInViewController.h
----------------------------------------------------------------------
diff --git a/sdks/ios/samples/Browser/browser/UGSignInViewController.h b/sdks/ios/samples/Browser/browser/UGSignInViewController.h
index ed8118d..58481cf 100644
--- a/sdks/ios/samples/Browser/browser/UGSignInViewController.h
+++ b/sdks/ios/samples/Browser/browser/UGSignInViewController.h
@@ -2,6 +2,20 @@
 //  UGSignInViewController.h
 //  Browser
 //
+// Licensed 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.
 
 @class UGAppViewController;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5c6802f5/sdks/ios/samples/Browser/browser/UGTextViewController.h
----------------------------------------------------------------------
diff --git a/sdks/ios/samples/Browser/browser/UGTextViewController.h b/sdks/ios/samples/Browser/browser/UGTextViewController.h
index 207ab70..57e2c8f 100644
--- a/sdks/ios/samples/Browser/browser/UGTextViewController.h
+++ b/sdks/ios/samples/Browser/browser/UGTextViewController.h
@@ -2,6 +2,20 @@
 //  UGTextViewController.h
 //  Browser
 //
+// Licensed 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.
 
 @interface UGTextViewController : UIViewController
 @property (nonatomic, strong) NSString *key;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5c6802f5/sdks/ios/samples/parties/parties/AppDelegate.h
----------------------------------------------------------------------
diff --git a/sdks/ios/samples/parties/parties/AppDelegate.h b/sdks/ios/samples/parties/parties/AppDelegate.h
index 37d08fd..1bc8193 100644
--- a/sdks/ios/samples/parties/parties/AppDelegate.h
+++ b/sdks/ios/samples/parties/parties/AppDelegate.h
@@ -2,8 +2,20 @@
 //  AppDelegate.h
 //  parties
 //
-//  Copyright (c) 2013 Apigee. All rights reserved.
+// Licensed 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.
 
 #import <UIKit/UIKit.h>
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5c6802f5/sdks/ios/samples/parties/parties/PartiesViewController.h
----------------------------------------------------------------------
diff --git a/sdks/ios/samples/parties/parties/PartiesViewController.h b/sdks/ios/samples/parties/parties/PartiesViewController.h
index fad15c7..2231ca1 100644
--- a/sdks/ios/samples/parties/parties/PartiesViewController.h
+++ b/sdks/ios/samples/parties/parties/PartiesViewController.h
@@ -2,8 +2,20 @@
 //  PartiesViewController.h
 //  parties
 //
-//  Copyright (c) 2013 Apigee. All rights reserved.
+// Licensed 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.
 
 #import <UIKit/UIKit.h>
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5c6802f5/sdks/ios/samples/parties/parties/PartyViewController.h
----------------------------------------------------------------------
diff --git a/sdks/ios/samples/parties/parties/PartyViewController.h b/sdks/ios/samples/parties/parties/PartyViewController.h
index 305f770..100c4c9 100644
--- a/sdks/ios/samples/parties/parties/PartyViewController.h
+++ b/sdks/ios/samples/parties/parties/PartyViewController.h
@@ -2,8 +2,20 @@
 //  PartyViewController.h
 //  parties
 //
-//  Copyright (c) 2013 Apigee. All rights reserved.
+// Licensed 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.
 
 #import <UIKit/UIKit.h>
 


[2/2] git commit: Merge branch 'pr/55'

Posted by sn...@apache.org.
Merge branch 'pr/55'

Conflicts:
	NOTICE


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

Branch: refs/heads/master
Commit: bfc6f551a15898375f4d5e11eac4ff40476eed03
Parents: 3bf7bc1 5c6802f
Author: Dave Johnson <sn...@apache.org>
Authored: Wed Aug 20 12:40:55 2014 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Aug 20 12:40:55 2014 -0400

----------------------------------------------------------------------
 NOTICE                                          | 33 ++++++++++++++++++++
 .../samples/Books/books/AddBookViewController.h | 14 +++++++++
 sdks/ios/samples/Books/books/AppDelegate.h      | 14 +++++++++
 .../samples/Books/books/BooksViewController.h   | 14 +++++++++
 .../Books/books/UGSignInViewController.h        | 14 +++++++++
 .../ios/samples/Browser/browser/UGAppDelegate.h | 14 +++++++++
 .../Browser/browser/UGAppViewController.h       | 14 +++++++++
 .../browser/UGCollectionViewController.h        | 14 +++++++++
 .../Browser/browser/UGEntityViewController.h    | 14 +++++++++
 .../Browser/browser/UGSignInViewController.h    | 14 +++++++++
 .../Browser/browser/UGTextViewController.h      | 14 +++++++++
 sdks/ios/samples/parties/parties/AppDelegate.h  | 14 ++++++++-
 .../parties/parties/PartiesViewController.h     | 14 ++++++++-
 .../parties/parties/PartyViewController.h       | 14 ++++++++-
 14 files changed, 212 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bfc6f551/NOTICE
----------------------------------------------------------------------
diff --cc NOTICE
index 65d87c2,3b4c11e..45ddf8f
--- a/NOTICE
+++ b/NOTICE
@@@ -20,15 -20,42 +20,48 @@@ Google, Inc. Released under the MIT lic
  This product bundles Bootstrap v2.3.2 Copyright 2012 Twitter, Inc
  Licensed under the Apache License v2.0
  
 -This product bundles with jquery-ui-1.8.9. Licensed under MIT license.
 +This product bundles jquery-ui-1.8.9. Licensed under MIT license.
  
 -This product bundles with mocha.
 -All rights reserved. Licensed under MIT.
 +This product bundles jquery-1.9.1 Licensed under MIT license.
 +
 +This product bundles mocha. All rights reserved. Licensed under MIT.
  Copyright (c) 2011-2014 TJ Holowaychuk <tj...@vision-media.ca>
  
 +This product bundles NSubstitute v1.6.0.0. Licensed under the BSD 2-Clause License.
 +
 +This product bundles NUnit v2.6.2.
 +Portions Copyright © 2002-2012 Charlie Poole or Copyright © 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov or Copyright © 2000-2002 Philip A. Craig
 +
+ This product bundles a number of files within the /sdks/ios
+ package.
+ 
+  Copyright (C) 2009 Stig Brautaset. All rights reserved.
+  
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+  
+  * Redistributions of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+  
+  * Neither the name of the author nor the names of its contributors may be used
+    to endorse or promote products derived from this software without specific
+    prior written permission.
+  
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
+ This product bundles SSToolkit Copyright (c) 2009-2011 Sam Soffes. All rights reserved.
+ These files can be located within the /sdks/ios package.
+