Author: ivol Date: Thu Oct 7 11:11:27 2010 New Revision: 139 Log: [AMDATU-34]
Added assemble module that generates binary and source releases Added copying of cfg files to deploy dir in root pom.xml which was accidentally removed after the last refactoring, causing Amdatu to fail on startup Added: trunk/amdatu-release/ trunk/amdatu-release/pom.xml trunk/amdatu-release/src/ trunk/amdatu-release/src/main/ trunk/amdatu-release/src/main/assembly/ trunk/amdatu-release/src/main/assembly/bin-release.xml trunk/amdatu-release/src/main/assembly/src-release.xml Modified: trunk/platform-bundles/cassandra-application/pom.xml trunk/platform-bundles/sesame-application/pom.xml trunk/platform-bundles/shindig-application/pom.xml trunk/platform-bundles/wink-application/pom.xml trunk/pom.xml trunk/src/main/resources/conf/felix-config.properties Added: trunk/amdatu-release/pom.xml ============================================================================== --- (empty file) +++ trunk/amdatu-release/pom.xml Thu Oct 7 11:11:27 2010 @@ -0,0 +1,270 @@ +<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>0.0.4</version> <!-- There is not yet an easy way to inherit this version from its parent --> + </parent> + <packaging>pom</packaging> + <artifactId>amdatu-release</artifactId> + <name>Amdatu release</name> + + <dependencies> + <!-- Application bundles --> + <dependency> + <groupId>org.amdatu.application</groupId> + <artifactId>dashboard</artifactId> + <version>${platform.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.application</groupId> + <artifactId>gadgetmanagement</artifactId> + <version>${platform.version}</version> + <scope>compile</scope> + </dependency> + + <!-- Example bundles --> + <dependency> + <groupId>org.amdatu.example</groupId> + <artifactId>course-gadget</artifactId> + <version>${platform.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.example</groupId> + <artifactId>course-service</artifactId> + <version>${platform.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.example</groupId> + <artifactId>friends-gadget</artifactId> + <version>${platform.version}</version> + <scope>compile</scope> + </dependency> + + <!-- Gadget bundles --> + <dependency> + <groupId>org.amdatu.gadget</groupId> + <artifactId>login</artifactId> + <version>${platform.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.gadget</groupId> + <artifactId>sparqlendpoint</artifactId> + <version>${platform.version}</version> + <scope>compile</scope> + </dependency> + + <!-- Platform bundles --> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>authorization</artifactId> + <version>${platform.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>cassandra-application</artifactId> + <version>${platform.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>cassandra-listener</artifactId> + <version>${platform.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>cassandra-persistencemanager</artifactId> + <version>${platform.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>config-template-manager</artifactId> + <version>${platform.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>httpcontext</artifactId> + <version>${platform.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>loghandler</artifactId> + <version>${platform.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>profile-service</artifactId> + <version>${platform.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>sesame-application</artifactId> + <version>${platform.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>shindig-application</artifactId> + <version>${platform.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>tenant-service</artifactId> + <version>${platform.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>useradmin-cassandra-store</artifactId> + <version>${platform.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>wink-application</artifactId> + <version>${platform.version}</version> + <scope>runtime</scope> + </dependency> + + <!-- System bundles --> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.main</artifactId> + <version>${org.apache.felix.main.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.osgi.core</artifactId> + <version>${org.osgi.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</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.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.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.ops4j.pax.web</groupId> + <artifactId>pax-web-jetty-bundle</artifactId> + <version>${pax-web.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.ops4j.pax.web</groupId> + <artifactId>pax-web-jsp</artifactId> + <version>${pax-web.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.commons.mime</artifactId> + <version>${org.apache.sling.commons.mime.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.commons.osgi</artifactId> + <version>${org.apache.sling.commons.osgi.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.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> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-5</version> + <executions> + <execution> + <id>create-release</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/main/assembly/bin-release.xml</descriptor> + <descriptor>src/main/assembly/src-release.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> Added: trunk/amdatu-release/src/main/assembly/bin-release.xml ============================================================================== --- (empty file) +++ trunk/amdatu-release/src/main/assembly/bin-release.xml Thu Oct 7 11:11:27 2010 @@ -0,0 +1,139 @@ +<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> + <formats> + <format>tar</format> + <format>tar.gz</format> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> <!-- strip the module prefixes --> + + <dependencySets> + <dependencySet> + <outputDirectory>application-bundles</outputDirectory> + <outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping> + <includes> + <include>org.amdatu.application:*</include> + </includes> + <unpack>false</unpack> + <useTransitiveDependencies>false</useTransitiveDependencies> + </dependencySet> + + <dependencySet> + <outputDirectory>example-bundles</outputDirectory> + <outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping> + <includes> + <include>org.amdatu.example:*</include> + </includes> + <unpack>false</unpack> + <useTransitiveDependencies>false</useTransitiveDependencies> + </dependencySet> + + <dependencySet> + <scope>runtime</scope> + <outputDirectory>gadget-bundles</outputDirectory> + <outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping> + <includes> + <include>org.amdatu.gadget:*</include> + </includes> + <unpack>false</unpack> + <useTransitiveDependencies>false</useTransitiveDependencies> + </dependencySet> + + <dependencySet> + <scope>runtime</scope> + <outputDirectory>platform-bundles</outputDirectory> + <outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping> + <includes> + <include>org.amdatu.platform:*</include> + </includes> + <unpack>false</unpack> + <useTransitiveDependencies>false</useTransitiveDependencies> + </dependencySet> + + <dependencySet> + <scope>runtime</scope> + <outputDirectory>system-bundles</outputDirectory> + <includes> + <include>org.apache.felix:*</include> + <include>org.apache.sling:*</include> + <include>org.ops4j.pax.web:*</include> + <include>org.ops4j.pax.useradmin:*</include> + </includes> + <unpack>false</unpack> + <useTransitiveDependencies>false</useTransitiveDependencies> + </dependencySet> + </dependencySets> + + <fileSets> + <fileSet> + <directory>../src/main/resources/conf</directory> + <outputDirectory>conf</outputDirectory> + <filtered>true</filtered> + </fileSet> + <fileSet> + <directory>../src/main/resources/shell</directory> + <outputDirectory></outputDirectory> + <filtered>true</filtered> + <includes> + <include>run.sh</include> + <include>startup.bat</include> + </includes> + </fileSet> + <fileSet> + <directory>../src/main/resources/shortcuts</directory> + <outputDirectory></outputDirectory> + <filtered>true</filtered> + <includes> + <include>Amdatu dashboard.URL</include> + <include>Felix Web Console.URL</include> + </includes> + </fileSet> + + <!-- These entries need to be replaced when the new central configuration bundle is available --> + <fileSet> + <directory>../platform-bundles/cassandra-application/src/main/resources/conf</directory> + <outputDirectory>deploy</outputDirectory> + <filtered>true</filtered> + </fileSet> + <fileSet> + <directory>../example-bundles/course-gadget/src/main/resources/conf</directory> + <outputDirectory>deploy</outputDirectory> + <filtered>true</filtered> + </fileSet> + <fileSet> + <directory>../example-bundles/course-service/src/main/resources/conf</directory> + <outputDirectory>deploy</outputDirectory> + <filtered>true</filtered> + </fileSet> + <fileSet> + <directory>../example-bundles/friends-gadget/src/main/resources/conf</directory> + <outputDirectory>deploy</outputDirectory> + <filtered>true</filtered> + </fileSet> + <fileSet> + <directory>../gadget-bundles/login-gadget/src/main/resources/conf</directory> + <outputDirectory>deploy</outputDirectory> + <filtered>true</filtered> + </fileSet> + <fileSet> + <directory>../gadget-bundles/sparqlendpoint-gadget/src/main/resources/conf</directory> + <outputDirectory>deploy</outputDirectory> + <filtered>true</filtered> + </fileSet> + <fileSet> + <directory>../platform-bundles/config-template-manager/src/main/resources/conf</directory> + <outputDirectory>deploy</outputDirectory> + <filtered>true</filtered> + </fileSet> + <fileSet> + <directory>../platform-bundles/loghandler/src/main/resources/conf</directory> + <outputDirectory>deploy</outputDirectory> + <filtered>true</filtered> + </fileSet> + </fileSets> + +</assembly> \ No newline at end of file Added: trunk/amdatu-release/src/main/assembly/src-release.xml ============================================================================== --- (empty file) +++ trunk/amdatu-release/src/main/assembly/src-release.xml Thu Oct 7 11:11:27 2010 @@ -0,0 +1,25 @@ +<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>src</id> + <formats> + <format>tar</format> + <format>tar.gz</format> + <format>zip</format> + </formats> + + <fileSets> + <fileSet> + <directory>..</directory> + <excludes> + <exclude>**/target/**</exclude> + <exclude>**/.settings/**</exclude> + <exclude>**/.classpath</exclude> + <exclude>**/.project</exclude> + </excludes> + </fileSet> + </fileSets> + +</assembly> \ No newline at end of file Modified: trunk/platform-bundles/cassandra-application/pom.xml ============================================================================== --- trunk/platform-bundles/cassandra-application/pom.xml (original) +++ trunk/platform-bundles/cassandra-application/pom.xml Thu Oct 7 11:11:27 2010 @@ -9,7 +9,6 @@ </parent> <groupId>org.amdatu.platform</groupId> <artifactId>cassandra-application</artifactId> - <version>${cassandra.version}</version> <packaging>bundle</packaging> <name>Amdatu Platform - Apache Cassandra Application</name> Modified: trunk/platform-bundles/sesame-application/pom.xml ============================================================================== --- trunk/platform-bundles/sesame-application/pom.xml (original) +++ trunk/platform-bundles/sesame-application/pom.xml Thu Oct 7 11:11:27 2010 @@ -11,7 +11,6 @@ <artifactId>sesame-application</artifactId> <packaging>bundle</packaging> <name>Amdatu Platform - Sesame Application</name> - <version>${org.openrdf.sesame.version}</version> <dependencies> <dependency> Modified: trunk/platform-bundles/shindig-application/pom.xml ============================================================================== --- trunk/platform-bundles/shindig-application/pom.xml (original) +++ trunk/platform-bundles/shindig-application/pom.xml Thu Oct 7 11:11:27 2010 @@ -11,7 +11,6 @@ <artifactId>shindig-application</artifactId> <packaging>bundle</packaging> <name>Amdatu Platform - Apache Shindig Application</name> - <version>${shindig.version}</version> <dependencies> Modified: trunk/platform-bundles/wink-application/pom.xml ============================================================================== --- trunk/platform-bundles/wink-application/pom.xml (original) +++ trunk/platform-bundles/wink-application/pom.xml Thu Oct 7 11:11:27 2010 @@ -11,7 +11,6 @@ <artifactId>wink-application</artifactId> <packaging>bundle</packaging> <name>Amdatu Platform - Apache Wink Application</name> - <version>${org.apache.wink.version}</version> <dependencies> <dependency> Modified: trunk/pom.xml ============================================================================== --- trunk/pom.xml (original) +++ trunk/pom.xml Thu Oct 7 11:11:27 2010 @@ -317,7 +317,7 @@ <dependency> <groupId>org.amdatu.platform</groupId> <artifactId>cassandra-application</artifactId> - <version>${cassandra.version}</version> + <version>${platform.version}</version> <scope>provided</scope> </dependency> <dependency> @@ -365,13 +365,13 @@ <dependency> <groupId>org.amdatu.platform</groupId> <artifactId>sesame-application</artifactId> - <version>${org.openrdf.sesame.version}</version> + <version>${platform.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.amdatu.platform</groupId> <artifactId>shindig-application</artifactId> - <version>${shindig.version}</version> + <version>${platform.version}</version> <scope>provided</scope> </dependency> <dependency> @@ -383,7 +383,7 @@ <dependency> <groupId>org.amdatu.platform</groupId> <artifactId>wink-application</artifactId> - <version>${org.apache.wink.version}</version> + <version>${platform.version}</version> <scope>provided</scope> </dependency> <dependency> @@ -621,9 +621,54 @@ </resource> </resources> </configuration> - </execution> + </execution> + <execution> + <id>copy-configs</id> + <phase>install</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${deploy.directory}</outputDirectory> + <resources> + <resource> + <directory>platform-bundles/cassandra-application/src/main/resources/conf</directory> + <filtering>true</filtering> + </resource> + <resource> + <directory>example-bundles/course-gadget/src/main/resources/conf</directory> + <filtering>true</filtering> + </resource> + <resource> + <directory>example-bundles/course-service/src/main/resources/conf</directory> + <filtering>true</filtering> + </resource> + <resource> + <directory>example-bundles/friends-gadget/src/main/resources/conf</directory> + <filtering>true</filtering> + </resource> + <resource> + <directory>gadget-bundles/login-gadget/src/main/resources/conf</directory> + <filtering>true</filtering> + </resource> + <resource> + <directory>gadget-bundles/sparqlendpoint-gadget/src/main/resources/conf</directory> + <filtering>true</filtering> + </resource> + <resource> + <directory>platform-bundles/loghandler/src/main/resources/conf</directory> + <filtering>true</filtering> + </resource> + <resource> + <directory>platform-bundles/config-template-manager/src/main/resources/conf</directory> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> </executions> - </plugin> + </plugin> + </plugins> <!-- Here we manage the plugins of all child projects --> Modified: trunk/src/main/resources/conf/felix-config.properties ============================================================================== --- trunk/src/main/resources/conf/felix-config.properties (original) +++ trunk/src/main/resources/conf/felix-config.properties Thu Oct 7 11:11:27 2010 @@ -70,13 +70,13 @@ # 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=file:platform-bundles/org.amdatu.shindig-app-bundle-1.1-BETA5-incubating.jar +#felix.auto.install.5=file:platform-bundles/org.amdatu.shindig-app-bundle-0.0.4.jar # 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.5=reference:file:platform-bundles/org.amdatu.platform.shindig-application-1.1-BETA5-incubating.jar reference:file:platform-bundles/org.amdatu.platform.cassandra-application-0.6.4.jar reference:file:platform-bundles/org.amdatu.platform.cassandra-listener-0.0.4.jar reference:file:platform-bundles/org.amdatu.platform.cassandra-persistencemanager-0.0.4.jar reference:file:platform-bundles/org.amdatu.platform.loghandler-0.0.4.jar reference:file:platform-bundles/org.amdatu.platform.profile-service-0.0.4.jar reference:file:platform-bundles/org.amdatu.platform.tenant-service-0.0.4.jar reference:file:platform-bundles/org.amdatu.platform.authorization-0.0.4.jar reference:file:platform-bundles/org.amdatu.platform.httpcontext-0.0.4.jar reference:file:platform-bundles/org.amdatu.platform.wink-application-1.1.1-incubating.jar reference:file:platform-bundles/org.amdatu.platform.sesame-application-2.3.1.jar reference:file:platform-bundles/org.amdatu.platform.config-template-manager-0.0.4.jar reference:file:platform-bundles/org.amdatu.platform.useradmin-cassandra-store-0.0.4.jar +felix.auto.start.5=reference:file:platform-bundles/org.amdatu.platform.shindig-application-0.0.4.jar reference:file:platform-bundles/org.amdatu.platform.cassandra-application-0.0.4.jar reference:file:platform-bundles/org.amdatu.platform.cassandra-listener-0.0.4.jar reference:file:platform-bundles/org.amdatu.platform.cassandra-persistencemanager-0.0.4.jar reference:file:platform-bundles/org.amdatu.platform.loghandler-0.0.4.jar reference:file:platform-bundles/org.amdatu.platform.profile-service-0.0.4.jar reference:file:platform-bundles/org.amdatu.platform.tenant-service-0.0.4.jar reference:file:platform-bundles/org.amdatu.platform.authorization-0.0.4.jar reference:file:platform-bundles/org.amdatu.platform.httpcontext-0.0.4.jar reference:file:platform-bundles/org.amdatu.platform.wink-application-0.0.4.jar reference:file:platform-bundles/org.amdatu.platform.sesame-application-0.0.4.jar reference:file:platform-bundles/org.amdatu.platform.config-template-manager-0.0.4.jar reference:file:platform-bundles/org.amdatu.platform.useradmin-cassandra-store-0.0.4.jar felix.auto.start.10=reference:file:application-bundles/org.amdatu.application.dashboard-0.0.4.jar reference:file:application-bundles/org.amdatu.application.gadgetmanagement-0.0.4.jar felix.auto.start.20=reference:file:gadget-bundles/org.amdatu.gadget.sparqlendpoint-0.0.4.jar reference:file:gadget-bundles/org.amdatu.gadget.login-0.0.4.jar felix.auto.start.30=reference:file:example-bundles/org.amdatu.example.friends-gadget-0.0.4.jar reference:file:example-bundles/org.amdatu.example.course-gadget-0.0.4.jar reference:file:example-bundles/org.amdatu.example.course-service-0.0.4.jar
