Author: [email protected] Date: Mon Aug 8 10:21:53 2011 New Revision: 1274 Log: [AMDATUCASSANDRA-72] Updated release assembly to support config filtering
Added: trunk/amdatu-cassandra/config/ trunk/amdatu-cassandra/config/pom.xml trunk/amdatu-cassandra/config/src/ trunk/amdatu-cassandra/config/src/main/ trunk/amdatu-cassandra/config/src/main/resources/ trunk/amdatu-cassandra/config/src/main/resources/org.amdatu.core.cassandra.application.cfg Removed: trunk/amdatu-cassandra/config-fileinstall/ Modified: trunk/amdatu-cassandra/pom.xml trunk/amdatu-cassandra/release/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 Added: trunk/amdatu-cassandra/config/pom.xml ============================================================================== --- (empty file) +++ trunk/amdatu-cassandra/config/pom.xml Mon Aug 8 10:21:53 2011 @@ -0,0 +1,66 @@ +<?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.cassandra</groupId> + <artifactId>org.amdatu.cassandra</artifactId> + <version>0.2.1-SNAPSHOT</version> + </parent> + <artifactId>org.amdatu.cassandra.config</artifactId> + <packaging>jar</packaging> + <name>Amdatu Cassandra configuration files</name> + <description>This artifacts holds the configuration files for Amdatu Cassandra.</description> + + <repositories> + <repository> + <id>amdatu.releases</id> + <name>Amdatu Release Repository</name> + <url>http://repository.amdatu.org/releases</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>amdatu.snapshots</id> + <name>Amdatu Snapshot Repository</name> + <url>http://repository.amdatu.org/snapshots</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <repository> + <id>riptano</id> + <name>Riptano Repository</name> + <url>http://mvn.riptano.com/content/repositories/riptano</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> + +</project> \ No newline at end of file Added: trunk/amdatu-cassandra/config/src/main/resources/org.amdatu.core.cassandra.application.cfg ============================================================================== --- (empty file) +++ trunk/amdatu-cassandra/config/src/main/resources/org.amdatu.core.cassandra.application.cfg Mon Aug 8 10:21:53 2011 @@ -0,0 +1,99 @@ +# 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 + +# Directory to store Cassandra logfiles +commitlogdir=work/cassandra/commitlog + +# Directory in which the data files are stored +datafiledir=work/cassandra/data + +# Directory in which the caches are saved +savedcachesdir=work/cassandra/saved_caches + +log4j.systemlog=work/cassandra/system.log + +############################### +# Cassandra clustering related properties +############################### + +# Name of the Cassandra cluster to join. If a seed is defined in the 'seeds' property +# that defines a different clustername, a clustername mismatch error will be displayed +# and that seed will not become part of this cluster. +clustername=${cassandra.clustername} + +# Comma separated list of IP addresses of nodes in the cluster to connect to. +# Note that does not need to be a full listing of all IP addresses of all nodes +# in the cluster, it may be a subset of it. This property determines with what +# other nodes in the cluster this node will synchronize its data. +# When cassandra is executed in stand-alone mode, this value should be 127.0.0.1 +seeds=${cassandra.seeds} + +# The IP address of this node that other cassandra nodes will use to connect to. +# This IP address must thus be accessible from the other nodes in the cluster (to +# be precise; those that provided this node as one of its seeds). +# When cassandra is executed in stand-alone mode, this value should be localhost +listen_address=${cassandra.listen_address} + +# The default replication factor of new keyspaces. The replication factor determines +# the amount of nodes on which data is replicated. So if default_replication_factor +# equals 1 and you have a two-node cluster, it is very likely that you will get timeouts +# as it will try to read data only stored on the other node (data is distributed among +# the two nodes). In case all data should be available on all nodes in the cluster, which +# is necessary in case the node should also be able to run stand-alone, the replication +# factor should equal the number of nodes in the cluster. +# Note that upon the very first boot of a node, the replication factor must be 1 as the +# replication factor may never be higher then the amount of nodes in the cluster. Usually +# the replication factor upon first boot is always 1, to be increased at runtime. +default_replication_factor=${cassandra.default_replication_factor} + +# The read consistency level to apply. The read consistencly level determines the +# amount of nodes in the cluster that must reply on a request for providing the latest +# version of some row before the result is returned. Note that if the read consistency +# level is ALL, all nodes in the cluster are effectively down as soon as one node in +# the cluster goes down, as cassandra will block until it received an answer from +# this (unavailable) node before returning the result. +consistency_level_read=${cassandra.consistency_level_read} + +# The write consistency level to apply. The write consistencly level determines the +# amount of nodes in the cluster that should have received the write request operation +# before the call is returned. Note that if the write consistency level is ALL, all +# nodes in the cluster are effectively down as soon as one node in the cluster goes +# down, as cassandra will block each write operation until this (unavailable) node +# answered. +consistency_level_write=${cassandra.consistency_level_write} + +# Auto bootstrap should be enabled for nodes that are newly added to an existing Cassandra +# cluster. After that, autobootstrap must be set to false +autobootstrap=${cassandra.autobootstrap} + +# You may leave this field blank in case of a single node cluster. However if you plan +# to later build a cluster including this first instance, it is recommended to set the +# initial token�s value to zero. This simplifies load balancing as you later expand the +# cluster. +initial_token=${cassandra.initial_token} + +# The address to bind the Thrift RPC service to -- clients connect here. +# Usually this is the same value as the listen_address. If you leave this +# blank that is exactly what will happen, so it is recommended to leave this empty +rpc_address=${cassandra.rpc_address} + +# port for Thrift to listen for clients on +rpc_port=${cassandra.rpc_port} + +# storage port +storage_port=${cassandra.storage_port} \ No newline at end of file Modified: trunk/amdatu-cassandra/pom.xml ============================================================================== --- trunk/amdatu-cassandra/pom.xml (original) +++ trunk/amdatu-cassandra/pom.xml Mon Aug 8 10:21:53 2011 @@ -158,6 +158,14 @@ <scope>test</scope> <type>jar</type> </dependency> + <dependency> + <groupId>org.amdatu.cassandra</groupId> + <artifactId>org.amdatu.cassandra.config</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + <type>jar</type> + </dependency> + <!-- Amdatu core dependencies --> <dependency> @@ -260,6 +268,7 @@ </distributionManagement> <modules> + <module>config</module> <module>cassandra-application</module> <!-- Modified: trunk/amdatu-cassandra/release/pom.xml ============================================================================== --- trunk/amdatu-cassandra/release/pom.xml (original) +++ trunk/amdatu-cassandra/release/pom.xml Mon Aug 8 10:21:53 2011 @@ -30,6 +30,12 @@ <dependencies> <dependency> <groupId>org.amdatu.cassandra</groupId> + <artifactId>org.amdatu.cassandra.config</artifactId> + <scope>runtime</scope> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.amdatu.cassandra</groupId> <artifactId>org.amdatu.cassandra.application</artifactId> <scope>runtime</scope> <type>bundle</type> @@ -84,6 +90,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> + <version>2.2.1</version> <executions> <execution> <id>create-release</id> 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 Mon Aug 8 10:21:53 2011 @@ -28,15 +28,25 @@ <unpack>false</unpack> <useTransitiveDependencies>false</useTransitiveDependencies> </dependencySet> + <dependencySet> + <outputDirectory>conf</outputDirectory> + <outputFileNameMapping></outputFileNameMapping> + <includes> + <include>org.amdatu.cassandra:org.amdatu.cassandra.config</include> + </includes> + <unpack>true</unpack> + <unpackOptions> + <filtered>true</filtered> + <includes> + <include>*.cfg</include> + </includes> + </unpackOptions> + <useTransitiveDependencies>false</useTransitiveDependencies> + </dependencySet> </dependencySets> <fileSets> <fileSet> - <directory>../config-fileinstall</directory> - <outputDirectory>conf</outputDirectory> - <filtered>true</filtered> - </fileSet> - <fileSet> <directory>src/main/resources</directory> <outputDirectory></outputDirectory> <filtered>true</filtered> 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 Mon Aug 8 10:21:53 2011 @@ -24,7 +24,7 @@ <format>zip</format> </formats> <baseDirectory>amdatu-cassandra-${project.version}</baseDirectory> - <includeBaseDirectory>true</includeBaseDirectory> <!-- strip the module prefixes --> + <includeBaseDirectory>false</includeBaseDirectory> <!-- strip the module prefixes --> <componentDescriptors> <componentDescriptor>src/main/assembly/bin-component.xml</componentDescriptor> 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 Mon Aug 8 10:21:53 2011 @@ -23,25 +23,23 @@ <format>tar.gz</format> <format>zip</format> </formats> + <includeBaseDirectory>false</includeBaseDirectory> - <sources> - <outputDirectory>src</outputDirectory> - <fileSets> - <fileSet> - <directory>..</directory> - <outputDirectory>src</outputDirectory> - <excludes> - <exclude>**/target/**</exclude> - <exclude>**/.settings/**</exclude> - <exclude>**/.classpath</exclude> - <exclude>**/.project</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>src/main/resources</directory> - <outputDirectory></outputDirectory> - </fileSet> - </fileSets> - </sources> + <fileSets> + <fileSet> + <directory>..</directory> + <outputDirectory>src</outputDirectory> + <excludes> + <exclude>**/target/**</exclude> + <exclude>**/.settings/**</exclude> + <exclude>**/.classpath</exclude> + <exclude>**/.project</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>src/main/resources</directory> + <outputDirectory></outputDirectory> + </fileSet> + </fileSets> </assembly> \ No newline at end of file
_______________________________________________ Amdatu-commits mailing list [email protected] http://lists.amdatu.org/mailman/listinfo/amdatu-commits
