Revision: 4525
http://sourceforge.net/p/vexi/code/4525
Author: mkpg2
Date: 2013-05-24 12:10:47 +0000 (Fri, 24 May 2013)
Log Message:
-----------
Update-fix build. Point to trunk projects now we are working in a branch.
Modified Paths:
--------------
branches/vexi4/org.vexi-core.devtools/meta/module-build.xml
branches/vexi4/org.vexi-core.download/meta/product-assembly.xml
branches/vexi4/org.vexi-core.main/meta/module-build.xml
branches/vexi4/org.vexi-core.main/meta/module.xml
branches/vexi4/org.vexi-core.truetype/meta/module-build.xml
branches/vexi4/org.vexi-library.io/meta/module-build.xml
branches/vexi4/org.vexi-library.io/meta/module.xml
branches/vexi4/org.vexi-library.js/meta/module-build.xml
branches/vexi4/org.vexi-library.js/meta/module.xml
branches/vexi4/org.vexi-library.net/meta/module-build.xml
branches/vexi4/org.vexi-library.net/meta/module.xml
branches/vexi4/org.vexi-library.value/meta/module-build.xml
branches/vexi4/org.vexi-library.value/meta/module.xml
trunk/org.vexi-library.testing/meta/module-build.xml
trunk/org.vexi-library.testing/src/main/java/org/vexi/testutil/Utilities.java
Modified: branches/vexi4/org.vexi-core.devtools/meta/module-build.xml
===================================================================
--- branches/vexi4/org.vexi-core.devtools/meta/module-build.xml 2013-05-24
11:37:26 UTC (rev 4524)
+++ branches/vexi4/org.vexi-core.devtools/meta/module-build.xml 2013-05-24
12:10:47 UTC (rev 4525)
@@ -1,8 +1,8 @@
<ebuild-module-build ebuild-version="0.7">
- <using source="local" name="build.shared"/>
+ <using source="local" name="build.shared" branch="trunk" />
<builders>
- <builder source="local" name="build.jpp"/>
+ <builder source="local" name="build.jpp" branch="trunk" />
<builder source="ebuild" name="build.java.compile"/>
</builders>
</ebuild-module-build>
Modified: branches/vexi4/org.vexi-core.download/meta/product-assembly.xml
===================================================================
--- branches/vexi4/org.vexi-core.download/meta/product-assembly.xml
2013-05-24 11:37:26 UTC (rev 4524)
+++ branches/vexi4/org.vexi-core.download/meta/product-assembly.xml
2013-05-24 12:10:47 UTC (rev 4525)
@@ -1,5 +1,5 @@
<ebuild-product-assembly ebuild-version="0.8">
- <using source="local" name="build.shared"/>
+ <using source="local" name="build.shared" branch="trunk" />
<target name="constituents">
<!-- Turn off debugging information, breaks shrinker -->
@@ -57,7 +57,7 @@
</assembler>
</target>
<target name="signed">
- <assembler source="local" name="build.sign">
+ <assembler source="local" name="build.sign" branch="trunk" >
<input ref="unsigned"/>
<property key="secret_name" value="secret.vexi"/>
</assembler>
Modified: branches/vexi4/org.vexi-core.main/meta/module-build.xml
===================================================================
--- branches/vexi4/org.vexi-core.main/meta/module-build.xml 2013-05-24
11:37:26 UTC (rev 4524)
+++ branches/vexi4/org.vexi-core.main/meta/module-build.xml 2013-05-24
12:10:47 UTC (rev 4525)
@@ -2,8 +2,8 @@
<using source="local" name="library.js" context="build"/>
<builders>
- <builder source="local" name="build.jpp" />
- <builder source="local" name="build.jencode" />
+ <builder source="local" name="build.jpp"
branch="trunk" />
+ <builder source="local" name="build.jencode"
branch="trunk" />
<builder refid="javac" />
<builder refid="javaexport" />
<builder refid="jppexport" />
Modified: branches/vexi4/org.vexi-core.main/meta/module.xml
===================================================================
--- branches/vexi4/org.vexi-core.main/meta/module.xml 2013-05-24 11:37:26 UTC
(rev 4524)
+++ branches/vexi4/org.vexi-core.main/meta/module.xml 2013-05-24 12:10:47 UTC
(rev 4525)
@@ -6,6 +6,6 @@
<dependency source="local" name="library.js"/>
<dependency source="local" name="core.truetype"/>
<!-- Test Dependencies -->
- <dependency source="local" name="library.testing"
scope="test"/>
+ <dependency source="local" name="library.testing"
branch="trunk" scope="test"/>
</dependencies>
</ebuild-module>
Modified: branches/vexi4/org.vexi-core.truetype/meta/module-build.xml
===================================================================
--- branches/vexi4/org.vexi-core.truetype/meta/module-build.xml 2013-05-24
11:37:26 UTC (rev 4524)
+++ branches/vexi4/org.vexi-core.truetype/meta/module-build.xml 2013-05-24
12:10:47 UTC (rev 4525)
@@ -1,5 +1,5 @@
<ebuild-module-build ebuild-version="0.8">
- <using source="local" name="library.util" context="build"/>
+ <using source="local" name="library.util" branch="trunk"
context="build"/>
<builders>
<builder refid="javac"/>
Modified: branches/vexi4/org.vexi-library.io/meta/module-build.xml
===================================================================
--- branches/vexi4/org.vexi-library.io/meta/module-build.xml 2013-05-24
11:37:26 UTC (rev 4524)
+++ branches/vexi4/org.vexi-library.io/meta/module-build.xml 2013-05-24
12:10:47 UTC (rev 4525)
@@ -1,5 +1,5 @@
<ebuild-module-build ebuild-version="0.8">
- <using source="local" name="library.util" context="build"/>
+ <using source="local" name="library.util" branch="trunk"
context="build"/>
<builders>
<builder refid="javac" />
Modified: branches/vexi4/org.vexi-library.io/meta/module.xml
===================================================================
--- branches/vexi4/org.vexi-library.io/meta/module.xml 2013-05-24 11:37:26 UTC
(rev 4524)
+++ branches/vexi4/org.vexi-library.io/meta/module.xml 2013-05-24 12:10:47 UTC
(rev 4525)
@@ -2,6 +2,6 @@
<artifact name="java_classes.jar" />
<dependencies>
- <dependency source="local" name="library.util"/>
+ <dependency source="local" name="library.util" branch="trunk"
/>
</dependencies>
</ebuild-module>
Modified: branches/vexi4/org.vexi-library.js/meta/module-build.xml
===================================================================
--- branches/vexi4/org.vexi-library.js/meta/module-build.xml 2013-05-24
11:37:26 UTC (rev 4524)
+++ branches/vexi4/org.vexi-library.js/meta/module-build.xml 2013-05-24
12:10:47 UTC (rev 4525)
@@ -1,9 +1,9 @@
<ebuild-module-build ebuild-version="0.8">
- <using source="local" name="library.util" context="build"/>
+ <using source="local" name="library.util" branch="trunk"
context="build"/>
<builders>
- <builder source="local" name="build.jpp"/>
+ <builder source="local" name="build.jpp" branch="trunk" />
<builder refid="javac" />
<builder refid="javaexport" />
Modified: branches/vexi4/org.vexi-library.js/meta/module.xml
===================================================================
--- branches/vexi4/org.vexi-library.js/meta/module.xml 2013-05-24 11:37:26 UTC
(rev 4524)
+++ branches/vexi4/org.vexi-library.js/meta/module.xml 2013-05-24 12:10:47 UTC
(rev 4525)
@@ -8,7 +8,7 @@
<dependency source="local" name="library.net"/>
<dependency source="local" name="library.io"/>
<!-- Test Dependencies -->
- <dependency source="local" name="library.testing"
scope="test"/>
+ <dependency source="local" name="library.testing"
branch="trunk" scope="test"/>
<dependency source="ibiblio" org="org.apache.xmlrpc"
name="xmlrpc-server" tag="3.1.3" scope="test"/>
</dependencies>
</ebuild-module>
Modified: branches/vexi4/org.vexi-library.net/meta/module-build.xml
===================================================================
--- branches/vexi4/org.vexi-library.net/meta/module-build.xml 2013-05-24
11:37:26 UTC (rev 4524)
+++ branches/vexi4/org.vexi-library.net/meta/module-build.xml 2013-05-24
12:10:47 UTC (rev 4525)
@@ -1,8 +1,8 @@
<ebuild-module-build ebuild-version="0.8">
- <using source="local" name="library.util" context="build"/>
+ <using source="local" name="library.util" branch="trunk"
context="build"/>
<builders>
- <builder source="local" name="build.jpp">
+ <builder source="local" name="build.jpp" branch="trunk" >
<property key="defines" conf="apache_http">
{ "APACHE_HTTP": "true" }
</property>
Modified: branches/vexi4/org.vexi-library.net/meta/module.xml
===================================================================
--- branches/vexi4/org.vexi-library.net/meta/module.xml 2013-05-24 11:37:26 UTC
(rev 4524)
+++ branches/vexi4/org.vexi-library.net/meta/module.xml 2013-05-24 12:10:47 UTC
(rev 4525)
@@ -11,12 +11,12 @@
<!-- <checked-in name="httpcore-4.0.1.jar"
conf="apache_http" type="java_classes.jar"/> -->
<dependency source="maven-public" conf="apache_http"
org="org.apache.httpcomponents" name="httpclient" tag="4.1.1"/>
- <dependency source="local"
name="library.crypto" />
+ <dependency source="local"
name="library.crypto" branch="trunk" />
<!-- Test Dependencies -->
<dependency source="maven-public" org="junit" name="junit"
tag="3.8.2" scope="test"/>
<dependency source="maven-public" org="org.mortbay.jetty"
name="jetty" tag="6.1.24" scope="test"/>
- <dependency source="local" org="org.vexi"
name="library.testing" scope="test"/>
+ <dependency source="local" org="org.vexi"
name="library.testing" branch="trunk" scope="test"/>
</dependencies>
</ebuild-module>
Modified: branches/vexi4/org.vexi-library.value/meta/module-build.xml
===================================================================
--- branches/vexi4/org.vexi-library.value/meta/module-build.xml 2013-05-24
11:37:26 UTC (rev 4524)
+++ branches/vexi4/org.vexi-library.value/meta/module-build.xml 2013-05-24
12:10:47 UTC (rev 4525)
@@ -1,5 +1,5 @@
<ebuild-module-build ebuild-version="0.8">
- <using source="local" name="build.shared"/>
+ <using source="local" name="build.shared" branch="trunk" />
<builders>
<builder id="javac" source="ebuild" name="build.java.compile">
<property key="debug" conf="nodebug" value="false"/>
Modified: branches/vexi4/org.vexi-library.value/meta/module.xml
===================================================================
--- branches/vexi4/org.vexi-library.value/meta/module.xml 2013-05-24
11:37:26 UTC (rev 4524)
+++ branches/vexi4/org.vexi-library.value/meta/module.xml 2013-05-24
12:10:47 UTC (rev 4525)
@@ -5,7 +5,7 @@
<dependencies>
<system name="java.jre" tag="1.4"/>
<!-- Test dependencies -->
- <dependency source="local" org="org.vexi"
name="library.testing" scope="test"/>
+ <dependency source="local" org="org.vexi"
name="library.testing" branch="trunk" scope="test"/>
<dependency source="ibiblio" org="junit" name="junit"
tag="3.8.1" scope="test"/>
<dependency source="ibiblio" org="commons-collections"
name="commons-collections-testframework" tag="3.1" scope="test"/>
</dependencies>
Modified: trunk/org.vexi-library.testing/meta/module-build.xml
===================================================================
--- trunk/org.vexi-library.testing/meta/module-build.xml 2013-05-24
11:37:26 UTC (rev 4524)
+++ trunk/org.vexi-library.testing/meta/module-build.xml 2013-05-24
12:10:47 UTC (rev 4525)
@@ -1,5 +1,5 @@
<ebuild-module ebuild-version="pre-1.0">
- <using source="local" name="build.shared"/>
+ <using source="local" name="build.shared" branch="trunk" />
<builders>
<builder source="ebuild" name="build.java.compile"/>
Modified:
trunk/org.vexi-library.testing/src/main/java/org/vexi/testutil/Utilities.java
===================================================================
---
trunk/org.vexi-library.testing/src/main/java/org/vexi/testutil/Utilities.java
2013-05-24 11:37:26 UTC (rev 4524)
+++
trunk/org.vexi-library.testing/src/main/java/org/vexi/testutil/Utilities.java
2013-05-24 12:10:47 UTC (rev 4525)
@@ -34,14 +34,19 @@
}
static public String fileAsString(String path, String filename) throws
IOException{
+
BufferedReader r = new BufferedReader(new FileReader(path));
- StringBuffer output = new StringBuffer();
- String l;
- while((l=r.readLine())!=null){
- output.append(l);
- output.append('\n');
+ try{
+ StringBuffer output = new StringBuffer();
+ String l;
+ while((l=r.readLine())!=null){
+ output.append(l);
+ output.append('\n');
+ }
+ return output.toString();
+ }finally{
+ r.close();
}
- return output.toString();
}
// Returns files with suffixes beginning with suffixPrefix
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
_______________________________________________
Vexi-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/vexi-svn
