Author: jm
Date: 2011-10-18 14:00:33 -0700 (Tue, 18 Oct 2011)
New Revision: 27218
Added:
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/descriptors/config-dev.xml
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/descriptors/config-unix.xml
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/descriptors/config-windows.xml
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/xsl/
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/xsl/template.xslt
Removed:
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/descriptors/unix-bin.xml
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/descriptors/windows-bin.xml
Modified:
csplugins/trunk/toronto/jm/cykaraf/distribution/pom.xml
Log:
Added XSLT stylesheet for generating assembly descriptors
Added assembly descriptor for development purposes (i.e. no Cytoscape bundles
are copied to the Karaf repository)
Modified: csplugins/trunk/toronto/jm/cykaraf/distribution/pom.xml
===================================================================
--- csplugins/trunk/toronto/jm/cykaraf/distribution/pom.xml 2011-10-18
18:46:15 UTC (rev 27217)
+++ csplugins/trunk/toronto/jm/cykaraf/distribution/pom.xml 2011-10-18
21:00:33 UTC (rev 27218)
@@ -58,6 +58,30 @@
</resources>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xml-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-descriptors</id>
+
<phase>generate-resources</phase>
+ <goals>
+ <goal>transform</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <transformationSets>
+ <transformationSet>
+
<dir>src/main/descriptors</dir>
+ <includes>
+
<include>config-*.xml</include>
+ </includes>
+
<stylesheet>src/main/xsl/template.xslt</stylesheet>
+ </transformationSet>
+ </transformationSets>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.5</version>
@@ -77,23 +101,39 @@
<version>${karaf.version}</version>
<executions>
<execution>
- <id>add-features-to-repo</id>
- <phase>generate-resources</phase>
- <goals>
-
<goal>add-features-to-repo</goal>
- </goals>
- <configuration>
- <descriptors>
-
<descriptor>mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features</descriptor>
-
<descriptor>mvn:org.cytoscape/features/${project.version}/xml/features</descriptor>
- </descriptors>
- <features>
-
<feature>cytoscape-gui</feature>
- </features>
-
<includeMvnBasedDescriptors>true</includeMvnBasedDescriptors>
-
<repository>target/features-repo</repository>
- </configuration>
+ <id>add-features-to-repo</id>
+
<phase>generate-resources</phase>
+ <goals>
+
<goal>add-features-to-repo</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+
<descriptor>mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features</descriptor>
+
<descriptor>mvn:org.cytoscape/features/${project.version}/xml/features</descriptor>
+ </descriptors>
+ <features>
+
<feature>cytoscape-gui</feature>
+ </features>
+
<includeMvnBasedDescriptors>true</includeMvnBasedDescriptors>
+
<repository>target/features-repo</repository>
+ </configuration>
</execution>
+ <execution>
+
<id>add-features-to-repo-dev</id>
+
<phase>generate-resources</phase>
+ <goals>
+
<goal>add-features-to-repo</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+
<descriptor>mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features</descriptor>
+
<descriptor>mvn:org.cytoscape/features/${project.version}/xml/features</descriptor>
+ </descriptors>
+ <features/>
+
<includeMvnBasedDescriptors>true</includeMvnBasedDescriptors>
+
<repository>target/features-repo-dev</repository>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
@@ -177,6 +217,20 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
+ <id>directory</id>
+ <phase>compile</phase>
+ <goals>
+
<goal>directory-single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+
<descriptor>target/generated-resources/xml/xslt/config-dev.xml</descriptor>
+ </descriptors>
+
<finalName>${project.artifactId}-${project.version}</finalName>
+
<appendAssemblyId>false</appendAssemblyId>
+ </configuration>
+ </execution>
+ <execution>
<id>unix-bin</id>
<phase>package</phase>
<goals>
@@ -184,7 +238,7 @@
</goals>
<configuration>
<descriptors>
-
<descriptor>src/main/descriptors/unix-bin.xml</descriptor>
+
<descriptor>target/generated-resources/xml/xslt/config-windows.xml</descriptor>
</descriptors>
<finalName>${project.artifactId}-${project.version}</finalName>
<tarLongFileMode>gnu</tarLongFileMode>
@@ -198,7 +252,7 @@
</goals>
<configuration>
<descriptors>
-
<descriptor>src/main/descriptors/windows-bin.xml</descriptor>
+
<descriptor>target/generated-resources/xml/xslt/config-unix.xml</descriptor>
</descriptors>
<finalName>${project.artifactId}-${project.version}</finalName>
</configuration>
Added:
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/descriptors/config-dev.xml
===================================================================
---
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/descriptors/config-dev.xml
(rev 0)
+++
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/descriptors/config-dev.xml
2011-10-18 21:00:33 UTC (rev 27218)
@@ -0,0 +1,23 @@
+<config>
+ <output-format>tar.gz</output-format>
+ <line-ending>keep</line-ending>
+ <karaf>
+ <feature-repository>target/features-repo-dev</feature-repository>
+ <distribution
base="target/dependencies/windows/apache-karaf-${karaf.version}">
+ <scripts>
+ <script>bin/karaf.bat</script>
+ </scripts>
+ </distribution>
+ <distribution
base="target/dependencies/unix/apache-karaf-${karaf.version}">
+ <scripts>
+ <script>bin/karaf</script>
+ </scripts>
+ </distribution>
+ </karaf>
+ <cytoscape>
+ <scripts>
+ <script>cytoscape.sh</script>
+ <script>cytoscape.bat</script>
+ </scripts>
+ </cytoscape>
+</config>
\ No newline at end of file
Added:
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/descriptors/config-unix.xml
===================================================================
---
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/descriptors/config-unix.xml
(rev 0)
+++
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/descriptors/config-unix.xml
2011-10-18 21:00:33 UTC (rev 27218)
@@ -0,0 +1,17 @@
+<config>
+ <output-format>tar.gz</output-format>
+ <line-ending>unix</line-ending>
+ <karaf>
+ <feature-repository>target/features-repo</feature-repository>
+ <distribution
base="target/dependencies/unix/apache-karaf-${karaf.version}">
+ <scripts>
+ <script>bin/karaf</script>
+ </scripts>
+ </distribution>
+ </karaf>
+ <cytoscape>
+ <scripts>
+ <script>cytoscape.sh</script>
+ </scripts>
+ </cytoscape>
+</config>
\ No newline at end of file
Added:
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/descriptors/config-windows.xml
===================================================================
---
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/descriptors/config-windows.xml
(rev 0)
+++
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/descriptors/config-windows.xml
2011-10-18 21:00:33 UTC (rev 27218)
@@ -0,0 +1,18 @@
+<config>
+ <output-format>zip</output-format>
+ <line-ending>dos</line-ending>
+ <karaf>
+ <feature-repository>target/features-repo</feature-repository>
+ <distribution
base="target/dependencies/windows/apache-karaf-${karaf.version}">
+ <scripts>
+ <script>bin/karaf.bat</script>
+ </scripts>
+ </distribution>
+ </karaf>
+ <cytoscape>
+ <scripts>
+ <script>cytoscape.sh</script>
+ <script>cytoscape.bat</script>
+ </scripts>
+ </cytoscape>
+</config>
\ No newline at end of file
Deleted:
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/descriptors/unix-bin.xml
===================================================================
---
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/descriptors/unix-bin.xml
2011-10-18 18:46:15 UTC (rev 27217)
+++
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/descriptors/unix-bin.xml
2011-10-18 21:00:33 UTC (rev 27218)
@@ -1,88 +0,0 @@
-<assembly>
- <id></id>
-
- <formats>
- <format>tar.gz</format>
- </formats>
-
- <fileSets>
- <!-- Expanded Karaf Standard Distribution -->
- <fileSet>
-
<directory>target/dependencies/unix/apache-karaf-${karaf.version}</directory>
- <outputDirectory>/framework</outputDirectory>
- <excludes>
- <exclude>**/demos/**</exclude>
- <exclude>bin/**</exclude>
- <exclude>etc/custom.properties</exclude>
- <exclude>etc/system.properties</exclude>
- <exclude>etc/users.properties</exclude>
- <exclude>etc/org.ops4j.pax.url.mvn.cfg</exclude>
- <exclude>etc/org.apache.karaf.features.cfg</exclude>
- <exclude>etc/org.ops4j.pax.logging.cfg</exclude>
- <exclude>LICENSE</exclude>
- <exclude>NOTICE</exclude>
- <exclude>README</exclude>
- <exclude>RELEASE-NOTES</exclude>
- <exclude>karaf-manual*.html</exclude>
- <exclude>karaf-manual*.pdf</exclude>
- </excludes>
- </fileSet>
-
- <!-- Copy over bin/* separately to get the correct file mode -->
- <fileSet>
-
<directory>target/dependencies/unix/apache-karaf-${karaf.version}</directory>
- <outputDirectory>/framework</outputDirectory>
- <includes>
- <include>bin/karaf</include>
- </includes>
- <fileMode>0755</fileMode>
- </fileSet>
-
- <fileSet>
- <directory>src/main/bin</directory>
- <outputDirectory>/</outputDirectory>
- <lineEnding>unix</lineEnding>
- <fileMode>0755</fileMode>
- <includes>
- <include>cytoscape.sh</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>target/dependencies/branding</directory>
- <includes>
- <include>*.jar</include>
- </includes>
- <outputDirectory>/framework/lib</outputDirectory>
- </fileSet>
-
- <fileSet>
- <directory>target/dependencies/splash-launcher/images</directory>
- <includes>
- <include>CytoscapeSplashScreen.png</include>
- </includes>
- <outputDirectory>/framework</outputDirectory>
- </fileSet>
-
- <fileSet>
- <directory>src/main/distribution</directory>
- <outputDirectory>/framework</outputDirectory>
- <fileMode>0644</fileMode>
- </fileSet>
- <fileSet>
- <directory>target/classes/etc</directory>
- <outputDirectory>/framework/etc/</outputDirectory>
- <lineEnding>unix</lineEnding>
- <fileMode>0644</fileMode>
- <excludes>
- <exclude>**/*.formatted</exclude>
- </excludes>
- </fileSet>
-
- <fileSet>
- <directory>target/features-repo</directory>
- <outputDirectory>/framework/system</outputDirectory>
- </fileSet>
-
- </fileSets>
-</assembly>
\ No newline at end of file
Deleted:
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/descriptors/windows-bin.xml
===================================================================
---
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/descriptors/windows-bin.xml
2011-10-18 18:46:15 UTC (rev 27217)
+++
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/descriptors/windows-bin.xml
2011-10-18 21:00:33 UTC (rev 27218)
@@ -1,89 +0,0 @@
-<assembly>
- <id></id>
-
- <formats>
- <format>zip</format>
- </formats>
-
- <fileSets>
- <!-- Expanded Karaf Standard Distribution -->
- <fileSet>
-
<directory>target/dependencies/windows/apache-karaf-${karaf.version}</directory>
- <outputDirectory>/framework</outputDirectory>
- <excludes>
- <exclude>**/demos/**</exclude>
- <exclude>bin/**</exclude>
- <exclude>etc/custom.properties</exclude>
- <exclude>etc/system.properties</exclude>
- <exclude>etc/users.properties</exclude>
- <exclude>etc/org.ops4j.pax.url.mvn.cfg</exclude>
- <exclude>etc/org.apache.karaf.features.cfg</exclude>
- <exclude>etc/org.ops4j.pax.logging.cfg</exclude>
- <exclude>LICENSE</exclude>
- <exclude>NOTICE</exclude>
- <exclude>README</exclude>
- <exclude>RELEASE-NOTES</exclude>
- <exclude>karaf-manual*.html</exclude>
- <exclude>karaf-manual*.pdf</exclude>
- </excludes>
- </fileSet>
-
- <!-- Copy over bin/* separately to get the correct file mode -->
- <fileSet>
-
<directory>target/dependencies/windows/apache-karaf-${karaf.version}</directory>
- <outputDirectory>/framework</outputDirectory>
- <includes>
- <include>bin/karaf.bat</include>
- </includes>
- <fileMode>0755</fileMode>
- </fileSet>
-
- <fileSet>
- <directory>src/main/bin</directory>
- <outputDirectory>/</outputDirectory>
- <lineEnding>dos</lineEnding>
- <fileMode>0755</fileMode>
- <includes>
- <include>cytoscape.sh</include>
- <include>cytoscape.bat</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>target/dependencies/branding</directory>
- <includes>
- <include>*.jar</include>
- </includes>
- <outputDirectory>/framework/lib</outputDirectory>
- </fileSet>
-
- <fileSet>
- <directory>target/dependencies/splash-launcher/images</directory>
- <includes>
- <include>CytoscapeSplashScreen.png</include>
- </includes>
- <outputDirectory>/framework</outputDirectory>
- </fileSet>
-
- <fileSet>
- <directory>src/main/distribution</directory>
- <outputDirectory>/framework</outputDirectory>
- <fileMode>0644</fileMode>
- </fileSet>
- <fileSet>
- <directory>target/classes/etc</directory>
- <outputDirectory>/framework/etc/</outputDirectory>
- <lineEnding>dos</lineEnding>
- <fileMode>0644</fileMode>
- <excludes>
- <exclude>**/*.formatted</exclude>
- </excludes>
- </fileSet>
-
- <fileSet>
- <directory>target/features-repo</directory>
- <outputDirectory>/framework/system</outputDirectory>
- </fileSet>
-
- </fileSets>
-</assembly>
\ No newline at end of file
Added:
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/xsl/template.xslt
===================================================================
--- csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/xsl/template.xslt
(rev 0)
+++ csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/xsl/template.xslt
2011-10-18 21:00:33 UTC (rev 27218)
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
+ xmlns:xs="http://www.w3.org/2001/XMLSchema";
+ exclude-result-prefixes="xs">
+
+ <xsl:output indent="yes"/>
+
+ <xsl:template match="/">
+<assembly>
+ <id></id>
+
+ <formats>
+ <format><xsl:value-of select="/config/output-format"/></format>
+ </formats>
+
+ <fileSets>
+ <fileSet>
+ <directory><xsl:value-of
select="/config/karaf/distribution/@base"/></directory>
+ <outputDirectory>/framework</outputDirectory>
+ <excludes>
+ <exclude>**/demos/**</exclude>
+ <exclude>bin/**</exclude>
+ <exclude>etc/custom.properties</exclude>
+ <exclude>etc/system.properties</exclude>
+ <exclude>etc/users.properties</exclude>
+ <exclude>etc/org.ops4j.pax.url.mvn.cfg</exclude>
+ <exclude>etc/org.apache.karaf.features.cfg</exclude>
+ <exclude>etc/org.ops4j.pax.logging.cfg</exclude>
+ <exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
+ <exclude>README</exclude>
+ <exclude>RELEASE-NOTES</exclude>
+ <exclude>karaf-manual*.html</exclude>
+ <exclude>karaf-manual*.pdf</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- Copy over bin/* separately to get the correct file mode -->
+ <xsl:for-each select="/config/karaf/distribution">
+ <fileSet>
+ <directory><xsl:value-of select="@base"/></directory>
+ <outputDirectory>/framework</outputDirectory>
+ <includes>
+ <xsl:for-each select="scripts/script">
+ <include><xsl:value-of select="."/></include>
+ </xsl:for-each>
+ </includes>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ </xsl:for-each>
+
+ <fileSet>
+ <directory>src/main/bin</directory>
+ <outputDirectory>/</outputDirectory>
+ <lineEnding><xsl:value-of
select="/config/line-ending"/></lineEnding>
+ <fileMode>0755</fileMode>
+ <includes>
+ <xsl:for-each select="/config/cytoscape/scripts/script">
+ <include><xsl:value-of select="."/></include>
+ </xsl:for-each>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/dependencies/branding</directory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ <outputDirectory>/framework/lib</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/dependencies/splash-launcher/images</directory>
+ <includes>
+ <include>CytoscapeSplashScreen.png</include>
+ </includes>
+ <outputDirectory>/framework</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>src/main/distribution</directory>
+ <outputDirectory>/framework</outputDirectory>
+ <fileMode>0644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>target/classes/etc</directory>
+ <outputDirectory>/framework/etc/</outputDirectory>
+ <lineEnding><xsl:value-of
select="/config/line-ending"/></lineEnding>
+ <fileMode>0644</fileMode>
+ <excludes>
+ <exclude>**/*.formatted</exclude>
+ </excludes>
+ </fileSet>
+
+ <fileSet>
+ <directory><xsl:value-of
select="/config/karaf/feature-repository"/></directory>
+ <outputDirectory>/framework/system</outputDirectory>
+ </fileSet>
+
+ </fileSets>
+</assembly>
+
+</xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
