Author: mes
Date: 2011-03-11 15:41:32 -0800 (Fri, 11 Mar 2011)
New Revision: 24413

Added:
   core3/gui-distribution/trunk/distribution/src/main/resources/plugins/
Modified:
   core3/gui-distribution/trunk/distribution/pom.xml
   core3/gui-distribution/trunk/distribution/src/main/bin/cytoscape.sh
   core3/gui-distribution/trunk/startlevel-3/pom.xml
Log:
added fileinstall which now looks in the bundles/plugins directory for new 
bundles to load

Modified: core3/gui-distribution/trunk/distribution/pom.xml
===================================================================
--- core3/gui-distribution/trunk/distribution/pom.xml   2011-03-11 21:04:33 UTC 
(rev 24412)
+++ core3/gui-distribution/trunk/distribution/pom.xml   2011-03-11 23:41:32 UTC 
(rev 24413)
@@ -18,7 +18,9 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
+        <version>${maven-assembly-plugin.version}</version>
         <configuration>
           <descriptors>
             <descriptor>src/main/assembly/src.xml</descriptor>

Modified: core3/gui-distribution/trunk/distribution/src/main/bin/cytoscape.sh
===================================================================
--- core3/gui-distribution/trunk/distribution/src/main/bin/cytoscape.sh 
2011-03-11 21:04:33 UTC (rev 24412)
+++ core3/gui-distribution/trunk/distribution/src/main/bin/cytoscape.sh 
2011-03-11 23:41:32 UTC (rev 24413)
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-java -jar -Xss10M -Xmx1550M -Dswing.aatext=true 
-Dawt.useSystemAAFontSettings=lcd -Dapple.laf.useScreenMenuBar=true 
-Dapple.awt.fileDialogForDirectories=true -Dapple.awt.graphics.UseQuartz=true 
-Dcom.apple.mrj.application.apple.menu.about.name=Cytoscape 
-Dorg.ops4j.pax.logging.DefaultServiceLog.level=NONE 
-Dbundles.configuration.location=bundles/configurations cytoscape-launcher.jar 
+java -jar -Xss10M -Xmx1550M -Dswing.aatext=true 
-Dawt.useSystemAAFontSettings=lcd -Dapple.laf.useScreenMenuBar=true 
-Dapple.awt.fileDialogForDirectories=true -Dapple.awt.graphics.UseQuartz=true 
-Dcom.apple.mrj.application.apple.menu.about.name=Cytoscape 
-Dorg.ops4j.pax.logging.DefaultServiceLog.level=NONE 
-Dbundles.configuration.location=bundles/configurations 
-Dfelix.fileinstall.dir=bundles/plugins cytoscape-launcher.jar 

Modified: core3/gui-distribution/trunk/startlevel-3/pom.xml
===================================================================
--- core3/gui-distribution/trunk/startlevel-3/pom.xml   2011-03-11 21:04:33 UTC 
(rev 24412)
+++ core3/gui-distribution/trunk/startlevel-3/pom.xml   2011-03-11 23:41:32 UTC 
(rev 24413)
@@ -555,8 +555,14 @@
                        <artifactId>xstream</artifactId>
                        <version>1.3.1</version>
                </dependency>
+       
+               <!-- to load bundle plugins -->
+               <dependency>
+                       <groupId>org.apache.felix</groupId>
+                       <artifactId>org.apache.felix.fileinstall</artifactId>
+                       <version>3.1.10</version>
+               </dependency>
                
-               
        </dependencies>
 
 </project>

-- 
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.

Reply via email to