http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/test/resources/logging.properties ---------------------------------------------------------------------- diff --git a/stack/rest/src/test/resources/logging.properties b/stack/rest/src/test/resources/logging.properties index a0eca06..ecbbf0c 100644 --- a/stack/rest/src/test/resources/logging.properties +++ b/stack/rest/src/test/resources/logging.properties @@ -15,14 +15,15 @@ # limitations under the License. # Tweak this file to get more logging out Jersey and other depedencies that use -# Java Logging instead of our preferred SLF4J via Log4j setup. +# Java Logging instead of our preferred SLF4J via Log4j setup. -handlers=java.util.logging.ConsoleHandler -java.util.logging.ConsoleHandler.level=FINEST -java.util.logging.SimpleFormatter.format=%4$-7s [%3$s] %5$s%6$s%n +handlers = org.slf4j.bridge.SLF4JBridgeHandler +#java.util.logging.ConsoleHandler.level=FINEST +#java.util.logging.SimpleFormatter.format=%4$-7s [%3$s] %5$s%6$s%n #All log level details .level=INFO -#org.glassfish.jersey.level=FINE -#org.glassfish.jersey.tracing.level=FINE +org.glassfish.jersey.level=FINE +org.glassfish.jersey.tracing.level=FINE + #com.sun.jersey.level=FINE
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/services/pom.xml ---------------------------------------------------------------------- diff --git a/stack/services/pom.xml b/stack/services/pom.xml index 466bd45..a771b34 100644 --- a/stack/services/pom.xml +++ b/stack/services/pom.xml @@ -204,6 +204,12 @@ <version>2.21</version> </dependency> + <dependency> + <groupId>org.glassfish.jersey.media</groupId> + <artifactId>jersey-media-json-jackson</artifactId> + <version>2.21</version> + </dependency> + <!--<dependency>--> <!--<groupId>com.sun.jersey</groupId>--> <!--<artifactId>jersey-core</artifactId>--> http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/services/src/main/java/org/apache/usergrid/security/providers/FoursquareProvider.java ---------------------------------------------------------------------- diff --git a/stack/services/src/main/java/org/apache/usergrid/security/providers/FoursquareProvider.java b/stack/services/src/main/java/org/apache/usergrid/security/providers/FoursquareProvider.java index 738a20f..cdba485 100644 --- a/stack/services/src/main/java/org/apache/usergrid/security/providers/FoursquareProvider.java +++ b/stack/services/src/main/java/org/apache/usergrid/security/providers/FoursquareProvider.java @@ -17,8 +17,6 @@ package org.apache.usergrid.security.providers; -import com.fasterxml.jackson.core.type.TypeReference; -import com.sun.jersey.api.client.WebResource; import org.apache.usergrid.management.ManagementService; import org.apache.usergrid.persistence.EntityManager; import org.apache.usergrid.persistence.Query; @@ -32,8 +30,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; import javax.ws.rs.core.MediaType; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -94,7 +90,7 @@ public class FoursquareProvider extends AbstractProvider { .queryParam( "v", "20120623" ) .request() .accept( MediaType.APPLICATION_JSON ) - .get(Map.class); + .get( Map.class ); Map<String, Object> fq_user = ( Map<String, Object> ) ( ( Map<?, ?> ) body.get( "response" ) ).get( "user" ); http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/services/src/test/java/org/apache/usergrid/management/OrganizationIT.java ---------------------------------------------------------------------- diff --git a/stack/services/src/test/java/org/apache/usergrid/management/OrganizationIT.java b/stack/services/src/test/java/org/apache/usergrid/management/OrganizationIT.java index e0561a2..b48fd77 100644 --- a/stack/services/src/test/java/org/apache/usergrid/management/OrganizationIT.java +++ b/stack/services/src/test/java/org/apache/usergrid/management/OrganizationIT.java @@ -62,12 +62,13 @@ public class OrganizationIT { @Test public void testCreateOrganization() throws Exception { -// UserInfo user = -// setup.getMgmtSvc().createAdminUser( uniqueUsername(), "Ed Anuff", uniqueEmail(), "test", false, false ); -// assertNotNull( user ); +// UserInfo user = +// setup.getMgmtSvc().createAdminUser( uniqueUsername(), "Ed Anuff", uniqueEmail(), "test", false, false ); +// assertNotNull( user ); final String orgName = uniqueOrg(); - OrganizationOwnerInfo organization = newOrgAppAdminRule.createOwnerAndOrganization( orgName, uniqueUsername(), uniqueEmail(),"Ed Anuff", "test" ); //setup.getMgmtSvc().getOrganizationsForAdminUser( organization.getOwner().getUuid() ); + OrganizationOwnerInfo organization = + newOrgAppAdminRule.createOwnerAndOrganization( orgName, uniqueUsername(), uniqueEmail(),"Ed Anuff", "test" ); //setup.getMgmtSvc().getOrganizationsForAdminUser( organization.getOwner().getUuid() ); //createOrganization( orgName, user, false ); assertNotNull( organization ); @@ -80,13 +81,15 @@ public class OrganizationIT { organization.getOrganization().getUuid()); assertEquals("wrong number of users", 1, users.size()); - ApplicationInfo applicationInfo = setup.getMgmtSvc().createApplication(organization.getOrganization().getUuid(), "ed-application"); + ApplicationInfo applicationInfo = setup.getMgmtSvc() + .createApplication(organization.getOrganization().getUuid(), "ed-application"); assertNotNull(applicationInfo.getId()); setup.getEntityIndex().refresh(applicationInfo.getId()); - Map<UUID, String> applications = setup.getMgmtSvc().getApplicationsForOrganization( organization.getOrganization().getUuid() ); + Map<UUID, String> applications = setup.getMgmtSvc() + .getApplicationsForOrganization( organization.getOrganization().getUuid() ); assertEquals( "wrong number of applications", 1, applications.size() ); OrganizationInfo organization2 = setup.getMgmtSvc().getOrganizationForApplication( applicationInfo.getId() ); @@ -100,7 +103,8 @@ public class OrganizationIT { setup.getEntityIndex().refresh(CpNamingUtils.MANAGEMENT_APPLICATION_ID); - UserInfo u = setup.getMgmtSvc().verifyAdminUserPasswordCredentials( organization.getOwner().getUuid().toString(), "test" ); + UserInfo u = setup.getMgmtSvc().verifyAdminUserPasswordCredentials( + organization.getOwner().getUuid().toString(), "test" ); assertNotNull( u ); String token = setup.getMgmtSvc().getAccessTokenForAdminUser( organization.getOwner().getUuid(), 0 );
