Author: jm
Date: 2011-10-14 13:32:51 -0700 (Fri, 14 Oct 2011)
New Revision: 27190
Modified:
csplugins/trunk/toronto/jm/cykaraf/distribution/pom.xml
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/descriptors/unix-bin.xml
Log:
Added splash screen integration
Changed distribution so that Karaf bits are in the "framework" directory
Modified: csplugins/trunk/toronto/jm/cykaraf/distribution/pom.xml
===================================================================
--- csplugins/trunk/toronto/jm/cykaraf/distribution/pom.xml 2011-10-14
19:59:21 UTC (rev 27189)
+++ csplugins/trunk/toronto/jm/cykaraf/distribution/pom.xml 2011-10-14
20:32:51 UTC (rev 27190)
@@ -89,6 +89,24 @@
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
+ <id>unpack-splash-launcher</id>
+
<phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+
<groupId>org.cytoscape.gui-distribution</groupId>
+
<artifactId>splash-launcher</artifactId>
+
<version>${project.version}</version>
+
<type>jar</type>
+
<outputDirectory>target/dependencies/splash-launcher</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
<!-- Uncompress the standard
Karaf distribution -->
<id>unpack</id>
<phase>generate-resources</phase>
Modified:
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-14 19:59:21 UTC (rev 27189)
+++
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/descriptors/unix-bin.xml
2011-10-14 20:32:51 UTC (rev 27190)
@@ -9,7 +9,7 @@
<!-- Expanded Karaf Standard Distribution -->
<fileSet>
<directory>target/dependencies/apache-karaf-${karaf.version}</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory>/framework</outputDirectory>
<excludes>
<exclude>**/demos/**</exclude>
<exclude>bin/**</exclude>
@@ -29,35 +29,43 @@
<!-- Copy over bin/* separately to get the correct file mode -->
<fileSet>
<directory>target/dependencies/apache-karaf-${karaf.version}</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory>/framework</outputDirectory>
<includes>
+ <!--
<include>bin/admin</include>
- <include>bin/karaf</include>
<include>bin/start</include>
<include>bin/stop</include>
+ -->
+ <include>bin/karaf</include>
</includes>
<fileMode>0755</fileMode>
</fileSet>
- <!-- Copy over jar files -->
- <!--
<fileSet>
- <directory>target/dependencies</directory>
+ <directory>src/main/bin</directory>
+ <outputDirectory>/</outputDirectory>
<includes>
- <include>my-custom.jar</include>
+ <include>cytoscape.sh</include>
</includes>
- <outputDirectory>/lib/</outputDirectory>
+ <fileMode>0755</fileMode>
</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>/</outputDirectory>
+ <outputDirectory>/framework</outputDirectory>
<fileMode>0644</fileMode>
</fileSet>
<fileSet>
<directory>target/classes/etc</directory>
- <outputDirectory>/etc/</outputDirectory>
+ <outputDirectory>/framework/etc/</outputDirectory>
<lineEnding>unix</lineEnding>
<fileMode>0644</fileMode>
<excludes>
@@ -67,7 +75,7 @@
<fileSet>
<directory>target/features-repo</directory>
- <outputDirectory>/system</outputDirectory>
+ <outputDirectory>/framework/system</outputDirectory>
</fileSet>
</fileSets>
--
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.
