Author: [email protected]
Date: Wed May 2 11:47:27 2012
New Revision: 2304
Log:
[AMDATUAUTH-123] Fixed several FIXME's
Modified:
trunk/amdatu-auth/test-integration/base/src/main/java/org/amdatu/auth/test/integration/base/AuthConfigs.java
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/service/TokenProviderImpl.java
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/osgi/Activator.java
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/service/ResourceBase.java
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/service/UsersResource.java
Modified:
trunk/amdatu-auth/test-integration/base/src/main/java/org/amdatu/auth/test/integration/base/AuthConfigs.java
==============================================================================
---
trunk/amdatu-auth/test-integration/base/src/main/java/org/amdatu/auth/test/integration/base/AuthConfigs.java
(original)
+++
trunk/amdatu-auth/test-integration/base/src/main/java/org/amdatu/auth/test/integration/base/AuthConfigs.java
Wed May 2 11:47:27 2012
@@ -24,7 +24,6 @@
import org.amdatu.itest.base.Fixture;
import org.amdatu.itest.base.ProvisionedConfig;
import org.amdatu.itest.base.TestContext;
-import org.amdatu.web.itest.base.WebConfigs;
import java.io.IOException;
import java.util.ArrayList;
@@ -122,9 +121,9 @@
private static Properties getOAuthServerCfg() {
Properties properties = new Properties();
- properties.put("hostname", HOSTNAME); // fixme private/missing
constants
- properties.put("portnr", PORTNR); // fixme private/missing constants
- properties.put("authorizeurl", "/oauth-server/jsp/authorize.jsp"); //
fixme private/missing constants
+ properties.put("hostname", HOSTNAME);
+ properties.put("portnr", PORTNR);
+ properties.put("authorizeurl", "/oauth-server/jsp/authorize.jsp");
properties.put("request.timestamp.maxage", "300000");
properties.put("request.token.maxage", "300000");
properties.put("access.token.maxage", "-1");
@@ -135,7 +134,7 @@
private static Properties getFSConsumerRegistryCfg() {
Properties properties = new Properties();
- properties.put("datadir", "work/consumerregistrystore"); // fixme
private/missing constants
+ properties.put("datadir", "work/consumerregistrystore");
return properties;
}
Modified:
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/service/TokenProviderImpl.java
==============================================================================
---
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/service/TokenProviderImpl.java
(original)
+++
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/service/TokenProviderImpl.java
Wed May 2 11:47:27 2012
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2010, 2011 The Amdatu Foundation
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -48,7 +48,7 @@
/**
* This class provides tokens and nonces.
- *
+ *
* @author <a href="mailto:[email protected]";>Amdatu Project
Team</a>
*/
public class TokenProviderImpl implements TokenProvider, ManagedService {
@@ -91,7 +91,6 @@
}
public void stop() {
- // FIXME: was m_tenant.getId()
m_logService.log(LogService.LOG_INFO,
"Service '" + getClass().getName() + "' stopped for tenant '" +
m_tenant.getPID() + "'");
}
@@ -214,7 +213,7 @@
attributes.put(NONCE, nonce);
String timestamp = new Long(System.currentTimeMillis()).toString();
attributes.put(TIMESTAMP, timestamp);
- attributes.put(TENANTID, m_tenant.getPID()); // FIXME: was getId()
+ attributes.put(TENANTID, m_tenant.getPID());
// First create the unencrypted token
String signature = generateSignature(attributes);
Modified:
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/osgi/Activator.java
==============================================================================
---
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/osgi/Activator.java
(original)
+++
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/osgi/Activator.java
Wed May 2 11:47:27 2012
@@ -20,6 +20,7 @@
import org.amdatu.auth.useradmin.rest.service.RolesResource;
import org.amdatu.auth.useradmin.rest.service.UsersResource;
import org.amdatu.libraries.osgi.ServiceDependentActivator;
+import org.amdatu.tenant.Tenant;
import org.amdatu.web.rest.jaxrs.JaxRsSpi;
import org.apache.felix.dm.DependencyManager;
@@ -49,6 +50,7 @@
.add(createServiceDependency().setService(LogService.class).setRequired(true))
.add(createServiceDependency().setService(UserAdmin.class).setRequired(true))
.add(createServiceDependency().setService(TokenProvider.class).setRequired(true))
+
.add(createServiceDependency().setService(Tenant.class).setRequired(true))
.add(createConfigurationDependency().setPid(UsersResource.PID)));
// Create the groups resource service and register it as REST service
@@ -57,6 +59,7 @@
.setImplementation(GroupsResource.class)
.add(createServiceDependency().setService(UserAdmin.class).setRequired(true))
.add(createServiceDependency().setService(TokenProvider.class).setRequired(true))
+
.add(createServiceDependency().setService(Tenant.class).setRequired(true))
.add(createServiceDependency().setService(LogService.class).setRequired(true)));
// Create the groups resource service and register it as REST service
@@ -65,6 +68,7 @@
.setImplementation(RolesResource.class)
.add(createServiceDependency().setService(UserAdmin.class).setRequired(true))
.add(createServiceDependency().setService(TokenProvider.class).setRequired(true))
+
.add(createServiceDependency().setService(Tenant.class).setRequired(true))
.add(createServiceDependency().setService(LogService.class).setRequired(true)));
}
Modified:
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/service/ResourceBase.java
==============================================================================
---
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/service/ResourceBase.java
(original)
+++
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/service/ResourceBase.java
Wed May 2 11:47:27 2012
@@ -21,6 +21,7 @@
import org.amdatu.auth.tools.rest.jaxb.AtomSyndicationLink;
import org.amdatu.auth.useradmin.rest.bean.RoleBean;
import org.amdatu.auth.useradmin.rest.bean.SearchResultBean;
+import org.amdatu.tenant.Tenant;
import java.net.URISyntaxException;
import java.util.ArrayList;
@@ -55,6 +56,7 @@
private volatile LogService m_logService;
private volatile UserAdmin m_userAdmin;
private volatile TokenProvider m_tokenProvider;
+ private volatile Tenant m_tenant;
// Disable HTTP caching in this REST interface
private static CacheControl NO_CACHE_CONTROL;
@@ -459,4 +461,8 @@
protected LogService getLogService() {
return m_logService;
}
+
+ protected Tenant getTenant() {
+ return m_tenant;
+ }
}
Modified:
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/service/UsersResource.java
==============================================================================
---
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/service/UsersResource.java
(original)
+++
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/service/UsersResource.java
Wed May 2 11:47:27 2012
@@ -106,13 +106,7 @@
@Produces({MediaType.TEXT_PLAIN})
@Path("status")
public String status() {
-
- System.err.println("FIXME!");
-// FIXME quick hack to prevent NPE as these props are no longer there
-// String tenantId = (String)
m_component.getServiceProperties().get(org.amdatu.tenant.Constants.PID_KEY);
-// String tenantName = (String)
m_component.getServiceProperties().get(org.amdatu.tenant.Constants.NAME_KEY);
-// return "UserAdmin Users management for tenant '" + tenantName + " (" +
tenantId + ")' service online";
- return "UserAdmin Users management for tenant 'QQQ' service online";
+ return "UserAdmin Users management for tenant '" +
getTenant().getPID() + "' service online";
}
/**
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
