Revision: 3956
http://vexi.svn.sourceforge.net/vexi/?rev=3956&view=rev
Author: mkpg2
Date: 2010-10-30 02:17:14 +0000 (Sat, 30 Oct 2010)
Log Message:
-----------
Fix build issues.
- badly signed jar
- empty .vexi files
Modified Paths:
--------------
trunk/_ebuild/seed/build.xml
trunk/_ebuild/seed/version
trunk/org.vexi-build.jpp/src/test/java/test_jpp/TestPreprocessor.java
trunk/org.vexi-build.sign/src/main/java/org/vexi/build/sign/VexiSignAssembler.java
trunk/org.vexi-distribution/meta/component-assembly.xml
trunk/org.vexi-distribution/meta/component.xml
trunk/org.vexi-library.net/meta/module.xml
trunk/org.vexi-tools.certify/src/main/java/vexitools/security/certify/Check.java
Modified: trunk/_ebuild/seed/build.xml
===================================================================
--- trunk/_ebuild/seed/build.xml 2010-10-30 00:19:12 UTC (rev 3955)
+++ trunk/_ebuild/seed/build.xml 2010-10-30 02:17:14 UTC (rev 3956)
@@ -4,7 +4,7 @@
<property name="file" value="ebuild-${version}.zip"/>
<target name="fetch" unless="nofetch">
- <get
src="http://sandbox.emanate5.com:8123/download/ebuild-installation/${version.path}/release/${file}";
+ <get
src="http://sandbox.emanate5.com:8123/download/0.7/ebuild-installation/${version.path}/release/${file}";
usetimestamp="true"
dest="./${file}"/>
</target>
Modified: trunk/_ebuild/seed/version
===================================================================
--- trunk/_ebuild/seed/version 2010-10-30 00:19:12 UTC (rev 3955)
+++ trunk/_ebuild/seed/version 2010-10-30 02:17:14 UTC (rev 3956)
@@ -1,4 +1,4 @@
-version.path=trunk/137
-version=rev_137
+version.path=trunk/149
+version=rev_149
#nofetch=true
Modified: trunk/org.vexi-build.jpp/src/test/java/test_jpp/TestPreprocessor.java
===================================================================
--- trunk/org.vexi-build.jpp/src/test/java/test_jpp/TestPreprocessor.java
2010-10-30 00:19:12 UTC (rev 3955)
+++ trunk/org.vexi-build.jpp/src/test/java/test_jpp/TestPreprocessor.java
2010-10-30 02:17:14 UTC (rev 3956)
@@ -17,11 +17,10 @@
import org.vexi.build.jpp.Preprocessor;
import org.vexi.build.jpp.Preprocessor.SourcePath;
+import org.vexi.testutil.Utilities;
import org.vexi.util.Problem;
-import vexi.testing.TestUtil;
-
public class TestPreprocessor extends TestCase
{
@@ -39,11 +38,11 @@
// - if there is no output files create a test anyway, with expected
output ""
TestSuite testSuite = new TestSuite();
URL url = TestPreprocessor.class.getResource("cases");
- String[] inFiles =
TestUtil.listFileWithSuffix(url.getPath(),"in");
+ String[] inFiles =
Utilities.listTestFile(url.getPath(),null,"in");
for(int i=0; i<inFiles.length; i++){
String prefix =
inFiles[i].substring(0,inFiles[i].length()-3);
- String[] outs =
TestUtil.listFileStartsWith(url.getPath(), prefix + "."+"out");
+ String[] outs = Utilities.listTestFile(url.getPath(),
prefix, "out");
if(outs.length==0)
testSuite.addTest(new
TestPreprocessor(inFiles[i],null));
@@ -64,7 +63,7 @@
URL url = TestPreprocessor.class.getResource(dir+"/" +
filename);
if(url==null)
return "";
- return TestUtil.fileAsString(url.getPath(), filename);
+ return Utilities.fileAsString(url.getPath(), filename);
}
SourcePath sp = new SourcePath(){
@@ -97,9 +96,9 @@
w.flush();
String outputGen = sw.getBuffer().toString();
- TestUtil.assertOutputsEqual(getName(),
- TestUtil.trimLines(output),
- TestUtil.trimLines(outputGen));
+ Utilities.assertOutputsEqual(getName(),
+ Utilities.trimLines(output),
+ Utilities.trimLines(outputGen));
}
Modified:
trunk/org.vexi-build.sign/src/main/java/org/vexi/build/sign/VexiSignAssembler.java
===================================================================
---
trunk/org.vexi-build.sign/src/main/java/org/vexi/build/sign/VexiSignAssembler.java
2010-10-30 00:19:12 UTC (rev 3955)
+++
trunk/org.vexi-build.sign/src/main/java/org/vexi/build/sign/VexiSignAssembler.java
2010-10-30 02:17:14 UTC (rev 3956)
@@ -8,7 +8,6 @@
import org.vexi.security.SecretFolder;
import org.vexi.security.SignFiles;
-import org.vexi.security.SignedType;
import ebuild.api.IAssemblerArgument;
import ebuild.api.IEBuild;
@@ -31,18 +30,18 @@
String secretName = props.expectString("secret_name");
File secretFolder = ebuild.getCredentialsFile(secretName);
if(!secretFolder.isDirectory()){
- throw new BuildPluginException("No such directory:
"+secretFolder.getAbsolutePath());
+ throw new BuildPluginException("No such directory:
"+ebuild.formatAsDisplayPath(secretFolder));
}
SecretFolder secret;
try{
secret = new SecretFolder(secretFolder, null);
-
- SignedType signType = props.getEnum(SignedType.class, "sign_type",
SignedType.signed);
File in = inputs.expectLoneInput().expectLoneArtifact();
- File f = new SignFiles().process(secret, in,
argument.getOutputDirectory(), signType);
- return singletonList(f);
+ // REMARK - we have to use the release file name
+ File out = new File(argument.getOutputDirectory(),
argument.getReleaseFileName());
+ new SignFiles().process(secret, in, out);
+ return singletonList(out);
}catch(Exception e){
throw new BuildPluginException(e);
}
Modified: trunk/org.vexi-distribution/meta/component-assembly.xml
===================================================================
--- trunk/org.vexi-distribution/meta/component-assembly.xml 2010-10-30
00:19:12 UTC (rev 3955)
+++ trunk/org.vexi-distribution/meta/component-assembly.xml 2010-10-30
02:17:14 UTC (rev 3956)
@@ -14,15 +14,13 @@
</module-selection>
</input>
<input name="cores">
- <component source="local"
name="core.download" confs="core_signed" mapping="->signed"/>
- <component source="local"
name="core.download" confs="core_unsigned"/>
+ <component source="local"
name="core.download" confs="core_signed"
mapping="apache_http->apache_http"/>
+ <component source="local"
name="core.download" confs="core_unsigned"
mapping="apache_http->apache_http; ->signed"/>
</input>
<property key="layout">
- {
- "cores": "/",
- "vexis": "/",
- "jsdoc": "/docs/reference"
- }
+ cores -> /
+ vexis -> /
| remove-org
+ jsdoc -> /docs/reference
</property>
</assembler>
</assembly-result>
Modified: trunk/org.vexi-distribution/meta/component.xml
===================================================================
--- trunk/org.vexi-distribution/meta/component.xml 2010-10-30 00:19:12 UTC
(rev 3955)
+++ trunk/org.vexi-distribution/meta/component.xml 2010-10-30 02:17:14 UTC
(rev 3956)
@@ -1,8 +1,9 @@
<ebuild-component ebuild-version="pre-1.0">
<release name="vexi_dist" suffix=".zip"/>
<configurations>
- <configuration name="[default]" aliases="core_unsigned, docs"/>
- <configuration name="deploy" aliases="core_signed"/>
+ <configuration name="apache_http" aliases="core_unsigned,
core_signed, apache_http"/>
+ <configuration name="[default]" aliases="core_unsigned,
core_signed"/>
+ <configuration name="deploy" aliases="core_signed"/>
</configurations>
</ebuild-component>
Modified: trunk/org.vexi-library.net/meta/module.xml
===================================================================
--- trunk/org.vexi-library.net/meta/module.xml 2010-10-30 00:19:12 UTC (rev
3955)
+++ trunk/org.vexi-library.net/meta/module.xml 2010-10-30 02:17:14 UTC (rev
3956)
@@ -5,12 +5,12 @@
</configurations>
<dependencies>
- <checked-in name="httpcore-4.0.1.jar" confs="apache_http"
/>
-
- <dependency source="ibiblio" org="org.mortbay.jetty"
name="jetty" version="6.1.24" scope="test"/>
+ <checked-in name="httpcore-4.0.1.jar" confs="apache_http"
type="java.classes.jar"/>
+ <dependency source="ibiblio" org="org.mortbay.jetty"
name="jetty" version="6.1.24" scope="test"/>
<dependency source="local"
name="library.crypto" />
+
<!-- Test Dependencies -->
- <dependency source="ibiblio" org="junit"
name="junit" version="3.8.2" scope="test"/>
+ <dependency source="ibiblio" org="junit" name="junit"
version="3.8.2" scope="test"/>
<dependency source="local" org="org.vexi"
name="library.testing" scope="test"/>
</dependencies>
</ebuild-module>
Modified:
trunk/org.vexi-tools.certify/src/main/java/vexitools/security/certify/Check.java
===================================================================
---
trunk/org.vexi-tools.certify/src/main/java/vexitools/security/certify/Check.java
2010-10-30 00:19:12 UTC (rev 3955)
+++
trunk/org.vexi-tools.certify/src/main/java/vexitools/security/certify/Check.java
2010-10-30 02:17:14 UTC (rev 3956)
@@ -9,7 +9,7 @@
public class Check {
static public void main(String[] args) throws Exception {
File cert = new File("secret.vexi/root.crt");
- File signedDir = new File("signed");
+ File signedDir = new File("signer_out");
if(!signedDir.exists()) throw new RuntimeException("No such target
dir: "+signedDir);
VerifyFiles.run(DefaultLog.logger, cert, signedDir);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
