Author: [email protected]
Date: Wed Feb 8 10:39:28 2012
New Revision: 2074
Log:
AMDATU-554 Additional renames of members, parameters and private methods
Modified:
trunk/amdatu-core/deployment-tenantconf/src/main/java/org/amdatu/core/deployment/tenantconf/TenantAutoConfResourceProcessor.java
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/tenant/MultiTenantBenchmarkTest.java
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/tenant/MultiTenantTest.java
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/AbstractHandler.java
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/FilterHandler.java
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/FilterHandlerRegistry.java
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/ServletHandler.java
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/ServletHandlerRegistry.java
trunk/amdatu-web/dispatcher/src/test/java/org/amdatu/web/dispatcher/handler/FilterHandlerTest.java
trunk/amdatu-web/dispatcher/src/test/java/org/amdatu/web/dispatcher/handler/ServletHandlerTest.java
trunk/amdatu-web/jsp/src/main/java/org/amdatu/web/jsp/service/ResourceProviderListener.java
trunk/amdatu-web/resource/src/main/java/org/amdatu/web/resource/service/ResourceProviderListener.java
trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/web/rest/wink/service/WinkRegistrationServiceImpl.java
trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/web/rest/wink/service/WinkRestServlet.java
trunk/amdatu-web/tenantresolver-parameter/src/main/java/org/amdatu/web/tenantresolver/parameter/service/ParameterTenantResolverExtenderFilter.java
Modified:
trunk/amdatu-core/deployment-tenantconf/src/main/java/org/amdatu/core/deployment/tenantconf/TenantAutoConfResourceProcessor.java
==============================================================================
---
trunk/amdatu-core/deployment-tenantconf/src/main/java/org/amdatu/core/deployment/tenantconf/TenantAutoConfResourceProcessor.java
(original)
+++
trunk/amdatu-core/deployment-tenantconf/src/main/java/org/amdatu/core/deployment/tenantconf/TenantAutoConfResourceProcessor.java
Wed Feb 8 10:39:28 2012
@@ -136,22 +136,22 @@
for (ConfigurationResourcesTask task : m_scheduledTasks) {
String resourceName = task.getResource().getName();
- String tenantId = Constants.PID_VALUE_PLATFORM;
+ String tenantPID = Constants.PID_VALUE_PLATFORM;
Pattern p = Pattern.compile("tenant-([^-\\.]+)-*(.*)\\.xml");
Matcher m = p.matcher(resourceName);
if (m.find()
&& m.group(1) != null && !"".equals(m.group(1))
&& m.group(2) != null && !"".equals(m.group(2))) {
- tenantId = m.group(1);
+ tenantPID = m.group(1);
}
synchronized (m_configurationAdmins) {
for (Entry<ServiceReference, ConfigurationAdmin> entry :
m_configurationAdmins.entrySet()) {
ServiceReference reference = entry.getKey();
Object prop = reference.getProperty(Constants.PID_KEY);
- if (prop != null && tenantId.equals(prop)) {
+ if (prop != null && tenantPID.equals(prop)) {
try {
- m_logService.log(LogService.LOG_INFO, "Running
update task for tenant... " + tenantId);
+ m_logService.log(LogService.LOG_INFO, "Running
update task for tenant... " + tenantPID);
task.run(entry.getValue());
}
catch (Exception e) {
Modified:
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/tenant/MultiTenantBenchmarkTest.java
==============================================================================
---
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/tenant/MultiTenantBenchmarkTest.java
(original)
+++
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/tenant/MultiTenantBenchmarkTest.java
Wed Feb 8 10:39:28 2012
@@ -115,13 +115,13 @@
*/
@Test
public void testBenchmark() throws Exception {
- List<String> createdTenantIDs = new ArrayList<String>(TENANT_COUNT);
+ List<String> createdTenantPIDs = new ArrayList<String>(TENANT_COUNT);
// Ramp up: create up to TENANT_COUNT tenants (start at one as we get
a _PLATFORM tenant for free)...
for (int i = 1; i < TENANT_COUNT; i++) {
- String tenantId = generateTenantId(i);
- addTenantConfig(createTenantConfiguration(tenantId));
- createdTenantIDs.add(tenantId);
+ String tenantPID = generateTenantPID(i);
+ addTenantConfig(createTenantConfiguration(tenantPID));
+ createdTenantPIDs.add(tenantPID);
}
// Wait until the system has been settled and all tenants are
activated...
@@ -138,15 +138,15 @@
List<Configuration> tmpConfigs = new
ArrayList<Configuration>(m_configurations);
// Make a call to each and every tenant...
- List<String> seenList = new ArrayList<String>(createdTenantIDs);
+ List<String> seenList = new ArrayList<String>(createdTenantPIDs);
for (Configuration config : tmpConfigs) {
- String tenantId = (String) config.getProperties().get(PID_KEY);
+ String tenantPID = (String) config.getProperties().get(PID_KEY);
- MyDependentService service = getServiceInstance(tenantId);
+ MyDependentService service = getServiceInstance(tenantPID);
assertNotNull(service.sayIt());
// Mark this tenant as seen...
- seenList.remove(tenantId);
+ seenList.remove(tenantPID);
}
assertEquals("Not all tenants were seen/called?!", 0, seenList.size());
@@ -168,27 +168,27 @@
}
/**
- * @param tenantId
+ * @param tenantPID
* @return
*/
- private MyDependentService getServiceInstance(String tenantId) throws
Exception {
- return m_testContext.getService(MyDependentService.class,
String.format("(%1$s=%2$s)", PID_KEY, tenantId));
+ private MyDependentService getServiceInstance(String tenantPID) throws
Exception {
+ return m_testContext.getService(MyDependentService.class,
String.format("(%1$s=%2$s)", PID_KEY, tenantPID));
}
/**
- * @param tenantId the tenant identifier to use.
+ * @param tenantPID the tenant identifier to use.
* @return the configuration for creating a new tenant.
*/
- private Properties createTenantConfiguration(String tenantId) {
+ private Properties createTenantConfiguration(String tenantPID) {
Properties properties = new Properties();
- properties.put(PID_KEY, tenantId);
+ properties.put(PID_KEY, tenantPID);
return properties;
}
/**
* @return a "unique" tenant identifier, never <code>null</code>.
*/
- private String generateTenantId(int i) {
+ private String generateTenantPID(int i) {
return String.format("Tenant-%s", Integer.toString(i));
}
Modified:
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/tenant/MultiTenantTest.java
==============================================================================
---
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/tenant/MultiTenantTest.java
(original)
+++
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/tenant/MultiTenantTest.java
Wed Feb 8 10:39:28 2012
@@ -168,9 +168,9 @@
*/
@Test
public void
testAddingMultiTenantAwareServiceCausesNewServiceRegistrations() throws
Exception {
- String tenantId = generateTenantId();
+ String tenantPID = generateTenantPID();
- Properties properties = createTenantConfiguration(tenantId);
+ Properties properties = createTenantConfiguration(tenantPID);
addTenantConfig(properties);
// We've got a number of explicit tenants + one framework (= default)
tenant
@@ -201,18 +201,18 @@
*/
@Test
public void testMultiTenantAwareServiceOnlySeesItsOwnServices() throws
Exception {
- String tenantId = generateTenantId();
+ String tenantPID = generateTenantPID();
List<String> msg = m_eventHandler.getMessages();
- Properties properties = createTenantConfiguration(tenantId);
+ Properties properties = createTenantConfiguration(tenantPID);
addTenantConfig(properties);
msg = m_eventHandler.getMessages();
assertNotNull(msg);
assertEquals(2, msg.size());
- assertStringFound(msg, "MyDependencyService:START{" +
Constants.PID_KEY + ";" + tenantId + "}");
- assertStringFound(msg, "MyDependentService:START{" + Constants.PID_KEY
+ ";" + tenantId + "}");
+ assertStringFound(msg, "MyDependencyService:START{" +
Constants.PID_KEY + ";" + tenantPID + "}");
+ assertStringFound(msg, "MyDependentService:START{" + Constants.PID_KEY
+ ";" + tenantPID + "}");
}
/**
@@ -222,18 +222,18 @@
*/
@Test
public void
testObtainTenantSpecificServiceInstanceSucceedsForNonMultiTenantService()
throws Exception {
- String tenantId = generateTenantId();
+ String tenantPID = generateTenantPID();
- Properties properties = createTenantConfiguration(tenantId);
+ Properties properties = createTenantConfiguration(tenantPID);
addTenantConfig(properties);
ServiceReference[] serviceRefs =
m_bundleContext.getServiceReferences(SERVICE_NAME,
- String.format("(%1$s=%2$s)", Constants.PID_KEY, tenantId));
+ String.format("(%1$s=%2$s)", Constants.PID_KEY, tenantPID));
assertNotNull(serviceRefs);
assertEquals(1, serviceRefs.length);
MyDependentService service = (MyDependentService)
m_bundleContext.getService(serviceRefs[0]);
- assertEquals(String.format("[%1$s] [%1$s]", tenantId),
service.sayIt());
+ assertEquals(String.format("[%1$s] [%1$s]", tenantPID),
service.sayIt());
}
/**
@@ -243,9 +243,9 @@
*/
@Test
public void
testObtainPlatformSpecificServiceInstanceSucceedsForNonMultiTenantService()
throws Exception {
- String tenantId = generateTenantId();
+ String tenantPID = generateTenantPID();
- Properties properties = createTenantConfiguration(tenantId);
+ Properties properties = createTenantConfiguration(tenantPID);
addTenantConfig(properties);
ServiceReference[] serviceRefs =
m_bundleContext.getServiceReferences(SERVICE_NAME,
@@ -264,9 +264,9 @@
*/
@Test
public void
testObtainMultiTenancyAwareServiceWithoutFilterYieldsPlatformInstance() throws
Exception {
- String tenantId = generateTenantId();
+ String tenantPID = generateTenantPID();
- Properties properties = createTenantConfiguration(tenantId);
+ Properties properties = createTenantConfiguration(tenantPID);
addTenantConfig(properties);
ServiceReference serviceRef =
m_bundleContext.getServiceReference(SERVICE_NAME);
@@ -283,9 +283,9 @@
*/
@Test
public void
testRemovingMultiTenantAwareServiceCausesServiceDeregistrations() throws
Exception {
- String tenantId = generateTenantId();
+ String tenantPID = generateTenantPID();
- Properties properties = createTenantConfiguration(tenantId);
+ Properties properties = createTenantConfiguration(tenantPID);
Configuration config = addTenantConfig(properties);
// We've got a number of explicit tenants + one framework (= default)
tenant
@@ -305,8 +305,8 @@
msg = m_eventHandler.getMessages();
assertEquals(2, msg.size());
- assertStringFound(msg, "MyDependencyService:STOP{" + Constants.PID_KEY
+ ";" + tenantId + "}");
- assertStringFound(msg, "MyDependentService:STOP{" + Constants.PID_KEY
+ ";" + tenantId + "}");
+ assertStringFound(msg, "MyDependencyService:STOP{" + Constants.PID_KEY
+ ";" + tenantPID + "}");
+ assertStringFound(msg, "MyDependentService:STOP{" + Constants.PID_KEY
+ ";" + tenantPID + "}");
}
/**
@@ -316,9 +316,9 @@
*/
@Test
public void testUpdateTenantPIDIsImpossibleForExistingTenants() throws
Exception {
- String tenantId = generateTenantId();
+ String tenantPID = generateTenantPID();
- Properties properties = createTenantConfiguration(tenantId);
+ Properties properties = createTenantConfiguration(tenantPID);
Configuration config = addTenantConfig(properties);
// We've got a number of explicit tenants + one framework (= default)
tenant
@@ -334,7 +334,7 @@
// Check that we can still find back our existing services...
assertEquals(1, countServices(m_bundleContext, Tenant.class.getName(),
"(" + Constants.PID_KEY
- + "=" + tenantId + ")"));
+ + "=" + tenantPID + ")"));
// Check that the "old" tenant is really gone...
assertEquals(0, countServices(m_bundleContext, Tenant.class.getName(),
"(" + Constants.PID_KEY
+ "=foo-bar-key)"));
@@ -347,10 +347,10 @@
*/
@Test
public void testUpdateMultiTenantAwareServiceCausesServiceUpdates() throws
Exception {
- String tenantId = generateTenantId();
+ String tenantPID = generateTenantPID();
List<String> msg = m_eventHandler.getMessages();
- Properties properties = createTenantConfiguration(tenantId);
+ Properties properties = createTenantConfiguration(tenantPID);
String oldTenantName = (String) properties.get(Constants.NAME_KEY);
Configuration config = addTenantConfig(properties);
@@ -389,20 +389,20 @@
}
/**
- * @param tenantId
+ * @param tenantPID
* @return
*/
- private Properties createTenantConfiguration(String tenantId) {
+ private Properties createTenantConfiguration(String tenantPID) {
Properties properties = new Properties();
- properties.put(Constants.PID_KEY, tenantId);
- properties.put(Constants.NAME_KEY, "Tenant " + tenantId);
+ properties.put(Constants.PID_KEY, tenantPID);
+ properties.put(Constants.NAME_KEY, "Tenant " + tenantPID);
return properties;
}
/**
* @return
*/
- private String generateTenantId() {
+ private String generateTenantPID() {
return String.format("mt%s", Long.toHexString(System.nanoTime()));
}
Modified:
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/AbstractHandler.java
==============================================================================
---
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/AbstractHandler.java
(original)
+++
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/AbstractHandler.java
Wed Feb 8 10:39:28 2012
@@ -37,7 +37,7 @@
}
private final Map<String, String> m_initParams = new HashMap<String,
String>();
- protected final String m_tenantid;
+ protected final String m_tenantPID;
protected final int m_handlerId;
protected final int m_ranking;
@@ -46,15 +46,15 @@
private ExtServletContext m_servletContext;
private State m_state;
- public AbstractHandler(int handlerId, int ranking, String tenantid) {
- this(handlerId, ranking, "", tenantid);
+ public AbstractHandler(int handlerId, int ranking, String tenantPID) {
+ this(handlerId, ranking, "", tenantPID);
}
- public AbstractHandler(int handlerId, int ranking, String contextId,
String tenantid) {
+ public AbstractHandler(int handlerId, int ranking, String contextId,
String tenantPID) {
m_handlerId = handlerId;
m_ranking = ranking;
m_contextId = contextId;
- m_tenantid = tenantid;
+ m_tenantPID = tenantPID;
m_state = State.NEW;
}
@@ -70,8 +70,8 @@
return m_ranking;
}
- public final String getTenantId() {
- return m_tenantid;
+ public final String getTenantPID() {
+ return m_tenantPID;
}
public final State getState() {
Modified:
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/FilterHandler.java
==============================================================================
---
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/FilterHandler.java
(original)
+++
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/FilterHandler.java
Wed Feb 8 10:39:28 2012
@@ -32,8 +32,8 @@
private final Pattern m_compiledPattern;
public FilterHandler(int handlerId, String contextId, Filter filter,
String pattern, int ranking,
- String tenantid) {
- super(handlerId, ranking, contextId, tenantid);
+ String tenantPID) {
+ super(handlerId, ranking, contextId, tenantPID);
m_filter = filter;
if (pattern == null || pattern.equals("")) {
m_pattern = ".*";
Modified:
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/FilterHandlerRegistry.java
==============================================================================
---
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/FilterHandlerRegistry.java
(original)
+++
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/FilterHandlerRegistry.java
Wed Feb 8 10:39:28 2012
@@ -146,10 +146,10 @@
getLogService().log(LogService.LOG_WARNING, "Cannot register a
filter without pattern");
return;
}
- String tenantId = getStringProperty(serviceReference, PID_KEY);
+ String tenantPID = getStringProperty(serviceReference, PID_KEY);
final FilterHandler filterHandler =
- new FilterHandler(serviceId, contextId, filter, pattern,
serviceRanking, tenantId);
+ new FilterHandler(serviceId, contextId, filter, pattern,
serviceRanking, tenantPID);
filterHandler.setInitParams(getInitParams(serviceReference));
m_filterHandlersLock.writeLock().lock();
@@ -233,7 +233,7 @@
if (tenantPID.equals(MAGIC_NOTENANT_PID)) {
List<FilterHandler> filterHandlers = new
LinkedList<FilterHandler>();
for (FilterHandler filterHandler : m_filterHandlers.values()) {
- if (filterHandler.getTenantId() == null ||
filterHandler.getTenantId() == MAGIC_NOTENANT_PID) {
+ if (filterHandler.getTenantPID() == null ||
filterHandler.getTenantPID() == MAGIC_NOTENANT_PID) {
filterHandlers.add(filterHandler);
}
}
@@ -242,7 +242,7 @@
else {
List<FilterHandler> filterHandlers = new
LinkedList<FilterHandler>();
for (FilterHandler filterHandler : m_filterHandlers.values()) {
- if (filterHandler.getTenantId() == null ||
filterHandler.getTenantId() == MAGIC_NOTENANT_PID ||
filterHandler.getTenantId().equals(tenantPID)) {
+ if (filterHandler.getTenantPID() == null ||
filterHandler.getTenantPID() == MAGIC_NOTENANT_PID ||
filterHandler.getTenantPID().equals(tenantPID)) {
filterHandlers.add(filterHandler);
}
}
Modified:
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/ServletHandler.java
==============================================================================
---
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/ServletHandler.java
(original)
+++
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/ServletHandler.java
Wed Feb 8 10:39:28 2012
@@ -29,8 +29,8 @@
private final Servlet m_servlet;
public ServletHandler(int handlerId, int ranking, String contextId,
Servlet servlet,
- String alias, String tenantid) {
- super(handlerId, ranking, contextId, tenantid);
+ String alias, String tenantPID) {
+ super(handlerId, ranking, contextId, tenantPID);
if (alias == null || alias.equals("")) {
m_alias = "/";
}
Modified:
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/ServletHandlerRegistry.java
==============================================================================
---
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/ServletHandlerRegistry.java
(original)
+++
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/ServletHandlerRegistry.java
Wed Feb 8 10:39:28 2012
@@ -250,7 +250,7 @@
if (tenantPID.equals(MAGIC_NOTENANT_PID)) {
List<ServletHandler> filterHandlers = new
LinkedList<ServletHandler>();
for (ServletHandler filterHandler :
m_servletHandlers.values()) {
- if (filterHandler.getTenantId() == null ||
filterHandler.getTenantId() == MAGIC_NOTENANT_PID) {
+ if (filterHandler.getTenantPID() == null ||
filterHandler.getTenantPID() == MAGIC_NOTENANT_PID) {
filterHandlers.add(filterHandler);
}
}
@@ -259,7 +259,7 @@
else {
List<ServletHandler> filterHandlers = new
LinkedList<ServletHandler>();
for (ServletHandler servletHandler :
m_servletHandlers.values()) {
- if (servletHandler.getTenantId() == null ||
servletHandler.getTenantId() == MAGIC_NOTENANT_PID ||
servletHandler.getTenantId().equals(tenantPID)) {
+ if (servletHandler.getTenantPID() == null ||
servletHandler.getTenantPID() == MAGIC_NOTENANT_PID ||
servletHandler.getTenantPID().equals(tenantPID)) {
filterHandlers.add(servletHandler);
}
}
Modified:
trunk/amdatu-web/dispatcher/src/test/java/org/amdatu/web/dispatcher/handler/FilterHandlerTest.java
==============================================================================
---
trunk/amdatu-web/dispatcher/src/test/java/org/amdatu/web/dispatcher/handler/FilterHandlerTest.java
(original)
+++
trunk/amdatu-web/dispatcher/src/test/java/org/amdatu/web/dispatcher/handler/FilterHandlerTest.java
Wed Feb 8 10:39:28 2012
@@ -44,7 +44,7 @@
FilterHandler fh1 = new FilterHandler(1, contextId, filter, "aaa", 2,
"t1");
Assert.assertEquals(1, fh1.getId());
- Assert.assertEquals(fh1.getTenantId(), "t1");
+ Assert.assertEquals(fh1.getTenantPID(), "t1");
Assert.assertEquals(fh1.getContextId(), contextId);
Assert.assertEquals(fh1.getRanking(), 2);
Assert.assertEquals(fh1.getPattern(), "aaa");
Modified:
trunk/amdatu-web/dispatcher/src/test/java/org/amdatu/web/dispatcher/handler/ServletHandlerTest.java
==============================================================================
---
trunk/amdatu-web/dispatcher/src/test/java/org/amdatu/web/dispatcher/handler/ServletHandlerTest.java
(original)
+++
trunk/amdatu-web/dispatcher/src/test/java/org/amdatu/web/dispatcher/handler/ServletHandlerTest.java
Wed Feb 8 10:39:28 2012
@@ -44,7 +44,7 @@
ServletHandler sh1 = new ServletHandler(1, 2, contextId, servlet,
"/helloworld", "t1");
Assert.assertEquals(1, sh1.getId());
- Assert.assertEquals(sh1.getTenantId(), "t1");
+ Assert.assertEquals(sh1.getTenantPID(), "t1");
Assert.assertEquals(sh1.getContextId(), contextId);
Assert.assertEquals(sh1.getRanking(), 2);
Assert.assertEquals(sh1.getAlias(), "/helloworld");
Modified:
trunk/amdatu-web/jsp/src/main/java/org/amdatu/web/jsp/service/ResourceProviderListener.java
==============================================================================
---
trunk/amdatu-web/jsp/src/main/java/org/amdatu/web/jsp/service/ResourceProviderListener.java
(original)
+++
trunk/amdatu-web/jsp/src/main/java/org/amdatu/web/jsp/service/ResourceProviderListener.java
Wed Feb 8 10:39:28 2012
@@ -120,9 +120,9 @@
}
// AMDATU-479 - this is tricky
- final String tenantId = getStringProperty(serviceReference, PID_KEY);
- if (tenantId != null)
- properties.put(PID_KEY, tenantId);
+ final String tenantPID = getStringProperty(serviceReference, PID_KEY);
+ if (tenantPID != null)
+ properties.put(PID_KEY, tenantPID);
ResourceProviderJspServlet jspServlet = new
ResourceProviderJspServlet(jspBundle);
Component component = m_dependencyManager.createComponent()
Modified:
trunk/amdatu-web/resource/src/main/java/org/amdatu/web/resource/service/ResourceProviderListener.java
==============================================================================
---
trunk/amdatu-web/resource/src/main/java/org/amdatu/web/resource/service/ResourceProviderListener.java
(original)
+++
trunk/amdatu-web/resource/src/main/java/org/amdatu/web/resource/service/ResourceProviderListener.java
Wed Feb 8 10:39:28 2012
@@ -110,9 +110,9 @@
properties.put(HttpContextManagerService.CONTEXT_ID_KEY,
contextId);
// AMDATU-479 - this is tricky
- final String tenantId = getStringProperty(serviceReference, PID_KEY);
- if (tenantId != null)
- properties.put(PID_KEY, tenantId);
+ final String tenantPID = getStringProperty(serviceReference, PID_KEY);
+ if (tenantPID != null)
+ properties.put(PID_KEY, tenantPID);
Component servletComponent = m_dependencyManager.createComponent();
servletComponent.setInterface(Servlet.class.getName(), properties);
Modified:
trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/web/rest/wink/service/WinkRegistrationServiceImpl.java
==============================================================================
---
trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/web/rest/wink/service/WinkRegistrationServiceImpl.java
(original)
+++
trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/web/rest/wink/service/WinkRegistrationServiceImpl.java
Wed Feb 8 10:39:28 2012
@@ -96,12 +96,12 @@
initParams.put(HttpContextManagerService.CONTEXT_ID_KEY,
contextId);
}
- String tenantId = getStringProperty(serviceReference,
Constants.PID_KEY);
- if (!tenantId.equals("")) {
- initParams.put(Constants.PID_KEY, tenantId);
+ String tenantPID = getStringProperty(serviceReference,
Constants.PID_KEY);
+ if (!tenantPID.equals("")) {
+ initParams.put(Constants.PID_KEY, tenantPID);
}
- WinkRestServlet restServlet = new WinkRestServlet(restPath, service,
tenantId);
+ WinkRestServlet restServlet = new WinkRestServlet(restPath, service,
tenantPID);
Component servletComponent = m_dependencyManager.createComponent()
.setInterface(Servlet.class.getName(), initParams)
Modified:
trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/web/rest/wink/service/WinkRestServlet.java
==============================================================================
---
trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/web/rest/wink/service/WinkRestServlet.java
(original)
+++
trunk/amdatu-web/rest-wink/src/main/java/org/amdatu/web/rest/wink/service/WinkRestServlet.java
Wed Feb 8 10:39:28 2012
@@ -42,10 +42,10 @@
private String m_requestProcessorId;
private Object m_service;
- public WinkRestServlet(String resourcePath, Object service, String
tenantId) {
+ public WinkRestServlet(String resourcePath, Object service, String
tenantPID) {
super();
m_resourceName = resourcePath;
- m_requestProcessorId = resourcePath + "_" + tenantId;
+ m_requestProcessorId = resourcePath + "_" + tenantPID;
m_service = service;
}
Modified:
trunk/amdatu-web/tenantresolver-parameter/src/main/java/org/amdatu/web/tenantresolver/parameter/service/ParameterTenantResolverExtenderFilter.java
==============================================================================
---
trunk/amdatu-web/tenantresolver-parameter/src/main/java/org/amdatu/web/tenantresolver/parameter/service/ParameterTenantResolverExtenderFilter.java
(original)
+++
trunk/amdatu-web/tenantresolver-parameter/src/main/java/org/amdatu/web/tenantresolver/parameter/service/ParameterTenantResolverExtenderFilter.java
Wed Feb 8 10:39:28 2012
@@ -58,10 +58,10 @@
throws IOException, ServletException {
HttpServletRequest httpServletRequest = (HttpServletRequest)
servletRequest;
- String tenantId =
httpServletRequest.getParameter(TENANT_REQUEST_PARAMETER);
+ String tenantPID =
httpServletRequest.getParameter(TENANT_REQUEST_PARAMETER);
- if (tenantId != null) {
- Tenant tenant = m_registry.getTenant(tenantId);
+ if (tenantPID != null) {
+ Tenant tenant = m_registry.getTenant(tenantPID);
if (tenant != null) {
servletRequest.setAttribute(DispatcherService.TENANT_REQUESTCONTEXT_KEY,
tenant);
servletRequest.setAttribute(DispatcherService.TENANTPID_REQUESTCONTEXT_KEY,
tenant.getPID());
@@ -69,7 +69,7 @@
else {
// No INF/WARN/ERR cause there may be multiple resolvers in
play
m_logService.log(LogService.LOG_DEBUG,
- "Failed to resolved request to available tenant for
request value: " + tenantId);
+ "Failed to resolved request to available tenant for
request value: " + tenantPID);
}
}
filterChain.doFilter(servletRequest, servletResponse);
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
