Author: [email protected]
Date: Mon Jan 30 23:23:03 2012
New Revision: 2033
Log:
AMDATU-529 Refactored multitenant manifest properties to have X- prefix
Modified:
trunk/amdatu-core/configadmin/pom.xml
trunk/amdatu-core/eventadmin/pom.xml
trunk/amdatu-core/logservice/pom.xml
trunk/amdatu-core/preferences/pom.xml
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/tenant/adaptor/TenantAdaptorConstants.java
trunk/amdatu-core/useradmin/pom.xml
trunk/amdatu-core/useradminstore-prefs/pom.xml
trunk/amdatu-kitchensink/demo-tenant-local/pom.xml
Modified: trunk/amdatu-core/configadmin/pom.xml
==============================================================================
--- trunk/amdatu-core/configadmin/pom.xml (original)
+++ trunk/amdatu-core/configadmin/pom.xml Mon Jan 30 23:23:03 2012
@@ -43,8 +43,8 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<MultiTenant-Bundle-Activator>org.apache.felix.cm.impl.ConfigurationManager</MultiTenant-Bundle-Activator>
- <MultiTenant-Scope>BOTH</MultiTenant-Scope>
+
<X-MultiTenant-Bundle-Activator>org.apache.felix.cm.impl.ConfigurationManager</X-MultiTenant-Bundle-Activator>
+ <X-MultiTenant-Scope>BOTH</X-MultiTenant-Scope>
<Bundle-Activator>org.amdatu.tenant.adaptor.MultiTenantBundleActivator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.core.configadmin</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile;inline=org/apache/felix/**</Embed-Dependency>
Modified: trunk/amdatu-core/eventadmin/pom.xml
==============================================================================
--- trunk/amdatu-core/eventadmin/pom.xml (original)
+++ trunk/amdatu-core/eventadmin/pom.xml Mon Jan 30 23:23:03 2012
@@ -43,8 +43,8 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<MultiTenant-Bundle-Activator>org.apache.felix.eventadmin.impl.Activator</MultiTenant-Bundle-Activator>
- <MultiTenant-Scope>BOTH</MultiTenant-Scope>
+
<X-MultiTenant-Bundle-Activator>org.apache.felix.eventadmin.impl.Activator</X-MultiTenant-Bundle-Activator>
+ <X-MultiTenant-Scope>BOTH</X-MultiTenant-Scope>
<Bundle-Activator>org.amdatu.tenant.adaptor.MultiTenantBundleActivator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.core.eventadmin</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile;inline=org/apache/felix/**|EDU/oswego/**</Embed-Dependency>
Modified: trunk/amdatu-core/logservice/pom.xml
==============================================================================
--- trunk/amdatu-core/logservice/pom.xml (original)
+++ trunk/amdatu-core/logservice/pom.xml Mon Jan 30 23:23:03 2012
@@ -43,8 +43,8 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<MultiTenant-Bundle-Activator>org.apache.felix.log.Activator</MultiTenant-Bundle-Activator>
- <MultiTenant-Scope>BOTH</MultiTenant-Scope>
+
<X-MultiTenant-Bundle-Activator>org.apache.felix.log.Activator</X-MultiTenant-Bundle-Activator>
+ <X-MultiTenant-Scope>BOTH</X-MultiTenant-Scope>
<Bundle-Activator>org.amdatu.tenant.adaptor.MultiTenantBundleActivator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.core.logservice</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile;inline=org/apache/felix/**</Embed-Dependency>
Modified: trunk/amdatu-core/preferences/pom.xml
==============================================================================
--- trunk/amdatu-core/preferences/pom.xml (original)
+++ trunk/amdatu-core/preferences/pom.xml Mon Jan 30 23:23:03 2012
@@ -43,8 +43,8 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<MultiTenant-Bundle-Activator>org.apache.felix.prefs.impl.PreferencesManager</MultiTenant-Bundle-Activator>
- <MultiTenant-Scope>BOTH</MultiTenant-Scope>
+
<X-MultiTenant-Bundle-Activator>org.apache.felix.prefs.impl.PreferencesManager</X-MultiTenant-Bundle-Activator>
+ <X-MultiTenant-Scope>BOTH</X-MultiTenant-Scope>
<Bundle-Activator>org.amdatu.tenant.adaptor.MultiTenantBundleActivator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.core.preferences</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile;inline=org/apache/**</Embed-Dependency>
Modified:
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/tenant/adaptor/TenantAdaptorConstants.java
==============================================================================
---
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/tenant/adaptor/TenantAdaptorConstants.java
(original)
+++
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/tenant/adaptor/TenantAdaptorConstants.java
Mon Jan 30 23:23:03 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
@@ -16,16 +16,16 @@
package org.amdatu.tenant.adaptor;
/**
- *
+ *
* @author <a href="mailto:[email protected]";>Amdatu Project
Team</a>
*/
public interface TenantAdaptorConstants {
- 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_BUNDLE_ACTIVATOR_KEY =
"X-MultiTenant-Bundle-Activator";
+ public static final String MULTITENANT_SCOPE_KEY = "X-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_KEY =
"X-MultiTenant-Version";
public static final String MULTITENANT_VERSION_VALUE = "1";
}
Modified: trunk/amdatu-core/useradmin/pom.xml
==============================================================================
--- trunk/amdatu-core/useradmin/pom.xml (original)
+++ trunk/amdatu-core/useradmin/pom.xml Mon Jan 30 23:23:03 2012
@@ -43,8 +43,8 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<MultiTenant-Bundle-Activator>org.ops4j.pax.useradmin.service.internal.Activator</MultiTenant-Bundle-Activator>
- <MultiTenant-Scope>BOTH</MultiTenant-Scope>
+
<X-MultiTenant-Bundle-Activator>org.ops4j.pax.useradmin.service.internal.Activator</X-MultiTenant-Bundle-Activator>
+ <X-MultiTenant-Scope>BOTH</X-MultiTenant-Scope>
<Bundle-Activator>org.amdatu.tenant.adaptor.MultiTenantBundleActivator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.core.useradmin</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile;inline=org/ops4j/pax/useradmin/**</Embed-Dependency>
Modified: trunk/amdatu-core/useradminstore-prefs/pom.xml
==============================================================================
--- trunk/amdatu-core/useradminstore-prefs/pom.xml (original)
+++ trunk/amdatu-core/useradminstore-prefs/pom.xml Mon Jan 30 23:23:03 2012
@@ -43,8 +43,8 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<MultiTenant-Bundle-Activator>org.ops4j.pax.useradmin.provider.preferences.internal.Activator</MultiTenant-Bundle-Activator>
- <MultiTenant-Scope>BOTH</MultiTenant-Scope>
+
<X-MultiTenant-Bundle-Activator>org.ops4j.pax.useradmin.provider.preferences.internal.Activator</X-MultiTenant-Bundle-Activator>
+ <X-MultiTenant-Scope>BOTH</X-MultiTenant-Scope>
<Bundle-Activator>org.amdatu.tenant.adaptor.MultiTenantBundleActivator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.core.useradminstore.prefs</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile;inline=org/ops4j/pax/useradmin/provider/preferences/**</Embed-Dependency>
Modified: trunk/amdatu-kitchensink/demo-tenant-local/pom.xml
==============================================================================
--- trunk/amdatu-kitchensink/demo-tenant-local/pom.xml (original)
+++ trunk/amdatu-kitchensink/demo-tenant-local/pom.xml Mon Jan 30 23:23:03 2012
@@ -35,8 +35,8 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<MultiTenant-Bundle-Activator>org.amdatu.kitchensink.demo.tenant.local.impl.Activator</MultiTenant-Bundle-Activator>
- <MultiTenant-Scope>TENANT</MultiTenant-Scope>
+
<X-MultiTenant-Bundle-Activator>org.amdatu.kitchensink.demo.tenant.local.impl.Activator</X-MultiTenant-Bundle-Activator>
+ <X-MultiTenant-Scope>TENANT</X-MultiTenant-Scope>
<Bundle-Activator>org.amdatu.tenant.adaptor.MultiTenantBundleActivator</Bundle-Activator>
<Embed-Dependency>*;scope=compile;inline=true</Embed-Dependency>
<Export-Package>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
