Author: [email protected]
Date: Thu Jan 19 14:47:38 2012
New Revision: 1940
Log:
AMDATU-494 Split tenant artifact into seperate api, adaptor and factory
Added:
trunk/amdatu-core/tenant-adaptor/
trunk/amdatu-core/tenant-adaptor/LICENSE
trunk/amdatu-core/tenant-adaptor/NOTICE
trunk/amdatu-core/tenant-adaptor/pom.xml
- copied, changed from r1939, /trunk/amdatu-core/tenant/pom.xml
trunk/amdatu-core/tenant-adaptor/src/
trunk/amdatu-core/tenant-adaptor/src/main/
trunk/amdatu-core/tenant-adaptor/src/main/java/
trunk/amdatu-core/tenant-adaptor/src/main/java/org/
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/core/
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/core/tenant/
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/core/tenant/adaptor/
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/core/tenant/adaptor/MultiTenantBundleActivator.java
- copied, changed from r1939,
/trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/MultiTenantBundleActivator.java
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/core/tenant/adaptor/MultiTenantBundleInputStream.java
- copied, changed from r1939,
/trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/MultiTenantBundleInputStream.java
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/core/tenant/adaptor/TenantAdapter.java
- copied, changed from r1939,
/trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/adaptor/TenantAdapter.java
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/core/tenant/adaptor/TenantAwareBundle.java
- copied, changed from r1939,
/trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/adaptor/TenantAwareBundle.java
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/core/tenant/adaptor/TenantAwareBundleContext.java
- copied, changed from r1939,
/trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/adaptor/TenantAwareBundleContext.java
trunk/amdatu-core/tenant-factory/
trunk/amdatu-core/tenant-factory/LICENSE
trunk/amdatu-core/tenant-factory/NOTICE
trunk/amdatu-core/tenant-factory/pom.xml
- copied, changed from r1939, /trunk/amdatu-core/tenant/pom.xml
trunk/amdatu-core/tenant-factory/src/
trunk/amdatu-core/tenant-factory/src/main/
trunk/amdatu-core/tenant-factory/src/main/java/
trunk/amdatu-core/tenant-factory/src/main/java/org/
trunk/amdatu-core/tenant-factory/src/main/java/org/amdatu/
trunk/amdatu-core/tenant-factory/src/main/java/org/amdatu/core/
trunk/amdatu-core/tenant-factory/src/main/java/org/amdatu/core/tenant/
trunk/amdatu-core/tenant-factory/src/main/java/org/amdatu/core/tenant/factory/
trunk/amdatu-core/tenant-factory/src/main/java/org/amdatu/core/tenant/factory/TenantImpl.java
- copied, changed from r1939,
/trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/factory/TenantImpl.java
trunk/amdatu-core/tenant-factory/src/main/java/org/amdatu/core/tenant/factory/TenantServiceFactory.java
- copied, changed from r1939,
/trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/factory/TenantServiceFactory.java
trunk/amdatu-core/tenant-factory/src/main/java/org/amdatu/core/tenant/factory/osgi/
trunk/amdatu-core/tenant-factory/src/main/java/org/amdatu/core/tenant/factory/osgi/Activator.java
- copied, changed from r1939,
/trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/osgi/Activator.java
trunk/amdatu-core/tenant-factory/src/main/resources/
trunk/amdatu-core/tenant-factory/src/main/resources/OSGI-INF/
trunk/amdatu-core/tenant-factory/src/main/resources/OSGI-INF/metatype/
trunk/amdatu-core/tenant-factory/src/main/resources/OSGI-INF/metatype/metatype.xml
- copied, changed from r1939,
/trunk/amdatu-core/tenant/src/main/resources/OSGI-INF/metatype/metatype.xml
trunk/amdatu-core/tenant-factory/src/test/
trunk/amdatu-core/tenant-factory/src/test/java/
trunk/amdatu-core/tenant-factory/src/test/java/org/
trunk/amdatu-core/tenant-factory/src/test/java/org/amdatu/
trunk/amdatu-core/tenant-factory/src/test/java/org/amdatu/test/
trunk/amdatu-core/tenant-factory/src/test/java/org/amdatu/test/unit/
trunk/amdatu-core/tenant-factory/src/test/java/org/amdatu/test/unit/TenantEntityTest.java
- copied, changed from r1939,
/trunk/amdatu-core/tenant/src/test/java/org/amdatu/test/unit/TenantEntityTest.java
Modified:
trunk/amdatu-core/pom.xml
trunk/amdatu-core/tenant/pom.xml
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/MultiTenantBundleActivator.java
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/MultiTenantBundleInputStream.java
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/adaptor/
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/factory/
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/osgi/
trunk/amdatu-core/tenant/src/main/resources/
trunk/amdatu-core/tenant/src/test/
Modified: trunk/amdatu-core/pom.xml
==============================================================================
--- trunk/amdatu-core/pom.xml (original)
+++ trunk/amdatu-core/pom.xml Thu Jan 19 14:47:38 2012
@@ -90,6 +90,8 @@
<module>log-console</module>
<module>log-forwarder-jdk</module>
<module>tenant</module>
+ <module>tenant-adaptor</module>
+ <module>tenant-factory</module>
<module>useradmincache</module>
<module>useradminstore-fs</module>
<module>itest</module>
Added: trunk/amdatu-core/tenant-adaptor/LICENSE
==============================================================================
--- (empty file)
+++ trunk/amdatu-core/tenant-adaptor/LICENSE Thu Jan 19 14:47:38 2012
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
Added: trunk/amdatu-core/tenant-adaptor/NOTICE
==============================================================================
--- (empty file)
+++ trunk/amdatu-core/tenant-adaptor/NOTICE Thu Jan 19 14:47:38 2012
@@ -0,0 +1,25 @@
+Amdatu Core Tenant
+Copyright 2010, 2011 The Amdatu Foundation
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2007).
+Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2007).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
Copied: trunk/amdatu-core/tenant-adaptor/pom.xml (from r1939,
/trunk/amdatu-core/tenant/pom.xml)
==============================================================================
--- /trunk/amdatu-core/tenant/pom.xml (original)
+++ trunk/amdatu-core/tenant-adaptor/pom.xml Thu Jan 19 14:47:38 2012
@@ -1,57 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.verning permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core</artifactId>
- <version>0.3.0-SNAPSHOT</version>
- </parent>
- <artifactId>org.amdatu.core.tenant</artifactId>
- <packaging>bundle</packaging>
- <name>Amdatu Core - Tenant Service</name>
- <description>This bundle provides a tenant management service with tenant
CRUD operations</description>
-
- <dependencies>
- <dependency>
- <groupId>org.amdatu.libraries</groupId>
- <artifactId>org.amdatu.libraries.utilities</artifactId>
- <version>${org.amdatu.libraries.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
-
<Bundle-Activator>org.amdatu.core.tenant.osgi.Activator</Bundle-Activator>
- <Bundle-SymbolicName>org.amdatu.core.tenant</Bundle-SymbolicName>
- <Export-Package>
- org.amdatu.core.tenant;version=1.0.0
- </Export-Package>
- </instructions>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.verning permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core</artifactId>
+ <version>0.3.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.amdatu.core.tenant.adaptor</artifactId>
+ <packaging>bundle</packaging>
+ <name>Amdatu Core - Tenant Adaptor</name>
+ <description>This library bundle provides (base) classes for Tenant
adaptors</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.tenant</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ org.amdatu.core.tenant.adaptor;version=1.0.0
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+</project>
Copied:
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/core/tenant/adaptor/MultiTenantBundleActivator.java
(from r1939,
/trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/MultiTenantBundleActivator.java)
==============================================================================
---
/trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/MultiTenantBundleActivator.java
(original)
+++
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/core/tenant/adaptor/MultiTenantBundleActivator.java
Thu Jan 19 14:47:38 2012
@@ -13,12 +13,12 @@
* 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;
import java.util.Properties;
-import org.amdatu.core.tenant.adaptor.TenantAdapter;
-import org.amdatu.core.tenant.adaptor.TenantAwareBundleContext;
+import org.amdatu.core.tenant.Tenant;
+import org.amdatu.core.tenant.TenantConstants;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleActivator;
Copied:
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/core/tenant/adaptor/MultiTenantBundleInputStream.java
(from r1939,
/trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/MultiTenantBundleInputStream.java)
==============================================================================
---
/trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/MultiTenantBundleInputStream.java
(original)
+++
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/core/tenant/adaptor/MultiTenantBundleInputStream.java
Thu Jan 19 14:47:38 2012
@@ -13,7 +13,7 @@
* 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;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
@@ -27,6 +27,7 @@
import java.util.jar.JarOutputStream;
import java.util.jar.Manifest;
+import org.amdatu.core.tenant.TenantConstants;
import org.osgi.framework.Constants;
/**
Copied:
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/core/tenant/adaptor/TenantAdapter.java
(from r1939,
/trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/adaptor/TenantAdapter.java)
==============================================================================
Copied:
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/core/tenant/adaptor/TenantAwareBundle.java
(from r1939,
/trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/adaptor/TenantAwareBundle.java)
==============================================================================
Copied:
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/core/tenant/adaptor/TenantAwareBundleContext.java
(from r1939,
/trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/adaptor/TenantAwareBundleContext.java)
==============================================================================
---
/trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/adaptor/TenantAwareBundleContext.java
(original)
+++
trunk/amdatu-core/tenant-adaptor/src/main/java/org/amdatu/core/tenant/adaptor/TenantAwareBundleContext.java
Thu Jan 19 14:47:38 2012
@@ -25,7 +25,6 @@
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
-import org.amdatu.core.tenant.MultiTenantBundleInputStream;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
Added: trunk/amdatu-core/tenant-factory/LICENSE
==============================================================================
--- (empty file)
+++ trunk/amdatu-core/tenant-factory/LICENSE Thu Jan 19 14:47:38 2012
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
Added: trunk/amdatu-core/tenant-factory/NOTICE
==============================================================================
--- (empty file)
+++ trunk/amdatu-core/tenant-factory/NOTICE Thu Jan 19 14:47:38 2012
@@ -0,0 +1,16 @@
+Amdatu Core Tenant Factory
+Copyright 2010, 2011 The Amdatu Foundation
+
+I. Included Software
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2007).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
Copied: trunk/amdatu-core/tenant-factory/pom.xml (from r1939,
/trunk/amdatu-core/tenant/pom.xml)
==============================================================================
--- /trunk/amdatu-core/tenant/pom.xml (original)
+++ trunk/amdatu-core/tenant-factory/pom.xml Thu Jan 19 14:47:38 2012
@@ -1,57 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.verning permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core</artifactId>
- <version>0.3.0-SNAPSHOT</version>
- </parent>
- <artifactId>org.amdatu.core.tenant</artifactId>
- <packaging>bundle</packaging>
- <name>Amdatu Core - Tenant Service</name>
- <description>This bundle provides a tenant management service with tenant
CRUD operations</description>
-
- <dependencies>
- <dependency>
- <groupId>org.amdatu.libraries</groupId>
- <artifactId>org.amdatu.libraries.utilities</artifactId>
- <version>${org.amdatu.libraries.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
-
<Bundle-Activator>org.amdatu.core.tenant.osgi.Activator</Bundle-Activator>
- <Bundle-SymbolicName>org.amdatu.core.tenant</Bundle-SymbolicName>
- <Export-Package>
- org.amdatu.core.tenant;version=1.0.0
- </Export-Package>
- </instructions>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.verning permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core</artifactId>
+ <version>0.3.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.amdatu.core.tenant.factory</artifactId>
+ <packaging>bundle</packaging>
+ <name>Amdatu Core - Tenant Factory</name>
+ <description>This bundle provides ManagedServiceFactory for Tenant
services</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.tenant</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <!--
+ <dependency>
+ <groupId>org.amdatu.libraries</groupId>
+ <artifactId>org.amdatu.libraries.utilities</artifactId>
+ <version>${org.amdatu.libraries.version}</version>
+ <scope>test</scope>
+ </dependency>
+ -->
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+
<Bundle-Activator>org.amdatu.core.tenant.factory.osgi.Activator</Bundle-Activator>
+ </instructions>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+</project>
Copied:
trunk/amdatu-core/tenant-factory/src/main/java/org/amdatu/core/tenant/factory/TenantImpl.java
(from r1939,
/trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/factory/TenantImpl.java)
==============================================================================
Copied:
trunk/amdatu-core/tenant-factory/src/main/java/org/amdatu/core/tenant/factory/TenantServiceFactory.java
(from r1939,
/trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/factory/TenantServiceFactory.java)
==============================================================================
Copied:
trunk/amdatu-core/tenant-factory/src/main/java/org/amdatu/core/tenant/factory/osgi/Activator.java
(from r1939,
/trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/osgi/Activator.java)
==============================================================================
---
/trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/osgi/Activator.java
(original)
+++
trunk/amdatu-core/tenant-factory/src/main/java/org/amdatu/core/tenant/factory/osgi/Activator.java
Thu Jan 19 14:47:38 2012
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.core.tenant.osgi;
+package org.amdatu.core.tenant.factory.osgi;
import java.util.Dictionary;
import java.util.Hashtable;
Copied:
trunk/amdatu-core/tenant-factory/src/main/resources/OSGI-INF/metatype/metatype.xml
(from r1939,
/trunk/amdatu-core/tenant/src/main/resources/OSGI-INF/metatype/metatype.xml)
==============================================================================
Copied:
trunk/amdatu-core/tenant-factory/src/test/java/org/amdatu/test/unit/TenantEntityTest.java
(from r1939,
/trunk/amdatu-core/tenant/src/test/java/org/amdatu/test/unit/TenantEntityTest.java)
==============================================================================
---
/trunk/amdatu-core/tenant/src/test/java/org/amdatu/test/unit/TenantEntityTest.java
(original)
+++
trunk/amdatu-core/tenant-factory/src/test/java/org/amdatu/test/unit/TenantEntityTest.java
Thu Jan 19 14:47:38 2012
@@ -13,21 +13,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.test.unit;
-
+package org.amdatu.test.unit;
+
import org.amdatu.core.tenant.factory.TenantImpl;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class TenantEntityTest {
-
- @Test
- // AMDATU-260
- public void testEquality() {
- TenantImpl t1 = new TenantImpl("t13245", "Kwik");
- TenantImpl t2 = new TenantImpl("t13245", "Kwek");
- Assert.assertEquals(t1, t2);
- TenantImpl t3 = new TenantImpl("t23245", "Kwek");
- Assert.assertNotSame(t2, t3);
- }
-}
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TenantEntityTest {
+
+ @Test
+ // AMDATU-260
+ public void testEquality() {
+ TenantImpl t1 = new TenantImpl("t13245", "Kwik");
+ TenantImpl t2 = new TenantImpl("t13245", "Kwek");
+ Assert.assertEquals(t1, t2);
+ TenantImpl t3 = new TenantImpl("t23245", "Kwek");
+ Assert.assertNotSame(t2, t3);
+ }
+}
Modified: trunk/amdatu-core/tenant/pom.xml
==============================================================================
--- trunk/amdatu-core/tenant/pom.xml (original)
+++ trunk/amdatu-core/tenant/pom.xml Thu Jan 19 14:47:38 2012
@@ -15,7 +15,8 @@
limitations under the License.verning permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.amdatu.core</groupId>
@@ -24,18 +25,9 @@
</parent>
<artifactId>org.amdatu.core.tenant</artifactId>
<packaging>bundle</packaging>
- <name>Amdatu Core - Tenant Service</name>
- <description>This bundle provides a tenant management service with tenant
CRUD operations</description>
+ <name>Amdatu Core - Tenant API</name>
+ <description>This library bundle provides the Amdatu Tenant API</description>
- <dependencies>
- <dependency>
- <groupId>org.amdatu.libraries</groupId>
- <artifactId>org.amdatu.libraries.utilities</artifactId>
- <version>${org.amdatu.libraries.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
<build>
<plugins>
<plugin>
@@ -43,15 +35,13 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.core.tenant.osgi.Activator</Bundle-Activator>
- <Bundle-SymbolicName>org.amdatu.core.tenant</Bundle-SymbolicName>
<Export-Package>
org.amdatu.core.tenant;version=1.0.0
</Export-Package>
</instructions>
</configuration>
</plugin>
-
+
</plugins>
- </build>
+ </build>
</project>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
