usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [31/50] [abbrv] git commit: Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into USERGRID-165_fix-exports-tests
Date Fri, 13 Jun 2014 18:54:10 GMT
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into USERGRID-165_fix-exports-tests

# By Furkan Bicak (5) and Dave Johnson (2)
# Via Dave Johnson (2) and others
* 'two-dot-o' of https://github.com/usergrid/usergrid:
  Fix to getContainers() in CpRelationManager.
  Show chop coordinator logs on coordinator user interface
  Fix CollectionIT.testGroups().
  Code refactoring
  Enable RunnerMojo to be called from other Mojos
  Chaining chop maven plugin goals
  Adding maven checkstyle plugin

Conflicts:
	stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/3e96f797
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/3e96f797
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/3e96f797

Branch: refs/pull/200/head
Commit: 3e96f797debc7d6c2b37b72fed1b66e2f9746fa4
Parents: 4c4a4f3 54b6d24
Author: grey <greyes@apigee.com>
Authored: Thu Jun 12 08:35:57 2014 -0700
Committer: grey <greyes@apigee.com>
Committed: Thu Jun 12 08:35:57 2014 -0700

----------------------------------------------------------------------
 chop/check_style.xml                            |  70 +++++++++++
 .../apache/usergrid/chop/plugin/DeployMojo.java |   1 +
 .../apache/usergrid/chop/plugin/ResetMojo.java  |  20 ++++
 .../apache/usergrid/chop/plugin/RunnerMojo.java |   6 +
 .../apache/usergrid/chop/plugin/SetupMojo.java  |  49 ++++++--
 .../apache/usergrid/chop/plugin/StartMojo.java  |  18 ++-
 chop/pom.xml                                    |  11 ++
 .../usergrid/chop/stack/CoordinatedStack.java   |   2 +-
 .../usergrid/chop/stack/SetupStackState.java    |  23 +++-
 .../webapp/coordinator/StackCoordinator.java    |   4 +-
 .../webapp/coordinator/rest/SetupResource.java  |  44 ++++---
 .../webapp/coordinator/rest/StartResource.java  |   2 +-
 .../chop/webapp/view/log/LogLayout.java         | 113 +++++++++++++++++
 .../chop/webapp/view/main/MainView.java         |   7 ++
 .../usergrid/chop/webapp/ChopUiTestUtils.java   |   4 +-
 .../corepersistence/CpEntityManager.java        |   2 +-
 .../corepersistence/CpRelationManager.java      | 120 ++++++++++++-------
 .../usergrid/persistence/CollectionIT.java      |   2 +-
 .../persistence/EntityConnectionsIT.java        |  22 +++-
 .../cassandra/ManagementServiceImpl.java        |  12 +-
 20 files changed, 433 insertions(+), 99 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3e96f797/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------
diff --cc stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
index 88f9d6a,eb821ba..d348deb
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
@@@ -339,7 -331,7 +339,7 @@@ public class CpEntityManager implement
                  logger.debug( "Loading entity {}:{} from scope\n   app {}\n   owner {}\n
  name {}", 
                      new Object[] {
                          id.getType(), id.getUuid(), 
--                        collectionScope.getApplication(), 
++                        collectionScope.getApplication(),
                          collectionScope.getOwner(),
                          collectionScope.getName()
                  } );

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3e96f797/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
----------------------------------------------------------------------


Mime
View raw message