usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [40/50] [abbrv] git commit: Continue Style fixes
Date Mon, 07 Jul 2014 18:16:57 GMT
Continue Style fixes


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

Branch: refs/heads/two-dot-o
Commit: 9b6d819785fe4901609abbee7ab504eed35d16eb
Parents: c692c0f
Author: Furkan Bicak <bicak.cs@safehaus.org>
Authored: Mon Jun 30 09:20:26 2014 +0300
Committer: Furkan Bicak <bicak.cs@safehaus.org>
Committed: Mon Jun 30 09:20:26 2014 +0300

----------------------------------------------------------------------
 .../usergrid/chop/webapp/coordinator/StackCoordinator.java       | 4 ++--
 .../usergrid/chop/webapp/coordinator/rest/ResetResource.java     | 2 +-
 .../usergrid/chop/webapp/coordinator/rest/StopResource.java      | 2 +-
 .../usergrid/chop/webapp/coordinator/rest/UploadResource.java    | 1 -
 4 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/9b6d8197/chop/webapp/src/main/java/org/apache/usergrid/chop/webapp/coordinator/StackCoordinator.java
----------------------------------------------------------------------
diff --git a/chop/webapp/src/main/java/org/apache/usergrid/chop/webapp/coordinator/StackCoordinator.java
b/chop/webapp/src/main/java/org/apache/usergrid/chop/webapp/coordinator/StackCoordinator.java
index c9a72b8..58998cf 100644
--- a/chop/webapp/src/main/java/org/apache/usergrid/chop/webapp/coordinator/StackCoordinator.java
+++ b/chop/webapp/src/main/java/org/apache/usergrid/chop/webapp/coordinator/StackCoordinator.java
@@ -88,8 +88,8 @@ public class StackCoordinator {
      * @param runnerCount
      * @return
      */
-    public CoordinatedStack setupStack( String commitId, String artifactId, String groupId,
String version, String user,
-                                        int runnerCount ) {
+    public CoordinatedStack setupStack( String commitId, String artifactId, String groupId,
String version,
+                                        String user, int runnerCount ) {
 
         User chopUser = userDao.get( user );
         File runnerJar = CoordinatorUtils.getRunnerJar( chopUiFig.getContextPath(), user,
groupId, artifactId, version,

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/9b6d8197/chop/webapp/src/main/java/org/apache/usergrid/chop/webapp/coordinator/rest/ResetResource.java
----------------------------------------------------------------------
diff --git a/chop/webapp/src/main/java/org/apache/usergrid/chop/webapp/coordinator/rest/ResetResource.java
b/chop/webapp/src/main/java/org/apache/usergrid/chop/webapp/coordinator/rest/ResetResource.java
index b54f4b3..6567e10 100644
--- a/chop/webapp/src/main/java/org/apache/usergrid/chop/webapp/coordinator/rest/ResetResource.java
+++ b/chop/webapp/src/main/java/org/apache/usergrid/chop/webapp/coordinator/rest/ResetResource.java
@@ -113,7 +113,7 @@ public class ResetResource extends TestableResource implements RestParams
{
                            .build();
         }
         /** SetupStackState.SetUp */
-        LOG.info( "Stack is stopped, checking runner states..." );
+        LOG.info( "Stack is set up, checking runner states..." );
 
         /** Check state of all runners */
         String moduleId = BasicModule.createId( groupId, artifactId, version );

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/9b6d8197/chop/webapp/src/main/java/org/apache/usergrid/chop/webapp/coordinator/rest/StopResource.java
----------------------------------------------------------------------
diff --git a/chop/webapp/src/main/java/org/apache/usergrid/chop/webapp/coordinator/rest/StopResource.java
b/chop/webapp/src/main/java/org/apache/usergrid/chop/webapp/coordinator/rest/StopResource.java
index a8c8694..af2294e 100644
--- a/chop/webapp/src/main/java/org/apache/usergrid/chop/webapp/coordinator/rest/StopResource.java
+++ b/chop/webapp/src/main/java/org/apache/usergrid/chop/webapp/coordinator/rest/StopResource.java
@@ -112,7 +112,7 @@ public class StopResource extends TestableResource implements RestParams
{
                            .type( MediaType.APPLICATION_JSON )
                            .build();
         }
-        /** SetupStackState.Setup */
+        /** SetupStackState.SetUp */
         LOG.info( "Stack is set up, checking runner states..." );
 
         /** Check state of all runners */

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/9b6d8197/chop/webapp/src/main/java/org/apache/usergrid/chop/webapp/coordinator/rest/UploadResource.java
----------------------------------------------------------------------
diff --git a/chop/webapp/src/main/java/org/apache/usergrid/chop/webapp/coordinator/rest/UploadResource.java
b/chop/webapp/src/main/java/org/apache/usergrid/chop/webapp/coordinator/rest/UploadResource.java
index 00564d4..136760a 100644
--- a/chop/webapp/src/main/java/org/apache/usergrid/chop/webapp/coordinator/rest/UploadResource.java
+++ b/chop/webapp/src/main/java/org/apache/usergrid/chop/webapp/coordinator/rest/UploadResource.java
@@ -298,5 +298,4 @@ public class UploadResource extends TestableResource implements RestParams,
Cons
 
         return coordinatorJarMd5;
     }
-
 }


Mime
View raw message