Author: [email protected]
Date: Tue Jan 31 12:19:11 2012
New Revision: 2036
Log:
AMDATU-529 Changed dutchism adaptor to adapter (from AMDATU-495)
Added:
trunk/amdatu-core/tenant-adapter/
trunk/amdatu-core/tenant-adapter/LICENSE
- copied, changed from r2035, /trunk/amdatu-core/tenant-adaptor/LICENSE
trunk/amdatu-core/tenant-adapter/NOTICE
- copied, changed from r2035, /trunk/amdatu-core/tenant-adaptor/NOTICE
trunk/amdatu-core/tenant-adapter/pom.xml
- copied, changed from r2035, /trunk/amdatu-core/tenant-adaptor/pom.xml
trunk/amdatu-core/tenant-adapter/src/
trunk/amdatu-core/tenant-adapter/src/main/
trunk/amdatu-core/tenant-adapter/src/main/java/
trunk/amdatu-core/tenant-adapter/src/main/java/org/
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/adapter/
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/adapter/MultiTenantBundleActivator.java
- copied, changed from r2035,
/trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/tenant/adaptor/MultiTenantBundleActivator.java
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/adapter/MultiTenantBundleInputStream.java
- copied, changed from r2035,
/trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/tenant/adaptor/MultiTenantBundleInputStream.java
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/adapter/TenantAdapter.java
- copied, changed from r2035,
/trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/tenant/adaptor/TenantAdapter.java
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/adapter/TenantAdapterConstants.java
- copied, changed from r2035,
/trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/tenant/adaptor/TenantAdaptorConstants.java
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/adapter/TenantAwareBundle.java
- copied, changed from r2035,
/trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/tenant/adaptor/TenantAwareBundle.java
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/adapter/TenantAwareBundleContext.java
- copied, changed from r2035,
/trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/tenant/adaptor/TenantAwareBundleContext.java
Modified:
trunk/amdatu-core/configadmin/pom.xml
trunk/amdatu-core/eventadmin/pom.xml
trunk/amdatu-core/itest/base/src/main/java/org/amdatu/core/itest/base/CoreBundles.java
trunk/amdatu-core/itest/pom.xml
trunk/amdatu-core/itest/tests/src/test/java/org/amdatu/core/itest/tests/tenant/MultiTenantTest.java
trunk/amdatu-core/logservice/pom.xml
trunk/amdatu-core/pom.xml
trunk/amdatu-core/preferences/pom.xml
trunk/amdatu-core/tenant-adaptor/
trunk/amdatu-core/useradmin/pom.xml
trunk/amdatu-core/useradminstore-prefs/pom.xml
trunk/amdatu-kitchensink/demo-tenant-local/pom.xml
trunk/amdatu-kitchensink/release-server/pom.xml
trunk/amdatu-kitchensink/release-server/src/main/assembly/bin-component.xml
trunk/amdatu-release/pom.xml
Modified: trunk/amdatu-core/configadmin/pom.xml
==============================================================================
--- trunk/amdatu-core/configadmin/pom.xml (original)
+++ trunk/amdatu-core/configadmin/pom.xml Tue Jan 31 12:19:11 2012
@@ -45,13 +45,13 @@
<instructions>
<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-Activator>org.amdatu.tenant.adapter.MultiTenantBundleActivator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.core.configadmin</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile;inline=org/apache/felix/**</Embed-Dependency>
<Embed-Transitive>false</Embed-Transitive>
<Import-Package>
org.amdatu.tenant;version="[1.0,2)",
- org.amdatu.tenant.adaptor;version="[1.0,2)",
+ org.amdatu.tenant.adapter;version="[1.0,2)",
*
</Import-Package>
</instructions>
Modified: trunk/amdatu-core/eventadmin/pom.xml
==============================================================================
--- trunk/amdatu-core/eventadmin/pom.xml (original)
+++ trunk/amdatu-core/eventadmin/pom.xml Tue Jan 31 12:19:11 2012
@@ -45,13 +45,13 @@
<instructions>
<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-Activator>org.amdatu.tenant.adapter.MultiTenantBundleActivator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.core.eventadmin</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile;inline=org/apache/felix/**|EDU/oswego/**</Embed-Dependency>
<Embed-Transitive>false</Embed-Transitive>
<Import-Package>
org.amdatu.tenant;version="[1.0,2)",
- org.amdatu.tenant.adaptor;version="[1.0,2)",
+ org.amdatu.tenant.adapter;version="[1.0,2)",
*
</Import-Package>
<Export-Package>
Modified:
trunk/amdatu-core/itest/base/src/main/java/org/amdatu/core/itest/base/CoreBundles.java
==============================================================================
---
trunk/amdatu-core/itest/base/src/main/java/org/amdatu/core/itest/base/CoreBundles.java
(original)
+++
trunk/amdatu-core/itest/base/src/main/java/org/amdatu/core/itest/base/CoreBundles.java
Tue Jan 31 12:19:11 2012
@@ -41,7 +41,7 @@
LOG_CONSOLE("org.amdatu.core", "org.amdatu.core.log.console"),
LOG_FORWARDER_JDK("org.amdatu.core",
"org.amdatu.core.log.forwarder.jdk"),
TENANT("org.amdatu.tenant", "org.amdatu.tenant"),
- TENANT_ADAPTOR("org.amdatu.tenant", "org.amdatu.tenant.adaptor"),
+ TENANT_ADAPTER("org.amdatu.tenant", "org.amdatu.tenant.adapter"),
TENANT_FACTORY("org.amdatu.tenant", "org.amdatu.tenant.factory");
private final String m_groupId;
Modified: trunk/amdatu-core/itest/pom.xml
==============================================================================
--- trunk/amdatu-core/itest/pom.xml (original)
+++ trunk/amdatu-core/itest/pom.xml Tue Jan 31 12:19:11 2012
@@ -254,7 +254,7 @@
</dependency>
<dependency>
<groupId>org.amdatu.tenant</groupId>
- <artifactId>org.amdatu.tenant.adaptor</artifactId>
+ <artifactId>org.amdatu.tenant.adapter</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
<type>bundle</type>
@@ -379,7 +379,7 @@
</dependency>
<dependency>
<groupId>org.amdatu.tenant</groupId>
- <artifactId>org.amdatu.tenant.adaptor</artifactId>
+ <artifactId>org.amdatu.tenant.adapter</artifactId>
<type>bundle</type>
</dependency>
<dependency>
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
Tue Jan 31 12:19:11 2012
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2010-2012 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
@@ -15,11 +15,11 @@
*/
package org.amdatu.core.itest.tests.tenant;
-import static
org.amdatu.tenant.adaptor.TenantAdaptorConstants.MULTITENANT_BUNDLE_ACTIVATOR_KEY;
-import static
org.amdatu.tenant.adaptor.TenantAdaptorConstants.MULTITENANT_SCOPE_KEY;
-import static
org.amdatu.tenant.adaptor.TenantAdaptorConstants.MULTITENANT_SCOPE_VALUE_BOTH;
-import static
org.amdatu.tenant.adaptor.TenantAdaptorConstants.MULTITENANT_VERSION_KEY;
-import static
org.amdatu.tenant.adaptor.TenantAdaptorConstants.MULTITENANT_VERSION_VALUE;
+import static
org.amdatu.tenant.adapter.TenantAdapterConstants.MULTITENANT_BUNDLE_ACTIVATOR_KEY;
+import static
org.amdatu.tenant.adapter.TenantAdapterConstants.MULTITENANT_SCOPE_KEY;
+import static
org.amdatu.tenant.adapter.TenantAdapterConstants.MULTITENANT_SCOPE_VALUE_BOTH;
+import static
org.amdatu.tenant.adapter.TenantAdapterConstants.MULTITENANT_VERSION_KEY;
+import static
org.amdatu.tenant.adapter.TenantAdapterConstants.MULTITENANT_VERSION_VALUE;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -48,7 +48,7 @@
import org.amdatu.core.itest.tests.tenant.mock.MyDependentServiceImpl;
import org.amdatu.core.itest.tests.tenant.mock.MyTenancyActivator;
import org.amdatu.tenant.TenantConstants;
-import org.amdatu.tenant.adaptor.MultiTenantBundleActivator;
+import org.amdatu.tenant.adapter.MultiTenantBundleActivator;
import org.apache.felix.dm.DependencyManager;
import org.junit.After;
import org.junit.Before;
@@ -70,7 +70,7 @@
/**
* Integration test cases for multi-tenancy.
- *
+ *
* @author <a href="mailto:[email protected]";>Amdatu Project
Team</a>
*/
@RunWith(JUnit4TestRunner.class)
@@ -128,7 +128,7 @@
/**
* Helper method to count the number of service registrations for a given
service-class.
- *
+ *
* @param context the bundle context to use;
* @param service the service to count.
* @return a service registration count, >= 0.
@@ -146,7 +146,7 @@
/**
* Creates the PAX-exam configuration.
- *
+ *
* @return a PAX-exam configuration, never <code>null</code>.
*/
@org.ops4j.pax.exam.junit.Configuration
@@ -165,7 +165,7 @@
.set(Constants.BUNDLE_SYMBOLICNAME, "My Tenancy Bundle")
.set(Constants.EXPORT_PACKAGE,
"org.amdatu.core.itest.tests.tenant.mock")
.set(Constants.IMPORT_PACKAGE,
-
"org.amdatu.core.itest.tests.tenant.mock,org.amdatu.tenant,org.amdatu.tenant.adaptor,"
+
+
"org.amdatu.core.itest.tests.tenant.mock,org.amdatu.tenant,org.amdatu.tenant.adapter,"
+
"org.osgi.service.log,org.osgi.framework,org.apache.felix.dm,junit.framework")
.build();
@@ -179,7 +179,7 @@
/**
* Sets up an individual test case.
- *
+ *
* @throws Exception not part of this test case.
*/
@Before
@@ -203,7 +203,7 @@
/**
* Tears down an individual test case.
- *
+ *
* @throws Exception not part of this test case.
*/
@After
@@ -222,7 +222,7 @@
/**
* Tests that when a multi-tenant aware service is registered, multiple
service registrations are made, one for each tenant.
- *
+ *
* @throws Exception not part of this test case.
*/
@Test
@@ -241,7 +241,7 @@
/**
* Tests that when a multi-tenant aware service is registered, multiple
service registrations are made, one for each tenant.
- *
+ *
* @throws Exception not part of this test case.
*/
@Test
@@ -255,7 +255,7 @@
/**
* Tests that when a multi-tenant aware service is registered, each tenant
only sees its own services, not the services of other tenants.
- *
+ *
* @throws Exception not part of this test case.
*/
@Test
@@ -276,7 +276,7 @@
/**
* Tests that when a non-multi-tenant service (= this test case) tries to
obtain a multi-tenant aware service, this would fail.
- *
+ *
* @throws Exception not part of this test case.
*/
@Test
@@ -294,7 +294,7 @@
/**
* Tests that when a non-multi-tenant service (= this test case) tries to
obtain a multi-tenant aware service, this would fail.
- *
+ *
* @throws Exception not part of this test case.
*/
@Ignore
@@ -313,7 +313,7 @@
/**
* Tests that when a multi-tenant aware service is registered, multiple
service registrations are made, one for each tenant.
- *
+ *
* @throws Exception not part of this test case.
*/
@Test
Modified: trunk/amdatu-core/logservice/pom.xml
==============================================================================
--- trunk/amdatu-core/logservice/pom.xml (original)
+++ trunk/amdatu-core/logservice/pom.xml Tue Jan 31 12:19:11 2012
@@ -45,13 +45,13 @@
<instructions>
<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-Activator>org.amdatu.tenant.adapter.MultiTenantBundleActivator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.core.logservice</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile;inline=org/apache/felix/**</Embed-Dependency>
<Embed-Transitive>false</Embed-Transitive>
<Import-Package>
org.amdatu.tenant;version="[1.0,2)",
- org.amdatu.tenant.adaptor;version="[1.0,2)",
+ org.amdatu.tenant.adapter;version="[1.0,2)",
*
</Import-Package>
<Export-Package>
Modified: trunk/amdatu-core/pom.xml
==============================================================================
--- trunk/amdatu-core/pom.xml (original)
+++ trunk/amdatu-core/pom.xml Tue Jan 31 12:19:11 2012
@@ -89,7 +89,7 @@
<module>log-console</module>
<module>log-forwarder-jdk</module>
<module>tenant</module>
- <module>tenant-adaptor</module>
+ <module>tenant-adapter</module>
<module>tenant-factory</module>
<module>itest</module>
</modules>
Modified: trunk/amdatu-core/preferences/pom.xml
==============================================================================
--- trunk/amdatu-core/preferences/pom.xml (original)
+++ trunk/amdatu-core/preferences/pom.xml Tue Jan 31 12:19:11 2012
@@ -45,13 +45,13 @@
<instructions>
<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-Activator>org.amdatu.tenant.adapter.MultiTenantBundleActivator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.core.preferences</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile;inline=org/apache/**</Embed-Dependency>
<Embed-Transitive>false</Embed-Transitive>
<Import-Package>
org.amdatu.tenant;version="[1.0,2)",
- org.amdatu.tenant.adaptor;version="[1.0,2)",
+ org.amdatu.tenant.adapter;version="[1.0,2)",
*
</Import-Package>
<Export-Package>
Copied: trunk/amdatu-core/tenant-adapter/LICENSE (from r2035,
/trunk/amdatu-core/tenant-adaptor/LICENSE)
==============================================================================
Copied: trunk/amdatu-core/tenant-adapter/NOTICE (from r2035,
/trunk/amdatu-core/tenant-adaptor/NOTICE)
==============================================================================
Copied: trunk/amdatu-core/tenant-adapter/pom.xml (from r2035,
/trunk/amdatu-core/tenant-adaptor/pom.xml)
==============================================================================
--- /trunk/amdatu-core/tenant-adaptor/pom.xml (original)
+++ trunk/amdatu-core/tenant-adapter/pom.xml Tue Jan 31 12:19:11 2012
@@ -16,10 +16,10 @@
<version>0.3.0-SNAPSHOT</version>
</parent>
<groupId>org.amdatu.tenant</groupId>
- <artifactId>org.amdatu.tenant.adaptor</artifactId>
+ <artifactId>org.amdatu.tenant.adapter</artifactId>
<packaging>bundle</packaging>
- <name>Amdatu Tenant - Tenant Adaptor</name>
- <description>This library bundle provides (base) classes for Tenant
adaptors</description>
+ <name>Amdatu Tenant - Tenant adapter</name>
+ <description>This library bundle provides (base) classes for Tenant
adapters</description>
<dependencies>
<dependency>
@@ -38,7 +38,7 @@
<configuration>
<instructions>
<Export-Package>
- org.amdatu.tenant.adaptor;version=1.0.0
+ org.amdatu.tenant.adapter;version=1.0.0
</Export-Package>
</instructions>
</configuration>
Copied:
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/adapter/MultiTenantBundleActivator.java
(from r2035,
/trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/tenant/adaptor/MultiTenantBundleActivator.java)
==============================================================================
---
/trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/tenant/adaptor/MultiTenantBundleActivator.java
(original)
+++
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/adapter/MultiTenantBundleActivator.java
Tue Jan 31 12:19:11 2012
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.tenant.adaptor;
+package org.amdatu.tenant.adapter;
import static org.amdatu.tenant.TenantConstants.PID_KEY;
import static org.amdatu.tenant.TenantConstants.PID_VALUE_PLATFORM;
-import static org.amdatu.tenant.adaptor.TenantAdaptorConstants.*;
+import static org.amdatu.tenant.adapter.TenantAdapterConstants.*;
import java.util.Properties;
Copied:
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/adapter/MultiTenantBundleInputStream.java
(from r2035,
/trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/tenant/adaptor/MultiTenantBundleInputStream.java)
==============================================================================
---
/trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/tenant/adaptor/MultiTenantBundleInputStream.java
(original)
+++
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/adapter/MultiTenantBundleInputStream.java
Tue Jan 31 12:19:11 2012
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.tenant.adaptor;
-import static
org.amdatu.tenant.adaptor.TenantAdaptorConstants.MULTITENANT_BUNDLE_ACTIVATOR_KEY;
-import static
org.amdatu.tenant.adaptor.TenantAdaptorConstants.MULTITENANT_VERSION_KEY;
-import static
org.amdatu.tenant.adaptor.TenantAdaptorConstants.MULTITENANT_VERSION_VALUE;
+package org.amdatu.tenant.adapter;
+import static
org.amdatu.tenant.adapter.TenantAdapterConstants.MULTITENANT_BUNDLE_ACTIVATOR_KEY;
+import static
org.amdatu.tenant.adapter.TenantAdapterConstants.MULTITENANT_VERSION_KEY;
+import static
org.amdatu.tenant.adapter.TenantAdapterConstants.MULTITENANT_VERSION_VALUE;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
Copied:
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/adapter/TenantAdapter.java
(from r2035,
/trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/tenant/adaptor/TenantAdapter.java)
==============================================================================
---
/trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/tenant/adaptor/TenantAdapter.java
(original)
+++
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/adapter/TenantAdapter.java
Tue Jan 31 12:19:11 2012
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.tenant.adaptor;
+package org.amdatu.tenant.adapter;
import static org.amdatu.tenant.TenantConstants.NAME_KEY;
import static org.amdatu.tenant.TenantConstants.PID_KEY;
-import static
org.amdatu.tenant.adaptor.TenantAdaptorConstants.MULTITENANT_BUNDLE_ACTIVATOR_KEY;
+import static
org.amdatu.tenant.adapter.TenantAdapterConstants.MULTITENANT_BUNDLE_ACTIVATOR_KEY;
import java.util.Properties;
Copied:
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/adapter/TenantAdapterConstants.java
(from r2035,
/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-adapter/src/main/java/org/amdatu/tenant/adapter/TenantAdapterConstants.java
Tue Jan 31 12:19:11 2012
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.tenant.adaptor;
+package org.amdatu.tenant.adapter;
/**
*
* @author <a href="mailto:[email protected]";>Amdatu Project
Team</a>
*/
-public interface TenantAdaptorConstants {
+public interface TenantAdapterConstants {
public static final String MULTITENANT_BUNDLE_ACTIVATOR_KEY =
"X-MultiTenant-Bundle-Activator";
public static final String MULTITENANT_SCOPE_KEY = "X-MultiTenant-Scope";
Copied:
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/adapter/TenantAwareBundle.java
(from r2035,
/trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/tenant/adaptor/TenantAwareBundle.java)
==============================================================================
---
/trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/tenant/adaptor/TenantAwareBundle.java
(original)
+++
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/adapter/TenantAwareBundle.java
Tue Jan 31 12:19:11 2012
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.tenant.adaptor;
+package org.amdatu.tenant.adapter;
import java.io.IOException;
import java.io.InputStream;
Copied:
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/adapter/TenantAwareBundleContext.java
(from r2035,
/trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/tenant/adaptor/TenantAwareBundleContext.java)
==============================================================================
---
/trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/tenant/adaptor/TenantAwareBundleContext.java
(original)
+++
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/adapter/TenantAwareBundleContext.java
Tue Jan 31 12:19:11 2012
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.tenant.adaptor;
+package org.amdatu.tenant.adapter;
import java.io.File;
import java.io.IOException;
Modified: trunk/amdatu-core/useradmin/pom.xml
==============================================================================
--- trunk/amdatu-core/useradmin/pom.xml (original)
+++ trunk/amdatu-core/useradmin/pom.xml Tue Jan 31 12:19:11 2012
@@ -45,13 +45,13 @@
<instructions>
<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-Activator>org.amdatu.tenant.adapter.MultiTenantBundleActivator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.core.useradmin</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile;inline=org/ops4j/pax/useradmin/**</Embed-Dependency>
<Embed-Transitive>false</Embed-Transitive>
<Import-Package>
org.amdatu.tenant;version="[1.0,2)",
- org.amdatu.tenant.adaptor;version="[1.0,2)",
+ org.amdatu.tenant.adapter;version="[1.0,2)",
*
</Import-Package>
<Export-Package>
Modified: trunk/amdatu-core/useradminstore-prefs/pom.xml
==============================================================================
--- trunk/amdatu-core/useradminstore-prefs/pom.xml (original)
+++ trunk/amdatu-core/useradminstore-prefs/pom.xml Tue Jan 31 12:19:11 2012
@@ -45,13 +45,13 @@
<instructions>
<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-Activator>org.amdatu.tenant.adapter.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>
<Embed-Transitive>false</Embed-Transitive>
<Import-Package>
org.amdatu.tenant;version="[1.0,2)",
- org.amdatu.tenant.adaptor;version="[1.0,2)",
+ org.amdatu.tenant.adapter;version="[1.0,2)",
*
</Import-Package>
<Export-Package>
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 Tue Jan 31 12:19:11 2012
@@ -26,7 +26,7 @@
<artifactId>org.amdatu.kitchensink.demo.tenant.local</artifactId>
<packaging>bundle</packaging>
<name>Amdatu Kitchensink - Multi-Tenant Demo Local</name>
- <description>This bundle demonstrates the use of an adaptor to create tenant
specific services</description>
+ <description>This bundle demonstrates the use of an adapter to create tenant
specific services</description>
<build>
<plugins>
@@ -37,14 +37,14 @@
<instructions>
<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>
+
<Bundle-Activator>org.amdatu.tenant.adapter.MultiTenantBundleActivator</Bundle-Activator>
<Embed-Dependency>*;scope=compile;inline=true</Embed-Dependency>
<Export-Package>
org.amdatu.kitchensink.demo.tenant.local;version=1.0.0
</Export-Package>
<Import-Package>
org.amdatu.tenant;version="[1.0,2)",
- org.amdatu.tenant.adaptor;version="[1.0,2)",
+ org.amdatu.tenant.adapter;version="[1.0,2)",
*
</Import-Package>
</instructions>
Modified: trunk/amdatu-kitchensink/release-server/pom.xml
==============================================================================
--- trunk/amdatu-kitchensink/release-server/pom.xml (original)
+++ trunk/amdatu-kitchensink/release-server/pom.xml Tue Jan 31 12:19:11 2012
@@ -175,7 +175,7 @@
</dependency>
<dependency>
<groupId>org.amdatu.tenant</groupId>
- <artifactId>org.amdatu.tenant.adaptor</artifactId>
+ <artifactId>org.amdatu.tenant.adapter</artifactId>
<version>${org.amdatu.core.version}</version>
<scope>runtime</scope>
<type>bundle</type>
Modified:
trunk/amdatu-kitchensink/release-server/src/main/assembly/bin-component.xml
==============================================================================
--- trunk/amdatu-kitchensink/release-server/src/main/assembly/bin-component.xml
(original)
+++ trunk/amdatu-kitchensink/release-server/src/main/assembly/bin-component.xml
Tue Jan 31 12:19:11 2012
@@ -39,7 +39,7 @@
<include>org.apache.felix:org.apache.felix.metatype</include>
<include>org.apache.felix:org.apache.felix.log</include>
<include>org.amdatu.tenant:org.amdatu.tenant</include>
- <include>org.amdatu.tenant:org.amdatu.tenant.adaptor</include>
+ <include>org.amdatu.tenant:org.amdatu.tenant.adapter</include>
<include>org.amdatu.tenant:org.amdatu.tenant.factory</include>
<include>org.amdatu.core:org.amdatu.core.fileinstall.autoconf</include>
<include>org.amdatu.core:org.amdatu.core.deployment.tenantconf</include>
Modified: trunk/amdatu-release/pom.xml
==============================================================================
--- trunk/amdatu-release/pom.xml (original)
+++ trunk/amdatu-release/pom.xml Tue Jan 31 12:19:11 2012
@@ -210,7 +210,7 @@
</dependency>
<dependency>
<groupId>org.amdatu.tenant</groupId>
- <artifactId>org.amdatu.tenant.adaptor</artifactId>
+ <artifactId>org.amdatu.tenant.adapter</artifactId>
<version>${org.amdatu.core.version}</version>
<scope>runtime</scope>
<type>bundle</type>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
