You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2014/09/04 00:11:45 UTC
[50/52] [abbrv] git commit: Merge branch 'master' into two-dot-o
Merge branch 'master' into two-dot-o
Conflicts:
stack/mongo-emulator/src/test/resources/usergrid-test-context.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/479969f7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/479969f7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/479969f7
Branch: refs/heads/two-dot-o-push-notifications
Commit: 479969f7b7bc9a3b84de665a7973a0e155844852
Parents: e395f12 17a9b8c
Author: Dave Johnson <sn...@apache.org>
Authored: Wed Sep 3 12:47:49 2014 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Sep 3 12:47:49 2014 -0400
----------------------------------------------------------------------
LICENSE | 2 -
NOTICE | 34 -----
release/src/main/assembly/source.xml | 2 +
.../NSubstitute.1.6.0.0/BreakingChanges.txt | 131 -------------------
.../packages/NSubstitute.1.6.0.0/CHANGELOG.txt | 103 ---------------
.../packages/NSubstitute.1.6.0.0/README.txt | 119 -----------------
sdks/dotnet/packages/NUnit.2.6.2/README.txt | 3 +
.../packages/Newtonsoft.Json.4.5.11/README.txt | 3 +
sdks/dotnet/packages/RestSharp.104.1/README.txt | 3 +
sdks/dotnet/packages/RestSharp.104.1/readme.txt | 19 ---
.../packages/Geocoder.0.1.0.0/README.txt | 3 +
.../extensions/usergrid.validation.js | 34 ++---
sdks/html5-javascript/lib/Module.js | 19 ++-
sdks/html5-javascript/lib/Usergrid.js | 36 +++--
sdks/html5-javascript/usergrid.js | 31 ++---
sdks/html5-javascript/usergrid.min.js | 31 ++---
.../test/resources/usergrid-test-context.xml | 99 +++++++-------
ugc/features/step_definitions/ugc_steps.rb | 23 ++--
ugc/features/support/env.rb | 23 ++--
ugc/lib/ugc.rb | 23 ++--
ugc/lib/ugc/application.rb | 23 ++--
ugc/lib/ugc/commands/delete.rb | 23 ++--
ugc/lib/ugc/commands/get.rb | 23 ++--
ugc/lib/ugc/commands/logout.rb | 16 +++
ugc/lib/ugc/commands/post.rb | 23 ++--
ugc/lib/ugc/commands/profile.rb | 23 ++--
ugc/lib/ugc/commands/put.rb | 23 ++--
ugc/lib/ugc/commands/query.rb | 23 ++--
ugc/lib/ugc/commands/target.rb | 23 ++--
ugc/lib/ugc/helpers/curl.rb | 23 ++--
ugc/lib/ugc/helpers/format.rb | 23 ++--
ugc/lib/ugc/helpers/history.rb | 23 ++--
ugc/lib/ugc/helpers/parse.rb | 23 ++--
ugc/lib/ugc/helpers/rest.rb | 23 ++--
ugc/lib/ugc/management.rb | 23 ++--
ugc/lib/ugc/settings.rb | 23 ++--
ugc/lib/ugc/version.rb | 23 ++--
ugc/test/default_test.rb | 23 ++--
ugc/test/test_helper.rb | 23 ++--
39 files changed, 408 insertions(+), 763 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/479969f7/stack/mongo-emulator/src/test/resources/usergrid-test-context.xml
----------------------------------------------------------------------
diff --cc stack/mongo-emulator/src/test/resources/usergrid-test-context.xml
index 66850fd,6c0fedb..d066bb2
--- a/stack/mongo-emulator/src/test/resources/usergrid-test-context.xml
+++ b/stack/mongo-emulator/src/test/resources/usergrid-test-context.xml
@@@ -1,51 -1,48 +1,48 @@@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
- /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. 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. For additional information regarding
- * copyright in this work, please see the NOTICE file in the top level
- * directory of this distribution.
- */
- -->
- <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"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
-
-
- <import resource="classpath:/usergrid-services-context.xml"/>
-
- <bean id="properties"
- class="org.springframework.beans.factory.config.PropertiesFactoryBean">
- <property name="singleton" value="true" />
- <property name="ignoreResourceNotFound" value="true" />
- <property name="locations">
- <list>
- <value>classpath:/usergrid-default.properties</value>
- <value>classpath:/usergrid-test.properties</value>
- <value>${usergrid-custom-spring-test-properties}</value>
- </list>
- </property>
- </bean>
-
- <bean id="mongoServer" class="org.apache.usergrid.mongo.MongoServer"
- init-method="startServer" destroy-method="stopServer" />
-
- <bean id="databaseInitializer" class="org.apache.usergrid.mongo.DatabaseInitializer"
- init-method="init" />
- </beans>
- 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"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
-
-
- <import resource="classpath:/usergrid-services-context.xml"/>
-
- <bean id="properties"
- class="org.springframework.beans.factory.config.PropertiesFactoryBean">
- <property name="singleton" value="true" />
- <property name="ignoreResourceNotFound" value="true" />
- <property name="locations">
- <list>
- <value>classpath:/usergrid-default.properties</value>
- <value>classpath:/usergrid-test.properties</value>
- <value>${usergrid-custom-spring-test-properties}</value>
- </list>
- </property>
- </bean>
-
- <bean id="mongoServer" class="org.apache.usergrid.mongo.MongoServer"
- init-method="startServer" destroy-method="stopServer" />
-
- <bean id="databaseInitializer" class="org.apache.usergrid.mongo.DatabaseInitializer"
- init-method="init" />
-</beans>
++<?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"
++ xsi:schemaLocation="
++ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
++ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd
++ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
++
++
++ <import resource="classpath:/usergrid-services-context.xml"/>
++
++ <bean id="properties"
++ class="org.springframework.beans.factory.config.PropertiesFactoryBean">
++ <property name="singleton" value="true" />
++ <property name="ignoreResourceNotFound" value="true" />
++ <property name="locations">
++ <list>
++ <value>classpath:/usergrid-default.properties</value>
++ <value>classpath:/usergrid-test.properties</value>
++ <value>${usergrid-custom-spring-test-properties}</value>
++ </list>
++ </property>
++ </bean>
++
++ <bean id="mongoServer" class="org.apache.usergrid.mongo.MongoServer"
++ init-method="startServer" destroy-method="stopServer" />
++
++ <bean id="databaseInitializer" class="org.apache.usergrid.mongo.DatabaseInitializer"
++ init-method="init" />
++</beans>