# HG changeset patch # User Jaroslav Tulach # Date 1358329926 -3600 # Node ID 3641fd0663d3e2e8566fd68c1ce4b64d03414f36 # Parent aa69b138762439a84d58f28ebbb050a7512806de After Lahvac's tweaks the compilation seems to run OK diff -r aa69b1387624 -r 3641fd0663d3 javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/PageProcessor.java --- a/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/PageProcessor.java Tue Jan 15 22:48:17 2013 +0100 +++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/PageProcessor.java Wed Jan 16 10:52:06 2013 +0100 @@ -62,6 +62,9 @@ public boolean process(Set annotations, RoundEnvironment roundEnv) { for (Element e : roundEnv.getElementsAnnotatedWith(Page.class)) { Page p = e.getAnnotation(Page.class); + if (p == null) { + continue; + } PackageElement pe = (PackageElement)e.getEnclosingElement(); String pkg = pe.getQualifiedName().toString(); diff -r aa69b1387624 -r 3641fd0663d3 launcher/pom.xml --- a/launcher/pom.xml Tue Jan 15 22:48:17 2013 +0100 +++ b/launcher/pom.xml Wed Jan 16 10:52:06 2013 +0100 @@ -55,5 +55,10 @@ + + ${project.groupId} + javaquery.api + ${project.version} + diff -r aa69b1387624 -r 3641fd0663d3 launcher/src/main/java/org/apidesign/bck2brwsr/dew/Compile.java --- a/launcher/src/main/java/org/apidesign/bck2brwsr/dew/Compile.java Tue Jan 15 22:48:17 2013 +0100 +++ b/launcher/src/main/java/org/apidesign/bck2brwsr/dew/Compile.java Wed Jan 16 10:52:06 2013 +0100 @@ -4,27 +4,40 @@ */ package org.apidesign.bck2brwsr.dew; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.URI; +import java.net.URISyntaxException; import java.nio.charset.Charset; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; +import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.tools.Diagnostic; import javax.tools.DiagnosticListener; import javax.tools.FileObject; +import javax.tools.ForwardingJavaFileManager; import javax.tools.JavaCompiler; import javax.tools.JavaCompiler.CompilationTask; import javax.tools.JavaFileManager; import javax.tools.JavaFileObject; import javax.tools.JavaFileObject.Kind; +import javax.tools.SimpleJavaFileObject; import javax.tools.StandardJavaFileManager; import javax.tools.StandardLocation; +import javax.tools.ToolProvider; /** * @@ -41,6 +54,7 @@ this.jfo = jfo; } + /* public static Map compile(String html, String java) throws IOException { JavaCompiler jc = javax.tools.ToolProvider.getSystemJavaCompiler(); String pkg = findPkg(java); @@ -58,6 +72,123 @@ } return Collections.emptyMap(); } + */ + public static Map compile(final String html, final String code) throws IOException { + final String pkg = findPkg(code); +// String cls = findCls(code); + + DiagnosticListener devNull = new DiagnosticListener() { + public void report(Diagnostic diagnostic) { + System.err.println("diagnostic=" + diagnostic); + } + }; + StandardJavaFileManager sjfm = ToolProvider.getSystemJavaCompiler().getStandardFileManager(devNull, null, null); + +// sjfm.setLocation(StandardLocation.PLATFORM_CLASS_PATH, toFiles(boot)); +// sjfm.setLocation(StandardLocation.CLASS_PATH, toFiles(compile)); + + final Map class2BAOS = new HashMap(); + + JavaFileObject file = new SimpleJavaFileObject(URI.create("mem://mem"), Kind.SOURCE) { + @Override + public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException { + return code; + } + }; + final JavaFileObject htmlFile = new SimpleJavaFileObject(URI.create("mem://mem2"), Kind.OTHER) { + @Override + public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException { + return html; + } + + @Override + public InputStream openInputStream() throws IOException { + return new ByteArrayInputStream(html.getBytes()); + } + }; + + final URI scratch; + try { + scratch = new URI("mem://mem3"); + } catch (URISyntaxException ex) { + throw new IOException(ex); + } + + JavaFileManager jfm = new ForwardingJavaFileManager(sjfm) { + @Override + public JavaFileObject getJavaFileForOutput(Location location, String className, Kind kind, FileObject sibling) throws IOException { + if (kind == Kind.CLASS) { + final ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + + class2BAOS.put(className.replace('.', '/') + ".class", buffer); + return new SimpleJavaFileObject(sibling.toUri(), kind) { + @Override + public OutputStream openOutputStream() throws IOException { + return buffer; + } + }; + } + + if (kind == Kind.SOURCE) { + return new SimpleJavaFileObject(scratch/*sibling.toUri()*/, kind) { + private final ByteArrayOutputStream data = new ByteArrayOutputStream(); + @Override + public OutputStream openOutputStream() throws IOException { + return data; + } + + @Override + public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException { + data.close(); + return new String(data.toByteArray()); + } + }; + } + + throw new IllegalStateException(); + } +// @Override +// public Iterable list(Location location, String packageName, Set kinds, boolean recurse) throws IOException { +// if (location == StandardLocation.PLATFORM_CLASS_PATH) { +// return super.list(location, packageName, kinds, recurse); +// } +// if (location == StandardLocation.CLASS_PATH) { +// return super.list(location, packageName, kinds, recurse); +// } +// if (location == StandardLocation.SOURCE_PATH) { +// System.out.println("src path for " + packageName + " kinds: " + kinds); +// if (packageName.equals(pkg) && kinds.contains(Kind.OTHER)) { +// return Collections.singleton(htmlFile); +// } +// return Collections.emptyList(); +// } +// throw new UnsupportedOperationException("Loc: " + location + " pkg: " + packageName + " kinds: " + kinds + " rec: " + recurse); +// } + + @Override + public FileObject getFileForInput(Location location, String packageName, String relativeName) throws IOException { + if (location == StandardLocation.SOURCE_PATH) { +// System.out.println("src path for " + packageName + " kinds: " + kinds); + if (packageName.equals(pkg)) { + return htmlFile; + } + } + + return null; + } + + }; + + ToolProvider.getSystemJavaCompiler().getTask(null, jfm, devNull, /*XXX:*/Arrays.asList("-source", "1.7", "-target", "1.7"), null, Arrays.asList(file)).call(); + + Map result = new HashMap(); + + for (Map.Entry e : class2BAOS.entrySet()) { + result.put(e.getKey(), e.getValue().toByteArray()); + } + + return result; + } @Override public ClassLoader getClassLoader(Location location) { diff -r aa69b1387624 -r 3641fd0663d3 launcher/src/test/java/org/apidesign/bck2brwsr/dew/CompileTest.java --- a/launcher/src/test/java/org/apidesign/bck2brwsr/dew/CompileTest.java Tue Jan 15 22:48:17 2013 +0100 +++ b/launcher/src/test/java/org/apidesign/bck2brwsr/dew/CompileTest.java Wed Jan 16 10:52:06 2013 +0100 @@ -19,10 +19,14 @@ + " " + ""; String java = "package x.y.z;" - + "class X {" - + "}"; + + "import org.apidesign.bck2brwsr.htmlpage.api.*;" + + "@Page(xhtml=\"index.html\", className=\"Index\")" + + "class X { " + + " @OnClick(id=\"btn\") static void clcs() {}" + + "}"; Map result = Compile.compile(html, java); assertNotNull(result.get("x/y/z/X.class"), "Class X is compiled: " + result); + assertNotNull(result.get("x/y/z/Index.class"), "Class Index is compiled: " + result); } }