Author: bdekruijff at gmail.com Date: Thu Nov 11 15:22:41 2010 New Revision: 407
Log: AMDATU-138 Added dev-server assembly under create-devserver profile Added: trunk/amdatu-release/src/main/assembly/bin-component.xml trunk/amdatu-release/src/main/assembly/dev-server.xml Modified: trunk/amdatu-release/pom.xml trunk/amdatu-release/src/main/assembly/bin-release.xml trunk/amdatu-release/src/main/assembly/src-release.xml Modified: trunk/amdatu-release/pom.xml ============================================================================== --- trunk/amdatu-release/pom.xml (original) +++ trunk/amdatu-release/pom.xml Thu Nov 11 15:22:41 2010 @@ -1,4 +1,5 @@ -<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";> +<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> @@ -8,7 +9,7 @@ <packaging>pom</packaging> <artifactId>amdatu-release</artifactId> <name>Amdatu Release</name> - + <dependencies> <!-- Authorization bundles --> <dependency> @@ -25,7 +26,7 @@ <scope>compile</scope> <type>bundle</type> </dependency> - + <!-- Core bundles --> <dependency> <groupId>org.amdatu.core.cassandra</groupId> @@ -40,14 +41,14 @@ <version>${platform.version}</version> <scope>runtime</scope> <type>bundle</type> - </dependency> + </dependency> <dependency> <groupId>org.amdatu.core.cassandra</groupId> <artifactId>persistencemanager</artifactId> <version>${platform.version}</version> <scope>runtime</scope> <type>bundle</type> - </dependency> + </dependency> <dependency> <groupId>org.amdatu.core.cassandra</groupId> <artifactId>useradminstore</artifactId> @@ -68,44 +69,44 @@ <version>${platform.version}</version> <scope>runtime</scope> <type>bundle</type> - </dependency> + </dependency> <dependency> <groupId>org.amdatu.core</groupId> <artifactId>loghandler</artifactId> <version>${platform.version}</version> <scope>runtime</scope> <type>bundle</type> - </dependency> + </dependency> <dependency> <groupId>org.amdatu.core</groupId> <artifactId>tenant</artifactId> <version>${platform.version}</version> <scope>runtime</scope> <type>bundle</type> - </dependency> - - <!-- Example bundles --> - <dependency> - <groupId>org.amdatu.example.course</groupId> - <artifactId>gadget</artifactId> - <version>${platform.version}</version> - <scope>compile</scope> - <type>bundle</type> - </dependency> - <dependency> - <groupId>org.amdatu.example.course</groupId> - <artifactId>service</artifactId> - <version>${platform.version}</version> - <scope>compile</scope> - <type>bundle</type> - </dependency> - <dependency> - <groupId>org.amdatu.example.friends</groupId> - <artifactId>gadget</artifactId> - <version>${platform.version}</version> - <scope>compile</scope> - <type>bundle</type> - </dependency> + </dependency> + + <!-- Example bundles --> + <dependency> + <groupId>org.amdatu.example.course</groupId> + <artifactId>gadget</artifactId> + <version>${platform.version}</version> + <scope>compile</scope> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.amdatu.example.course</groupId> + <artifactId>service</artifactId> + <version>${platform.version}</version> + <scope>compile</scope> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.amdatu.example.friends</groupId> + <artifactId>gadget</artifactId> + <version>${platform.version}</version> + <scope>compile</scope> + <type>bundle</type> + </dependency> <!-- Open Social bundles --> <dependency> @@ -128,31 +129,31 @@ <version>${platform.version}</version> <scope>runtime</scope> <type>bundle</type> - </dependency> + </dependency> <dependency> <groupId>org.amdatu.opensocial</groupId> <artifactId>shindig</artifactId> <version>${platform.version}</version> <scope>runtime</scope> <type>bundle</type> - </dependency> + </dependency> - <!-- Semantic Web bundles --> + <!-- Semantic Web bundles --> <dependency> <groupId>org.amdatu.semanticweb</groupId> <artifactId>sesame</artifactId> <version>${platform.version}</version> <scope>runtime</scope> <type>bundle</type> - </dependency> + </dependency> <dependency> <groupId>org.amdatu.semanticweb</groupId> <artifactId>sparqlendpoint</artifactId> <version>${platform.version}</version> <scope>compile</scope> <type>bundle</type> - </dependency> - + </dependency> + <!-- Web bundles --> <dependency> <groupId>org.amdatu.web</groupId> @@ -160,7 +161,7 @@ <version>${platform.version}</version> <scope>runtime</scope> <type>bundle</type> - </dependency> + </dependency> <dependency> <groupId>org.amdatu.web</groupId> <artifactId>jsp</artifactId> @@ -169,27 +170,27 @@ <type>bundle</type> </dependency> <dependency> - <groupId>org.amdatu.web.rest</groupId> + <groupId>org.amdatu.web.rest</groupId> <artifactId>jaxrs</artifactId> <version>${platform.version}</version> <scope>runtime</scope> <type>bundle</type> - </dependency> + </dependency> <dependency> - <groupId>org.amdatu.web.rest</groupId> + <groupId>org.amdatu.web.rest</groupId> <artifactId>wink</artifactId> <version>${platform.version}</version> <scope>runtime</scope> <type>bundle</type> - </dependency> - + </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> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.osgi.core</artifactId> @@ -206,7 +207,7 @@ <groupId> org.apache.felix</groupId> <artifactId>org.osgi.foundation</artifactId> </exclusion> - </exclusions> + </exclusions> </dependency> <dependency> <groupId>org.apache.felix</groupId> @@ -219,25 +220,25 @@ <artifactId>org.apache.felix.configadmin</artifactId> <version>${org.apache.felix.configadmin.version}</version> <scope>compile</scope> - </dependency> + </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> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.log</artifactId> <version>${org.apache.felix.log.version}</version> <scope>compile</scope> - </dependency> + </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> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.http.jetty</artifactId> @@ -261,7 +262,7 @@ <artifactId>ops4j-base-lang</artifactId> <version>1.2.2</version> <scope>compile</scope> - </dependency> + </dependency> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.commons.mime</artifactId> @@ -279,39 +280,39 @@ <artifactId>org.apache.felix.dependencymanager</artifactId> <version>${org.apache.felix.dependencymanager.version}</version> <scope>compile</scope> - </dependency> + </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> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.webconsole</artifactId> <version>${org.apache.felix.webconsole.version}</version> <scope>compile</scope> - </dependency> + </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> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.shell</artifactId> <version>${org.apache.felix.shell.version}</version> <scope>compile</scope> - </dependency> + </dependency> <dependency> <groupId>org.ops4j.pax.useradmin</groupId> <artifactId>pax-useradmin-service</artifactId> <version>${pax.useradmin.version}</version> <scope>compile</scope> - </dependency> + </dependency> </dependencies> - + <profiles> <profile> <!-- Profile active only for release builds --> @@ -333,14 +334,14 @@ </goals> <configuration> <tasks> - <delete dir="${snapshot.repository.directory}"/> + <delete dir="${snapshot.repository.directory}" /> <echo>Deleting directory ${snapshot.repository.directory}</echo> </tasks> </configuration> </execution> </executions> - </plugin> - + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> @@ -364,5 +365,35 @@ </plugins> </build> </profile> + <profile> + <!-- Profile active only for release builds --> + <id>build-devserver</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <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/dev-server.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> </project> Added: trunk/amdatu-release/src/main/assembly/bin-component.xml ============================================================================== --- (empty file) +++ trunk/amdatu-release/src/main/assembly/bin-component.xml Thu Nov 11 15:22:41 2010 @@ -0,0 +1,149 @@ +<?xml version="1.0" encoding="UTF-8"?> +<component xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.0 view-source:http://maven.apache.org/xsd/component-1.1.0.xsd";> + + <!-- + Shared component definition for + - bin-release + - dev-server + --> + <dependencySets> + <dependencySet> + <outputDirectory>amdatu-application</outputDirectory> + <outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}.${artifact.extension} + </outputFileNameMapping> + <includes> + <include>org.amdatu.authorization:*</include> + <include>org.amdatu.authorization.*:*</include> + <include>org.amdatu.opensocial:*</include> + <include>org.amdatu.opensocial.*:*</include> + <include>org.amdatu.semanticweb:*</include> + <include>org.amdatu.semanticweb.*:*</include> + <include>org.amdatu.web:*</include> + <include>org.amdatu.web.*:*</include> + </includes> + <unpack>false</unpack> + <useTransitiveDependencies>false</useTransitiveDependencies> + </dependencySet> + + <dependencySet> + <scope>runtime</scope> + <outputDirectory>amdatu-examples</outputDirectory> + <outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}.${artifact.extension} + </outputFileNameMapping> + <includes> + <include>org.amdatu.example:*</include> + <include>org.amdatu.example.*:*</include> + </includes> + <unpack>false</unpack> + <useTransitiveDependencies>false</useTransitiveDependencies> + </dependencySet> + + <dependencySet> + <scope>runtime</scope> + <outputDirectory>amdatu-core</outputDirectory> + <outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}.${artifact.extension} + </outputFileNameMapping> + <includes> + <include>org.amdatu.core:*</include> + <include>org.amdatu.core.*:*</include> + </includes> + <unpack>false</unpack> + <useTransitiveDependencies>false</useTransitiveDependencies> + </dependencySet> + + <dependencySet> + <scope>runtime</scope> + <outputDirectory>amdatu-system</outputDirectory> + <includes> + <include>org.apache.felix:*</include> + <include>org.apache.sling:*</include> + <include>org.ops4j.pax.web:*</include> + <include>org.ops4j.pax.useradmin:*</include> + <include>org.ops4j.pax.swissbox:*</include> + <include>org.ops4j.base:*</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> + <fileSet> + <directory>..</directory> + <outputDirectory></outputDirectory> + <filtered>true</filtered> + <includes> + <include>changelog.txt</include> + <include>license.txt</include> + <include>readme.txt</include> + </includes> + </fileSet> + + <!-- These entries need to be replaced when the new central configuration bundle is available --> + <fileSet> + <directory>../amdatu-core/cassandra-application/src/main/resources/conf</directory> + <outputDirectory>deploy</outputDirectory> + <filtered>true</filtered> + </fileSet> + <fileSet> + <directory>../amdatu-example/course-gadget/src/main/resources/conf</directory> + <outputDirectory>deploy</outputDirectory> + <filtered>true</filtered> + </fileSet> + <fileSet> + <directory>../amdatu-example/course-service/src/main/resources/conf</directory> + <outputDirectory>deploy</outputDirectory> + <filtered>true</filtered> + </fileSet> + <fileSet> + <directory>../amdatu-example/friends-gadget/src/main/resources/conf</directory> + <outputDirectory>deploy</outputDirectory> + <filtered>true</filtered> + </fileSet> + <fileSet> + <directory>../amdatu-authorization/login-gadget/src/main/resources/conf</directory> + <outputDirectory>deploy</outputDirectory> + <filtered>true</filtered> + </fileSet> + <fileSet> + <directory>../amdatu-semanticweb/sparqlendpoint-gadget/src/main/resources/conf</directory> + <outputDirectory>deploy</outputDirectory> + <filtered>true</filtered> + </fileSet> + <fileSet> + <directory>../amdatu-core/config-templates/src/main/resources/conf</directory> + <outputDirectory>deploy</outputDirectory> + <filtered>true</filtered> + </fileSet> + <fileSet> + <directory>../amdatu-core/loghandler/src/main/resources/conf</directory> + <outputDirectory>deploy</outputDirectory> + <filtered>true</filtered> + </fileSet> + </fileSets> + +</component> \ No newline at end of file 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 Thu Nov 11 15:22:41 2010 @@ -1,150 +1,16 @@ -<assembly - xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; +<?xml version="1.0" encoding="UTF-8"?> +<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>dir</format> <format>tar.gz</format> <format>zip</format> </formats> <includeBaseDirectory>false</includeBaseDirectory> <!-- strip the module prefixes --> - - <dependencySets> - <dependencySet> - <outputDirectory>amdatu-application</outputDirectory> - <outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping> - <includes> - <include>org.amdatu.authorization:*</include> - <include>org.amdatu.authorization.*:*</include> - <include>org.amdatu.opensocial:*</include> - <include>org.amdatu.opensocial.*:*</include> - <include>org.amdatu.semanticweb:*</include> - <include>org.amdatu.semanticweb.*:*</include> - <include>org.amdatu.web:*</include> - <include>org.amdatu.web.*:*</include> - </includes> - <unpack>false</unpack> - <useTransitiveDependencies>false</useTransitiveDependencies> - </dependencySet> - - <dependencySet> - <scope>runtime</scope> - <outputDirectory>amdatu-examples</outputDirectory> - <outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping> - <includes> - <include>org.amdatu.example:*</include> - <include>org.amdatu.example.*:*</include> - </includes> - <unpack>false</unpack> - <useTransitiveDependencies>false</useTransitiveDependencies> - </dependencySet> - - <dependencySet> - <scope>runtime</scope> - <outputDirectory>amdatu-core</outputDirectory> - <outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping> - <includes> - <include>org.amdatu.core:*</include> - <include>org.amdatu.core.*:*</include> - </includes> - <unpack>false</unpack> - <useTransitiveDependencies>false</useTransitiveDependencies> - </dependencySet> - <dependencySet> - <scope>runtime</scope> - <outputDirectory>amdatu-system</outputDirectory> - <includes> - <include>org.apache.felix:*</include> - <include>org.apache.sling:*</include> - <include>org.ops4j.pax.web:*</include> - <include>org.ops4j.pax.useradmin:*</include> - <include>org.ops4j.pax.swissbox:*</include> - <include>org.ops4j.base:*</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> - <fileSet> - <directory>..</directory> - <outputDirectory></outputDirectory> - <filtered>true</filtered> - <includes> - <include>changelog.txt</include> - <include>license.txt</include> - <include>readme.txt</include> - </includes> - </fileSet> - - <!-- These entries need to be replaced when the new central configuration bundle is available --> - <fileSet> - <directory>../amdatu-core/cassandra-application/src/main/resources/conf</directory> - <outputDirectory>deploy</outputDirectory> - <filtered>true</filtered> - </fileSet> - <fileSet> - <directory>../amdatu-example/course-gadget/src/main/resources/conf</directory> - <outputDirectory>deploy</outputDirectory> - <filtered>true</filtered> - </fileSet> - <fileSet> - <directory>../amdatu-example/course-service/src/main/resources/conf</directory> - <outputDirectory>deploy</outputDirectory> - <filtered>true</filtered> - </fileSet> - <fileSet> - <directory>../amdatu-example/friends-gadget/src/main/resources/conf</directory> - <outputDirectory>deploy</outputDirectory> - <filtered>true</filtered> - </fileSet> - <fileSet> - <directory>../amdatu-authorization/login-gadget/src/main/resources/conf</directory> - <outputDirectory>deploy</outputDirectory> - <filtered>true</filtered> - </fileSet> - <fileSet> - <directory>../amdatu-semanticweb/sparqlendpoint-gadget/src/main/resources/conf</directory> - <outputDirectory>deploy</outputDirectory> - <filtered>true</filtered> - </fileSet> - <fileSet> - <directory>../amdatu-core/config-templates/src/main/resources/conf</directory> - <outputDirectory>deploy</outputDirectory> - <filtered>true</filtered> - </fileSet> - <fileSet> - <directory>../amdatu-core/loghandler/src/main/resources/conf</directory> - <outputDirectory>deploy</outputDirectory> - <filtered>true</filtered> - </fileSet> - </fileSets> - + <componentDescriptors> + <componentDescriptor>src/main/assembly/bin-component.xml</componentDescriptor> + </componentDescriptors> + </assembly> \ No newline at end of file Added: trunk/amdatu-release/src/main/assembly/dev-server.xml ============================================================================== --- (empty file) +++ trunk/amdatu-release/src/main/assembly/dev-server.xml Thu Nov 11 15:22:41 2010 @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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>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 Modified: trunk/amdatu-release/src/main/assembly/src-release.xml ============================================================================== --- trunk/amdatu-release/src/main/assembly/src-release.xml (original) +++ trunk/amdatu-release/src/main/assembly/src-release.xml Thu Nov 11 15:22:41 2010 @@ -1,25 +1,23 @@ -<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";> +<?xml version="1.0" encoding="UTF-8"?> +<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>dir</format> - <format>tar.gz</format> - <format>zip</format> - </formats> - - <fileSets> + <id>src</id> + <formats> + <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> + <exclude>**/target/**</exclude> + <exclude>**/.settings/**</exclude> + <exclude>**/.classpath</exclude> + <exclude>**/.project</exclude> </excludes> </fileSet> </fileSets> - + </assembly> \ No newline at end of file
