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/22 16:16:18 UTC
[82/95] [abbrv] git commit: resloved conflict errors
resloved conflict errors
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/3789e130
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/3789e130
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/3789e130
Branch: refs/heads/import-feature
Commit: 3789e1304d0b6285c26d76661db670c8091abf2d
Parents: d907d57
Author: Harish Rajagopal <hr...@apigee.com>
Authored: Tue Aug 5 09:45:19 2014 -0700
Committer: Harish Rajagopal <hr...@apigee.com>
Committed: Tue Aug 5 09:45:19 2014 -0700
----------------------------------------------------------------------
.../cassandra/ManagementServiceImpl.java | 43 ++------------------
.../usergrid/management/importUG/ImportJob.java | 5 +++
2 files changed, 9 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3789e130/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
index d60f6bf..100a9a6 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
@@ -16,21 +16,8 @@
*/
package org.apache.usergrid.management.cassandra;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
-import java.util.Set;
-import java.util.UUID;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang.text.StrSubstitutor;
import org.apache.shiro.UnavailableSecurityManagerException;
@@ -61,7 +48,6 @@ import org.apache.usergrid.security.tokens.TokenCategory;
import org.apache.usergrid.security.tokens.TokenInfo;
import org.apache.usergrid.security.tokens.TokenService;
import org.apache.usergrid.security.tokens.exceptions.TokenException;
-<<<<<<< HEAD
import org.apache.usergrid.services.*;
import org.apache.usergrid.utils.*;
import org.slf4j.Logger;
@@ -71,21 +57,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import java.nio.ByteBuffer;
import java.util.*;
import java.util.Map.Entry;
-=======
-import org.apache.usergrid.services.ServiceAction;
-import org.apache.usergrid.services.ServiceManager;
-import org.apache.usergrid.services.ServiceManagerFactory;
-import org.apache.usergrid.services.ServiceRequest;
-import org.apache.usergrid.services.ServiceResults;
-import org.apache.usergrid.utils.ConversionUtils;
-import org.apache.usergrid.utils.JsonUtils;
-import org.apache.usergrid.utils.MailUtils;
-import org.apache.usergrid.utils.StringUtils;
-import org.apache.usergrid.utils.UUIDUtils;
-
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
->>>>>>> 9fc1ab40878c4a4756e9734bd444ccdad436d4fd
import static java.lang.Boolean.parseBoolean;
import static org.apache.commons.codec.binary.Base64.encodeBase64URLSafeString;
@@ -1964,11 +1935,8 @@ public class ManagementServiceImpl implements ManagementService {
}
-<<<<<<< HEAD
- protected String emailMsg( Map<String, String> values, String propertyName ) {
-=======
+
public String emailMsg( Map<String, String> values, String propertyName ) {
->>>>>>> 9fc1ab40878c4a4756e9734bd444ccdad436d4fd
return new StrSubstitutor( values ).replace( properties.getProperty( propertyName ) );
}
@@ -2476,11 +2444,8 @@ public class ManagementServiceImpl implements ManagementService {
}
-<<<<<<< HEAD
- protected String buildUserAppUrl( UUID applicationId, String url, User user, String token ) throws Exception {
-=======
+
public String buildUserAppUrl( UUID applicationId, String url, User user, String token ) throws Exception {
->>>>>>> 9fc1ab40878c4a4756e9734bd444ccdad436d4fd
ApplicationInfo ai = getApplicationInfo( applicationId );
OrganizationInfo oi = getOrganizationForApplication( applicationId );
return String.format( url, oi.getName(), StringUtils.stringOrSubstringAfterFirst( ai.getName(), '/' ),
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3789e130/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportJob.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportJob.java b/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportJob.java
index db0c4c8..a05e613 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportJob.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportJob.java
@@ -73,4 +73,9 @@ public class ImportJob extends OnlyOnceJob {
public void setImportService( final ImportService importService ) {
this.importService = importService;
}
+
+ @Override
+ public void dead(JobExecution execution) throws Exception {
+
+ }
}