Author: paperwing
Date: 2012-07-25 15:35:49 -0700 (Wed, 25 Jul 2012)
New Revision: 29989

Modified:
   core3/gui-distribution/trunk/assembly/pom.xml
Log:
Added entry in gui-distribution/assembly/pom.xml to move Karaf deploy 
directory. This is done to avoid permission issues if the user does not have 
access to the Karaf deploy directory such as Cytoscape installed somewhere 
where admin rights are needed. Currently moved to 
~/.cytoscape/3.0/apps/installed, used by App Manager for installing bundles, 
and possibly Karaf Archives in future.

Modified: core3/gui-distribution/trunk/assembly/pom.xml
===================================================================
--- core3/gui-distribution/trunk/assembly/pom.xml       2012-07-25 21:57:46 UTC 
(rev 29988)
+++ core3/gui-distribution/trunk/assembly/pom.xml       2012-07-25 22:35:49 UTC 
(rev 29989)
@@ -279,6 +279,14 @@
                                                <configuration>
                                                        
<file>target/dependencies/unix/apache-karaf-${karaf.version}/bin/karaf</file>
                                                        
<outputFile>target/dependencies/launcher/bin/karaf</outputFile>
+                                                       <regex>false</regex>
+                                                       
<unescape>false</unescape>
+                                                       <replacements>
+                                                               <replacement>
+                                                                       
<token>MAIN=org.apache.karaf.main.Main</token>
+                                                                       
<value>MAIN=org.cytoscape.launcher.internal.Launcher</value>
+                                                               </replacement>
+                                                       </replacements>         
                                        
                                                </configuration>
                                        </execution>
                                        <execution>
@@ -290,19 +298,30 @@
                                                <configuration>
                                                        
<file>target/dependencies/windows/apache-karaf-${karaf.version}/bin/karaf.bat</file>
                                                        
<outputFile>target/dependencies/launcher/bin/karaf.bat</outputFile>
+                                                       <regex>false</regex>
+                                                       
<unescape>false</unescape>
+                                                       <replacements>
+                                                               <replacement>
+                                                                       
<token>MAIN=org.apache.karaf.main.Main</token>
+                                                                       
<value>MAIN=org.cytoscape.launcher.internal.Launcher</value>
+                                                               </replacement>
+                                                       </replacements>
                                                </configuration>
                                        </execution>
+                                       <execution>
+                                               <id>move-deploy-directory</id>
+                                               <phase>compile</phase>
+                                               <goals>
+                                                       <goal>replace</goal>
+                                               </goals>
+                                               <configuration>
+                                                       
<file>target/cytoscape/framework/etc/org.apache.felix.fileinstall-deploy.cfg</file>
+                                                       
<unescape>false</unescape>
+                                                       
<token>felix.fileinstall.dir.*</token>
+                                                       
<value>felix.fileinstall.dir = 
\$\{user.home\}/.cytoscape/3.0/apps/installed</value>
+                                               </configuration>
+                                       </execution>
                                </executions>
-                               <configuration>
-                                       <regex>false</regex>
-                                       <unescape>false</unescape>
-                                       <replacements>
-                                               <replacement>
-                                                       
<token>MAIN=org.apache.karaf.main.Main</token>
-                                                       
<value>MAIN=org.cytoscape.launcher.internal.Launcher</value>
-                                               </replacement>
-                                       </replacements>
-                               </configuration>
                        </plugin>
                </plugins>
        </build>

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