Author: [email protected] Date: Tue Nov 15 16:57:13 2011 New Revision: 1721 Log:
Added: sandbox/ivol/amdatu-gadget-container/ sandbox/ivol/amdatu-gadget-container/gadget-container-release/ sandbox/ivol/amdatu-gadget-container/gadget-container-release/pom.xml sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/ sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/ sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/assembly/ sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/assembly/bin-component.xml sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/assembly/bin-release.xml sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/assembly/dev-server.xml sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/ sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/bin/ sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/bin/run.sh sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/bin/startup.bat sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/conf/ sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/conf/amdatu-platform.properties sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/config/ sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/config/org.amdatu.core.config.templates.cfg sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/config/org.amdatu.core.loghandler.cfg sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/config/org.amdatu.core.tenant.cfg sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/config/org.apache.felix.http.cfg sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/favicon/ sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/favicon/favicon.ico (contents, props changed) sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/licenses/ sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/licenses/apache-license-2.0.txt sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/shortcuts/ sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/shortcuts/Amdatu dashboard.URL sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/shortcuts/Felix Web Console.URL Added: sandbox/ivol/amdatu-gadget-container/gadget-container-release/pom.xml ============================================================================== --- (empty file) +++ sandbox/ivol/amdatu-gadget-container/gadget-container-release/pom.xml Tue Nov 15 16:57:13 2011 @@ -0,0 +1,544 @@ +<?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>amdatu</artifactId> + <version>4</version> + </parent> + <groupId>org.amdatu.release</groupId> + <artifactId>org.amdatu.release.gadgetcontainer</artifactId> + <packaging>pom</packaging> + <version>0.0.1-SNAPSHOT</version> + <name>Amdatu Gadget Container release</name> + + <properties> + <amdatu.http.hostname>localhost</amdatu.http.hostname> + <amdatu.http.port>8080</amdatu.http.port> + <amdatu.https.port>8045</amdatu.https.port> + <amdatu.log.level>INFO</amdatu.log.level> + + <org.amdatu.core.version>0.2.1</org.amdatu.core.version> + <org.amdatu.web.version>0.2.1</org.amdatu.web.version> + <org.amdatu.lib.version>0.2.1</org.amdatu.lib.version> + + <org.amdatu.cassandra.version>0.2.1-RC3</org.amdatu.cassandra.version> + <org.amdatu.auth.version>0.2.1-RC1</org.amdatu.auth.version> + <org.amdatu.opensocial.version>0.2.0</org.amdatu.opensocial.version> + + <org.apache.felix.main.version>3.0.2</org.apache.felix.main.version> + <org.apache.felix.eventadmin.version>1.2.2</org.apache.felix.eventadmin.version> + <org.apache.felix.configadmin.version>1.2.4</org.apache.felix.configadmin.version> + <org.apache.felix.scr.version>1.6.0</org.apache.felix.scr.version> + <org.apache.felix.log.version>1.0.0</org.apache.felix.log.version> + <org.apache.felix.file.install.version>3.1.10</org.apache.felix.file.install.version> + <org.apache.felix.http.version>2.0.4</org.apache.felix.http.version> + <org.apache.felix.metatype.version>1.0.4</org.apache.felix.metatype.version> + <org.apache.felix.webconsole.version>3.1.2</org.apache.felix.webconsole.version> + <org.apache.felix.shell.tui.version>1.4.1</org.apache.felix.shell.tui.version> + <org.apache.felix.shell.version>1.4.2</org.apache.felix.shell.version> + <org.apache.felix.prefs.version>1.0.4</org.apache.felix.prefs.version> + + <pax.useradmin.version>0.0.1-amdatu1</pax.useradmin.version> + + <!-- Cassandra properties --> + <cassandra.autobootstrap>false</cassandra.autobootstrap> + <cassandra.clustername>'Amdatu Cassandra Cluster'</cassandra.clustername> + <cassandra.consistency_level_read>ONE</cassandra.consistency_level_read> + <cassandra.consistency_level_write>ONE</cassandra.consistency_level_write> + <cassandra.default_replication_factor>1</cassandra.default_replication_factor> + <cassandra.initial_token>0</cassandra.initial_token> + <cassandra.listen_address>localhost</cassandra.listen_address> + <cassandra.rpc_address></cassandra.rpc_address> + <cassandra.rpc_port>9160</cassandra.rpc_port> + <cassandra.seeds>127.0.0.1</cassandra.seeds> + <cassandra.storage_port>7000</cassandra.storage_port> + </properties> + + <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> + </repositories> + + <dependencies> + <dependency> + <groupId>org.amdatu.core</groupId> + <artifactId>org.amdatu.core.config.templates</artifactId> + <version>${org.amdatu.core.version}</version> + <scope>runtime</scope> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.amdatu.core</groupId> + <artifactId>org.amdatu.core.loghandler</artifactId> + <version>${org.amdatu.core.version}</version> + <scope>runtime</scope> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.amdatu.core</groupId> + <artifactId>org.amdatu.core.tenant</artifactId> + <version>${org.amdatu.core.version}</version> + <scope>runtime</scope> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.amdatu.core</groupId> + <artifactId>org.amdatu.core.tenantstore.inmem</artifactId> + <version>${org.amdatu.core.version}</version> + <scope>runtime</scope> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.amdatu.core</groupId> + <artifactId>org.amdatu.core.tenantuseradmindecorator</artifactId> + <version>${org.amdatu.core.version}</version> + <scope>runtime</scope> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.amdatu.core</groupId> + <artifactId>org.amdatu.core.useradminstore.fs</artifactId> + <version>${org.amdatu.core.version}</version> + <scope>runtime</scope> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.amdatu.web</groupId> + <artifactId>org.amdatu.web.httpcontext</artifactId> + <version>${org.amdatu.web.version}</version> + <scope>runtime</scope> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.amdatu.web</groupId> + <artifactId>org.amdatu.web.dispatcher</artifactId> + <version>${org.amdatu.web.version}</version> + <scope>runtime</scope> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.amdatu.web</groupId> + <artifactId>org.amdatu.web.tenantresolver.hostname</artifactId> + <version>${org.amdatu.web.version}</version> + <scope>runtime</scope> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.amdatu.web</groupId> + <artifactId>org.amdatu.web.resource</artifactId> + <version>${org.amdatu.web.version}</version> + <scope>runtime</scope> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.amdatu.web</groupId> + <artifactId>org.amdatu.web.jsp</artifactId> + <version>${org.amdatu.web.version}</version> + <scope>compile</scope> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.amdatu.web</groupId> + <artifactId>org.amdatu.web.jaxrs</artifactId> + <version>${org.amdatu.web.version}</version> + <scope>runtime</scope> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.amdatu.web</groupId> + <artifactId>org.amdatu.web.wink</artifactId> + <version>${org.amdatu.web.version}</version> + <scope>runtime</scope> + <type>bundle</type> + </dependency> + + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <version>${org.osgi.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <version>${org.osgi.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.main</artifactId> + <version>${org.apache.felix.main.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.eventadmin</artifactId> + <version>${org.apache.felix.eventadmin.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.configadmin</artifactId> + <version>${org.apache.felix.configadmin.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.scr</artifactId> + <version>${org.apache.felix.scr.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.log</artifactId> + <version>${org.apache.felix.log.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.fileinstall</artifactId> + <version>${org.apache.felix.file.install.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.http.jetty</artifactId> + <version>${org.apache.felix.http.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.framework</artifactId> + <version>${org.apache.felix.main.version}</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.prefs</artifactId> + <version>${org.apache.felix.prefs.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.dependencymanager</artifactId> + <version>${org.apache.felix.dependencymanager.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.dependencymanager.shell</artifactId> + <version>${org.apache.felix.dependencymanager.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.metatype</artifactId> + <version>${org.apache.felix.metatype.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.webconsole</artifactId> + <version>${org.apache.felix.webconsole.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.shell.tui</artifactId> + <version>${org.apache.felix.shell.tui.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.shell</artifactId> + <version>${org.apache.felix.shell.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.ops4j.pax.useradmin</groupId> + <artifactId>pax-useradmin-service</artifactId> + <version>${pax.useradmin.version}</version> + <scope>compile</scope> + </dependency> + + <!-- Add all the Cassandra dependencies --> + <dependency> + <groupId>org.amdatu.cassandra</groupId> + <artifactId>org.amdatu.cassandra.application</artifactId> + <version>${org.amdatu.cassandra.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.cassandra</groupId> + <artifactId>org.amdatu.cassandra.store.gadget</artifactId> + <version>${org.amdatu.cassandra.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.cassandra</groupId> + <artifactId>org.amdatu.cassandra.listener</artifactId> + <version>${org.amdatu.cassandra.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.cassandra</groupId> + <artifactId>org.amdatu.cassandra.persistencemanager</artifactId> + <version>${org.amdatu.cassandra.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.cassandra</groupId> + <artifactId>org.amdatu.cassandra.persistencemanager.hector</artifactId> + <version>${org.amdatu.cassandra.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.cassandra</groupId> + <artifactId>org.amdatu.cassandra.store.consumer</artifactId> + <version>${org.amdatu.cassandra.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.cassandra</groupId> + <artifactId>org.amdatu.cassandra.store.token</artifactId> + <version>${org.amdatu.cassandra.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.cassandra</groupId> + <artifactId>org.amdatu.cassandra.store.nonce</artifactId> + <version>${org.amdatu.cassandra.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.cassandra</groupId> + <artifactId>org.amdatu.cassandra.store.useradmin</artifactId> + <version>${org.amdatu.cassandra.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.cassandra</groupId> + <artifactId>org.amdatu.cassandra.config</artifactId> + <version>${org.amdatu.cassandra.version}</version> + <scope>compile</scope> + </dependency> + + <!-- Add the nec. Auth dependencies --> + <dependency> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.login.gadget</artifactId> + <version>${org.amdatu.auth.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.login.service</artifactId> + <version>${org.amdatu.auth.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.oauth.api</artifactId> + <version>${org.amdatu.auth.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.oauth.client</artifactId> + <version>${org.amdatu.auth.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.oauth.consumerregistry</artifactId> + <version>${org.amdatu.auth.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.oauth.server</artifactId> + <version>${org.amdatu.auth.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.tokenprovider</artifactId> + <version>${org.amdatu.auth.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.useradmin.gadget</artifactId> + <version>${org.amdatu.auth.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.useradmin.rest</artifactId> + <version>${org.amdatu.auth.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.config</artifactId> + <version>${org.amdatu.auth.version}</version> + <scope>compile</scope> + </dependency> + + <!-- Add the OpenSocial dependencies --> + <dependency> + <groupId>org.amdatu.opensocial</groupId> + <artifactId>org.amdatu.opensocial.dashboard</artifactId> + <version>${org.amdatu.opensocial.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.opensocial</groupId> + <artifactId>org.amdatu.opensocial.gadgetmanagement</artifactId> + <version>${org.amdatu.opensocial.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.opensocial</groupId> + <artifactId>org.amdatu.opensocial.profile</artifactId> + <version>${org.amdatu.opensocial.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.opensocial</groupId> + <artifactId>org.amdatu.opensocial.shindig</artifactId> + <version>${org.amdatu.opensocial.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.opensocial</groupId> + <artifactId>org.amdatu.opensocial.config</artifactId> + <version>${org.amdatu.opensocial.version}</version> + <scope>compile</scope> + </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> + <appendAssemblyId>true</appendAssemblyId> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + <profiles> + <!-- + This profile is active by default and only assembles the dev server. + However it will be overruled by the release profile below unless that one + is deactivated. + --> + <profile> + <id>development</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <build> + <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/dev-server.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <!-- + The release profile by default generates all binary, source, + javadoc and assemblies + --> + <id>release</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <build> + <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/dev-server.xml</descriptor> + <descriptor>src/main/assembly/bin-release.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> Added: sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/assembly/bin-component.xml ============================================================================== --- (empty file) +++ sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/assembly/bin-component.xml Tue Nov 15 16:57:13 2011 @@ -0,0 +1,85 @@ +<?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> + <outputDirectory>lib</outputDirectory> + <includes> + <include>org.osgi:org.osgi.compendium</include> + <include>org.apache.felix:*</include> + <include>org.ops4j.pax.useradmin:*</include> + </includes> + <unpack>false</unpack> + <useTransitiveDependencies>false</useTransitiveDependencies> + </dependencySet> + + <dependencySet> + <outputDirectory>deploy</outputDirectory> + <includes> + <include>org.amdatu.core:*</include> + <include>org.amdatu.web:*</include> + <include>org.amdatu.cassandra:*</include> + <include>org.amdatu.auth:*</include> + <include>org.amdatu.opensocial:*</include> + <include>org.amdatu.semanticweb:*</include> + </includes> + <excludes> + <exclude>org.amdatu.cassandra:org.amdatu.cassandra.config</exclude> + <exclude>org.amdatu.auth:org.amdatu.auth.config</exclude> + <exclude>org.amdatu.opensocial:org.amdatu.opensocial.config</exclude> + </excludes> + <unpack>false</unpack> + <useTransitiveDependencies>false</useTransitiveDependencies> + </dependencySet> + + <!--Unpack the the config files to deploy directory --> + <dependencySet> + <outputDirectory>deploy</outputDirectory> + <includes> + <include>org.amdatu.auth:org.amdatu.auth.config</include> + <include>org.amdatu.cassandra:org.amdatu.cassandra.config</include> + <include>org.amdatu.opensocial:org.amdatu.opensocial.config</include> + </includes> + <unpack>true</unpack> + <unpackOptions> + <excludes> + <exclude>META-INF/**</exclude> + </excludes> + <filtered>true</filtered> + </unpackOptions> + <outputFileNameMapping></outputFileNameMapping> <!-- MASSEMBLY-533 --> + <useTransitiveDependencies>false</useTransitiveDependencies> + </dependencySet> + </dependencySets> + <fileSets> + <fileSet> + <directory></directory> + <outputDirectory></outputDirectory> + <filtered>false</filtered> + <includes> + <include>LICENSE</include> + <include>NOTICE</include> + </includes> + </fileSet> + <fileSet> + <directory>src/main/resources/bin</directory> + <outputDirectory></outputDirectory> + <filtered>true</filtered> + </fileSet> + <fileSet> + <directory>src/main/resources/conf</directory> + <outputDirectory>conf</outputDirectory> + <filtered>true</filtered> + </fileSet> + <fileSet> + <directory>src/main/resources/shortcuts</directory> + <outputDirectory></outputDirectory> + <filtered>true</filtered> + </fileSet> + <fileSet> + <directory>src/main/resources/config</directory> + <outputDirectory>deploy</outputDirectory> + <filtered>true</filtered> + </fileSet> + </fileSets> +</component> \ No newline at end of file Added: sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/assembly/bin-release.xml ============================================================================== --- (empty file) +++ sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/assembly/bin-release.xml Tue Nov 15 16:57:13 2011 @@ -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>tar.gz</format> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <componentDescriptors> + <componentDescriptor>src/main/assembly/bin-component.xml</componentDescriptor> + </componentDescriptors> +</assembly> \ No newline at end of file Added: sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/assembly/dev-server.xml ============================================================================== --- (empty file) +++ sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/assembly/dev-server.xml Tue Nov 15 16:57:13 2011 @@ -0,0 +1,28 @@ +<?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>dev</id> + <formats> + <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: sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/bin/run.sh ============================================================================== --- (empty file) +++ sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/bin/run.sh Tue Nov 15 16:57:13 2011 @@ -0,0 +1,16 @@ +#!/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: sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/bin/startup.bat ============================================================================== --- (empty file) +++ sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/bin/startup.bat Tue Nov 15 16:57:13 2011 @@ -0,0 +1,19 @@ +@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: sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/conf/amdatu-platform.properties ============================================================================== --- (empty file) +++ sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/conf/amdatu-platform.properties Tue Nov 15 16:57:13 2011 @@ -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: sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/config/org.amdatu.core.config.templates.cfg ============================================================================== --- (empty file) +++ sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/config/org.amdatu.core.config.templates.cfg Tue Nov 15 16:57:13 2011 @@ -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: sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/config/org.amdatu.core.loghandler.cfg ============================================================================== --- (empty file) +++ sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/config/org.amdatu.core.loghandler.cfg Tue Nov 15 16:57:13 2011 @@ -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: sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/config/org.amdatu.core.tenant.cfg ============================================================================== --- (empty file) +++ sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/config/org.amdatu.core.tenant.cfg Tue Nov 15 16:57:13 2011 @@ -0,0 +1,4 @@ +# Default Tenants +tenant1.id=Default +tenant1.name=Default tenant +tenant1.properties.hostname=${amdatu.http.hostname} Added: sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/config/org.apache.felix.http.cfg ============================================================================== --- (empty file) +++ sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/config/org.apache.felix.http.cfg Tue Nov 15 16:57:13 2011 @@ -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: sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/favicon/favicon.ico ============================================================================== Binary file. No diff available. Added: sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/licenses/apache-license-2.0.txt ============================================================================== --- (empty file) +++ sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/licenses/apache-license-2.0.txt Tue Nov 15 16:57:13 2011 @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. Added: sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/shortcuts/Amdatu dashboard.URL ============================================================================== --- (empty file) +++ sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/shortcuts/Amdatu dashboard.URL Tue Nov 15 16:57:13 2011 @@ -0,0 +1,2 @@ +[InternetShortcut] +URL=http://${amdatu.http.hostname}:${amdatu.http.port}/dashboard/jsp/dashboard.jsp \ No newline at end of file Added: sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/shortcuts/Felix Web Console.URL ============================================================================== --- (empty file) +++ sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/shortcuts/Felix Web Console.URL Tue Nov 15 16:57:13 2011 @@ -0,0 +1,8 @@ +[InternetShortcut] +URL=http://${amdatu.http.hostname}:${amdatu.http.port}/system/console +IDList= +HotKey=0 +IconFile=favicon.ico +IconIndex=0 +[{000214A0-0000-0000-C000-000000000046}] +Prop3=19,2 _______________________________________________ Amdatu-commits mailing list [email protected] http://lists.amdatu.org/mailman/listinfo/amdatu-commits
