< prev index next >
src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java
Print this page
*** 67,77 ****
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintStream;
import java.net.URLClassLoader;
import java.util.ArrayList;
- import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
--- 67,76 ----
*** 185,195 ****
}
if (options.javacOptions != null) {
args.addAll(options.getJavacOptions(args, listener));
}
! JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();// compiler = JavacTool.create();
DiagnosticCollector<JavaFileObject> diagnostics = new DiagnosticCollector<JavaFileObject>();
StandardJavaFileManager fileManager = compiler.getStandardFileManager(diagnostics, null, null);
JavaCompiler.CompilationTask task = compiler.getTask(
null,
fileManager,
--- 184,198 ----
}
if (options.javacOptions != null) {
args.addAll(options.getJavacOptions(args, listener));
}
! JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
! if (compiler == null) {
! out.println(WscompileMessages.WSCOMPILE_CANT_GET_COMPILER(property("java.home"), property("java.version"), property("java.vendor")));
! return false;
! }
DiagnosticCollector<JavaFileObject> diagnostics = new DiagnosticCollector<JavaFileObject>();
StandardJavaFileManager fileManager = compiler.getStandardFileManager(diagnostics, null, null);
JavaCompiler.CompilationTask task = compiler.getTask(
null,
fileManager,
*** 303,312 ****
--- 306,324 ----
generateWsgenReport(endpointClass, (AbstractSEIModelImpl) rt.getModel(), wsdlFileName[0], schemaFiles);
}
return true;
}
+ private String property(String key) {
+ try {
+ String property = System.getProperty(key);
+ return property != null ? property : "UNKNOWN";
+ } catch (SecurityException ignored) {
+ return "UNKNOWN";
+ }
+ }
+
private List<File> getExternalFiles(List<String> exts) {
List<File> files = new ArrayList<File>();
for (String ext : exts) {
// first try absolute path ...
File file = new File(ext);
< prev index next >