Author: mes
Date: 2010-07-30 12:26:33 -0700 (Fri, 30 Jul 2010)
New Revision: 21095

Added:
   cytoscape/trunk/src/main/resources/cytoscape/
   cytoscape/trunk/src/main/resources/cytoscape/images/
Removed:
   cytoscape/trunk/images/
Modified:
   cytoscape/trunk/pom.xml
   cytoscape/trunk/src/main/resources/cytoscape.props
Log:
now building the cytoscape jar with, I believe, everything in its proper 
location

Modified: cytoscape/trunk/pom.xml
===================================================================
--- cytoscape/trunk/pom.xml     2010-07-30 18:59:14 UTC (rev 21094)
+++ cytoscape/trunk/pom.xml     2010-07-30 19:26:33 UTC (rev 21095)
@@ -13,8 +13,17 @@
   <properties>
     <corelibs.version>2.8.0-SNAPSHOT</corelibs.version>
   </properties>
- 
+
   <build>
+    <!-- This block allows fields to be substituted into resource files, 
+         such as the version number in cytoscape.props.  -->
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+
     <pluginManagement>
       <plugins>
         <plugin>
@@ -41,7 +50,7 @@
             <locale>en</locale>
             <javadocVersion>1.5</javadocVersion>
             <links>
-              
<link>http://download.oracle.com/docs/cd/E17476_01/javase/1.5.0/docs/api/</link>
+              <link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
             </links>
             <footer>Cytoscape API</footer>
             <header>Cytoscape API</header>
@@ -187,7 +196,7 @@
       <version>${corelibs.version}</version>
     </dependency>
 
-               <!-- swingx --> 
+        <!-- swingx -->        
         <dependency>
             <groupId>org.cytoscape.wrappers</groupId>
             <artifactId>com.l2fprod.common.sheet</artifactId>

Modified: cytoscape/trunk/src/main/resources/cytoscape.props
===================================================================
--- cytoscape/trunk/src/main/resources/cytoscape.props  2010-07-30 18:59:14 UTC 
(rev 21094)
+++ cytoscape/trunk/src/main/resources/cytoscape.props  2010-07-30 19:26:33 UTC 
(rev 21095)
@@ -14,7 +14,7 @@
 proxy.server=
 proxy.server.port=
 proxy.server.type=
-cytoscape.version.numb...@version@
+cytoscape.version.number=${version}
 exportTextAsShape=true
 vizmapper.cntMapperUpperLimit=2000
 undo.limit=10

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