Author: [email protected]
Date: Wed Oct 19 22:48:05 2011
New Revision: 1553
Log:
Moved packages, changed project name so it does not clash with the original
tenant bundle.
Added:
sandbox/marrs/amdatu-core/tenant/src/main/java/org/
sandbox/marrs/amdatu-core/tenant/src/main/java/org/amdatu/
sandbox/marrs/amdatu-core/tenant/src/main/java/org/amdatu/core/
sandbox/marrs/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/
sandbox/marrs/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/MultiTenantBundleActivator.java
- copied, changed from r1552,
/sandbox/marrs/amdatu-core/tenant/src/main/java/tenant/MultiTenantBundleActivator.java
sandbox/marrs/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/MultiTenantBundleInputStream.java
- copied, changed from r1552,
/sandbox/marrs/amdatu-core/tenant/src/main/java/tenant/MultiTenantBundleInputStream.java
sandbox/marrs/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/Tenant.java
- copied, changed from r1552,
/sandbox/marrs/amdatu-core/tenant/src/main/java/tenant/Tenant.java
sandbox/marrs/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/TenantConstants.java
- copied, changed from r1552,
/sandbox/marrs/amdatu-core/tenant/src/main/java/tenant/TenantConstants.java
sandbox/marrs/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/impl/
- copied from r1552,
/sandbox/marrs/amdatu-core/tenant/src/main/java/tenant/impl/
sandbox/marrs/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/packageinfo
- copied, changed from r1552,
/sandbox/marrs/amdatu-core/tenant/src/main/java/tenant/packageinfo
Removed:
sandbox/marrs/amdatu-core/tenant/src/main/java/tenant/MultiTenantBundleActivator.java
sandbox/marrs/amdatu-core/tenant/src/main/java/tenant/MultiTenantBundleInputStream.java
sandbox/marrs/amdatu-core/tenant/src/main/java/tenant/Tenant.java
sandbox/marrs/amdatu-core/tenant/src/main/java/tenant/TenantConstants.java
sandbox/marrs/amdatu-core/tenant/src/main/java/tenant/impl/
sandbox/marrs/amdatu-core/tenant/src/main/java/tenant/packageinfo
Modified:
sandbox/marrs/amdatu-core/tenant/pom.xml
sandbox/marrs/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/impl/TenantAdapter.java
sandbox/marrs/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/impl/TenantAwareBundle.java
sandbox/marrs/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/impl/TenantAwareBundleContext.java
Modified: sandbox/marrs/amdatu-core/tenant/pom.xml
==============================================================================
--- sandbox/marrs/amdatu-core/tenant/pom.xml (original)
+++ sandbox/marrs/amdatu-core/tenant/pom.xml Wed Oct 19 22:48:05 2011
@@ -22,7 +22,7 @@
<artifactId>org.amdatu.core</artifactId>
<version>0.2.1-SNAPSHOT</version>
</parent>
- <artifactId>org.amdatu.core.tenant</artifactId>
+ <artifactId>org.amdatu.core.tenant-2</artifactId>
<packaging>bundle</packaging>
<name>Amdatu Core - Tenant</name>
<description>Provides a transparant mechanism for adding multi-tenancy to an
OSGi application</description>
Copied:
sandbox/marrs/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/MultiTenantBundleActivator.java
(from r1552,
/sandbox/marrs/amdatu-core/tenant/src/main/java/tenant/MultiTenantBundleActivator.java)
==============================================================================
---
/sandbox/marrs/amdatu-core/tenant/src/main/java/tenant/MultiTenantBundleActivator.java
(original)
+++
sandbox/marrs/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/MultiTenantBundleActivator.java
Wed Oct 19 22:48:05 2011
@@ -1,11 +1,11 @@
-package tenant;
+package org.amdatu.core.tenant;
+import org.amdatu.core.tenant.impl.TenantAdapter;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
import org.osgi.service.log.LogService;
-import tenant.impl.TenantAdapter;
/**
* Generic bundle activator that can be used to convert a normal bundle into a
multi tenant one.
Copied:
sandbox/marrs/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/MultiTenantBundleInputStream.java
(from r1552,
/sandbox/marrs/amdatu-core/tenant/src/main/java/tenant/MultiTenantBundleInputStream.java)
==============================================================================
---
/sandbox/marrs/amdatu-core/tenant/src/main/java/tenant/MultiTenantBundleInputStream.java
(original)
+++
sandbox/marrs/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/MultiTenantBundleInputStream.java
Wed Oct 19 22:48:05 2011
@@ -1,4 +1,4 @@
-package tenant;
+package org.amdatu.core.tenant;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
Copied:
sandbox/marrs/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/Tenant.java
(from r1552,
/sandbox/marrs/amdatu-core/tenant/src/main/java/tenant/Tenant.java)
==============================================================================
--- /sandbox/marrs/amdatu-core/tenant/src/main/java/tenant/Tenant.java
(original)
+++
sandbox/marrs/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/Tenant.java
Wed Oct 19 22:48:05 2011
@@ -1,4 +1,4 @@
-package tenant;
+package org.amdatu.core.tenant;
/**
* Tenant interface.
Copied:
sandbox/marrs/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/TenantConstants.java
(from r1552,
/sandbox/marrs/amdatu-core/tenant/src/main/java/tenant/TenantConstants.java)
==============================================================================
--- /sandbox/marrs/amdatu-core/tenant/src/main/java/tenant/TenantConstants.java
(original)
+++
sandbox/marrs/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/TenantConstants.java
Wed Oct 19 22:48:05 2011
@@ -1,4 +1,4 @@
-package tenant;
+package org.amdatu.core.tenant;
/**
* Compile time constants for multi tenancy.
Modified:
sandbox/marrs/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/impl/TenantAdapter.java
==============================================================================
---
/sandbox/marrs/amdatu-core/tenant/src/main/java/tenant/impl/TenantAdapter.java
(original)
+++
sandbox/marrs/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/impl/TenantAdapter.java
Wed Oct 19 22:48:05 2011
@@ -1,11 +1,11 @@
-package tenant.impl;
+package org.amdatu.core.tenant.impl;
+import org.amdatu.core.tenant.Tenant;
+import org.amdatu.core.tenant.TenantConstants;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.service.log.LogService;
-import tenant.Tenant;
-import tenant.TenantConstants;
/**
* Adapter that instantiates a bundle activator and makes that instance tenant
specific
Modified:
sandbox/marrs/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/impl/TenantAwareBundle.java
==============================================================================
---
/sandbox/marrs/amdatu-core/tenant/src/main/java/tenant/impl/TenantAwareBundle.java
(original)
+++
sandbox/marrs/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/impl/TenantAwareBundle.java
Wed Oct 19 22:48:05 2011
@@ -1,4 +1,4 @@
-package tenant.impl;
+package org.amdatu.core.tenant.impl;
import java.io.IOException;
import java.io.InputStream;
Modified:
sandbox/marrs/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/impl/TenantAwareBundleContext.java
==============================================================================
---
/sandbox/marrs/amdatu-core/tenant/src/main/java/tenant/impl/TenantAwareBundleContext.java
(original)
+++
sandbox/marrs/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/impl/TenantAwareBundleContext.java
Wed Oct 19 22:48:05 2011
@@ -1,4 +1,4 @@
-package tenant.impl;
+package org.amdatu.core.tenant.impl;
import java.io.File;
import java.io.IOException;
@@ -9,6 +9,8 @@
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
+import org.amdatu.core.tenant.MultiTenantBundleInputStream;
+import org.amdatu.core.tenant.Tenant;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
@@ -22,8 +24,6 @@
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
-import tenant.MultiTenantBundleInputStream;
-import tenant.Tenant;
/**
* Wrapper class for the bundle context interface to make it tenant aware.
@@ -43,7 +43,7 @@
m_tenantId = tenantId;
m_bundle = new TenantAwareBundle(bc.getBundle(), m_tenantId);
}
-
+
public void unregisterServices() {
for (ServiceRegistration registration :
m_serviceRegistrations.values()) {
registration.unregister();
@@ -51,42 +51,42 @@
m_serviceRegistrations.clear();
}
- @Override
public String getProperty(String key) {
return m_bundleContext.getProperty(key);
}
- @Override
public Bundle getBundle() {
return m_bundle;
}
- @Override
- public Bundle installBundle(String location, InputStream input) throws
BundleException {
- return m_bundleContext.installBundle(location, new
MultiTenantBundleInputStream(input));
+ public Bundle installBundle(String location, InputStream input)
+ throws BundleException {
+ return m_bundleContext.installBundle(location,
+ new MultiTenantBundleInputStream(input));
}
- @Override
public Bundle installBundle(String location) throws BundleException {
try {
- return m_bundleContext.installBundle(location, new
MultiTenantBundleInputStream(bundleLocationToInputStream(location)));
- }
- catch (IOException e) {
- throw new BundleException("Could not convert bundle
location to an input stream, wrapping it failed.", e);
+ return m_bundleContext.installBundle(location,
+ new MultiTenantBundleInputStream(
+
bundleLocationToInputStream(location)));
+ } catch (IOException e) {
+ throw new BundleException(
+ "Could not convert bundle location to
an input stream, wrapping it failed.",
+ e);
}
}
- private InputStream bundleLocationToInputStream(String location) throws
IOException {
+ private InputStream bundleLocationToInputStream(String location)
+ throws IOException {
return (new URL(location)).openStream();
}
- @Override
public Bundle getBundle(long id) {
Bundle bundle = m_bundleContext.getBundle(id);
return new TenantAwareBundle(bundle, m_tenantId);
}
- @Override
public Bundle[] getBundles() {
Bundle[] bundles = m_bundleContext.getBundles();
for (int i = 0; i < bundles.length; i++) {
@@ -96,137 +96,141 @@
return bundles;
}
- @Override
- public void addServiceListener(ServiceListener listener, String filter)
throws InvalidSyntaxException {
+ public void addServiceListener(ServiceListener listener, String filter)
+ throws InvalidSyntaxException {
m_bundleContext.addServiceListener(listener,
getCompleteFilter(filter));
}
- @Override
public void addServiceListener(ServiceListener listener) {
try {
- m_bundleContext.addServiceListener(listener,
getCompleteFilter(null));
- }
- catch (InvalidSyntaxException e) {
+ m_bundleContext.addServiceListener(listener,
+ getCompleteFilter(null));
+ } catch (InvalidSyntaxException e) {
e.printStackTrace();
}
}
- @Override
public void removeServiceListener(ServiceListener listener) {
m_bundleContext.removeServiceListener(listener);
}
- @Override
public void addBundleListener(BundleListener listener) {
- TenantAwareBundleListener tenantAwareBundleListener = new
TenantAwareBundleListener(listener);
+ TenantAwareBundleListener tenantAwareBundleListener = new
TenantAwareBundleListener(
+ listener);
if (m_bundleListeners.putIfAbsent(listener,
tenantAwareBundleListener) == null) {
m_bundleContext.addBundleListener(tenantAwareBundleListener);
}
}
- @Override
public void removeBundleListener(BundleListener listener) {
- TenantAwareBundleListener tenantAwareBundleListener =
m_bundleListeners.remove(listener);
+ TenantAwareBundleListener tenantAwareBundleListener =
m_bundleListeners
+ .remove(listener);
if (tenantAwareBundleListener != null) {
m_bundleContext.removeBundleListener(tenantAwareBundleListener);
}
}
- @Override
public void addFrameworkListener(FrameworkListener listener) {
- TenantAwareFrameworkListener tenantAwareFrameworkListener = new
TenantAwareFrameworkListener(listener);
- if (m_frameworkListeners.putIfAbsent(listener,
tenantAwareFrameworkListener) == null) {
+ TenantAwareFrameworkListener tenantAwareFrameworkListener = new
TenantAwareFrameworkListener(
+ listener);
+ if (m_frameworkListeners.putIfAbsent(listener,
+ tenantAwareFrameworkListener) == null) {
m_bundleContext.addFrameworkListener(tenantAwareFrameworkListener);
}
}
- @Override
public void removeFrameworkListener(FrameworkListener listener) {
- TenantAwareFrameworkListener tenantAwareFrameworkListener =
m_frameworkListeners.remove(listener);
+ TenantAwareFrameworkListener tenantAwareFrameworkListener =
m_frameworkListeners
+ .remove(listener);
if (tenantAwareFrameworkListener != null) {
-
m_bundleContext.removeFrameworkListener(tenantAwareFrameworkListener);
+ m_bundleContext
+
.removeFrameworkListener(tenantAwareFrameworkListener);
}
}
- @Override
- public ServiceRegistration registerService(String[] clazzes, Object
service, Dictionary properties) {
+ public ServiceRegistration registerService(String[] clazzes,
+ Object service, Dictionary properties) {
if (properties == null) {
properties = new Properties();
}
properties.put(Tenant.ID_KEY, Integer.valueOf(m_tenantId));
- ServiceRegistration registration =
m_bundleContext.registerService(clazzes, service, properties);
- ServiceRegistrationAdapter adapter = new
ServiceRegistrationAdapter(registration);
+ ServiceRegistration registration =
m_bundleContext.registerService(
+ clazzes, service, properties);
+ ServiceRegistrationAdapter adapter = new
ServiceRegistrationAdapter(
+ registration);
m_serviceRegistrations.put(adapter, registration);
return adapter;
}
- @Override
- public ServiceRegistration registerService(String clazz, Object
service, Dictionary properties) {
+ public ServiceRegistration registerService(String clazz, Object service,
+ Dictionary properties) {
if (properties == null) {
properties = new Properties();
}
properties.put(Tenant.ID_KEY, Integer.valueOf(m_tenantId));
- ServiceRegistration registration =
m_bundleContext.registerService(clazz, service, properties);
- ServiceRegistrationAdapter adapter = new
ServiceRegistrationAdapter(registration);
+ ServiceRegistration registration =
m_bundleContext.registerService(
+ clazz, service, properties);
+ ServiceRegistrationAdapter adapter = new
ServiceRegistrationAdapter(
+ registration);
m_serviceRegistrations.put(adapter, registration);
return adapter;
}
- @Override
- public ServiceReference[] getServiceReferences(String clazz, String
filter) throws InvalidSyntaxException {
+ public ServiceReference[] getServiceReferences(String clazz, String
filter)
+ throws InvalidSyntaxException {
try {
- return m_bundleContext.getServiceReferences(clazz,
getCompleteFilter(filter));
- }
- catch (InvalidSyntaxException e) {
+ return m_bundleContext.getServiceReferences(clazz,
+ getCompleteFilter(filter));
+ } catch (InvalidSyntaxException e) {
e.printStackTrace();
}
return null;
}
-
+
public String getCompleteFilter(String filter) {
- String result = (filter == null) ? "(|(" + Tenant.ID_KEY + "="
+ m_tenantId +")(!(" + Tenant.ID_KEY + "=*)))" : "(&(|(" + Tenant.ID_KEY + "="
+ m_tenantId +")(!(" + Tenant.ID_KEY + "=*)))" + filter + ")";
+ String result = (filter == null) ? "(|(" + Tenant.ID_KEY + "="
+ + m_tenantId + ")(!(" + Tenant.ID_KEY + "=*)))"
: "(&(|("
+ + Tenant.ID_KEY + "=" + m_tenantId + ")(!(" +
Tenant.ID_KEY
+ + "=*)))" + filter + ")";
return result;
}
- @Override
- public ServiceReference[] getAllServiceReferences(String clazz, String
filter) throws InvalidSyntaxException {
+ public ServiceReference[] getAllServiceReferences(String clazz,
+ String filter) throws InvalidSyntaxException {
try {
- return m_bundleContext.getAllServiceReferences(clazz,
getCompleteFilter(filter));
- }
- catch (InvalidSyntaxException e) {
+ return m_bundleContext.getAllServiceReferences(clazz,
+ getCompleteFilter(filter));
+ } catch (InvalidSyntaxException e) {
e.printStackTrace();
}
return null;
}
- @Override
public ServiceReference getServiceReference(String clazz) {
try {
- ServiceReference[] references =
m_bundleContext.getServiceReferences(clazz, "(|(" + Tenant.ID_KEY + "=" +
m_tenantId +")(!(" + Tenant.ID_KEY + "=*)))");
+ ServiceReference[] references = m_bundleContext
+ .getServiceReferences(clazz, "(|(" +
Tenant.ID_KEY + "="
+ + m_tenantId + ")(!(" +
Tenant.ID_KEY + "=*)))");
if (references != null && references.length > 0) {
if (references.length > 1) {
Arrays.sort(references);
}
return references[0];
}
- }
- catch (InvalidSyntaxException e) {
+ } catch (InvalidSyntaxException e) {
e.printStackTrace();
}
return null;
}
- @Override
public Object getService(ServiceReference reference) {
return m_bundleContext.getService(reference);
}
- @Override
public boolean ungetService(ServiceReference reference) {
return m_bundleContext.ungetService(reference);
}
- @Override
public File getDataFile(String filename) {
if (m_dataFile == null) {
m_dataFile =
m_bundleContext.getDataFile(createTenantDataFile());
@@ -237,8 +241,7 @@
}
if (filename == null) {
return m_dataFile;
- }
- else {
+ } else {
return new File(m_dataFile, filename);
}
}
@@ -247,11 +250,10 @@
return TENANT_DATAFILE_PREFIX + m_tenantId;
}
- @Override
public Filter createFilter(String filter) throws InvalidSyntaxException
{
return m_bundleContext.createFilter(filter);
}
-
+
private class TenantAwareBundleListener implements BundleListener {
private final BundleListener m_listener;
@@ -259,27 +261,25 @@
m_listener = listener;
}
- @Override
public void bundleChanged(BundleEvent event) {
m_listener.bundleChanged(new
TenantAwareBundleEvent(event));
}
}
-
+
private class TenantAwareFrameworkListener implements FrameworkListener
{
private final FrameworkListener m_listener;
public TenantAwareFrameworkListener(FrameworkListener listener)
{
m_listener = listener;
-
+
}
- @Override
public void frameworkEvent(FrameworkEvent event) {
m_listener.frameworkEvent(new
TenantAwareFrameworkEvent(event));
}
-
+
}
-
+
private class TenantAwareBundleEvent extends BundleEvent {
private final BundleEvent m_event;
private final Bundle m_bundle;
@@ -291,13 +291,12 @@
BundleContext eventBundleContext =
eventBundle.getBundleContext();
m_bundle = new TenantAwareBundle(eventBundle,
m_tenantId);
}
-
- @Override
+
public Bundle getBundle() {
return m_bundle;
}
}
-
+
private class TenantAwareFrameworkEvent extends FrameworkEvent {
private final FrameworkEvent m_event;
private final Bundle m_bundle;
@@ -309,32 +308,28 @@
BundleContext eventBundleContext =
eventBundle.getBundleContext();
m_bundle = new TenantAwareBundle(eventBundle,
m_tenantId);
}
-
- @Override
+
public Bundle getBundle() {
return m_bundle;
}
}
-
+
private class ServiceRegistrationAdapter implements ServiceRegistration
{
private final ServiceRegistration m_registration;
public ServiceRegistrationAdapter(ServiceRegistration
registration) {
m_registration = registration;
-
+
}
- @Override
public ServiceReference getReference() {
return m_registration.getReference();
}
- @Override
public void setProperties(Dictionary properties) {
m_registration.setProperties(properties);
}
- @Override
public void unregister() {
m_serviceRegistrations.remove(this);
m_registration.unregister();
Copied:
sandbox/marrs/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/packageinfo
(from r1552,
/sandbox/marrs/amdatu-core/tenant/src/main/java/tenant/packageinfo)
==============================================================================
--- /sandbox/marrs/amdatu-core/tenant/src/main/java/tenant/packageinfo
(original)
+++
sandbox/marrs/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/packageinfo
Wed Oct 19 22:48:05 2011
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 2.0.0
\ No newline at end of file
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
