You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2014/07/28 16:17:41 UTC
[4/4] git commit: Merged master into angular branch
Merged master into angular branch
Project: http://git-wip-us.apache.org/repos/asf/rave/repo
Commit: http://git-wip-us.apache.org/repos/asf/rave/commit/3ae74e7a
Tree: http://git-wip-us.apache.org/repos/asf/rave/tree/3ae74e7a
Diff: http://git-wip-us.apache.org/repos/asf/rave/diff/3ae74e7a
Branch: refs/heads/angular
Commit: 3ae74e7aad1c673cd2d19505232520b597213291
Parents: 7ac9d69 aab1719
Author: Matt Franklin <mf...@apache.org>
Authored: Mon Jul 28 10:17:24 2014 -0400
Committer: Matt Franklin <mf...@apache.org>
Committed: Mon Jul 28 10:17:24 2014 -0400
----------------------------------------------------------------------
pom.xml | 2 +-
.../rave/rest/model/JsonResponseWrapper.java | 11 +-
.../java/org/apache/rave/rest/model/Person.java | 97 +++++++++++++-
.../portal/repository/PersonRepository.java | 8 ++
.../apache/rave/portal/service/UserService.java | 7 +
.../portal/service/impl/DefaultUserService.java | 5 +
.../service/impl/DefaultUserServiceTest.java | 8 ++
.../impl/MongoDbRegionWidgetRepositoryTest.java | 2 +-
rave-integration-tests/pom.xml | 27 +++-
.../rave-webservice-tests/pom.xml | 128 +++++++++++++++++++
.../webservice/StateManager.java | 37 ++++++
.../integrationtests/webservice/Stories.java | 101 +++++++++++++++
.../webservice/steps/CommonSteps.java | 63 +++++++++
.../webservice/steps/PeopleSteps.java | 122 ++++++++++++++++++
.../integrationtests/webservice/people.story | 40 ++++++
.../WEB-INF/applicationContext-security.xml | 1 +
16 files changed, 642 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/rave/blob/3ae74e7a/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/rave/blob/3ae74e7a/rave-integration-tests/pom.xml
----------------------------------------------------------------------