Author: mes
Date: 2011-01-25 11:39:25 -0800 (Tue, 25 Jan 2011)
New Revision: 23607
Added:
core3/splash/trunk/src/main/resources/WARNING.txt
core3/splash/trunk/src/main/resources/resources/
core3/splash/trunk/src/main/resources/resources/credits.txt
core3/splash/trunk/src/main/resources/resources/images/
Removed:
core3/splash/trunk/src/main/resources/credits.txt
core3/splash/trunk/src/main/resources/images/
Modified:
core3/splash/trunk/pom.xml
Log:
got splash screen included in bundle
Modified: core3/splash/trunk/pom.xml
===================================================================
--- core3/splash/trunk/pom.xml 2011-01-25 18:38:30 UTC (rev 23606)
+++ core3/splash/trunk/pom.xml 2011-01-25 19:39:25 UTC (rev 23607)
@@ -42,14 +42,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
+ <version>2.1.0</version>
<configuration>
<instructions>
<Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
<Bundle-Version>${pom.version}</Bundle-Version>
-
<Export-Package>!${bundle.namespace}.internal.*,${bundle.namespace}.*;version="${pom.version}"</Export-Package>
-
<Private-Package>${bundle.namespace}.internal.*</Private-Package>
<_include>-osgi.bnd</_include>
+
<Include-Resource>${project.build.directory}/classes/resources</Include-Resource>
</instructions>
</configuration>
</plugin>
@@ -62,8 +61,8 @@
<artifactId>batik-maven-plugin</artifactId>
<version>1.0-beta-1</version>
<configuration>
-
<srcDir>${project.build.directory}/classes/images/versioned-svg</srcDir>
- <destDir>${project.build.directory}/classes/images</destDir>
+
<srcDir>${project.build.directory}/classes/resources/images/versioned-svg</srcDir>
+
<destDir>${project.build.directory}/classes/resources/images</destDir>
</configuration>
<executions>
<execution>
@@ -75,8 +74,6 @@
</execution>
</executions>
</plugin>
-
-
</plugins>
</build>
@@ -85,11 +82,13 @@
<groupId>org.osgi</groupId>
<artifactId>osgi_R4_core</artifactId>
<version>1.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi_R4_compendium</artifactId>
<version>1.0</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
Added: core3/splash/trunk/src/main/resources/WARNING.txt
===================================================================
--- core3/splash/trunk/src/main/resources/WARNING.txt
(rev 0)
+++ core3/splash/trunk/src/main/resources/WARNING.txt 2011-01-25 19:39:25 UTC
(rev 23607)
@@ -0,0 +1,4 @@
+The additional directory named "resources" is used to simplify the inclusion
+of resources in the bundle by the maven-bundle-plugin. Put any resources
+you want included in the jar in the second resources directory and NOT this
+one!
Deleted: core3/splash/trunk/src/main/resources/credits.txt
===================================================================
--- core3/splash/trunk/src/main/resources/credits.txt 2011-01-25 18:38:30 UTC
(rev 23606)
+++ core3/splash/trunk/src/main/resources/credits.txt 2011-01-25 19:39:25 UTC
(rev 23607)
@@ -1,51 +0,0 @@
-Cytoscape is a collaboration
-between the Institute for
-Systems Biology, University of
-California San Diego, Memorial
-Sloan-Kettering Cancer Center,
-Institut Pasteur, and Agilent
-Technologies.
-
-For more information, please see:
-http://www.cytoscape.org
-
-Cytosape Developers, past and present,
-in alphabetical order:
-
-Annette Adler
-Nada Amin
-Mark Anderson
-Iliana Avila-Campillo
-Gary Bader
-Hamid Bolouri
-Ethan Cerami
-Rowan Christmas
-Melissa Cline
-Mike Creech
-Paul Edlefsen
-Stephanie Fan
-Trey Ideker
-Liz Kain
-Larissa Kamenkovich
-Ryan Kelley
-Sarah Killcoyne
-Brad Kohlenberg
-Allan Kuchinsky
-Nerius Landys
-Willem Ligtenberg
-Samad Lotia
-Andrew Markiel
-James McIninch
-Keiichiro Ono
-Owen Ozier
-David Reiss
-Chris Sander
-Paul Shannon
-Robert Sheridan
-Benno Shwikowski
-Mike Smoot
-James Taylor
-Aditya Vailaya
-Jonathan Wang
-Chris Workman
-
Copied: core3/splash/trunk/src/main/resources/resources/credits.txt (from rev
23606, core3/splash/trunk/src/main/resources/credits.txt)
===================================================================
--- core3/splash/trunk/src/main/resources/resources/credits.txt
(rev 0)
+++ core3/splash/trunk/src/main/resources/resources/credits.txt 2011-01-25
19:39:25 UTC (rev 23607)
@@ -0,0 +1,51 @@
+Cytoscape is a collaboration
+between the Institute for
+Systems Biology, University of
+California San Diego, Memorial
+Sloan-Kettering Cancer Center,
+Institut Pasteur, and Agilent
+Technologies.
+
+For more information, please see:
+http://www.cytoscape.org
+
+Cytosape Developers, past and present,
+in alphabetical order:
+
+Annette Adler
+Nada Amin
+Mark Anderson
+Iliana Avila-Campillo
+Gary Bader
+Hamid Bolouri
+Ethan Cerami
+Rowan Christmas
+Melissa Cline
+Mike Creech
+Paul Edlefsen
+Stephanie Fan
+Trey Ideker
+Liz Kain
+Larissa Kamenkovich
+Ryan Kelley
+Sarah Killcoyne
+Brad Kohlenberg
+Allan Kuchinsky
+Nerius Landys
+Willem Ligtenberg
+Samad Lotia
+Andrew Markiel
+James McIninch
+Keiichiro Ono
+Owen Ozier
+David Reiss
+Chris Sander
+Paul Shannon
+Robert Sheridan
+Benno Shwikowski
+Mike Smoot
+James Taylor
+Aditya Vailaya
+Jonathan Wang
+Chris Workman
+
--
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.
