Author: [email protected]
Date: Mon Jan 30 17:07:42 2012
New Revision: 2029
Log:
AMDATU-529 Moved adaptor related constact to own constants class in adaptor
package
Added:
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/core/tenant/adaptor/TenantAdaptorConstants.java
- copied, changed from r2028,
/trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/TenantConstants.java
Modified:
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/tenant/MultiTenantTest.java
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/core/tenant/adaptor/MultiTenantBundleActivator.java
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/core/tenant/adaptor/MultiTenantBundleInputStream.java
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/core/tenant/adaptor/TenantAdapter.java
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/TenantConstants.java
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
Mon Jan 30 17:07:42 2012
@@ -15,6 +15,11 @@
*/
package org.amdatu.core.itest.tests.tenant;
+import static
org.amdatu.core.tenant.adaptor.TenantAdaptorConstants.MULTITENANT_BUNDLE_ACTIVATOR_KEY;
+import static
org.amdatu.core.tenant.adaptor.TenantAdaptorConstants.MULTITENANT_SCOPE_KEY;
+import static
org.amdatu.core.tenant.adaptor.TenantAdaptorConstants.MULTITENANT_SCOPE_VALUE_BOTH;
+import static
org.amdatu.core.tenant.adaptor.TenantAdaptorConstants.MULTITENANT_VERSION_KEY;
+import static
org.amdatu.core.tenant.adaptor.TenantAdaptorConstants.MULTITENANT_VERSION_VALUE;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -153,9 +158,9 @@
.add(MyDependentServiceImpl.class)
.add(MyDependencyService.class)
.add(MyDependencyServiceImpl.class)
- .set(TenantConstants.MULTITENANT_SCOPE_KEY,
TenantConstants.MULTITENANT_SCOPE_VALUE_BOTH)
- .set(TenantConstants.MULTITENANT_VERSION_KEY,
TenantConstants.MULTITENANT_VERSION_VALUE)
- .set(TenantConstants.MULTITENANT_BUNDLE_ACTIVATOR_KEY,
MyTenancyActivator.class.getName())
+ .set(MULTITENANT_SCOPE_KEY, MULTITENANT_SCOPE_VALUE_BOTH)
+ .set(MULTITENANT_VERSION_KEY, MULTITENANT_VERSION_VALUE)
+ .set(MULTITENANT_BUNDLE_ACTIVATOR_KEY,
MyTenancyActivator.class.getName())
.set(Constants.BUNDLE_ACTIVATOR,
MultiTenantBundleActivator.class.getName())
.set(Constants.BUNDLE_SYMBOLICNAME, "My Tenancy Bundle")
.set(Constants.EXPORT_PACKAGE,
"org.amdatu.core.itest.tests.tenant.mock")
Modified:
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/core/tenant/adaptor/MultiTenantBundleActivator.java
==============================================================================
---
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/core/tenant/adaptor/MultiTenantBundleActivator.java
(original)
+++
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/core/tenant/adaptor/MultiTenantBundleActivator.java
Mon Jan 30 17:07:42 2012
@@ -15,11 +15,7 @@
*/
package org.amdatu.core.tenant.adaptor;
-import static
org.amdatu.core.tenant.TenantConstants.MULTITENANT_BUNDLE_ACTIVATOR_KEY;
-import static org.amdatu.core.tenant.TenantConstants.MULTITENANT_SCOPE_KEY;
-import static
org.amdatu.core.tenant.TenantConstants.MULTITENANT_SCOPE_VALUE_BOTH;
-import static
org.amdatu.core.tenant.TenantConstants.MULTITENANT_SCOPE_VALUE_PLATFORM;
-import static
org.amdatu.core.tenant.TenantConstants.MULTITENANT_SCOPE_VALUE_TENANTS;
+import static org.amdatu.core.tenant.adaptor.TenantAdaptorConstants.*;
import static org.amdatu.core.tenant.TenantConstants.PID_KEY;
import static org.amdatu.core.tenant.TenantConstants.PID_VALUE_PLATFORM;
Modified:
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/core/tenant/adaptor/MultiTenantBundleInputStream.java
==============================================================================
---
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/core/tenant/adaptor/MultiTenantBundleInputStream.java
(original)
+++
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/core/tenant/adaptor/MultiTenantBundleInputStream.java
Mon Jan 30 17:07:42 2012
@@ -14,6 +14,9 @@
* limitations under the License.
*/
package org.amdatu.core.tenant.adaptor;
+import static
org.amdatu.core.tenant.adaptor.TenantAdaptorConstants.MULTITENANT_BUNDLE_ACTIVATOR_KEY;
+import static
org.amdatu.core.tenant.adaptor.TenantAdaptorConstants.MULTITENANT_VERSION_KEY;
+import static
org.amdatu.core.tenant.adaptor.TenantAdaptorConstants.MULTITENANT_VERSION_VALUE;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
@@ -27,7 +30,6 @@
import java.util.jar.JarOutputStream;
import java.util.jar.Manifest;
-import org.amdatu.core.tenant.TenantConstants;
import org.osgi.framework.Constants;
/**
@@ -48,7 +50,7 @@
*/
public class MultiTenantBundleInputStream extends InputStream {
- private static final Name MULTITENANT_VERSION_NAME = new
Attributes.Name(TenantConstants.MULTITENANT_VERSION_KEY);
+ private static final Name MULTITENANT_VERSION_NAME = new
Attributes.Name(MULTITENANT_VERSION_KEY);
private static final Name BUNDLE_ACTIVATOR_NAME = new
Attributes.Name(Constants.BUNDLE_ACTIVATOR);
private static final String TENANT_IMPORT_PACKAGE =
MultiTenantBundleActivator.class.getPackage().getName()
+ ";version=\"[1.0,2)\"";
@@ -66,15 +68,15 @@
// do not process the bundle if it already has a tenant bundle
activator (somebody already preprocessed it)
// or it has no bundle activator at all (there's nothing to make
tenant aware)
if ((attributes.containsKey(MULTITENANT_VERSION_NAME) &&
(attributes.getValue(MULTITENANT_VERSION_NAME)
- .equals(TenantConstants.MULTITENANT_VERSION_VALUE))) ||
!attributes.containsKey(BUNDLE_ACTIVATOR_NAME)) {
+ .equals(MULTITENANT_VERSION_VALUE))) ||
!attributes.containsKey(BUNDLE_ACTIVATOR_NAME)) {
original.reset();
m_inputStream = original;
}
else {
String originalBundleActivator =
attributes.getValue(Constants.BUNDLE_ACTIVATOR);
attributes.putValue(Constants.BUNDLE_ACTIVATOR,
MultiTenantBundleActivator.class.getName());
-
attributes.putValue(TenantConstants.MULTITENANT_BUNDLE_ACTIVATOR_KEY,
originalBundleActivator);
- attributes.putValue(TenantConstants.MULTITENANT_VERSION_KEY,
TenantConstants.MULTITENANT_VERSION_VALUE);
+ attributes.putValue(MULTITENANT_BUNDLE_ACTIVATOR_KEY,
originalBundleActivator);
+ attributes.putValue(MULTITENANT_VERSION_KEY,
MULTITENANT_VERSION_VALUE);
String originalImportPackage =
attributes.getValue(Constants.IMPORT_PACKAGE);
if (originalImportPackage == null) {
Modified:
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/core/tenant/adaptor/TenantAdapter.java
==============================================================================
---
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/core/tenant/adaptor/TenantAdapter.java
(original)
+++
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/core/tenant/adaptor/TenantAdapter.java
Mon Jan 30 17:07:42 2012
@@ -15,9 +15,9 @@
*/
package org.amdatu.core.tenant.adaptor;
-import static
org.amdatu.core.tenant.TenantConstants.MULTITENANT_BUNDLE_ACTIVATOR_KEY;
import static org.amdatu.core.tenant.TenantConstants.NAME_KEY;
import static org.amdatu.core.tenant.TenantConstants.PID_KEY;
+import static
org.amdatu.core.tenant.adaptor.TenantAdaptorConstants.MULTITENANT_BUNDLE_ACTIVATOR_KEY;
import java.util.Properties;
Copied:
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/core/tenant/adaptor/TenantAdaptorConstants.java
(from r2028,
/trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/TenantConstants.java)
==============================================================================
---
/trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/TenantConstants.java
(original)
+++
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/core/tenant/adaptor/TenantAdaptorConstants.java
Mon Jan 30 17:07:42 2012
@@ -13,20 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.core.tenant;
+package org.amdatu.core.tenant.adaptor;
/**
- * Compile time constants for multi tenancy.
*
* @author <a href="mailto:[email protected]";>Amdatu Project
Team</a>
*/
-public interface TenantConstants {
+public interface TenantAdaptorConstants {
- public static final String PID_KEY = "org.amdatu.tenant.pid";
- public static final String NAME_KEY = "org.amdatu.tenant.name";
- public static final String PID_VALUE_PLATFORM =
"org.amdatu.tenant.PLATFORM";
-
- // adaptor stuff to be moved
public static final String MULTITENANT_BUNDLE_ACTIVATOR_KEY =
"MultiTenant-Bundle-Activator";
public static final String MULTITENANT_SCOPE_KEY = "MultiTenant-Scope";
public static final String MULTITENANT_SCOPE_VALUE_PLATFORM = "PLATFORM";
Modified:
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/TenantConstants.java
==============================================================================
---
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/TenantConstants.java
(original)
+++
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/TenantConstants.java
Mon Jan 30 17:07:42 2012
@@ -25,13 +25,4 @@
public static final String PID_KEY = "org.amdatu.tenant.pid";
public static final String NAME_KEY = "org.amdatu.tenant.name";
public static final String PID_VALUE_PLATFORM =
"org.amdatu.tenant.PLATFORM";
-
- // adaptor stuff to be moved
- public static final String MULTITENANT_BUNDLE_ACTIVATOR_KEY =
"MultiTenant-Bundle-Activator";
- public static final String MULTITENANT_SCOPE_KEY = "MultiTenant-Scope";
- public static final String MULTITENANT_SCOPE_VALUE_PLATFORM = "PLATFORM";
- public static final String MULTITENANT_SCOPE_VALUE_TENANTS = "TENANTS";
- public static final String MULTITENANT_SCOPE_VALUE_BOTH = "BOTH";
- public static final String MULTITENANT_VERSION_KEY = "MultiTenant-Version";
- public static final String MULTITENANT_VERSION_VALUE = "1";
}
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
