Author: jm Date: 2011-10-17 11:08:42 -0700 (Mon, 17 Oct 2011) New Revision: 27202
Added: csplugins/trunk/toronto/jm/cykaraf/branding/ csplugins/trunk/toronto/jm/cykaraf/branding/pom.xml csplugins/trunk/toronto/jm/cykaraf/branding/src/ csplugins/trunk/toronto/jm/cykaraf/branding/src/main/ csplugins/trunk/toronto/jm/cykaraf/branding/src/main/resources/ csplugins/trunk/toronto/jm/cykaraf/branding/src/main/resources/org/ csplugins/trunk/toronto/jm/cykaraf/branding/src/main/resources/org/apache/ csplugins/trunk/toronto/jm/cykaraf/branding/src/main/resources/org/apache/karaf/ csplugins/trunk/toronto/jm/cykaraf/branding/src/main/resources/org/apache/karaf/branding/ csplugins/trunk/toronto/jm/cykaraf/branding/src/main/resources/org/apache/karaf/branding/branding.properties csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/descriptors/windows-bin.xml csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/resources/etc/custom.properties Modified: csplugins/trunk/toronto/jm/cykaraf/distribution/pom.xml csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/descriptors/unix-bin.xml Log: Added console branding Added initial support for Windows-based distribution Added: csplugins/trunk/toronto/jm/cykaraf/branding/pom.xml =================================================================== --- csplugins/trunk/toronto/jm/cykaraf/branding/pom.xml (rev 0) +++ csplugins/trunk/toronto/jm/cykaraf/branding/pom.xml 2011-10-17 18:08:42 UTC (rev 27202) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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/xsd/maven-4.0.0.xsd";> + + <modelVersion>4.0.0</modelVersion> + + <groupId>org.cytoscape</groupId> + <artifactId>branding</artifactId> + <version>3.0.0-M4-SNAPSHOT</version> + <packaging>bundle</packaging> + <name>Cytoscape Branding</name> + + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.5</version> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-SymbolicName>manual</Bundle-SymbolicName> + <Import-Package>*</Import-Package> + <Private-Package>!*</Private-Package> + <Export-Package> + org.apache.karaf.branding + </Export-Package> + <Spring-Context>*;public-context:=false</Spring-Context> + </instructions> + </configuration> + </plugin> + </plugins> + </build> + +</project> \ No newline at end of file Added: csplugins/trunk/toronto/jm/cykaraf/branding/src/main/resources/org/apache/karaf/branding/branding.properties =================================================================== --- csplugins/trunk/toronto/jm/cykaraf/branding/src/main/resources/org/apache/karaf/branding/branding.properties (rev 0) +++ csplugins/trunk/toronto/jm/cykaraf/branding/src/main/resources/org/apache/karaf/branding/branding.properties 2011-10-17 18:08:42 UTC (rev 27202) @@ -0,0 +1,15 @@ +welcome = \ + [1m [32m _ [0m\n\ + [1m [32m ___ _ _| |_ ___ ___ ___ __ _ _ __ ___ [0m\n\ + [1m [32m / __| | | | __|/ _ \\/ __|/ __|/ _` | '_ \\ / _ \\ [0m\n\ + [1m [32m | (__| |_| | |_| (_) \\__ \\ (__| (_| | |_) | __/ [0m\n\ + [1m [32m \\___|\\__, |\\__|\\___/|___/\\___|\\__,_| .__/ \\___| [0m\n\ + [1m [32m |___/ |_| [0m\n\ +\n\ +Cytoscape ${project.version}\n\ +\n\ +Hit ' [1m<tab> [0m' for a list of available commands\n\ + [0m and ' [1m[cmd] --help [0m' for help on a specific command.\n\ +Hit ' [1m<ctrl-d> [0m' or ' [1mosgi:shutdown [0m' to shutdown Cytoscape.\n\ + +prompt = [1m${APPLICATION} [0m> \ No newline at end of file Modified: csplugins/trunk/toronto/jm/cykaraf/distribution/pom.xml =================================================================== --- csplugins/trunk/toronto/jm/cykaraf/distribution/pom.xml 2011-10-17 17:36:20 UTC (rev 27201) +++ csplugins/trunk/toronto/jm/cykaraf/distribution/pom.xml 2011-10-17 18:08:42 UTC (rev 27202) @@ -26,6 +26,12 @@ <type>tar.gz</type> </dependency> <dependency> + <groupId>org.apache.karaf</groupId> + <artifactId>apache-karaf</artifactId> + <version>${karaf.version}</version> + <type>zip</type> + </dependency> + <dependency> <groupId>org.apache.karaf.assemblies.features</groupId> <artifactId>standard</artifactId> <version>${karaf.version}</version> @@ -95,6 +101,24 @@ <artifactId>maven-dependency-plugin</artifactId> <executions> <execution> + <id>copy-dependencies</id> + <phase>generate-resources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.cytoscape</groupId> + <artifactId>branding</artifactId> + <version>${project.version}</version> + <type>jar</type> + <outputDirectory>target/dependencies/branding</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + <execution> <id>unpack-splash-launcher</id> <phase>generate-resources</phase> <goals> @@ -103,18 +127,17 @@ <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> + <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> + <id>unpack-unix</id> <phase>generate-resources</phase> <goals> <goal>unpack</goal> @@ -125,11 +148,28 @@ <groupId>org.apache.karaf</groupId> <artifactId>apache-karaf</artifactId> <type>tar.gz</type> - <outputDirectory>target/dependencies</outputDirectory> + <outputDirectory>target/dependencies/unix</outputDirectory> </artifactItem> </artifactItems> </configuration> </execution> + <execution> + <id>unpack-windows</id> + <phase>generate-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.apache.karaf</groupId> + <artifactId>apache-karaf</artifactId> + <type>zip</type> + <outputDirectory>target/dependencies/windows</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> </executions> </plugin> <plugin> @@ -150,6 +190,19 @@ <tarLongFileMode>gnu</tarLongFileMode> </configuration> </execution> + <execution> + <id>windows-bin</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/main/descriptors/windows-bin.xml</descriptor> + </descriptors> + <finalName>${project.artifactId}-${project.version}</finalName> + </configuration> + </execution> </executions> </plugin> </plugins> 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-17 17:36:20 UTC (rev 27201) +++ csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/descriptors/unix-bin.xml 2011-10-17 18:08:42 UTC (rev 27202) @@ -8,11 +8,12 @@ <fileSets> <!-- Expanded Karaf Standard Distribution --> <fileSet> - <directory>target/dependencies/apache-karaf-${karaf.version}</directory> + <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> @@ -29,14 +30,9 @@ <!-- Copy over bin/* separately to get the correct file mode --> <fileSet> - <directory>target/dependencies/apache-karaf-${karaf.version}</directory> + <directory>target/dependencies/unix/apache-karaf-${karaf.version}</directory> <outputDirectory>/framework</outputDirectory> <includes> - <!-- - <include>bin/admin</include> - <include>bin/start</include> - <include>bin/stop</include> - --> <include>bin/karaf</include> </includes> <fileMode>0755</fileMode> @@ -45,13 +41,22 @@ <fileSet> <directory>src/main/bin</directory> <outputDirectory>/</outputDirectory> + <lineEnding>unix</lineEnding> + <fileMode>0755</fileMode> <includes> <include>cytoscape.sh</include> </includes> - <fileMode>0755</fileMode> </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> Added: csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/descriptors/windows-bin.xml =================================================================== --- csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/descriptors/windows-bin.xml (rev 0) +++ csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/descriptors/windows-bin.xml 2011-10-17 18:08:42 UTC (rev 27202) @@ -0,0 +1,89 @@ +<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/resources/etc/custom.properties =================================================================== --- csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/resources/etc/custom.properties (rev 0) +++ csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/resources/etc/custom.properties 2011-10-17 18:08:42 UTC (rev 27202) @@ -0,0 +1,2 @@ +karaf.systemBundlesStartLevel=100 +org.osgi.framework.system.packages.extra = org.apache.karaf.branding; \ 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.
