Author: jm
Date: 2012-08-22 09:19:04 -0700 (Wed, 22 Aug 2012)
New Revision: 30247
Added:
core3/gui-distribution/trunk/assembly/src/main/resources/etc/org.apache.felix.fileinstall-deploy.cfg
Modified:
core3/gui-distribution/trunk/assembly/pom.xml
core3/gui-distribution/trunk/assembly/src/main/xsl/template.xslt
core3/gui-distribution/trunk/pom.xml
Log:
Fixes #1387: Deploy directory now being configured for all distribution types
Modified: core3/gui-distribution/trunk/assembly/pom.xml
===================================================================
--- core3/gui-distribution/trunk/assembly/pom.xml 2012-08-22 00:20:19 UTC
(rev 30246)
+++ core3/gui-distribution/trunk/assembly/pom.xml 2012-08-22 16:19:04 UTC
(rev 30247)
@@ -308,19 +308,6 @@
</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\}/CytoscapeConfiguration/3/apps/installed</value>
- </configuration>
- </execution>
</executions>
</plugin>
</plugins>
Added:
core3/gui-distribution/trunk/assembly/src/main/resources/etc/org.apache.felix.fileinstall-deploy.cfg
===================================================================
---
core3/gui-distribution/trunk/assembly/src/main/resources/etc/org.apache.felix.fileinstall-deploy.cfg
(rev 0)
+++
core3/gui-distribution/trunk/assembly/src/main/resources/etc/org.apache.felix.fileinstall-deploy.cfg
2012-08-22 16:19:04 UTC (rev 30247)
@@ -0,0 +1,3 @@
+felix.fileinstall.dir = ${user.home}/CytoscapeConfiguration/3/apps/installed
+felix.fileinstall.tmpdir = ${karaf.data}/generated-bundles
+felix.fileinstall.poll = 1000
Modified: core3/gui-distribution/trunk/assembly/src/main/xsl/template.xslt
===================================================================
--- core3/gui-distribution/trunk/assembly/src/main/xsl/template.xslt
2012-08-22 00:20:19 UTC (rev 30246)
+++ core3/gui-distribution/trunk/assembly/src/main/xsl/template.xslt
2012-08-22 16:19:04 UTC (rev 30247)
@@ -30,6 +30,7 @@
<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.apache.felix.fileinstall-deploy.cfg</exclude>
<exclude>etc/org.ops4j.pax.logging.cfg</exclude>
<exclude>etc/jre.properties</exclude>
<exclude>LICENSE</exclude>
Modified: core3/gui-distribution/trunk/pom.xml
===================================================================
--- core3/gui-distribution/trunk/pom.xml 2012-08-22 00:20:19 UTC (rev
30246)
+++ core3/gui-distribution/trunk/pom.xml 2012-08-22 16:19:04 UTC (rev
30247)
@@ -20,7 +20,7 @@
<cytoscape.api.version>3.0.0-beta3-SNAPSHOT</cytoscape.api.version>
<cytoscape.impl.version>3.0.0-alpha10-SNAPSHOT</cytoscape.impl.version>
<cytoscape.support.version>3.0.0-alpha9-SNAPSHOT</cytoscape.support.version>
- <karaf.version>2.2.7</karaf.version>
+ <karaf.version>2.2.9</karaf.version>
</properties>
<repositories>
--
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.
