Author: ivol Date: Tue Oct 12 10:23:36 2010 New Revision: 151 Log: AMDATU-34 Nightly builds should work now on Bamboo
Modified: trunk/amdatu-release/src/main/assembly/bin-release.xml trunk/maven-settings-bamboo.xml Modified: trunk/amdatu-release/src/main/assembly/bin-release.xml ============================================================================== --- trunk/amdatu-release/src/main/assembly/bin-release.xml (original) +++ trunk/amdatu-release/src/main/assembly/bin-release.xml Tue Oct 12 10:23:36 2010 @@ -1,139 +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";> + 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> + <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> - + <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 Modified: trunk/maven-settings-bamboo.xml ============================================================================== --- trunk/maven-settings-bamboo.xml (original) +++ trunk/maven-settings-bamboo.xml Tue Oct 12 10:23:36 2010 @@ -27,34 +27,52 @@ <localRepository>/vol/www/bamboo/build/maven-repository</localRepository> - <mirrors> - <mirror> - <id>central</id> - <name>Mirror to central</name> - <url>http://repo1.maven.org/maven2</url> - <mirrorOf>java.net</mirrorOf> - </mirror> - </mirrors> - - <activeProfiles> - <activeProfile>build-amdatu</activeProfile> - </activeProfiles> + <mirrors> + <mirror> + <id>central</id> + <name>Mirror to central</name> + <url>http://repo1.maven.org/maven2</url> + <mirrorOf>java.net</mirrorOf> + </mirror> + </mirrors> + + <activeProfiles> + <activeProfile>build-amdatu</activeProfile> + </activeProfiles> - <!-- Adjust these settings to your needs --> - <profiles> - <profile> - <id>build-amdatu</id> - <properties> - <server.hostname>localhost</server.hostname> - <server.port>3737</server.port> - <server.port.secure>9090</server.port.secure> - <root.directory>.</root.directory> - <conf.directory>${root.directory}/conf</conf.directory> - <work.directory.name>work</work.directory.name> - <work.directory>${root.directory}/${work.directory.name}</work.directory> - <deploy.directory.name>deploy</deploy.directory.name> - <deploy.directory>${root.directory}/${deploy.directory.name}</deploy.directory> - </properties> - </profile> - </profiles> + <!-- Adjust these settings to your needs --> + <profiles> + <profile> + <id>build-amdatu</id> + <properties> + <server.hostname>localhost</server.hostname> + <server.port>3737</server.port> + <server.port.secure>9090</server.port.secure> + <root.directory>.</root.directory> + <conf.directory>${root.directory}/conf</conf.directory> + <work.directory.name>work</work.directory.name> + <work.directory>${root.directory}/${work.directory.name}</work.directory> + <deploy.directory.name>deploy</deploy.directory.name> + <deploy.directory>${root.directory}/${deploy.directory.name}</deploy.directory> + </properties> + + <distributionManagement> + <snapshotRepository> + <name>Amdatu Nightly Builds</name> + <id>amdatu.nightly</id> + <url>dav:http://repository.amdatu.org/nightly</url> + </snapshotRepository> + <repository> + <name>Amdatu Distributions</name> + <id>amdatu.releases</id> + <url>dav:http://repository.amdatu.org/releases</url> + </repository> + <site> + <name>Amdatu Sites</name> + <id>amdatu.sites</id> + <url>dav:http://repository.amdatu.org/sites/${project.version}</url> + </site> + </distributionManagement> + </profile> + </profiles> </settings>
