Author: [email protected] Date: Wed Oct 26 14:16:56 2011 New Revision: 1654 Log: [AMDATUAUTH-110] Refactoring part 2
Added: trunk/amdatu-auth/test-performance/pom.xml trunk/amdatu-auth/test-performance/test-bundle/LICENSE trunk/amdatu-auth/test-performance/test-bundle/NOTICE trunk/amdatu-auth/test-performance/test-bundle/pom.xml trunk/amdatu-auth/test-performance/test-bundle/src/ trunk/amdatu-auth/test-performance/test-bundle/src/main/ trunk/amdatu-auth/test-performance/test-bundle/src/main/java/ trunk/amdatu-auth/test-performance/test-bundle/src/main/java/org/ trunk/amdatu-auth/test-performance/test-bundle/src/main/java/org/amdatu/ trunk/amdatu-auth/test-performance/test-bundle/src/main/java/org/amdatu/auth/ trunk/amdatu-auth/test-performance/test-bundle/src/main/java/org/amdatu/auth/test/ trunk/amdatu-auth/test-performance/test-bundle/src/main/java/org/amdatu/auth/test/performance/ trunk/amdatu-auth/test-performance/test-bundle/src/main/java/org/amdatu/auth/test/performance/osgi/ trunk/amdatu-auth/test-performance/test-bundle/src/main/java/org/amdatu/auth/test/performance/osgi/Activator.java trunk/amdatu-auth/test-performance/test-bundle/src/main/java/org/amdatu/auth/test/performance/service/ trunk/amdatu-auth/test-performance/test-bundle/src/main/java/org/amdatu/auth/test/performance/service/RESTPerformanceTest.java Modified: trunk/amdatu-auth/test-performance/test-execution/pom.xml Added: trunk/amdatu-auth/test-performance/pom.xml ============================================================================== --- (empty file) +++ trunk/amdatu-auth/test-performance/pom.xml Wed Oct 26 14:16:56 2011 @@ -0,0 +1,35 @@ +<?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.auth</groupId> + <artifactId>org.amdatu.auth</artifactId> + <version>0.2.1-SNAPSHOT</version> + </parent> + <artifactId>org.amdatu.auth.test.performance</artifactId> + <packaging>pom</packaging> + <name>Amdatu Auth - Performance Test</name> + <description>Root pom for Auth performance test</description> + + <modules> + + <module>test-execution</module> + + </modules> +</project> Added: trunk/amdatu-auth/test-performance/test-bundle/LICENSE ============================================================================== --- (empty file) +++ trunk/amdatu-auth/test-performance/test-bundle/LICENSE Wed Oct 26 14:16:56 2011 @@ -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-auth/test-performance/test-bundle/NOTICE ============================================================================== --- (empty file) +++ trunk/amdatu-auth/test-performance/test-bundle/NOTICE Wed Oct 26 14:16:56 2011 @@ -0,0 +1,29 @@ +Amdatu Auth - Performance Test bundle +Copyright 2010, 2011 The Amdatu Foundation + + +I. Included Software + +This product includes software developed by The Apache Software Foundation (http://www.apache.org/). +License: Apache Software License 2.0 (see http://www.apache.org/licenses/LICENSE-2.0.html). +- +This product includes JSON in JAVA, developed by JSON.org (http://www.json.org). +Copyright 2002 JSON.org +For more information, see http://www.json.org/ +License: JSON (see http://www.json.org/license) +- +This product includes Apache Wink developed by The Apache Software Foundation (http://www.apache.org/). +Copyright 2009-2010 The Apache Software Foundation +License: Apache Software License 2.0 (see http://www.apache.org/licenses/LICENSE-2.0.html). + + +II. Used Software + +This product uses software developed at The OSGi Alliance (http://www.osgi.org/). +Copyright (c) OSGi Alliance (2000, 2007). +License: Apache Software License 2.0 (see http://www.apache.org/licenses/LICENSE-2.0.html). + + +III. License Summary +This products is licensed under the Apache Software License 2.0, +see the LICENSE file included in this distribution. Added: trunk/amdatu-auth/test-performance/test-bundle/pom.xml ============================================================================== --- (empty file) +++ trunk/amdatu-auth/test-performance/test-bundle/pom.xml Wed Oct 26 14:16:56 2011 @@ -0,0 +1,89 @@ +<?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.auth</groupId> + <artifactId>org.amdatu.auth.test.performance</artifactId> + <version>0.2.1-SNAPSHOT</version> + </parent> + <artifactId>org.amdatu.auth.test.performance.bundle</artifactId> + <packaging>bundle</packaging> + <name>Amdatu Auth - Performance Test bundle</name> + + <properties> + <org.apache.wink.version>1.1.1-incubating</org.apache.wink.version> + <org.apache.felix.http.version>2.2.0</org.apache.felix.http.version> + + <amdatu.web.version>0.2.0</amdatu.web.version> + </properties> + + <dependencies> + <dependency> + <groupId>org.amdatu.web</groupId> + <artifactId>org.amdatu.web.httpcontext</artifactId> + <version>${amdatu.web.version}</version> + <scope>provided</scope> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.amdatu.web</groupId> + <artifactId>org.amdatu.web.jaxrs</artifactId> + <version>${amdatu.web.version}</version> + <scope>provided</scope> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + <version>20090211</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.libraries</groupId> + <artifactId>org.amdatu.libraries.utilities</artifactId> + <version>0.2.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.wink</groupId> + <artifactId>wink-assembly-aggregatejar-osgi</artifactId> + <version>${org.apache.wink.version}</version> + <scope>compile</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Bundle-Activator>org.amdatu.auth.test.performance.osgi.Activator</Bundle-Activator> + <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> + <Embed-Dependency>json,org.amdatu.libraries.utilities;scope=compile</Embed-Dependency> + <Import-Package> + * + </Import-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> +</project> Added: trunk/amdatu-auth/test-performance/test-bundle/src/main/java/org/amdatu/auth/test/performance/osgi/Activator.java ============================================================================== --- (empty file) +++ trunk/amdatu-auth/test-performance/test-bundle/src/main/java/org/amdatu/auth/test/performance/osgi/Activator.java Wed Oct 26 14:16:56 2011 @@ -0,0 +1,49 @@ +/* + * 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.auth.test.performance.osgi; + +import org.amdatu.libraries.utilities.osgi.ServiceDependentActivator; +import org.amdatu.auth.test.performance.service.RESTPerformanceTest; +import org.amdatu.web.httpcontext.ResourceProvider; +import org.amdatu.web.rest.jaxrs.JaxRsSpi; +import org.apache.felix.dm.DependencyManager; +import org.osgi.framework.BundleContext; +import org.osgi.service.log.LogService; + +/** + * This is the activator for the UserAdmin REST API bundle + * + * @author ivol + */ +public class Activator extends ServiceDependentActivator { + + @Override + protected Class<?>[] getRequiredServices() { + return new Class<?>[] { JaxRsSpi.class }; + } + + public void initWithDependencies(BundleContext context, DependencyManager manager) throws Exception { + // Create the users resource service and register it as REST service + manager.add(createComponent() + .setInterface(ResourceProvider.class.getName(), null) + .setImplementation(RESTPerformanceTest.class) + .add(createServiceDependency().setService(LogService.class).setRequired(true))); + } + + @Override + public void destroy(BundleContext bundleContext, DependencyManager dependencyManager) throws Exception { + } +} Added: trunk/amdatu-auth/test-performance/test-bundle/src/main/java/org/amdatu/auth/test/performance/service/RESTPerformanceTest.java ============================================================================== --- (empty file) +++ trunk/amdatu-auth/test-performance/test-bundle/src/main/java/org/amdatu/auth/test/performance/service/RESTPerformanceTest.java Wed Oct 26 14:16:56 2011 @@ -0,0 +1,58 @@ +/* + * 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.auth.test.performance.service; + +import java.net.URL; + +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.CacheControl; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; + +import org.amdatu.web.httpcontext.ResourceProvider; + +/** + * This bundle implements the /rest/performancetest REST interface + */ +@Path("performancetest") +public class RESTPerformanceTest implements ResourceProvider { + // Disable HTTP caching in this REST interface + private static CacheControl m_cacheControl; + static { + m_cacheControl = new CacheControl(); + m_cacheControl.setNoCache(true); + } + + // NB: each performance test bundle must implement a GET /rest/performancetest/status. This is used + // by the launcher to detect if the REST performance test bundle is up and running and so tests can + // be started. + @GET + @Produces({ MediaType.TEXT_PLAIN }) + @Path("status") + public Response status() { + return Response.ok("Auth performancetest service online").cacheControl(m_cacheControl).build(); + } + + public URL getResource(String name) { + return null; + } + + public String getResourceId() { + return "performancetest"; + } +} Modified: trunk/amdatu-auth/test-performance/test-execution/pom.xml ============================================================================== --- trunk/amdatu-auth/test-performance/test-execution/pom.xml (original) +++ trunk/amdatu-auth/test-performance/test-execution/pom.xml Wed Oct 26 14:16:56 2011 @@ -19,10 +19,10 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.amdatu.auth</groupId> - <artifactId>org.amdatu.auth</artifactId> + <artifactId>org.amdatu.auth.test.performance</artifactId> <version>0.2.1-SNAPSHOT</version> </parent> - <artifactId>org.amdatu.auth.test.performance</artifactId> + <artifactId>org.amdatu.auth.test.performance.execution</artifactId> <packaging>jar</packaging> <name>Amdatu Auth - Performance Test</name> <description>This bundle generates the Performance Test framework for the Auth project</description> @@ -45,37 +45,46 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.2</version> + <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> - <id>copy-perftest-jar</id> - <phase>process-resources</phase> + <id>create-release</id> + <phase>package</phase> <goals> - <goal>copy-dependencies</goal> + <goal>single</goal> </goals> <configuration> - <includeGroupIds>org.amdatu.test</includeGroupIds> - <includeArtifactIds>org.amdatu.test.performance</includeArtifactIds> - <outputDirectory>${project.build.directory}/assembly</outputDirectory> + <finalName>auth-performancetest</finalName> + <descriptors> + <descriptor>src/main/assembly/assembly.xml</descriptor> + </descriptors> </configuration> </execution> </executions> </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.3</version> <executions> <execution> - <id>create-release</id> - <phase>package</phase> + <id>copy</id> + <phase>process-resources</phase> <goals> - <goal>single</goal> + <goal>copy</goal> </goals> <configuration> - <descriptors> - <descriptor>src/main/assembly/assembly.xml</descriptor> - </descriptors> + <artifactItems> + <artifactItem> + <groupId>org.amdatu.test</groupId> + <artifactId>org.amdatu.test.performance</artifactId> + <version>${test.performance.version}</version> + <type>jar</type> + <overWrite>false</overWrite> + </artifactItem> + </artifactItems> + <outputDirectory>${project.build.directory}/assembly</outputDirectory> </configuration> </execution> </executions> _______________________________________________ Amdatu-commits mailing list [email protected] http://lists.amdatu.org/mailman/listinfo/amdatu-commits
