Author: [email protected]
Date: Tue Mar 13 15:51:16 2012
New Revision: 2141
Log:
Added:
branches/cassandra-platform-0.3.0/config-templates/
branches/cassandra-platform-0.3.0/config-templates/pom.xml
branches/cassandra-platform-0.3.0/config/src/main/resources/amdatu-cassandra-client-config.xml
branches/cassandra-platform-0.3.0/config/src/main/resources/amdatu-core-configtemplates-config.xml
Modified:
branches/cassandra-platform-0.3.0/cassandra-application/pom.xml
branches/cassandra-platform-0.3.0/cassandra-client/pom.xml
branches/cassandra-platform-0.3.0/config/src/main/resources/amdatu-cassandra-application-config.xml
Modified: branches/cassandra-platform-0.3.0/cassandra-application/pom.xml
==============================================================================
--- branches/cassandra-platform-0.3.0/cassandra-application/pom.xml
(original)
+++ branches/cassandra-platform-0.3.0/cassandra-application/pom.xml Tue Mar
13 15:51:16 2012
@@ -101,7 +101,11 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.cassandra.application.osgi.Activator</Bundle-Activator>
+ <X-MultiTenant-Version>1</X-MultiTenant-Version>
+
<X-MultiTenant-Bundle-Activator>org.amdatu.cassandra.application.osgi.Activator</X-MultiTenant-Bundle-Activator>
+ <X-MultiTenant-Binding>PLATFORM</X-MultiTenant-Binding>
+
<X-MultiTenant-Scope>(|(org.amdatu.tenant.pid=%TENANTPID%)(objectClass=org.osgi.service.log.LogService))</X-MultiTenant-Scope>
+
<Bundle-Activator>org.amdatu.tenant.adapter.MultiTenantBundleActivator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.cassandra.application</Bundle-SymbolicName>
<Embed-Dependency>!apache-cassandra|apache-cassandra-thrift|libthrift;scope=compile</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
@@ -149,37 +153,37 @@
</plugin>
</plugins>
<pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e
settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
-
org.apache.maven.plugins
- </groupId>
- <artifactId>
-
maven-dependency-plugin
- </artifactId>
-
<versionRange>[2.2,)</versionRange>
- <goals>
-
<goal>unpack-dependencies</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-dependency-plugin
+ </artifactId>
+ <versionRange>[2.2,)</versionRange>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
</pluginManagement>
</build>
Modified: branches/cassandra-platform-0.3.0/cassandra-client/pom.xml
==============================================================================
--- branches/cassandra-platform-0.3.0/cassandra-client/pom.xml (original)
+++ branches/cassandra-platform-0.3.0/cassandra-client/pom.xml Tue Mar 13
15:51:16 2012
@@ -51,7 +51,11 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.cassandra.client.osgi.Activator</Bundle-Activator>
+ <X-MultiTenant-Version>1</X-MultiTenant-Version>
+
<X-MultiTenant-Bundle-Activator>org.amdatu.cassandra.client.osgi.Activator</X-MultiTenant-Bundle-Activator>
+ <X-MultiTenant-Binding>PLATFORM</X-MultiTenant-Binding>
+
<X-MultiTenant-Scope>(|(org.amdatu.tenant.pid=%TENANTPID%)(objectClass=org.osgi.service.log.LogService))</X-MultiTenant-Scope>
+
<Bundle-Activator>org.amdatu.tenant.adapter.MultiTenantBundleActivator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.cassandra.client</Bundle-SymbolicName>
<Import-Package>
org.amdatu.cassandra.client,
Added: branches/cassandra-platform-0.3.0/config-templates/pom.xml
==============================================================================
--- (empty file)
+++ branches/cassandra-platform-0.3.0/config-templates/pom.xml Tue Mar 13
15:51:16 2012
@@ -0,0 +1,81 @@
+<?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.core</groupId>
+ <artifactId>org.amdatu.core</artifactId>
+ <version>0.2.1</version>
+ </parent>
+ <artifactId>org.amdatu.core.config.templates</artifactId>
+ <packaging>bundle</packaging>
+ <version>0.2.2-SNAPSHOT</version>
+ <name>Amdatu Core - Configuration Templates</name>
+ <description>The template manager can be used to replace configurable
properties in any file with configuration properties provided by
ConfigAdmin</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>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.config.templates</artifactId>
+ <version>0.2.1</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <X-MultiTenant-Version>1</X-MultiTenant-Version>
+
<X-MultiTenant-Bundle-Activator>org.amdatu.core.config.templates.osgi.Activator</X-MultiTenant-Bundle-Activator>
+ <X-MultiTenant-Binding>PLATFORM</X-MultiTenant-Binding>
+
<X-MultiTenant-Scope>(|(org.amdatu.tenant.pid=%TENANTPID%)(objectClass=org.osgi.service.log.LogService))</X-MultiTenant-Scope>
+
<Bundle-Activator>org.amdatu.tenant.adapter.MultiTenantBundleActivator</Bundle-Activator>
+ <Embed-Dependency>*;scope=compile;inline=true</Embed-Dependency>
+ <Embed-Transitive>false</Embed-Transitive>
+ <Import-Package>
+ org.amdatu.tenant;version="[1.0,2)",
+ org.amdatu.tenant.adapter;version="[1.0,2)",
+ *
+ </Import-Package>
+ <Export-Package>
+ org.amdatu.core.config.templates;version="1.0"
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Modified:
branches/cassandra-platform-0.3.0/config/src/main/resources/amdatu-cassandra-application-config.xml
==============================================================================
---
branches/cassandra-platform-0.3.0/config/src/main/resources/amdatu-cassandra-application-config.xml
(original)
+++
branches/cassandra-platform-0.3.0/config/src/main/resources/amdatu-cassandra-application-config.xml
Tue Mar 13 15:51:16 2012
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0";>
+<MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.1.0";
filter="(|(!(org.amdatu.tenant.pid=*))(org.amdatu.tenant.pid=org.amdatu.tenant.PLATFORM))">
<OCD name="Apache Cassandra Application"
id="org.amdatu.core.cassandra.application">
<AD id="workdir" type="STRING" cardinality="0" />
<AD id="commitlogdir" type="STRING" cardinality="0" />
@@ -18,7 +18,7 @@
<Designate pid="org.amdatu.core.cassandra.application" bundle="*">
<Object ocdref="org.amdatu.core.cassandra.application">
<Attribute adref="workdir">
- <Value>work/cassandra/commitlog</Value>
+ <Value>cassandra</Value>
</Attribute>
<Attribute adref="commitlogdir">
<Value>work/cassandra/commitlog</Value>
Added:
branches/cassandra-platform-0.3.0/config/src/main/resources/amdatu-cassandra-client-config.xml
==============================================================================
--- (empty file)
+++
branches/cassandra-platform-0.3.0/config/src/main/resources/amdatu-cassandra-client-config.xml
Tue Mar 13 15:51:16 2012
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.1.0";
filter="(|(!(org.amdatu.tenant.pid=*))(org.amdatu.tenant.pid=org.amdatu.tenant.PLATFORM))">
+ <OCD name="Apache Cassandra Client" id="org.amdatu.core.cassandra.client">
+ <AD id="clustername" type="STRING" cardinality="0" />
+ <AD id="schema_agreement_timeout" type="STRING" cardinality="0" />
+ <AD id="thrift_timeout" type="STRING" cardinality="0" />
+ <AD id="default_replication_factor" type="STRING" cardinality="0" />
+ <AD id="hector.hosts" type="STRING" cardinality="0" />
+ <AD id="hector.port" type="STRING" cardinality="0" />
+ <AD id="hector.maxActive" type="STRING" cardinality="0" />
+ <AD id="hector.maxWaitTimeWhenExhausted" type="STRING" cardinality="0" />
+ <AD id="hector.cassandraThriftSocketTimeout" type="STRING" cardinality="0"
/>
+ <AD id="hector.useThriftFramedTransport" type="STRING" cardinality="0" />
+ <AD id="hector.retryDownedHosts" type="STRING" cardinality="0" />
+ <AD id="hector.retryDownedHostsQueueSize" type="STRING" cardinality="0" />
+ <AD id="hector.retryDownedHostsDelayInSeconds" type="STRING"
cardinality="0" />
+ <AD id="hector.autoDiscoverHosts" type="STRING" cardinality="0" />
+ <AD id="hector.autoDiscoveryDelayInSeconds" type="STRING" cardinality="0"
/>
+ <AD id="hector.runAutoDiscoveryAtStartup" type="STRING" cardinality="0" />
+ <AD id="hector.useHostTimeoutTracker" type="STRING" cardinality="0" />
+ <AD id="hector.hostTimeoutCounter" type="STRING" cardinality="0" />
+ <AD id="hector.hostTimeoutWindow" type="STRING" cardinality="0" />
+ <AD id="hector.hostTimeoutSuspensionDurationInSeconds" type="STRING"
cardinality="0" />
+ <AD id="hector.hostTimeoutUnsuspendCheckDelay" type="STRING"
cardinality="0" />
+ <AD id="hector.useSocketKeepalive" type="STRING" cardinality="0" />
+ </OCD>
+
+ <Designate pid="org.amdatu.core.cassandra.client" bundle="*">
+ <Object ocdref="org.amdatu.core.cassandra.client">
+ <Attribute adref="clustername">
+ <Value>Amdatu Cluster</Value>
+ </Attribute>
+ <Attribute adref="schema_agreement_timeout">
+ <Value>30</Value>
+ </Attribute>
+ <Attribute adref="thrift_timeout">
+ <Value>10</Value>
+ </Attribute>
+ <Attribute adref="default_replication_factor">
+ <Value>1</Value>
+ </Attribute>
+ <Attribute adref="hector.hosts">
+ <Value>127.0.0.1</Value>
+ </Attribute>
+ <Attribute adref="hector.port">
+ <Value>9160</Value>
+ </Attribute>
+ <Attribute adref="hector.maxActive">
+ <Value>50</Value>
+ </Attribute>
+ <Attribute adref="hector.maxWaitTimeWhenExhausted">
+ <Value>-1</Value>
+ </Attribute>
+ <Attribute adref="hector.cassandraThriftSocketTimeout">
+ <Value>0</Value>
+ </Attribute>
+ <Attribute adref="hector.useThriftFramedTransport">
+ <Value>true</Value>
+ </Attribute>
+ <Attribute adref="hector.retryDownedHosts">
+ <Value>true</Value>
+ </Attribute>
+ <Attribute adref="hector.retryDownedHostsQueueSize">
+ <Value>-1</Value>
+ </Attribute>
+ <Attribute adref="hector.retryDownedHostsDelayInSeconds">
+ <Value>10</Value>
+ </Attribute>
+ <Attribute adref="hector.autoDiscoverHosts">
+ <Value>false</Value>
+ </Attribute>
+ <Attribute adref="hector.autoDiscoveryDelayInSeconds">
+ <Value>30</Value>
+ </Attribute>
+ <Attribute adref="hector.runAutoDiscoveryAtStartup">
+ <Value>false</Value>
+ </Attribute>
+ <Attribute adref="hector.useHostTimeoutTracker">
+ <Value>false</Value>
+ </Attribute>
+ <Attribute adref="hector.hostTimeoutCounter">
+ <Value>10</Value>
+ </Attribute>
+ <Attribute adref="hector.hostTimeoutWindow">
+ <Value>500</Value>
+ </Attribute>
+ <Attribute adref="hector.hostTimeoutSuspensionDurationInSeconds">
+ <Value>10</Value>
+ </Attribute>
+ <Attribute adref="hector.hostTimeoutUnsuspendCheckDelay">
+ <Value>10</Value>
+ </Attribute>
+ <Attribute adref="hector.useSocketKeepalive">
+ <Value>false</Value>
+ </Attribute>
+ </Object>
+ </Designate>
+</MetaData>
+
Added:
branches/cassandra-platform-0.3.0/config/src/main/resources/amdatu-core-configtemplates-config.xml
==============================================================================
--- (empty file)
+++
branches/cassandra-platform-0.3.0/config/src/main/resources/amdatu-core-configtemplates-config.xml
Tue Mar 13 15:51:16 2012
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.1.0";
filter="(|(!(org.amdatu.tenant.pid=*))(org.amdatu.tenant.pid=org.amdatu.tenant.PLATFORM))">
+ <OCD name="Config Templates Cassandra Application"
id="org.amdatu.core.config.templates">
+ <AD id="workdir" type="STRING" cardinality="0" />
+ <AD id="hostname" type="STRING" cardinality="0" />
+ <AD id="port" type="STRING" cardinality="0" />
+ </OCD>
+ <Designate pid="org.amdatu.core.config.templates" bundle="*">
+ <Object ocdref="org.amdatu.core.config.templates">
+ <Attribute adref="workdir">
+ <Value>config-template-manager</Value>
+ </Attribute>
+ <Attribute adref="hostname">
+ <Value>localhost</Value>
+ </Attribute>
+ <Attribute adref="port">
+ <Value>8080</Value>
+ </Attribute>
+ </Object>
+ </Designate>
+</MetaData>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
