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 17:58:50 UTC
[1/2] git commit: USERGRID-208 License headers for all XML files
Repository: incubator-usergrid
Updated Branches:
refs/heads/master 7fab67376 -> 717e4fe9b
USERGRID-208 License headers for all XML 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/18204c55
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/18204c55
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/18204c55
Branch: refs/heads/master
Commit: 18204c55686989380f5e0bfd384dbe9352408d10
Parents: a945495
Author: Lewis John McGibbney <le...@jpl.nasa.gov>
Authored: Wed Aug 13 00:02:21 2014 -0700
Committer: Lewis John McGibbney <le...@jpl.nasa.gov>
Committed: Wed Aug 13 00:02:21 2014 -0700
----------------------------------------------------------------------
.../usergrid-java-client/maven-metadata-local.xml | 16 ++++++++++++++++
stack/cloudbees.xml | 18 ++++++++++++++++++
.../AppleJavaExtensions/maven-metadata-local.xml | 16 ++++++++++++++++
.../recaptcha4j/maven-metadata-local.xml | 16 ++++++++++++++++
.../usergrid-java-client/maven-metadata-local.xml | 16 ++++++++++++++++
stack/rest/src/test/resources/project.properties | 15 +++++++++++++++
.../resources/usergrid-custom-test.properties | 15 +++++++++++++++
.../resources/usergrid-rest-deploy-context.xml | 16 ++++++++++++++++
.../src/test/resources/usergrid-test-context.xml | 16 ++++++++++++++++
9 files changed, 144 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/18204c55/sdks/android/m2/repository/org/usergrid/usergrid-java-client/maven-metadata-local.xml
----------------------------------------------------------------------
diff --git a/sdks/android/m2/repository/org/usergrid/usergrid-java-client/maven-metadata-local.xml b/sdks/android/m2/repository/org/usergrid/usergrid-java-client/maven-metadata-local.xml
index 456be57..181239b 100644
--- a/sdks/android/m2/repository/org/usergrid/usergrid-java-client/maven-metadata-local.xml
+++ b/sdks/android/m2/repository/org/usergrid/usergrid-java-client/maven-metadata-local.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<metadata>
<groupId>org.usergrid</groupId>
<artifactId>usergrid-java-client</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/18204c55/stack/cloudbees.xml
----------------------------------------------------------------------
diff --git a/stack/cloudbees.xml b/stack/cloudbees.xml
index d1cf4a9..8ad0e7e 100644
--- a/stack/cloudbees.xml
+++ b/stack/cloudbees.xml
@@ -1,3 +1,21 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+
<settings>
<profiles>
<profile>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/18204c55/stack/m2/repository/com/apple/AppleJavaExtensions/maven-metadata-local.xml
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/apple/AppleJavaExtensions/maven-metadata-local.xml b/stack/m2/repository/com/apple/AppleJavaExtensions/maven-metadata-local.xml
index 66f6d0f..f4855bd 100644
--- a/stack/m2/repository/com/apple/AppleJavaExtensions/maven-metadata-local.xml
+++ b/stack/m2/repository/com/apple/AppleJavaExtensions/maven-metadata-local.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<metadata>
<groupId>com.apple</groupId>
<artifactId>AppleJavaExtensions</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/18204c55/stack/m2/repository/net/tanesha/recaptcha4j/recaptcha4j/maven-metadata-local.xml
----------------------------------------------------------------------
diff --git a/stack/m2/repository/net/tanesha/recaptcha4j/recaptcha4j/maven-metadata-local.xml b/stack/m2/repository/net/tanesha/recaptcha4j/recaptcha4j/maven-metadata-local.xml
index 2133866..02932e8 100644
--- a/stack/m2/repository/net/tanesha/recaptcha4j/recaptcha4j/maven-metadata-local.xml
+++ b/stack/m2/repository/net/tanesha/recaptcha4j/recaptcha4j/maven-metadata-local.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<metadata>
<groupId>net.tanesha.recaptcha4j</groupId>
<artifactId>recaptcha4j</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/18204c55/stack/m2/repository/org/usergrid/usergrid-java-client/maven-metadata-local.xml
----------------------------------------------------------------------
diff --git a/stack/m2/repository/org/usergrid/usergrid-java-client/maven-metadata-local.xml b/stack/m2/repository/org/usergrid/usergrid-java-client/maven-metadata-local.xml
index f12ac4c..f0ebe32 100644
--- a/stack/m2/repository/org/usergrid/usergrid-java-client/maven-metadata-local.xml
+++ b/stack/m2/repository/org/usergrid/usergrid-java-client/maven-metadata-local.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<metadata>
<groupId>org.usergrid</groupId>
<artifactId>usergrid-java-client</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/18204c55/stack/rest/src/test/resources/project.properties
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/resources/project.properties b/stack/rest/src/test/resources/project.properties
index c0bf364..5cdb074 100644
--- a/stack/rest/src/test/resources/project.properties
+++ b/stack/rest/src/test/resources/project.properties
@@ -1 +1,16 @@
+# 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.
target.directory=${project.build.directory}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/18204c55/stack/rest/src/test/resources/usergrid-custom-test.properties
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/resources/usergrid-custom-test.properties b/stack/rest/src/test/resources/usergrid-custom-test.properties
index 3872c20..8d0f3f7 100644
--- a/stack/rest/src/test/resources/usergrid-custom-test.properties
+++ b/stack/rest/src/test/resources/usergrid-custom-test.properties
@@ -1,3 +1,18 @@
+# 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.
usergrid.mongo.disable=true
swagger.basepath=http://sometestvalue
usergrid.counter.batch.size=1
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/18204c55/stack/rest/src/test/resources/usergrid-rest-deploy-context.xml
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/resources/usergrid-rest-deploy-context.xml b/stack/rest/src/test/resources/usergrid-rest-deploy-context.xml
index a585542..424f480 100644
--- a/stack/rest/src/test/resources/usergrid-rest-deploy-context.xml
+++ b/stack/rest/src/test/resources/usergrid-rest-deploy-context.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
xmlns:context="http://www.springframework.org/schema/context" xmlns:p="http://www.springframework.org/schema/p"
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/18204c55/stack/rest/src/test/resources/usergrid-test-context.xml
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/resources/usergrid-test-context.xml b/stack/rest/src/test/resources/usergrid-test-context.xml
index 83aae5e..319c933 100644
--- a/stack/rest/src/test/resources/usergrid-test-context.xml
+++ b/stack/rest/src/test/resources/usergrid-test-context.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
xmlns:context="http://www.springframework.org/schema/context" xmlns:p="http://www.springframework.org/schema/p"
[2/2] git commit: Merge branch 'pr/45'
Posted by sn...@apache.org.
Merge branch 'pr/45'
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/717e4fe9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/717e4fe9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/717e4fe9
Branch: refs/heads/master
Commit: 717e4fe9bdf7fd85f1f0efa6399ac41c3086379b
Parents: 7fab673 18204c5
Author: Dave Johnson <sn...@apache.org>
Authored: Fri Aug 15 10:46:08 2014 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Fri Aug 15 10:46:08 2014 -0400
----------------------------------------------------------------------
.../usergrid-java-client/maven-metadata-local.xml | 16 ++++++++++++++++
stack/cloudbees.xml | 18 ++++++++++++++++++
.../AppleJavaExtensions/maven-metadata-local.xml | 16 ++++++++++++++++
.../recaptcha4j/maven-metadata-local.xml | 16 ++++++++++++++++
.../usergrid-java-client/maven-metadata-local.xml | 16 ++++++++++++++++
stack/rest/src/test/resources/project.properties | 15 +++++++++++++++
.../resources/usergrid-custom-test.properties | 15 +++++++++++++++
.../resources/usergrid-rest-deploy-context.xml | 16 ++++++++++++++++
.../src/test/resources/usergrid-test-context.xml | 16 ++++++++++++++++
9 files changed, 144 insertions(+)
----------------------------------------------------------------------