Author: [email protected] Date: Fri May 20 10:00:21 2011 New Revision: 1147 Log: [PREPARE-RELEASE] Merged changes from 0.2 branch back to the trunk
Removed: trunk/amdatu-cassandra/release/src/main/resources/LICENSE-ASL2 Modified: trunk/amdatu-cassandra/ (props changed) trunk/amdatu-cassandra/cassandra-application/NOTICE trunk/amdatu-cassandra/cassandra-application/src/main/resources/conf/cassandra.yaml trunk/amdatu-cassandra/cassandra-gadgetstore/pom.xml trunk/amdatu-cassandra/cassandra-persistencemanager/src/test/resources/cassandra.yaml trunk/amdatu-cassandra/cassandra-tools/src/main/resources/readme.txt trunk/amdatu-cassandra/config-fileinstall/org.amdatu.core.cassandra.application.cfg trunk/amdatu-cassandra/pom.xml trunk/amdatu-cassandra/release/src/main/assembly/bin-component.xml trunk/amdatu-cassandra/release/src/main/assembly/bin-release.xml trunk/amdatu-cassandra/release/src/main/assembly/src-release.xml trunk/amdatu-cassandra/release/src/main/resources/NOTICE trunk/amdatu-cassandra/test-performance/test-execution/src/main/assembly/assembly.xml trunk/amdatu-cassandra/test-performance/test-execution/src/main/assembly/component.xml trunk/amdatu-cassandra/test-performance/test-execution/src/main/resources/jmeter-plans/Amdatu Cassandra PM getRowKeys.jmx trunk/amdatu-cassandra/test-performance/test-execution/src/main/resources/jmeter-plans/Amdatu Cassandra PM.jmx trunk/amdatu-cassandra/test-performance/test-execution/src/main/resources/shell/configuration.properties trunk/amdatu-cassandra/test-performance/test-execution/src/main/resources/shell/run.bat trunk/amdatu-cassandra/test-performance/test-execution/src/main/resources/shell/run.sh Modified: trunk/amdatu-cassandra/cassandra-application/NOTICE ============================================================================== --- trunk/amdatu-cassandra/cassandra-application/NOTICE (original) +++ trunk/amdatu-cassandra/cassandra-application/NOTICE Fri May 20 10:00:21 2011 @@ -27,6 +27,55 @@ Copyright 2004-2005 SLF4J.ORG. For more information, see http://www.slf4j.org/. License: MIT License (see http://www.opensource.org/licenses/mit-license.php). +- +This product includes snakeyaml, developed by Andrey Somov +Copyright (c) 2008-2011, http://www.snakeyaml.org +For more information, see http://code.google.com/p/snakeyaml/. +License: Apache Software License 2.0 (see http://www.apache.org/licenses/LICENSE-2.0.html). +- +This product includes JUG (Java Uuid/guid Generator), developed by Jug. +Copyright (c) 2002 Tatu Saloranta, [email protected] +For more information, see http://jug.safehaus.org/. +License: Apache Software License 2.0 (see http://www.apache.org/licenses/LICENSE-2.0.html). +- +This product includes Jetty, developed by Mort Bay Consulting Pty Ltd. +Copyright 1995-2006 Mort Bay Consulting Pty Ltd +For more information, see http://jetty.codehaus.org/jetty/. +License: Apache Software License 2.0 (see http://www.apache.org/licenses/LICENSE-2.0.html). +- +This product includes Jackson, developed by Tatu Saloranta. +Copyright (c) 2007- Tatu Saloranta, [email protected] +For more information, see http://jackson.codehaus.org/. +License: Apache Software License 2.0 (see http://www.apache.org/licenses/LICENSE-2.0.html). +- +This product includes the high-scale-lib deveoped by Cliff Click. +For more information, see http://sourceforge.net/projects/high-scale-lib/. +License: Public Domain, see http://creativecommons.org/licenses/publicdomain. +- +This product includes Hadoop, developed by The Apache Software Foundation (http://www.apache.org/). +Copyright 2002-2004 The Apache Software Foundation +For more information, see http://hadoop.apache.org/. +License: Apache Software License 2.0 (see http://www.apache.org/licenses/LICENSE-2.0.html). +- +This product includes Guava-libraries, developed by Google Inc. +Copyright (C) 2010 Google Inc. +For more information, see http://code.google.com/p/guava-libraries/. +License: Apache Software License 2.0 (see http://www.apache.org/licenses/LICENSE-2.0.html). +- +This product includes concurrentlinkedhashmap, developed by Benjamin Manes +Copyright 2010 Benjamin Manes +For more information, see http://code.google.com/p/concurrentlinkedhashmap/. +License: Apache Software License 2.0 (see http://www.apache.org/licenses/LICENSE-2.0.html). +- +This product includes Apache Commons, developed by The Apache Software Foundation (http://www.apache.org/). +Copyright 2001-2009 The Apache Software Foundation. +For more information, see http://commons.apache.org/cli/. +License: Apache Software License 2.0 (see http://www.apache.org/licenses/LICENSE-2.0.html). +- +This product includes Apache Avro, developed by The Apache Software Foundation. +Copyright 2010 The Apache Software Foundation. +For more information, see http://avro.apache.org/. +License: Apache Software License 2.0 (see http://www.apache.org/licenses/LICENSE-2.0.html). II. Used Software Modified: trunk/amdatu-cassandra/cassandra-application/src/main/resources/conf/cassandra.yaml ============================================================================== --- trunk/amdatu-cassandra/cassandra-application/src/main/resources/conf/cassandra.yaml (original) +++ trunk/amdatu-cassandra/cassandra-application/src/main/resources/conf/cassandra.yaml Fri May 20 10:00:21 2011 @@ -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.verning permissions and limitations +# under the License. + # Cassandra storage config YAML #NOTE !!!!!!!! NOTE Modified: trunk/amdatu-cassandra/cassandra-gadgetstore/pom.xml ============================================================================== --- trunk/amdatu-cassandra/cassandra-gadgetstore/pom.xml (original) +++ trunk/amdatu-cassandra/cassandra-gadgetstore/pom.xml Fri May 20 10:00:21 2011 @@ -20,7 +20,7 @@ <parent> <groupId>org.amdatu.cassandra</groupId> <artifactId>org.amdatu.cassandra</artifactId> - <version>0.2.0-SNAPSHOT</version> + <version>0.2.1-SNAPSHOT</version> </parent> <artifactId>org.amdatu.cassandra.gadgetstore</artifactId> <packaging>bundle</packaging> Modified: trunk/amdatu-cassandra/cassandra-persistencemanager/src/test/resources/cassandra.yaml ============================================================================== --- trunk/amdatu-cassandra/cassandra-persistencemanager/src/test/resources/cassandra.yaml (original) +++ trunk/amdatu-cassandra/cassandra-persistencemanager/src/test/resources/cassandra.yaml Fri May 20 10:00:21 2011 @@ -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.verning permissions and limitations +# under the License. + # Cassandra storage config YAML # NOTE: Modified: trunk/amdatu-cassandra/cassandra-tools/src/main/resources/readme.txt ============================================================================== --- trunk/amdatu-cassandra/cassandra-tools/src/main/resources/readme.txt (original) +++ trunk/amdatu-cassandra/cassandra-tools/src/main/resources/readme.txt Fri May 20 10:00:21 2011 @@ -1,3 +1,20 @@ +<!-- + 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. +--> + This directory provides the Cassandra client utilities pre-configured to be used for the specified Cassandra client in the pom.xml file of this project. To generate Cassandra client tools for any cassandra client, edit the pom.xml and fill in these properties: Modified: trunk/amdatu-cassandra/config-fileinstall/org.amdatu.core.cassandra.application.cfg ============================================================================== --- trunk/amdatu-cassandra/config-fileinstall/org.amdatu.core.cassandra.application.cfg (original) +++ trunk/amdatu-cassandra/config-fileinstall/org.amdatu.core.cassandra.application.cfg Fri May 20 10:00:21 2011 @@ -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.verning permissions and limitations +# under the License. + # Root work directory of Cassandra log and data files workdir=cassandra Modified: trunk/amdatu-cassandra/pom.xml ============================================================================== --- trunk/amdatu-cassandra/pom.xml (original) +++ trunk/amdatu-cassandra/pom.xml Fri May 20 10:00:21 2011 @@ -20,7 +20,7 @@ <parent> <groupId>org.amdatu</groupId> <artifactId>amdatu</artifactId> - <version>2</version> + <version>3-SNAPSHOT</version> <relativePath>../amdatu-parent/pom.xml</relativePath> </parent> <groupId>org.amdatu.cassandra</groupId> @@ -379,10 +379,6 @@ <enableRulesSummary>false</enableRulesSummary> </configuration> </plugin> - - - - </plugins> </reporting> Modified: trunk/amdatu-cassandra/release/src/main/assembly/bin-component.xml ============================================================================== --- trunk/amdatu-cassandra/release/src/main/assembly/bin-component.xml (original) +++ trunk/amdatu-cassandra/release/src/main/assembly/bin-component.xml Fri May 20 10:00:21 2011 @@ -1,4 +1,20 @@ <?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. +--> <component xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.0 view-source:http://maven.apache.org/xsd/component-1.1.0.xsd";> Modified: trunk/amdatu-cassandra/release/src/main/assembly/bin-release.xml ============================================================================== --- trunk/amdatu-cassandra/release/src/main/assembly/bin-release.xml (original) +++ trunk/amdatu-cassandra/release/src/main/assembly/bin-release.xml Fri May 20 10:00:21 2011 @@ -1,4 +1,20 @@ <?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.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd";> Modified: trunk/amdatu-cassandra/release/src/main/assembly/src-release.xml ============================================================================== --- trunk/amdatu-cassandra/release/src/main/assembly/src-release.xml (original) +++ trunk/amdatu-cassandra/release/src/main/assembly/src-release.xml Fri May 20 10:00:21 2011 @@ -1,4 +1,20 @@ <?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.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd";> Modified: trunk/amdatu-cassandra/release/src/main/resources/NOTICE ============================================================================== --- trunk/amdatu-cassandra/release/src/main/resources/NOTICE (original) +++ trunk/amdatu-cassandra/release/src/main/resources/NOTICE Fri May 20 10:00:21 2011 @@ -1,55 +1,140 @@ +Amdatu Cassandra +Copyright 2010, 2011 The Amdatu Foundation + +I. Included Software + This product includes Amdatu Cassandra, developed by The Amdatu Foundation (http://www.amdatu.org/). Copyright 2011 The Amdatu Foundation. For more information, see http://www.amdatu.org/confluence/display/Amdatu/Amdatu+Cassandra. -License: Apache Software License 2.0 (see LICENSE-ASL2.txt). +License: Apache Software License 2.0 (see LICENSE). - This product includes Apache Cassandra, developed by the The Apache Software Foundation (http://www.apache.org/). Copyright 2009-2010 The Apache Software Foundation. For more information, see http://cassandra.apache.org/. -License: Apache Software License 2.0 (see LICENSE-ASL2.txt). +License: Apache Software License 2.0 (see LICENSE). - This product includes Apache Thrift, developed by The Apache Software Foundation (http://www.apache.org/). Copyright 2006-2010 The Apache Software Foundation. For more information, see http://incubator.apache.org/thrift/. -License: Apache Software License 2.0 (see LICENSE-ASL2.txt). +License: Apache Software License 2.0 (see LICENSE). - This product includes Apache log4j, developed by The Apache Software Foundation (http://www.apache.org/). Copyright 2007 The Apache Software Foundation. For more information, see http://logging.apache.org/log4j/. -License: Apache Software License 2.0 (see LICENSE-ASL2.txt). +License: Apache Software License 2.0 (see LICENSE). - This product includes Apache SLF4J, developed by Ceki G�lc�. Copyright 2004-2005 SLF4J.ORG. For more information, see http://www.slf4j.org/. -License: MIT License (see LICENSE-MIT.txt). +License: MIT License (see LICENSE-MIT). - This product includes Hector, developed by Ran Tavory (http://prettyprint.me/). Copyright 2010 Ran Tavory. For more information, see https://github.com/rantav/hector. -License: MIT License (see LICENSE-MIT.txt). +License: MIT License (see LICENSE-MIT). - This product includes Apache Commons CLI, developed by The Apache Software Foundation (http://www.apache.org/). Copyright 2001-2009 The Apache Software Foundation. For more information, see http://commons.apache.org/cli/. -License: Apache Software License 2.0 (see LICENSE-ASL2.txt). +License: Apache Software License 2.0 (see LICENSE). - This product includes JLine, developed by Marc Prud'hommeaux. Copyright 2002-2006 Marc Prud'hommeaux For more information, see http://jline.sourceforge.net/. -License: BSD license (see LICENSE-BSD.txt or http://jline.sourceforge.net/license.html) +License: BSD license (see LICENSE-BSD or http://jline.sourceforge.net/license.html) - This product includes ANTLR, developed by Terence Parr. Copyright 2010 Terence Parr For more information, see http://www.antlr.org/. -License: BSD license (see LICENSE-BSD.txt) +License: BSD license (see LICENSE-BSD) - This product includes google-gson, developed by Google Inc. Copyright 2008-2011 Google Inc. For more information, see http://code.google.com/p/google-gson/. -License: Apache Software License 2.0 (see LICENSE-ASL2.txt). +License: Apache Software License 2.0 (see LICENSE). - 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 LICENSE-JSON.txt) -- \ No newline at end of file +License: JSON (see LICENSE-JSON) +- +This product includes snakeyaml, developed by Andrey Somov +Copyright (c) 2008-2011, http://www.snakeyaml.org +For more information, see http://code.google.com/p/snakeyaml/. +License: Apache Software License 2.0 (see LICENSE). +- +This product includes JUG (Java Uuid/guid Generator), developed by Jug. +Copyright (c) 2002 Tatu Saloranta, [email protected] +For more information, see http://jug.safehaus.org/. +License: Apache Software License 2.0 (see LICENSE). +- +This product includes Jetty, developed by Mort Bay Consulting Pty Ltd. +Copyright 1995-2006 Mort Bay Consulting Pty Ltd +For more information, see http://jetty.codehaus.org/jetty/. +License: Apache Software License 2.0 (see LICENSE). +- +This product includes Jackson, developed by Tatu Saloranta. +Copyright (c) 2007- Tatu Saloranta, [email protected] +For more information, see http://jackson.codehaus.org/. +License: Apache Software License 2.0 (see LICENSE). +- +This product includes the high-scale-lib deveoped by Cliff Click. +For more information, see http://sourceforge.net/projects/high-scale-lib/. +License: Public Domain, see http://creativecommons.org/licenses/publicdomain. +- +This product includes Hadoop, developed by The Apache Software Foundation (http://www.apache.org/). +Copyright 2002-2004 The Apache Software Foundation +For more information, see http://hadoop.apache.org/. +License: Apache Software License 2.0 (see LICENSE). +- +This product includes Guava-libraries, developed by Google Inc. +Copyright (C) 2010 Google Inc. +For more information, see http://code.google.com/p/guava-libraries/. +License: Apache Software License 2.0 (see LICENSE). +- +This product includes concurrentlinkedhashmap, developed by Benjamin Manes +Copyright 2010 Benjamin Manes +For more information, see http://code.google.com/p/concurrentlinkedhashmap/. +License: Apache Software License 2.0 (see LICENSE). +- +This product includes Apache Commons, developed by The Apache Software Foundation (http://www.apache.org/). +Copyright 2001-2009 The Apache Software Foundation. +For more information, see http://commons.apache.org/cli/. +License: Apache Software License 2.0 (see LICENSE). +- +This product includes Apache Avro, developed by The Apache Software Foundation. +Copyright 2010 The Apache Software Foundation. +For more information, see http://avro.apache.org/. +License: Apache Software License 2.0 (see LICENSE). + + +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 LICENSE). +- +This product uses Pax UserAdmin developed by OPS4J (http://www.ops4j.org). +Copyright 2009 OPS4J +License: Apache Software License 2.0 (see LICENSE). +- +This product uses Pax Exam developed by OPS4J (http://www.ops4j.org). +Copyright 2009 OPS4J +License: Apache Software License 2.0 (see LICENSE). +- +This product uses Pax Swissbox developed by OPS4J (http://www.ops4j.org). +Copyright 2009 OPS4J +License: Apache Software License 2.0 (see LICENSE). +- +This product uses Apache Sling developed by The Apache Software Foundation (http://www.apache.org/). +Copyright 2008-2011 The Apache Software Foundation +License: Apache Software License 2.0 (see LICENSE). +- +This product uses Apache Felix developed by The Apache Software Foundation (http://www.apache.org/). +Copyright 2011 The Apache Software Foundation +License: Apache Software License 2.0 (see LICENSE). + + +III. License Summary +This products is licensed under the Apache Software License 2.0, +see the LICENSE file included in this distribution. Modified: trunk/amdatu-cassandra/test-performance/test-execution/src/main/assembly/assembly.xml ============================================================================== --- trunk/amdatu-cassandra/test-performance/test-execution/src/main/assembly/assembly.xml (original) +++ trunk/amdatu-cassandra/test-performance/test-execution/src/main/assembly/assembly.xml Fri May 20 10:00:21 2011 @@ -1,4 +1,20 @@ <?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.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd";> <id>bin</id> Modified: trunk/amdatu-cassandra/test-performance/test-execution/src/main/assembly/component.xml ============================================================================== --- trunk/amdatu-cassandra/test-performance/test-execution/src/main/assembly/component.xml (original) +++ trunk/amdatu-cassandra/test-performance/test-execution/src/main/assembly/component.xml Fri May 20 10:00:21 2011 @@ -1,4 +1,20 @@ <?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. +--> <component xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.0 view-source:http://maven.apache.org/xsd/component-1.1.0.xsd";> Modified: trunk/amdatu-cassandra/test-performance/test-execution/src/main/resources/jmeter-plans/Amdatu Cassandra PM getRowKeys.jmx ============================================================================== --- trunk/amdatu-cassandra/test-performance/test-execution/src/main/resources/jmeter-plans/Amdatu Cassandra PM getRowKeys.jmx (original) +++ trunk/amdatu-cassandra/test-performance/test-execution/src/main/resources/jmeter-plans/Amdatu Cassandra PM getRowKeys.jmx Fri May 20 10:00:21 2011 @@ -1,4 +1,20 @@ <?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. +--> <jmeterTestPlan version="1.2" properties="2.1"> <hashTree> <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Amdatu Web Test Plan" enabled="true"> Modified: trunk/amdatu-cassandra/test-performance/test-execution/src/main/resources/jmeter-plans/Amdatu Cassandra PM.jmx ============================================================================== --- trunk/amdatu-cassandra/test-performance/test-execution/src/main/resources/jmeter-plans/Amdatu Cassandra PM.jmx (original) +++ trunk/amdatu-cassandra/test-performance/test-execution/src/main/resources/jmeter-plans/Amdatu Cassandra PM.jmx Fri May 20 10:00:21 2011 @@ -1,4 +1,20 @@ <?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. +--> <jmeterTestPlan version="1.2" properties="2.1"> <hashTree> <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Amdatu Web Test Plan" enabled="true"> Modified: trunk/amdatu-cassandra/test-performance/test-execution/src/main/resources/shell/configuration.properties ============================================================================== --- trunk/amdatu-cassandra/test-performance/test-execution/src/main/resources/shell/configuration.properties (original) +++ trunk/amdatu-cassandra/test-performance/test-execution/src/main/resources/shell/configuration.properties Fri May 20 10:00:21 2011 @@ -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.verning permissions and limitations +# under the License. + # Java properties file for performance test execution. # Run a performance test Modified: trunk/amdatu-cassandra/test-performance/test-execution/src/main/resources/shell/run.bat ============================================================================== --- trunk/amdatu-cassandra/test-performance/test-execution/src/main/resources/shell/run.bat (original) +++ trunk/amdatu-cassandra/test-performance/test-execution/src/main/resources/shell/run.bat Fri May 20 10:00:21 2011 @@ -1 +1,16 @@ +@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. + java -Xmx1024m -jar org.amdatu.test.performance-${test.performance.version}.jar -config configuration.properties \ No newline at end of file Modified: trunk/amdatu-cassandra/test-performance/test-execution/src/main/resources/shell/run.sh ============================================================================== --- trunk/amdatu-cassandra/test-performance/test-execution/src/main/resources/shell/run.sh (original) +++ trunk/amdatu-cassandra/test-performance/test-execution/src/main/resources/shell/run.sh Fri May 20 10:00:21 2011 @@ -1 +1,16 @@ +# 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. + java -Xmx1024m -jar org.amdatu.test.performance-${test.performance.version}.jar -config configuration.properties \ No newline at end of file
_______________________________________________ Amdatu-commits mailing list [email protected] http://lists.amdatu.org/mailman/listinfo/amdatu-commits
