Author: [email protected]
Date: Tue Jun 12 15:29:22 2012
New Revision: 2478
Log:
Added 0.2.4 release
Added:
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/LICENSE
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/NOTICE
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/pom.xml
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/assembly/
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/assembly/bin-component.xml
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/assembly/bin-release.xml
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/resources/
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/resources/bin/
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/resources/bin/run.sh
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/resources/bin/startup.bat
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/resources/conf/
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/resources/conf/amdatu-platform.properties
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/resources/config/
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/resources/config/org.amdatu.core.config.templates.cfg
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/resources/config/org.amdatu.core.loghandler.cfg
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/resources/config/org.amdatu.core.tenant.cfg
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/resources/config/org.apache.felix.http.cfg
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/resources/licenses/
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/resources/licenses/apache-license-2.0.txt
Modified:
trunk/amdatu-performance-test/test-bundle-cassandra/pom.xml
trunk/amdatu-performance-test/test-bundle-cassandra/src/main/java/org/amdatu/test/performance/bundle/cassandra/osgi/Activator.java
trunk/amdatu-performance-test/test-execution/pom.xml
trunk/amdatu-performance-test/test-releases/cassandra-0.2.3/pom.xml
trunk/amdatu-performance-test/test-releases/cassandra-0.2.3/src/main/assembly/bin-component.xml
trunk/amdatu-performance-test/test-releases/pom.xml
Modified: trunk/amdatu-performance-test/test-bundle-cassandra/pom.xml
==============================================================================
--- trunk/amdatu-performance-test/test-bundle-cassandra/pom.xml (original)
+++ trunk/amdatu-performance-test/test-bundle-cassandra/pom.xml Tue Jun 12
15:29:22 2012
@@ -29,8 +29,8 @@
<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>
- <org.amdatu.web.version>1.0.0-RC1</org.amdatu.web.version>
- <org.amdatu.cassandra.version>0.3.0-SNAPSHOT</org.amdatu.cassandra.version>
+ <org.amdatu.web.version>0.2.1</org.amdatu.web.version>
+ <org.amdatu.cassandra.version>0.2.4-RC1</org.amdatu.cassandra.version>
</properties>
<dependencies>
@@ -117,8 +117,8 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.cassandra.test.performance.osgi.Activator</Bundle-Activator>
-
<Bundle-SymbolicName>org.amdatu.cassandra.test.performance-bundle</Bundle-SymbolicName>
+
<Bundle-Activator>org.amdatu.test.performance.bundle.cassandra.osgi.Activator</Bundle-Activator>
+
<Bundle-SymbolicName>org.amdatu.test.performance.bundle.cassandra</Bundle-SymbolicName>
<Embed-Dependency>json,org.amdatu.libraries.utilities;scope=compile</Embed-Dependency>
<Import-Package>
org.amdatu.cassandra.application;version="[1.0,2.0)",
@@ -126,6 +126,7 @@
org.amdatu.cassandra.persistencemanager.hector;version="[1.0,2.0)",
*
</Import-Package>
+ <Export-Package></Export-Package>
</instructions>
</configuration>
</plugin>
Modified:
trunk/amdatu-performance-test/test-bundle-cassandra/src/main/java/org/amdatu/test/performance/bundle/cassandra/osgi/Activator.java
==============================================================================
---
trunk/amdatu-performance-test/test-bundle-cassandra/src/main/java/org/amdatu/test/performance/bundle/cassandra/osgi/Activator.java
(original)
+++
trunk/amdatu-performance-test/test-bundle-cassandra/src/main/java/org/amdatu/test/performance/bundle/cassandra/osgi/Activator.java
Tue Jun 12 15:29:22 2012
@@ -16,9 +16,9 @@
package org.amdatu.test.performance.bundle.cassandra.osgi;
import org.amdatu.cassandra.client.CassandraClientService;
-import org.amdatu.cassandra.client.TenantKeyspaceMapper;
import org.amdatu.cassandra.listener.ColumnFamilyAvailable;
import org.amdatu.cassandra.listener.ColumnFamilyProvider;
+import org.amdatu.cassandra.persistencemanager.CassandraPersistenceManager;
import
org.amdatu.cassandra.persistencemanager.hector.HectorCassandraPersistenceManager;
import org.amdatu.libraries.utilities.osgi.ServiceDependentActivator;
import
org.amdatu.test.performance.bundle.cassandra.service.RESTPerformanceTest;
@@ -51,7 +51,7 @@
// Create the users resource service and register it as REST service
String keyspaceFilter =
- "(" + TenantKeyspaceMapper.KEYSPACE_AWARE_KEY + "=" +
TestColumnFamilyProvider.KEYSPACE + ")";
+ "(" + CassandraPersistenceManager.KEYSPACE_AWARE_KEY + "=" +
TestColumnFamilyProvider.KEYSPACE + ")";
String cfFilter1 = "(" + ColumnFamilyAvailable.FILTER_NAME + "=" +
TestColumnFamilyProvider.SUPER_CF + ")";
String cfFilter2 = "(" + ColumnFamilyAvailable.FILTER_NAME + "=" +
TestColumnFamilyProvider.STANDARD_CF + ")";
String cfFilter3 = "(" + ColumnFamilyAvailable.FILTER_NAME + "=" +
TestColumnFamilyProvider.ROWKEY_CF + ")";
Modified: trunk/amdatu-performance-test/test-execution/pom.xml
==============================================================================
--- trunk/amdatu-performance-test/test-execution/pom.xml (original)
+++ trunk/amdatu-performance-test/test-execution/pom.xml Tue Jun 12
15:29:22 2012
@@ -29,7 +29,7 @@
<properties>
<test.version.x>0.2.3</test.version.x>
- <test.version.y>0.3.0</test.version.y>
+ <test.version.y>0.2.4</test.version.y>
</properties>
<dependencies>
Modified: trunk/amdatu-performance-test/test-releases/cassandra-0.2.3/pom.xml
==============================================================================
--- trunk/amdatu-performance-test/test-releases/cassandra-0.2.3/pom.xml
(original)
+++ trunk/amdatu-performance-test/test-releases/cassandra-0.2.3/pom.xml Tue Jun
12 15:29:22 2012
@@ -42,9 +42,9 @@
<type>zip</type>
</dependency>
<dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.test.performance.bundle</artifactId>
- <version>${current.version}</version>
+ <groupId>org.amdatu</groupId>
+ <artifactId>org.amdatu.test.performance.bundle.cassandra</artifactId>
+ <version>${project.version}</version>
<scope>compile</scope>
<type>bundle</type>
</dependency>
Modified:
trunk/amdatu-performance-test/test-releases/cassandra-0.2.3/src/main/assembly/bin-component.xml
==============================================================================
---
trunk/amdatu-performance-test/test-releases/cassandra-0.2.3/src/main/assembly/bin-component.xml
(original)
+++
trunk/amdatu-performance-test/test-releases/cassandra-0.2.3/src/main/assembly/bin-component.xml
Tue Jun 12 15:29:22 2012
@@ -12,7 +12,7 @@
<dependencySet>
<outputDirectory>deploy</outputDirectory>
<includes>
-
<include>org.amdatu.cassandra:org.amdatu.cassandra.test.performance.bundle</include>
+
<include>org.amdatu:org.amdatu.test.performance.bundle.cassandra</include>
</includes>
<unpack>false</unpack>
<useTransitiveDependencies>false</useTransitiveDependencies>
Added: trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/LICENSE
==============================================================================
--- (empty file)
+++ trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/LICENSE Tue Jun
12 15:29:22 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-performance-test/test-releases/cassandra-0.2.4/NOTICE
==============================================================================
--- (empty file)
+++ trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/NOTICE Tue Jun
12 15:29:22 2012
@@ -0,0 +1,19 @@
+Amdatu Cassandra - Performance Test Release 0.2.4
+Copyright 2010, 2011 The Amdatu Foundation
+
+I. Included Software
+
+This product includes software developed at
+The Amdatu Foundation (http://www.amdatu.org/).
+Copyright 2010, 2011 The Amdatu Foundation
+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
Added: trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/pom.xml
==============================================================================
--- (empty file)
+++ trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/pom.xml Tue Jun
12 15:29:22 2012
@@ -0,0 +1,91 @@
+<?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</groupId>
+ <artifactId>org.amdatu.test.performance.releases</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.amdatu.cassandra.test.performance.release-0.2.4</artifactId>
+ <name>Amdatu Performance Test - Test Release Cassandra -
${current.version}</name>
+ <packaging>jar</packaging>
+
+ <properties>
+ <!-- Release version is the final release version (i.e 0.3.0), current
+ version is the actual version (i.e. 0.3.0-SNAPSHOT or 0.3.0-RC1) -->
+ <release.version>0.2.4</release.version>
+ <current.version>0.2.4-RC1</current.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.release.demo</artifactId>
+ <version>${current.version}</version>
+ <scope>compile</scope>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu</groupId>
+ <artifactId>org.amdatu.test.performance.bundle.cassandra</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ <type>bundle</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <defaultGoal>package</defaultGoal>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2.1</version>
+ <configuration>
+ <finalName>cassandra-${release.version}</finalName>
+ <appendAssemblyId>true</appendAssemblyId>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-release</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/main/assembly/bin-release.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </project>
\ No newline at end of file
Added:
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/assembly/bin-component.xml
==============================================================================
--- (empty file)
+++
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/assembly/bin-component.xml
Tue Jun 12 15:29:22 2012
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2
http://maven.apache.org/xsd/component-1.1.2.xsd";>
+ <dependencySets>
+ <dependencySet>
+ <includes>
+
<include>org.amdatu.cassandra:org.amdatu.cassandra.release.demo</include>
+ </includes>
+ <unpack>true</unpack>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>deploy</outputDirectory>
+ <includes>
+
<include>org.amdatu:org.amdatu.test.performance.bundle.cassandra</include>
+ </includes>
+ <unpack>false</unpack>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ </dependencySet>
+ </dependencySets>
+</component>
\ No newline at end of file
Added:
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/assembly/bin-release.xml
==============================================================================
--- (empty file)
+++
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/assembly/bin-release.xml
Tue Jun 12 15:29:22 2012
@@ -0,0 +1,29 @@
+<?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.
+-->
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd";>
+ <id>bin</id>
+ <formats>
+ <format>zip</format>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <componentDescriptors>
+
<componentDescriptor>src/main/assembly/bin-component.xml</componentDescriptor>
+ </componentDescriptors>
+</assembly>
\ No newline at end of file
Added:
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/resources/bin/run.sh
==============================================================================
--- (empty file)
+++
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/resources/bin/run.sh
Tue Jun 12 15:29:22 2012
@@ -0,0 +1,31 @@
+# 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.
+
+#!/bin/bash
+
+# Open a debug port
+JAVA_OPTS="-Xdebug
-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n"
+
+# Set memory options
+JAVA_OPTS="$JAVA_OPTS -Xms256m -Xmx1024m -XX:MaxPermSize=256m"
+
+# Felix property file
+JAVA_OPTS="$JAVA_OPTS
-Dfelix.config.properties=file:conf/amdatu-platform.properties"
+
+# Set encoding to UTF-8
+JAVA_OPTS="$JAVA_OPTS -Dfile.encoding=utf-8"
+
+# Run the platform...
+java $JAVA_OPTS -jar
lib/org.apache.felix.main-${org.apache.felix.main.version}.jar
Added:
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/resources/bin/startup.bat
==============================================================================
--- (empty file)
+++
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/resources/bin/startup.bat
Tue Jun 12 15:29:22 2012
@@ -0,0 +1,34 @@
+@REM Copyright (c) 2010, 2011 The Amdatu Foundation
+@REM
+@REM Licensed under the Apache License, Version 2.0 (the "License");
+@REM you may not use this file except in compliance with the License.
+@REM You may obtain a copy of the License at
+@REM
+@REM http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing, software
+@REM distributed under the License is distributed on an "AS IS" BASIS,
+@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@REM See the License for the specific language governing permissions and
+@REM limitations under the License.verning permissions and limitations
+@REM under the License.
+
+@echo off
+
+rem Open a debug port
+set JAVA_OPTS=-Xdebug
-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n
+
+rem Set memory options
+set JAVA_OPTS=%JAVA_OPTS% -Xms256m -Xmx1024m -XX:MaxPermSize=256m
+
+rem Felix property file
+set JAVA_OPTS=%JAVA_OPTS%
-Dfelix.config.properties=file:conf/amdatu-platform.properties
+
+rem Set encoding to UTF-8
+set JAVA_OPTS=%JAVA_OPTS% -Dfile.encoding=utf-8
+
+echo Starting Amdatu server
+echo JAVA_OPTS=%JAVA_OPTS%
+
+java %JAVA_OPTS% -jar
lib/org.apache.felix.main-${org.apache.felix.main.version}.jar
+
Added:
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/resources/conf/amdatu-platform.properties
==============================================================================
--- (empty file)
+++
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/resources/conf/amdatu-platform.properties
Tue Jun 12 15:29:22 2012
@@ -0,0 +1,120 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
+#
+# Framework config properties.
+#
+
+# To override the packages the framework exports by default from the
+# class path, set this variable.
+#org.osgi.framework.system.packages=
+
+# To append packages to the default set of exported system packages,
+# set this value.
+# Unfortunately, Cassandra uses a cliffc lib which contains a class
'org.cliffc.high_scale_lib.NonBlockingHashMap'
+# This class imports the com.sun package and so it must be exposed here.
+org.osgi.framework.system.packages.extra=sun.misc,com.sun.management
+
+# The following property makes specified packages from the class path
+# available to all bundles. You should avoid using this property.
+#org.osgi.framework.bootdelegation=sun.*,com.sun.*
+
+# Felix tries to guess when to implicitly boot delegate in certain
+# situations to ease integration without outside code. This feature
+# is enabled by default, uncomment the following line to disable it.
+#felix.bootdelegation.implicit=false
+
+# The following property explicitly specifies the location of the bundle
+# cache, which defaults to "felix-cache" in the current working directory.
+# If this value is not absolute, then the felix.cache.rootdir controls
+# how the absolute location is calculated. (See next property)
+org.osgi.framework.storage=felix-deploy
+
+# The following property is used to convert a relative bundle cache
+# location into an absolute one by specifying the root to prepend to
+# the relative cache path. The default for this property is the
+# current working directory.
+felix.cache.rootdir=work/cache
+
+# The following property controls whether the bundle cache is flushed
+# the first time the framework is initialized. Possible values are
+# "none" and "onFirstInit"; the default is "none".
+#org.osgi.framework.storage.clean=onFirstInit
+
+# The following property determines which actions are performed when
+# processing the auto-deploy directory. It is a comma-delimited list of
+# the following values: 'install', 'start', 'update', and 'uninstall'.
+# An undefined or blank value is equivalent to disabling auto-deploy
+# processing.
+#felix.auto.deploy.action=install,start,update,uninstall
+
+# The following property specifies the directory to use as the bundle
+# auto-deploy directory; the default is 'bundle' in the working directory.
+#felix.auto.deploy.dir=lib
+
+# The following property is a space-delimited list of bundle URLs
+# to install when the framework starts. The ending numerical component
+# is the target start level. Any number of these properties may be
+# specified for different start levels.
+#felix.auto.install.5=
+
+# The following property is a space-delimited list of bundle URLs
+# to install and start when the framework starts. The ending numerical
+# component is the target start level. Any number of these properties
+# may be specified for different start levels.
+felix.auto.start.1= \
+
reference:file:lib/org.osgi.compendium-${org.osgi.version}.jar \
+
reference:file:lib/org.apache.felix.configadmin-${org.apache.felix.configadmin.version}.jar
\
+
reference:file:lib/org.apache.felix.dependencymanager-${org.apache.felix.dependencymanager.version}.jar
\
+
reference:file:lib/org.apache.felix.dependencymanager.shell-${org.apache.felix.dependencymanager.version}.jar
\
+
reference:file:lib/org.apache.felix.eventadmin-${org.apache.felix.eventadmin.version}.jar
\
+
reference:file:lib/org.apache.felix.fileinstall-${org.apache.felix.file.install.version}.jar
\
+
reference:file:lib/org.apache.felix.log-${org.apache.felix.log.version}.jar \
+
reference:file:lib/org.apache.felix.metatype-${org.apache.felix.metatype.version}.jar
\
+
reference:file:lib/org.apache.felix.shell.tui-${org.apache.felix.shell.tui.version}.jar
\
+
reference:file:lib/org.apache.felix.shell-${org.apache.felix.shell.version}.jar
\
+
reference:file:lib/org.apache.felix.webconsole-${org.apache.felix.webconsole.version}.jar
\
+
reference:file:lib/org.apache.felix.http.jetty-${org.apache.felix.http.version}.jar
\
+
reference:file:lib/org.apache.felix.scr-${org.apache.felix.scr.version}.jar \
+
reference:file:lib/org.apache.felix.prefs-${org.apache.felix.prefs.version}.jar
\
+
reference:file:lib/pax-useradmin-service-${pax.useradmin.version}.jar
+
+# Sets the initial start level of the framework upon startup.
+#org.osgi.framework.startlevel.beginning=1
+
+# Sets the start level of newly installed bundles.
+#felix.startlevel.bundle=1
+
+# Felix installs a stream and content handler factories by default,
+# uncomment the following line to not install them.
+#felix.service.urlhandlers=false
+
+# The launcher registers a shutdown hook to cleanly stop the framework
+# by default, uncomment the following line to disable it.
+#felix.shutdown.hook=false
+
+# Config of config admin
+felix.cm.dir=${maven.dollar}{user.dir}/work/configadmin
+
+# Config of file install
+felix.fileinstall.poll=3000
+felix.fileinstall.dir=deploy
+felix.fileinstall.debug=1
+felix.fileinstall.bundles.new.start=true
+felix.fileinstall.filter=.*
+felix.fileinstall.tmpdir=work/fileinstall
+felix.fileinstall.disableConfigSave=true
\ No newline at end of file
Added:
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/resources/config/org.amdatu.core.config.templates.cfg
==============================================================================
--- (empty file)
+++
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/resources/config/org.amdatu.core.config.templates.cfg
Tue Jun 12 15:29:22 2012
@@ -0,0 +1,3 @@
+# The work directory in which temporary configuration files are stored
+# Note that this directory becomes a subdirectory of /target/work
+workdir=config-template-manager
\ No newline at end of file
Added:
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/resources/config/org.amdatu.core.loghandler.cfg
==============================================================================
--- (empty file)
+++
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/resources/config/org.amdatu.core.loghandler.cfg
Tue Jun 12 15:29:22 2012
@@ -0,0 +1,5 @@
+# This settings indicates the loglevels of messages that will be printed
+# to the console. Can be DEBUG, INFO, WARNING or ERROR. For example if "INFO"
+# is defined, only log messages will be printed in the console which have a
+# loglevel of INFO or higher (WARNING or ERROR).
+console.mininum.loglevel=${amdatu.log.level}
\ No newline at end of file
Added:
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/resources/config/org.amdatu.core.tenant.cfg
==============================================================================
--- (empty file)
+++
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/resources/config/org.amdatu.core.tenant.cfg
Tue Jun 12 15:29:22 2012
@@ -0,0 +1,4 @@
+# Default Tenants
+tenant1.id=Default
+tenant1.name=Default tenant
+tenant1.properties.hostname=${amdatu.http.hostname}
Added:
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/resources/config/org.apache.felix.http.cfg
==============================================================================
--- (empty file)
+++
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/resources/config/org.apache.felix.http.cfg
Tue Jun 12 15:29:22 2012
@@ -0,0 +1,6 @@
+# Skype runs on port 80, Oracle db on 8080. Therefore use this 'arbitrary' port
+# Provides properties for the HTTP service (Felix HTTP Bundle or Pax Web)
+org.osgi.service.http.port=${amdatu.http.port}
+org.osgi.service.http.port.secure=${amdatu.https.port}
+org.apache.felix.http.debug=true
+org.apache.felix.log.storeDebug=true
Added:
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/resources/licenses/apache-license-2.0.txt
==============================================================================
--- (empty file)
+++
trunk/amdatu-performance-test/test-releases/cassandra-0.2.4/src/main/resources/licenses/apache-license-2.0.txt
Tue Jun 12 15:29:22 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.
Modified: trunk/amdatu-performance-test/test-releases/pom.xml
==============================================================================
--- trunk/amdatu-performance-test/test-releases/pom.xml (original)
+++ trunk/amdatu-performance-test/test-releases/pom.xml Tue Jun 12 15:29:22 2012
@@ -33,6 +33,7 @@
<module>opensocial-0.2.1</module>
<module>opensocial-0.3.0</module>
<module>cassandra-0.2.3</module>
+ <module>cassandra-0.2.4</module>
<module>cassandra-0.3.0</module>
</modules>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
