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:37 UTC
[1/2] git commit: USERGRID-219 dd license headers to all Java files
Repository: incubator-usergrid
Updated Branches:
refs/heads/master bfc6f551a -> a2cbe1857
USERGRID-219 dd license headers to all Java 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/dc3d12da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/dc3d12da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/dc3d12da
Branch: refs/heads/master
Commit: dc3d12da8b2002f8a4928c11cfad1e12eaab1dab
Parents: 5c6802f
Author: Lewis John McGibbney <le...@jpl.nasa.gov>
Authored: Tue Aug 19 23:06:50 2014 -0700
Committer: Lewis John McGibbney <le...@jpl.nasa.gov>
Committed: Tue Aug 19 23:06:50 2014 -0700
----------------------------------------------------------------------
.../org/apache/usergrid/android/client/Client.java | 16 ++++++++++++++++
.../client/callbacks/ApiResponseCallback.java | 16 ++++++++++++++++
.../android/client/callbacks/ClientAsyncTask.java | 16 ++++++++++++++++
.../android/client/callbacks/ClientCallback.java | 16 ++++++++++++++++
.../callbacks/DeviceRegistrationCallback.java | 16 ++++++++++++++++
.../client/callbacks/GroupsRetrievedCallback.java | 16 ++++++++++++++++
.../client/callbacks/QueryResultsCallback.java | 16 ++++++++++++++++
.../android/client/utils/DeviceUuidFactory.java | 16 ++++++++++++++++
.../usergrid/android/client/utils/ObjectUtils.java | 16 ++++++++++++++++
.../src/test/resources/usergrid-test.properties | 11 +++++++++++
10 files changed, 155 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dc3d12da/sdks/android/src/main/java/org/apache/usergrid/android/client/Client.java
----------------------------------------------------------------------
diff --git a/sdks/android/src/main/java/org/apache/usergrid/android/client/Client.java b/sdks/android/src/main/java/org/apache/usergrid/android/client/Client.java
index a361f3c..764b1ac 100644
--- a/sdks/android/src/main/java/org/apache/usergrid/android/client/Client.java
+++ b/sdks/android/src/main/java/org/apache/usergrid/android/client/Client.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.usergrid.android.client;
import java.util.HashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dc3d12da/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/ApiResponseCallback.java
----------------------------------------------------------------------
diff --git a/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/ApiResponseCallback.java b/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/ApiResponseCallback.java
index 59d58b6..19c256f 100644
--- a/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/ApiResponseCallback.java
+++ b/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/ApiResponseCallback.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.usergrid.android.client.callbacks;
import org.usergrid.java.client.response.ApiResponse;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dc3d12da/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/ClientAsyncTask.java
----------------------------------------------------------------------
diff --git a/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/ClientAsyncTask.java b/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/ClientAsyncTask.java
index e4d4d82..2ad074e 100644
--- a/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/ClientAsyncTask.java
+++ b/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/ClientAsyncTask.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.usergrid.android.client.callbacks;
import android.os.AsyncTask;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dc3d12da/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/ClientCallback.java
----------------------------------------------------------------------
diff --git a/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/ClientCallback.java b/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/ClientCallback.java
index 559b3b9..0b834d5 100644
--- a/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/ClientCallback.java
+++ b/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/ClientCallback.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.usergrid.android.client.callbacks;
public interface ClientCallback<T> {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dc3d12da/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/DeviceRegistrationCallback.java
----------------------------------------------------------------------
diff --git a/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/DeviceRegistrationCallback.java b/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/DeviceRegistrationCallback.java
index 66ded57..462bebb 100644
--- a/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/DeviceRegistrationCallback.java
+++ b/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/DeviceRegistrationCallback.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.usergrid.android.client.callbacks;
import org.usergrid.java.client.entities.Device;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dc3d12da/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/GroupsRetrievedCallback.java
----------------------------------------------------------------------
diff --git a/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/GroupsRetrievedCallback.java b/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/GroupsRetrievedCallback.java
index 4558cf6..806110b 100644
--- a/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/GroupsRetrievedCallback.java
+++ b/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/GroupsRetrievedCallback.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.usergrid.android.client.callbacks;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dc3d12da/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/QueryResultsCallback.java
----------------------------------------------------------------------
diff --git a/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/QueryResultsCallback.java b/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/QueryResultsCallback.java
index 13f325e..3bc683a 100644
--- a/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/QueryResultsCallback.java
+++ b/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/QueryResultsCallback.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.usergrid.android.client.callbacks;
import org.usergrid.java.client.Client.Query;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dc3d12da/sdks/android/src/main/java/org/apache/usergrid/android/client/utils/DeviceUuidFactory.java
----------------------------------------------------------------------
diff --git a/sdks/android/src/main/java/org/apache/usergrid/android/client/utils/DeviceUuidFactory.java b/sdks/android/src/main/java/org/apache/usergrid/android/client/utils/DeviceUuidFactory.java
index 1eec3c3..6c731c2 100644
--- a/sdks/android/src/main/java/org/apache/usergrid/android/client/utils/DeviceUuidFactory.java
+++ b/sdks/android/src/main/java/org/apache/usergrid/android/client/utils/DeviceUuidFactory.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.usergrid.android.client.utils;
import static org.apache.usergrid.android.client.utils.ObjectUtils.isEmpty;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dc3d12da/sdks/android/src/main/java/org/apache/usergrid/android/client/utils/ObjectUtils.java
----------------------------------------------------------------------
diff --git a/sdks/android/src/main/java/org/apache/usergrid/android/client/utils/ObjectUtils.java b/sdks/android/src/main/java/org/apache/usergrid/android/client/utils/ObjectUtils.java
index 964dd9d..f0ef8fb 100644
--- a/sdks/android/src/main/java/org/apache/usergrid/android/client/utils/ObjectUtils.java
+++ b/sdks/android/src/main/java/org/apache/usergrid/android/client/utils/ObjectUtils.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.usergrid.android.client.utils;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dc3d12da/stack/config/src/test/resources/usergrid-test.properties
----------------------------------------------------------------------
diff --git a/stack/config/src/test/resources/usergrid-test.properties b/stack/config/src/test/resources/usergrid-test.properties
index b820e5c..d4ed71a 100644
--- a/stack/config/src/test/resources/usergrid-test.properties
+++ b/stack/config/src/test/resources/usergrid-test.properties
@@ -1,3 +1,14 @@
+# Licensed 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. See accompanying LICENSE file.
#
# Usergrid configuration properties
# Loaded by Spring PropertyPlaceholderConfigurer
[2/2] git commit: Merge branch 'pr/56'
Posted by sn...@apache.org.
Merge branch 'pr/56'
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/a2cbe185
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a2cbe185
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a2cbe185
Branch: refs/heads/master
Commit: a2cbe18577a611aaf41fd13333de4ec31bf80d38
Parents: bfc6f55 dc3d12d
Author: Dave Johnson <sn...@apache.org>
Authored: Wed Aug 20 12:41:13 2014 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Aug 20 12:41:13 2014 -0400
----------------------------------------------------------------------
.../org/apache/usergrid/android/client/Client.java | 16 ++++++++++++++++
.../client/callbacks/ApiResponseCallback.java | 16 ++++++++++++++++
.../android/client/callbacks/ClientAsyncTask.java | 16 ++++++++++++++++
.../android/client/callbacks/ClientCallback.java | 16 ++++++++++++++++
.../callbacks/DeviceRegistrationCallback.java | 16 ++++++++++++++++
.../client/callbacks/GroupsRetrievedCallback.java | 16 ++++++++++++++++
.../client/callbacks/QueryResultsCallback.java | 16 ++++++++++++++++
.../android/client/utils/DeviceUuidFactory.java | 16 ++++++++++++++++
.../usergrid/android/client/utils/ObjectUtils.java | 16 ++++++++++++++++
.../src/test/resources/usergrid-test.properties | 11 +++++++++++
10 files changed, 155 insertions(+)
----------------------------------------------------------------------