Author: [email protected] Date: Tue Jan 24 12:51:50 2012 New Revision: 1983
Log: Cleanups. Modified: trunk/amdatu-core/tenant-adaptor/pom.xml trunk/amdatu-core/tenant-factory/pom.xml trunk/amdatu-core/tenant-factory/src/main/java/org/amdatu/core/tenant/factory/TenantServiceFactory.java trunk/amdatu-core/tenant-factory/src/test/java/org/amdatu/core/tenant/factory/TenantServiceTest.java trunk/amdatu-core/tenant/pom.xml Modified: trunk/amdatu-core/tenant-adaptor/pom.xml ============================================================================== --- trunk/amdatu-core/tenant-adaptor/pom.xml (original) +++ trunk/amdatu-core/tenant-adaptor/pom.xml Tue Jan 24 12:51:50 2012 @@ -1,55 +1,47 @@ <?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. ---> +<!-- 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> + 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> + <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> + <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> Modified: trunk/amdatu-core/tenant-factory/pom.xml ============================================================================== --- trunk/amdatu-core/tenant-factory/pom.xml (original) +++ trunk/amdatu-core/tenant-factory/pom.xml Tue Jan 24 12:51:50 2012 @@ -1,52 +1,45 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright (c) 2010, 2011 The Amdatu Foundation +<!-- 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> - 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 + <dependencies> + <dependency> + <groupId>org.amdatu.core</groupId> + <artifactId>org.amdatu.core.tenant</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + </dependencies> - 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> - </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> + <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> Modified: trunk/amdatu-core/tenant-factory/src/main/java/org/amdatu/core/tenant/factory/TenantServiceFactory.java ============================================================================== --- trunk/amdatu-core/tenant-factory/src/main/java/org/amdatu/core/tenant/factory/TenantServiceFactory.java (original) +++ trunk/amdatu-core/tenant-factory/src/main/java/org/amdatu/core/tenant/factory/TenantServiceFactory.java Tue Jan 24 12:51:50 2012 @@ -1,3 +1,18 @@ +/* + * 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. + */ package org.amdatu.core.tenant.factory; import java.util.Dictionary; Modified: trunk/amdatu-core/tenant-factory/src/test/java/org/amdatu/core/tenant/factory/TenantServiceTest.java ============================================================================== --- trunk/amdatu-core/tenant-factory/src/test/java/org/amdatu/core/tenant/factory/TenantServiceTest.java (original) +++ trunk/amdatu-core/tenant-factory/src/test/java/org/amdatu/core/tenant/factory/TenantServiceTest.java Tue Jan 24 12:51:50 2012 @@ -19,14 +19,23 @@ import org.junit.Assert; import org.junit.Test; +/** + * Test cases for {@link TenantService}. + * + * @author <a href="mailto:[email protected]";>Amdatu Project Team</a> + */ public class TenantServiceTest { + /** + * Tests that the {@link Object#equals(Object)} method for {@link TenantService} only takes the "tenant.id" into consideration. + * See also AMDATU-260. + */ @Test - // AMDATU-260 public void testEquality() { TenantService t1 = new TenantService("t13245", "Kwik"); TenantService t2 = new TenantService("t13245", "Kwek"); Assert.assertEquals(t1, t2); + TenantService t3 = new TenantService("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 Tue Jan 24 12:51:50 2012 @@ -1,46 +1,38 @@ <?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. ---> +<!-- 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 API</name> - <description>This library bundle provides the Amdatu Tenant API</description> + 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 API</name> + <description>This library bundle provides the Amdatu Tenant API</description> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Export-Package> - org.amdatu.core.tenant;version=1.0.0 - </Export-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Export-Package> + org.amdatu.core.tenant;version=1.0.0 + </Export-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> </project> _______________________________________________ Amdatu-commits mailing list [email protected] http://lists.amdatu.org/mailman/listinfo/amdatu-commits
