You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2009/12/09 00:48:18 UTC
svn commit: r888633 - in
/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting:
api/CompilerConst.java api/ScriptingConst.java
loaders/java/jdk5/JavacCompiler.java
Author: werpu
Date: Tue Dec 8 23:48:18 2009
New Revision: 888633
URL: http://svn.apache.org/viewvc?rev=888633&view=rev
Log:
https://issues.apache.org/jira/browse/EXTSCRIPT-20
Refactoring extracting all shared compiler consts for the various implementations
Added:
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/CompilerConst.java (with props)
Modified:
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/ScriptingConst.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/jdk5/JavacCompiler.java
Added: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/CompilerConst.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/CompilerConst.java?rev=888633&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/CompilerConst.java (added)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/CompilerConst.java Tue Dec 8 23:48:18 2009
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.scripting.api;
+
+/**
+ * @author Werner Punz (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ *
+ * Various constants shared over the various compiler implementations
+ * JSR or non JSR!
+ */
+
+public class CompilerConst {
+ public static final String STD_ERROR_HEAD = "Java Compiler, Error on line: ";
+ public static final String JC_CLASSPATH = "-cp";
+ public static final String JC_TARGET_PATH = "-d";
+ public static final String JC_SOURCEPATH = "-sourcepath";
+ public static final String JC_DEBUG = "-g";
+ public static final String JAVA_WILDCARD = "*.java ";
+ public static final String JC_VERBOSE = "-verbose";
+}
Propchange: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/CompilerConst.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/CompilerConst.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/ScriptingConst.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/ScriptingConst.java?rev=888633&r1=888632&r2=888633&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/ScriptingConst.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/ScriptingConst.java Tue Dec 8 23:48:18 2009
@@ -59,5 +59,4 @@
public static final int ARTEFACT_TYPE_RESOURCEHANDLER = 19;
public static final int ARTEFACT_TYPE_CLIENTBEHAVIORRENDERER = 20;
- public static final String JAVA_WILDCARD = "*.java ";
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/jdk5/JavacCompiler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/jdk5/JavacCompiler.java?rev=888633&r1=888632&r2=888633&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/jdk5/JavacCompiler.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/jdk5/JavacCompiler.java Tue Dec 8 23:48:18 2009
@@ -4,7 +4,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.scripting.core.util.ClassUtils;
import org.apache.myfaces.scripting.core.util.FileUtils;
-import org.apache.myfaces.scripting.api.ScriptingConst;
+import org.apache.myfaces.scripting.api.CompilerConst;
import java.io.File;
import java.io.PrintWriter;
@@ -173,7 +173,7 @@
* @return an array of arguments that you have to pass to the Javac compiler
*/
protected String[] buildCompilerArguments(File sourcePath, File targetPath, String classPath) {
- StringBuilder sourcesList = FileUtils.fetchSourcePaths(sourcePath, ScriptingConst.JAVA_WILDCARD);
+ StringBuilder sourcesList = FileUtils.fetchSourcePaths(sourcePath, CompilerConst.JAVA_WILDCARD);
List arguments = getDefaultArguments(sourcePath, targetPath, classPath);
@@ -219,18 +219,18 @@
// Set both the source code path to search for class or interface
// definitions and the destination directory for class files.
- arguments.add("-sourcepath");
+ arguments.add(CompilerConst.JC_SOURCEPATH);
arguments.add(sourcePath.getAbsolutePath());
- arguments.add("-d");
+ arguments.add(CompilerConst.JC_TARGET_PATH);
arguments.add(targetPath.getAbsolutePath());
- arguments.add("-cp");
+ arguments.add(CompilerConst.JC_CLASSPATH);
arguments.add(classPath);
// Enable verbose output.
- arguments.add("-verbose");
+ arguments.add(CompilerConst.JC_VERBOSE);
// Generate all debugging information, including local variables.
- arguments.add("-g");
+ arguments.add(CompilerConst.JC_DEBUG);
return arguments;
}