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/03/15 22:20:40 UTC
[1/5] git commit: Partial fix for USERGRID-100: Add the correct A.L.
headers to the ios sdk files.
Repository: incubator-usergrid
Updated Branches:
refs/pull/72/head [created] e02f3cf9f
refs/pull/72/merge [created] e6d68a1dd
Partial fix for USERGRID-100: Add the correct A.L. headers to the ios sdk files.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/0ec48b49
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/0ec48b49
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/0ec48b49
Branch: refs/pull/72/head
Commit: 0ec48b49a23dc10247ef83a12805e1e50e5e47a5
Parents: 7ea7503
Author: Lieven Govaerts <lg...@mobsol.be>
Authored: Sat Mar 15 20:49:05 2014 +0100
Committer: Lieven Govaerts <lg...@mobsol.be>
Committed: Sat Mar 15 20:49:05 2014 +0100
----------------------------------------------------------------------
sdks/ios/UGAPI/UGActivity.h | 17 +++++++++++++++++
sdks/ios/UGAPI/UGActivity.m | 17 +++++++++++++++++
sdks/ios/UGAPI/UGClient.h | 17 +++++++++++++++++
sdks/ios/UGAPI/UGClient.m | 17 +++++++++++++++++
sdks/ios/UGAPI/UGClientDelegate.h | 17 +++++++++++++++++
sdks/ios/UGAPI/UGClientResponse.h | 17 +++++++++++++++++
sdks/ios/UGAPI/UGClientResponse.m | 17 +++++++++++++++++
sdks/ios/UGAPI/UGHTTPManager.h | 17 +++++++++++++++++
sdks/ios/UGAPI/UGHTTPManager.m | 17 +++++++++++++++++
sdks/ios/UGAPI/UGMultiStepAction.h | 17 +++++++++++++++++
sdks/ios/UGAPI/UGMultiStepAction.m | 17 +++++++++++++++++
sdks/ios/UGAPI/UGQuery.h | 17 +++++++++++++++++
sdks/ios/UGAPI/UGQuery.m | 17 +++++++++++++++++
sdks/ios/UGAPI/UGUser.h | 17 +++++++++++++++++
sdks/ios/UGAPI/UGUser.m | 23 ++++++++++++++++-------
sdks/ios/UGAPIApp/UGAPIApp-Prefix.pch | 17 +++++++++++++++++
sdks/ios/UGAPIApp/UGAppAppDelegate.h | 23 ++++++++++++++++-------
sdks/ios/UGAPIApp/UGAppAppDelegate.m | 23 ++++++++++++++++-------
sdks/ios/UGAPIApp/UGAppViewController.h | 23 ++++++++++++++++-------
sdks/ios/UGAPIApp/UGAppViewController.m | 23 ++++++++++++++++-------
sdks/ios/UGAPIApp/main.m | 23 ++++++++++++++++-------
sdks/ios/UGAPIAppTests/UGAPIAppTests.h | 23 ++++++++++++++++-------
sdks/ios/UGAPIAppTests/UGAPIAppTests.m | 23 ++++++++++++++++-------
23 files changed, 383 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPI/UGActivity.h
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPI/UGActivity.h b/sdks/ios/UGAPI/UGActivity.h
index a8b809c..1139518 100755
--- a/sdks/ios/UGAPI/UGActivity.h
+++ b/sdks/ios/UGAPI/UGActivity.h
@@ -1,3 +1,20 @@
+/*
+ * 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 <Foundation/Foundation.h>
@interface UGActivity : NSObject
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPI/UGActivity.m
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPI/UGActivity.m b/sdks/ios/UGAPI/UGActivity.m
index daf9988..3eaea00 100755
--- a/sdks/ios/UGAPI/UGActivity.m
+++ b/sdks/ios/UGAPI/UGActivity.m
@@ -1,3 +1,20 @@
+/*
+ * 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 "UGActivity.h"
// the way they have set up the object info
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPI/UGClient.h
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPI/UGClient.h b/sdks/ios/UGAPI/UGClient.h
index 4358d83..4e6a31f 100755
--- a/sdks/ios/UGAPI/UGClient.h
+++ b/sdks/ios/UGAPI/UGClient.h
@@ -1,3 +1,20 @@
+/*
+ * 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 <Foundation/Foundation.h>
#import "UGClientResponse.h"
#import "UGQuery.h"
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPI/UGClient.m
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPI/UGClient.m b/sdks/ios/UGAPI/UGClient.m
index 4ffc829..9d6407a 100755
--- a/sdks/ios/UGAPI/UGClient.m
+++ b/sdks/ios/UGAPI/UGClient.m
@@ -1,3 +1,20 @@
+/*
+ * 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 "UGClient.h"
#import "UGHTTPManager.h"
#import "SBJson.h"
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPI/UGClientDelegate.h
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPI/UGClientDelegate.h b/sdks/ios/UGAPI/UGClientDelegate.h
index 15a080c..28bc996 100644
--- a/sdks/ios/UGAPI/UGClientDelegate.h
+++ b/sdks/ios/UGAPI/UGClientDelegate.h
@@ -1,3 +1,20 @@
+/*
+ * 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 <Foundation/Foundation.h>
#import "UGClientResponse.h"
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPI/UGClientResponse.h
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPI/UGClientResponse.h b/sdks/ios/UGAPI/UGClientResponse.h
index 3432008..01bc5a1 100755
--- a/sdks/ios/UGAPI/UGClientResponse.h
+++ b/sdks/ios/UGAPI/UGClientResponse.h
@@ -1,3 +1,20 @@
+/*
+ * 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 <Foundation/Foundation.h>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPI/UGClientResponse.m
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPI/UGClientResponse.m b/sdks/ios/UGAPI/UGClientResponse.m
index 6519ef0..dc49fb4 100755
--- a/sdks/ios/UGAPI/UGClientResponse.m
+++ b/sdks/ios/UGAPI/UGClientResponse.m
@@ -1,3 +1,20 @@
+/*
+ * 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 "UGClientResponse.h"
@implementation UGClientResponse
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPI/UGHTTPManager.h
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPI/UGHTTPManager.h b/sdks/ios/UGAPI/UGHTTPManager.h
index 1110d8a..d6c1822 100755
--- a/sdks/ios/UGAPI/UGHTTPManager.h
+++ b/sdks/ios/UGAPI/UGHTTPManager.h
@@ -1,3 +1,20 @@
+/*
+ * 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 <Foundation/Foundation.h>
enum
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPI/UGHTTPManager.m
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPI/UGHTTPManager.m b/sdks/ios/UGAPI/UGHTTPManager.m
index 692f2e7..5d62fe9 100755
--- a/sdks/ios/UGAPI/UGHTTPManager.m
+++ b/sdks/ios/UGAPI/UGHTTPManager.m
@@ -1,3 +1,20 @@
+/*
+ * 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 "UGHTTPManager.h"
// all transaction IDs are unique across all UGHTTPManagers.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPI/UGMultiStepAction.h
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPI/UGMultiStepAction.h b/sdks/ios/UGAPI/UGMultiStepAction.h
index 6fbe888..fbc1259 100755
--- a/sdks/ios/UGAPI/UGMultiStepAction.h
+++ b/sdks/ios/UGAPI/UGMultiStepAction.h
@@ -1,3 +1,20 @@
+/*
+ * 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 <Foundation/Foundation.h>
// an enumeration for multi-step processes.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPI/UGMultiStepAction.m
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPI/UGMultiStepAction.m b/sdks/ios/UGAPI/UGMultiStepAction.m
index 3f5ff69..6a1b7c7 100755
--- a/sdks/ios/UGAPI/UGMultiStepAction.m
+++ b/sdks/ios/UGAPI/UGMultiStepAction.m
@@ -1,3 +1,20 @@
+/*
+ * 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 "UGMultiStepAction.h"
@implementation UGMultiStepAction
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPI/UGQuery.h
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPI/UGQuery.h b/sdks/ios/UGAPI/UGQuery.h
index 0a8c94c..b77e0a4 100755
--- a/sdks/ios/UGAPI/UGQuery.h
+++ b/sdks/ios/UGAPI/UGQuery.h
@@ -1,3 +1,20 @@
+/*
+ * 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 <Foundation/Foundation.h>
#import <CoreLocation/CoreLocation.h>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPI/UGQuery.m
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPI/UGQuery.m b/sdks/ios/UGAPI/UGQuery.m
index 0dff0f6..740ec5c 100755
--- a/sdks/ios/UGAPI/UGQuery.m
+++ b/sdks/ios/UGAPI/UGQuery.m
@@ -1,3 +1,20 @@
+/*
+ * 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 "UGQuery.h"
#import "UGHTTPManager.h"
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPI/UGUser.h
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPI/UGUser.h b/sdks/ios/UGAPI/UGUser.h
index 6012eb7..58e3b99 100755
--- a/sdks/ios/UGAPI/UGUser.h
+++ b/sdks/ios/UGAPI/UGUser.h
@@ -1,3 +1,20 @@
+/*
+ * 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 <Foundation/Foundation.h>
@interface UGUser : NSObject
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPI/UGUser.m
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPI/UGUser.m b/sdks/ios/UGAPI/UGUser.m
index 6d4ef76..d683b6d 100755
--- a/sdks/ios/UGAPI/UGUser.m
+++ b/sdks/ios/UGAPI/UGUser.m
@@ -1,10 +1,19 @@
-//
-// UGUser.m
-// testproject1
-//
-// Created by Donica Patel on 3/2/12.
-// Copyright (c) 2012 Apigee Corporation. 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 "UGUser.h"
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPIApp/UGAPIApp-Prefix.pch
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPIApp/UGAPIApp-Prefix.pch b/sdks/ios/UGAPIApp/UGAPIApp-Prefix.pch
index 9cde3b9..b497ab1 100644
--- a/sdks/ios/UGAPIApp/UGAPIApp-Prefix.pch
+++ b/sdks/ios/UGAPIApp/UGAPIApp-Prefix.pch
@@ -1,3 +1,20 @@
+/*
+ * 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.
+ */
+
//
// Prefix header for all source files of the 'UGAPIApp' target in the 'UGAPIApp' project
//
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPIApp/UGAppAppDelegate.h
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPIApp/UGAppAppDelegate.h b/sdks/ios/UGAPIApp/UGAppAppDelegate.h
index 0d2f6b4..15c3ced 100644
--- a/sdks/ios/UGAPIApp/UGAppAppDelegate.h
+++ b/sdks/ios/UGAPIApp/UGAppAppDelegate.h
@@ -1,10 +1,19 @@
-//
-// UGAppAppDelegate.h
-// UGAPIApp
-//
-// Created by Ed Anuff on 3/12/12.
-// Copyright (c) 2012 __MyCompanyName__. 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>
@class UGHTTPManager;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPIApp/UGAppAppDelegate.m
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPIApp/UGAppAppDelegate.m b/sdks/ios/UGAPIApp/UGAppAppDelegate.m
index ccff41f..2e7d6de 100644
--- a/sdks/ios/UGAPIApp/UGAppAppDelegate.m
+++ b/sdks/ios/UGAPIApp/UGAppAppDelegate.m
@@ -1,10 +1,19 @@
-//
-// UGAppAppDelegate.m
-// UGAPIApp
-//
-// Created by Ed Anuff on 3/12/12.
-// Copyright (c) 2012 __MyCompanyName__. 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 "UGAppAppDelegate.h"
#import "UGHTTPManager.h"
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPIApp/UGAppViewController.h
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPIApp/UGAppViewController.h b/sdks/ios/UGAPIApp/UGAppViewController.h
index 24b104e..9846c31 100644
--- a/sdks/ios/UGAPIApp/UGAppViewController.h
+++ b/sdks/ios/UGAPIApp/UGAppViewController.h
@@ -1,10 +1,19 @@
-//
-// UGAppViewController.h
-// UGAPIApp
-//
-// Created by Ed Anuff on 3/12/12.
-// Copyright (c) 2012 __MyCompanyName__. 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/0ec48b49/sdks/ios/UGAPIApp/UGAppViewController.m
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPIApp/UGAppViewController.m b/sdks/ios/UGAPIApp/UGAppViewController.m
index 2dddf84..b7c5424 100644
--- a/sdks/ios/UGAPIApp/UGAppViewController.m
+++ b/sdks/ios/UGAPIApp/UGAppViewController.m
@@ -1,10 +1,19 @@
-//
-// UGAppViewController.m
-// UGAPIApp
-//
-// Created by Ed Anuff on 3/12/12.
-// Copyright (c) 2012 __MyCompanyName__. 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 "UGAppViewController.h"
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPIApp/main.m
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPIApp/main.m b/sdks/ios/UGAPIApp/main.m
index 3848b41..f547811 100644
--- a/sdks/ios/UGAPIApp/main.m
+++ b/sdks/ios/UGAPIApp/main.m
@@ -1,10 +1,19 @@
-//
-// main.m
-// UGAPIApp
-//
-// Created by Ed Anuff on 3/12/12.
-// Copyright (c) 2012 __MyCompanyName__. 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/0ec48b49/sdks/ios/UGAPIAppTests/UGAPIAppTests.h
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPIAppTests/UGAPIAppTests.h b/sdks/ios/UGAPIAppTests/UGAPIAppTests.h
index 6de8009..abaf125 100644
--- a/sdks/ios/UGAPIAppTests/UGAPIAppTests.h
+++ b/sdks/ios/UGAPIAppTests/UGAPIAppTests.h
@@ -1,10 +1,19 @@
-//
-// UGAPIAppTests.h
-// UGAPIAppTests
-//
-// Created by Ed Anuff on 3/12/12.
-// Copyright (c) 2012 __MyCompanyName__. 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 <SenTestingKit/SenTestingKit.h>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPIAppTests/UGAPIAppTests.m
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPIAppTests/UGAPIAppTests.m b/sdks/ios/UGAPIAppTests/UGAPIAppTests.m
index 4a657de..0cda4c0 100644
--- a/sdks/ios/UGAPIAppTests/UGAPIAppTests.m
+++ b/sdks/ios/UGAPIAppTests/UGAPIAppTests.m
@@ -1,10 +1,19 @@
-//
-// UGAPIAppTests.m
-// UGAPIAppTests
-//
-// Created by Ed Anuff on 3/12/12.
-// Copyright (c) 2012 __MyCompanyName__. 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 "UGAPIAppTests.h"
[4/5] git commit: For USERGRID-100,
add a NOTICE file and update LICENSE for the SBJson and SSKeychain
components in the iOS SDK..
Posted by sn...@apache.org.
For USERGRID-100, add a NOTICE file and update LICENSE for the SBJson and SSKeychain components in the iOS SDK..
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/e02f3cf9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e02f3cf9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e02f3cf9
Branch: refs/pull/72/head
Commit: e02f3cf9ffbac8bffa4906c37d050c2a38578645
Parents: 0ec48b4
Author: Lieven Govaerts <lg...@mobsol.be>
Authored: Sat Mar 15 21:28:58 2014 +0100
Committer: Lieven Govaerts <lg...@mobsol.be>
Committed: Sat Mar 15 21:28:58 2014 +0100
----------------------------------------------------------------------
LICENSE | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
NOTICE | 11 ++++++++++
2 files changed, 75 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e02f3cf9/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 7a4a3ea..9fc77ee 100644
--- a/LICENSE
+++ b/LICENSE
@@ -199,4 +199,67 @@
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.
\ No newline at end of file
+ limitations under the License.
+
+
+USERGRID SUBCOMPONENTS
+
+The Usergrid software includes a number of subcomponents with separate
+copyrights and license terms. Your use of the source code for these
+subcomponents is subject to the terms and conditions of the following
+licenses.
+
+IOS SDK
+-------
+For the SBJson component:
+
+ Copyright (C) 2009-2011 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.
+
+
+For the SSKeychain component:
+
+ Copyright (c) 2010-2014 Sam Soffes, http://soff.es
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e02f3cf9/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..ae48093
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,11 @@
+Apache Usergrid_
+Copyright 2014 The Apache Software Foundation.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+This product bundles SBJson, which is available under a "3-clause BSD" license.
+For details, see sdks/ios/UGAPI/SBJson/ .
+
+This product bundles SSKeychain, which is available under a "MIT/X11" license.
+For details, see sdks/ios/UGAPI/SSKeychain/.
[2/5] git commit: Partial fix for USERGRID-100: Add the correct A.L.
headers to the ios sdk files.
Posted by sn...@apache.org.
Partial fix for USERGRID-100: Add the correct A.L. headers to the ios sdk files.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/0ec48b49
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/0ec48b49
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/0ec48b49
Branch: refs/pull/72/merge
Commit: 0ec48b49a23dc10247ef83a12805e1e50e5e47a5
Parents: 7ea7503
Author: Lieven Govaerts <lg...@mobsol.be>
Authored: Sat Mar 15 20:49:05 2014 +0100
Committer: Lieven Govaerts <lg...@mobsol.be>
Committed: Sat Mar 15 20:49:05 2014 +0100
----------------------------------------------------------------------
sdks/ios/UGAPI/UGActivity.h | 17 +++++++++++++++++
sdks/ios/UGAPI/UGActivity.m | 17 +++++++++++++++++
sdks/ios/UGAPI/UGClient.h | 17 +++++++++++++++++
sdks/ios/UGAPI/UGClient.m | 17 +++++++++++++++++
sdks/ios/UGAPI/UGClientDelegate.h | 17 +++++++++++++++++
sdks/ios/UGAPI/UGClientResponse.h | 17 +++++++++++++++++
sdks/ios/UGAPI/UGClientResponse.m | 17 +++++++++++++++++
sdks/ios/UGAPI/UGHTTPManager.h | 17 +++++++++++++++++
sdks/ios/UGAPI/UGHTTPManager.m | 17 +++++++++++++++++
sdks/ios/UGAPI/UGMultiStepAction.h | 17 +++++++++++++++++
sdks/ios/UGAPI/UGMultiStepAction.m | 17 +++++++++++++++++
sdks/ios/UGAPI/UGQuery.h | 17 +++++++++++++++++
sdks/ios/UGAPI/UGQuery.m | 17 +++++++++++++++++
sdks/ios/UGAPI/UGUser.h | 17 +++++++++++++++++
sdks/ios/UGAPI/UGUser.m | 23 ++++++++++++++++-------
sdks/ios/UGAPIApp/UGAPIApp-Prefix.pch | 17 +++++++++++++++++
sdks/ios/UGAPIApp/UGAppAppDelegate.h | 23 ++++++++++++++++-------
sdks/ios/UGAPIApp/UGAppAppDelegate.m | 23 ++++++++++++++++-------
sdks/ios/UGAPIApp/UGAppViewController.h | 23 ++++++++++++++++-------
sdks/ios/UGAPIApp/UGAppViewController.m | 23 ++++++++++++++++-------
sdks/ios/UGAPIApp/main.m | 23 ++++++++++++++++-------
sdks/ios/UGAPIAppTests/UGAPIAppTests.h | 23 ++++++++++++++++-------
sdks/ios/UGAPIAppTests/UGAPIAppTests.m | 23 ++++++++++++++++-------
23 files changed, 383 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPI/UGActivity.h
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPI/UGActivity.h b/sdks/ios/UGAPI/UGActivity.h
index a8b809c..1139518 100755
--- a/sdks/ios/UGAPI/UGActivity.h
+++ b/sdks/ios/UGAPI/UGActivity.h
@@ -1,3 +1,20 @@
+/*
+ * 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 <Foundation/Foundation.h>
@interface UGActivity : NSObject
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPI/UGActivity.m
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPI/UGActivity.m b/sdks/ios/UGAPI/UGActivity.m
index daf9988..3eaea00 100755
--- a/sdks/ios/UGAPI/UGActivity.m
+++ b/sdks/ios/UGAPI/UGActivity.m
@@ -1,3 +1,20 @@
+/*
+ * 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 "UGActivity.h"
// the way they have set up the object info
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPI/UGClient.h
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPI/UGClient.h b/sdks/ios/UGAPI/UGClient.h
index 4358d83..4e6a31f 100755
--- a/sdks/ios/UGAPI/UGClient.h
+++ b/sdks/ios/UGAPI/UGClient.h
@@ -1,3 +1,20 @@
+/*
+ * 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 <Foundation/Foundation.h>
#import "UGClientResponse.h"
#import "UGQuery.h"
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPI/UGClient.m
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPI/UGClient.m b/sdks/ios/UGAPI/UGClient.m
index 4ffc829..9d6407a 100755
--- a/sdks/ios/UGAPI/UGClient.m
+++ b/sdks/ios/UGAPI/UGClient.m
@@ -1,3 +1,20 @@
+/*
+ * 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 "UGClient.h"
#import "UGHTTPManager.h"
#import "SBJson.h"
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPI/UGClientDelegate.h
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPI/UGClientDelegate.h b/sdks/ios/UGAPI/UGClientDelegate.h
index 15a080c..28bc996 100644
--- a/sdks/ios/UGAPI/UGClientDelegate.h
+++ b/sdks/ios/UGAPI/UGClientDelegate.h
@@ -1,3 +1,20 @@
+/*
+ * 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 <Foundation/Foundation.h>
#import "UGClientResponse.h"
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPI/UGClientResponse.h
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPI/UGClientResponse.h b/sdks/ios/UGAPI/UGClientResponse.h
index 3432008..01bc5a1 100755
--- a/sdks/ios/UGAPI/UGClientResponse.h
+++ b/sdks/ios/UGAPI/UGClientResponse.h
@@ -1,3 +1,20 @@
+/*
+ * 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 <Foundation/Foundation.h>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPI/UGClientResponse.m
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPI/UGClientResponse.m b/sdks/ios/UGAPI/UGClientResponse.m
index 6519ef0..dc49fb4 100755
--- a/sdks/ios/UGAPI/UGClientResponse.m
+++ b/sdks/ios/UGAPI/UGClientResponse.m
@@ -1,3 +1,20 @@
+/*
+ * 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 "UGClientResponse.h"
@implementation UGClientResponse
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPI/UGHTTPManager.h
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPI/UGHTTPManager.h b/sdks/ios/UGAPI/UGHTTPManager.h
index 1110d8a..d6c1822 100755
--- a/sdks/ios/UGAPI/UGHTTPManager.h
+++ b/sdks/ios/UGAPI/UGHTTPManager.h
@@ -1,3 +1,20 @@
+/*
+ * 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 <Foundation/Foundation.h>
enum
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPI/UGHTTPManager.m
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPI/UGHTTPManager.m b/sdks/ios/UGAPI/UGHTTPManager.m
index 692f2e7..5d62fe9 100755
--- a/sdks/ios/UGAPI/UGHTTPManager.m
+++ b/sdks/ios/UGAPI/UGHTTPManager.m
@@ -1,3 +1,20 @@
+/*
+ * 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 "UGHTTPManager.h"
// all transaction IDs are unique across all UGHTTPManagers.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPI/UGMultiStepAction.h
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPI/UGMultiStepAction.h b/sdks/ios/UGAPI/UGMultiStepAction.h
index 6fbe888..fbc1259 100755
--- a/sdks/ios/UGAPI/UGMultiStepAction.h
+++ b/sdks/ios/UGAPI/UGMultiStepAction.h
@@ -1,3 +1,20 @@
+/*
+ * 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 <Foundation/Foundation.h>
// an enumeration for multi-step processes.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPI/UGMultiStepAction.m
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPI/UGMultiStepAction.m b/sdks/ios/UGAPI/UGMultiStepAction.m
index 3f5ff69..6a1b7c7 100755
--- a/sdks/ios/UGAPI/UGMultiStepAction.m
+++ b/sdks/ios/UGAPI/UGMultiStepAction.m
@@ -1,3 +1,20 @@
+/*
+ * 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 "UGMultiStepAction.h"
@implementation UGMultiStepAction
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPI/UGQuery.h
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPI/UGQuery.h b/sdks/ios/UGAPI/UGQuery.h
index 0a8c94c..b77e0a4 100755
--- a/sdks/ios/UGAPI/UGQuery.h
+++ b/sdks/ios/UGAPI/UGQuery.h
@@ -1,3 +1,20 @@
+/*
+ * 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 <Foundation/Foundation.h>
#import <CoreLocation/CoreLocation.h>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPI/UGQuery.m
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPI/UGQuery.m b/sdks/ios/UGAPI/UGQuery.m
index 0dff0f6..740ec5c 100755
--- a/sdks/ios/UGAPI/UGQuery.m
+++ b/sdks/ios/UGAPI/UGQuery.m
@@ -1,3 +1,20 @@
+/*
+ * 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 "UGQuery.h"
#import "UGHTTPManager.h"
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPI/UGUser.h
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPI/UGUser.h b/sdks/ios/UGAPI/UGUser.h
index 6012eb7..58e3b99 100755
--- a/sdks/ios/UGAPI/UGUser.h
+++ b/sdks/ios/UGAPI/UGUser.h
@@ -1,3 +1,20 @@
+/*
+ * 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 <Foundation/Foundation.h>
@interface UGUser : NSObject
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPI/UGUser.m
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPI/UGUser.m b/sdks/ios/UGAPI/UGUser.m
index 6d4ef76..d683b6d 100755
--- a/sdks/ios/UGAPI/UGUser.m
+++ b/sdks/ios/UGAPI/UGUser.m
@@ -1,10 +1,19 @@
-//
-// UGUser.m
-// testproject1
-//
-// Created by Donica Patel on 3/2/12.
-// Copyright (c) 2012 Apigee Corporation. 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 "UGUser.h"
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPIApp/UGAPIApp-Prefix.pch
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPIApp/UGAPIApp-Prefix.pch b/sdks/ios/UGAPIApp/UGAPIApp-Prefix.pch
index 9cde3b9..b497ab1 100644
--- a/sdks/ios/UGAPIApp/UGAPIApp-Prefix.pch
+++ b/sdks/ios/UGAPIApp/UGAPIApp-Prefix.pch
@@ -1,3 +1,20 @@
+/*
+ * 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.
+ */
+
//
// Prefix header for all source files of the 'UGAPIApp' target in the 'UGAPIApp' project
//
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPIApp/UGAppAppDelegate.h
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPIApp/UGAppAppDelegate.h b/sdks/ios/UGAPIApp/UGAppAppDelegate.h
index 0d2f6b4..15c3ced 100644
--- a/sdks/ios/UGAPIApp/UGAppAppDelegate.h
+++ b/sdks/ios/UGAPIApp/UGAppAppDelegate.h
@@ -1,10 +1,19 @@
-//
-// UGAppAppDelegate.h
-// UGAPIApp
-//
-// Created by Ed Anuff on 3/12/12.
-// Copyright (c) 2012 __MyCompanyName__. 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>
@class UGHTTPManager;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPIApp/UGAppAppDelegate.m
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPIApp/UGAppAppDelegate.m b/sdks/ios/UGAPIApp/UGAppAppDelegate.m
index ccff41f..2e7d6de 100644
--- a/sdks/ios/UGAPIApp/UGAppAppDelegate.m
+++ b/sdks/ios/UGAPIApp/UGAppAppDelegate.m
@@ -1,10 +1,19 @@
-//
-// UGAppAppDelegate.m
-// UGAPIApp
-//
-// Created by Ed Anuff on 3/12/12.
-// Copyright (c) 2012 __MyCompanyName__. 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 "UGAppAppDelegate.h"
#import "UGHTTPManager.h"
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPIApp/UGAppViewController.h
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPIApp/UGAppViewController.h b/sdks/ios/UGAPIApp/UGAppViewController.h
index 24b104e..9846c31 100644
--- a/sdks/ios/UGAPIApp/UGAppViewController.h
+++ b/sdks/ios/UGAPIApp/UGAppViewController.h
@@ -1,10 +1,19 @@
-//
-// UGAppViewController.h
-// UGAPIApp
-//
-// Created by Ed Anuff on 3/12/12.
-// Copyright (c) 2012 __MyCompanyName__. 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/0ec48b49/sdks/ios/UGAPIApp/UGAppViewController.m
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPIApp/UGAppViewController.m b/sdks/ios/UGAPIApp/UGAppViewController.m
index 2dddf84..b7c5424 100644
--- a/sdks/ios/UGAPIApp/UGAppViewController.m
+++ b/sdks/ios/UGAPIApp/UGAppViewController.m
@@ -1,10 +1,19 @@
-//
-// UGAppViewController.m
-// UGAPIApp
-//
-// Created by Ed Anuff on 3/12/12.
-// Copyright (c) 2012 __MyCompanyName__. 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 "UGAppViewController.h"
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPIApp/main.m
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPIApp/main.m b/sdks/ios/UGAPIApp/main.m
index 3848b41..f547811 100644
--- a/sdks/ios/UGAPIApp/main.m
+++ b/sdks/ios/UGAPIApp/main.m
@@ -1,10 +1,19 @@
-//
-// main.m
-// UGAPIApp
-//
-// Created by Ed Anuff on 3/12/12.
-// Copyright (c) 2012 __MyCompanyName__. 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/0ec48b49/sdks/ios/UGAPIAppTests/UGAPIAppTests.h
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPIAppTests/UGAPIAppTests.h b/sdks/ios/UGAPIAppTests/UGAPIAppTests.h
index 6de8009..abaf125 100644
--- a/sdks/ios/UGAPIAppTests/UGAPIAppTests.h
+++ b/sdks/ios/UGAPIAppTests/UGAPIAppTests.h
@@ -1,10 +1,19 @@
-//
-// UGAPIAppTests.h
-// UGAPIAppTests
-//
-// Created by Ed Anuff on 3/12/12.
-// Copyright (c) 2012 __MyCompanyName__. 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 <SenTestingKit/SenTestingKit.h>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ec48b49/sdks/ios/UGAPIAppTests/UGAPIAppTests.m
----------------------------------------------------------------------
diff --git a/sdks/ios/UGAPIAppTests/UGAPIAppTests.m b/sdks/ios/UGAPIAppTests/UGAPIAppTests.m
index 4a657de..0cda4c0 100644
--- a/sdks/ios/UGAPIAppTests/UGAPIAppTests.m
+++ b/sdks/ios/UGAPIAppTests/UGAPIAppTests.m
@@ -1,10 +1,19 @@
-//
-// UGAPIAppTests.m
-// UGAPIAppTests
-//
-// Created by Ed Anuff on 3/12/12.
-// Copyright (c) 2012 __MyCompanyName__. 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 "UGAPIAppTests.h"
[3/5] git commit: For USERGRID-100,
add a NOTICE file and update LICENSE for the SBJson and SSKeychain
components in the iOS SDK..
Posted by sn...@apache.org.
For USERGRID-100, add a NOTICE file and update LICENSE for the SBJson and SSKeychain components in the iOS SDK..
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/e02f3cf9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e02f3cf9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e02f3cf9
Branch: refs/pull/72/merge
Commit: e02f3cf9ffbac8bffa4906c37d050c2a38578645
Parents: 0ec48b4
Author: Lieven Govaerts <lg...@mobsol.be>
Authored: Sat Mar 15 21:28:58 2014 +0100
Committer: Lieven Govaerts <lg...@mobsol.be>
Committed: Sat Mar 15 21:28:58 2014 +0100
----------------------------------------------------------------------
LICENSE | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
NOTICE | 11 ++++++++++
2 files changed, 75 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e02f3cf9/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 7a4a3ea..9fc77ee 100644
--- a/LICENSE
+++ b/LICENSE
@@ -199,4 +199,67 @@
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.
\ No newline at end of file
+ limitations under the License.
+
+
+USERGRID SUBCOMPONENTS
+
+The Usergrid software includes a number of subcomponents with separate
+copyrights and license terms. Your use of the source code for these
+subcomponents is subject to the terms and conditions of the following
+licenses.
+
+IOS SDK
+-------
+For the SBJson component:
+
+ Copyright (C) 2009-2011 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.
+
+
+For the SSKeychain component:
+
+ Copyright (c) 2010-2014 Sam Soffes, http://soff.es
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e02f3cf9/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..ae48093
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,11 @@
+Apache Usergrid_
+Copyright 2014 The Apache Software Foundation.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+This product bundles SBJson, which is available under a "3-clause BSD" license.
+For details, see sdks/ios/UGAPI/SBJson/ .
+
+This product bundles SSKeychain, which is available under a "MIT/X11" license.
+For details, see sdks/ios/UGAPI/SSKeychain/.
[5/5] git commit: Merge e02f3cf9ffbac8bffa4906c37d050c2a38578645 into
7ea7503a75c94e3d9306e405c2bedf79a092fc7b
Posted by sn...@apache.org.
Merge e02f3cf9ffbac8bffa4906c37d050c2a38578645 into 7ea7503a75c94e3d9306e405c2bedf79a092fc7b
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/e6d68a1d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e6d68a1d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e6d68a1d
Branch: refs/pull/72/merge
Commit: e6d68a1dd8dc6040e8386638b675ef0708a164ca
Parents: 7ea7503 e02f3cf
Author: Lieven Govaerts <lg...@apache.org>
Authored: Sat Mar 15 20:34:17 2014 +0000
Committer: Lieven Govaerts <lg...@apache.org>
Committed: Sat Mar 15 20:34:17 2014 +0000
----------------------------------------------------------------------
LICENSE | 65 +++++++++++++++++++++++++++-
NOTICE | 11 +++++
sdks/ios/UGAPI/UGActivity.h | 17 ++++++++
sdks/ios/UGAPI/UGActivity.m | 17 ++++++++
sdks/ios/UGAPI/UGClient.h | 17 ++++++++
sdks/ios/UGAPI/UGClient.m | 17 ++++++++
sdks/ios/UGAPI/UGClientDelegate.h | 17 ++++++++
sdks/ios/UGAPI/UGClientResponse.h | 17 ++++++++
sdks/ios/UGAPI/UGClientResponse.m | 17 ++++++++
sdks/ios/UGAPI/UGHTTPManager.h | 17 ++++++++
sdks/ios/UGAPI/UGHTTPManager.m | 17 ++++++++
sdks/ios/UGAPI/UGMultiStepAction.h | 17 ++++++++
sdks/ios/UGAPI/UGMultiStepAction.m | 17 ++++++++
sdks/ios/UGAPI/UGQuery.h | 17 ++++++++
sdks/ios/UGAPI/UGQuery.m | 17 ++++++++
sdks/ios/UGAPI/UGUser.h | 17 ++++++++
sdks/ios/UGAPI/UGUser.m | 23 +++++++---
sdks/ios/UGAPIApp/UGAPIApp-Prefix.pch | 17 ++++++++
sdks/ios/UGAPIApp/UGAppAppDelegate.h | 23 +++++++---
sdks/ios/UGAPIApp/UGAppAppDelegate.m | 23 +++++++---
sdks/ios/UGAPIApp/UGAppViewController.h | 23 +++++++---
sdks/ios/UGAPIApp/UGAppViewController.m | 23 +++++++---
sdks/ios/UGAPIApp/main.m | 23 +++++++---
sdks/ios/UGAPIAppTests/UGAPIAppTests.h | 23 +++++++---
sdks/ios/UGAPIAppTests/UGAPIAppTests.m | 23 +++++++---
25 files changed, 458 insertions(+), 57 deletions(-)
----------------------------------------------------------------------