Author: dkulp
Date: Mon Jan 19 12:23:59 2009
New Revision: 735792
URL: http://svn.apache.org/viewvc?rev=735792&view=rev
Log:
Merged revisions 735787 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r735787 | dkulp | 2009-01-19 15:11:47 -0500 (Mon, 19 Jan 2009) | 2 lines
[CXF-1992] Honor java.home to find javac
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/Compiler.java
cxf/branches/2.1.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettySpringTypesFactory.java
(props changed)
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 19 12:23:59 2009
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
732710,732827,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965,735113,735252,735722-735723,735729,735734,735782
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
732710,732827,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965,735113,735252,735722-735723,735729,735734,735782,735787
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/Compiler.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/Compiler.java?rev=735792&r1=735791&r2=735792&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/Compiler.java
(original)
+++
cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/Compiler.java
Mon Jan 19 12:23:59 2009
@@ -32,13 +32,37 @@
public class Compiler {
public boolean compileFiles(String[] files, File outputDir) {
List<String> list = new ArrayList<String>();
- list.add("javac");
-
+
+ // Start of honoring java.home for used javac
+ String fsep = System.getProperty("file.separator");
+ String javacstr = "javac";
+ String platformjavacname = "javac";
+
+ if (System.getProperty("os.name").toLowerCase().indexOf("windows") >
-1) {
+ platformjavacname = "javac.exe";
+ }
+
+ if (new File(System.getProperty("java.home") + fsep +
platformjavacname).exists()) {
+ // check if java.home is jdk home
+ javacstr = System.getProperty("java.home") + fsep +
platformjavacname;
+ } else if (new File(System.getProperty("java.home") + fsep + ".." +
fsep + "bin" + fsep
+ + platformjavacname).exists()) {
+ // check if java.home is jre home
+ javacstr = System.getProperty("java.home") + fsep + ".." + fsep +
"bin" + fsep
+ + platformjavacname;
+ }
+
+ list.add(javacstr);
+ // End of honoring java.home for used javac
+
+ // This code doesn't honor java.home
+ // list.add("javac");
+
if (outputDir != null) {
list.add("-d");
list.add(outputDir.getAbsolutePath().replace(File.pathSeparatorChar, '/'));
}
-
+
String javaClasspath = System.getProperty("java.class.path");
boolean classpathSetted = javaClasspath != null ? true : false;
if (!classpathSetted) {
@@ -48,13 +72,13 @@
list.add("-classpath");
list.add(javaClasspath);
}
-
+
int idx = list.size();
list.addAll(Arrays.asList(files));
-
+
return internalCompile(list.toArray(new String[list.size()]), idx);
}
-
+
public boolean internalCompile(String[] args, int sourceFileIndex) {
Process p = null;
String cmdArray[] = null;
@@ -69,7 +93,7 @@
args[i] = args[i].replace(File.separatorChar, '/');
//
// javac gives an error if you use forward slashes
- // with package-info.java. Refer to:
+ // with package-info.java. Refer to:
//
http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6198196
//
if (args[i].indexOf("package-info.java") > -1
@@ -91,7 +115,7 @@
cmdArray = new String[args.length];
System.arraycopy(args, 0, cmdArray, 0, args.length);
}
-
+
if (System.getProperty("os.name").toLowerCase().indexOf("windows")
> -1) {
for (int i = 0; i < cmdArray.length; i++) {
if (cmdArray[i].indexOf("package-info") == -1) {
@@ -99,7 +123,7 @@
}
}
}
-
+
p = Runtime.getRuntime().exec(cmdArray);
if (p.getErrorStream() != null) {
@@ -124,8 +148,7 @@
System.err.print("[ERROR] IOException during exec() of compiler
\"" + args[0] + "\"");
System.err.println(". Check your path environment variable.");
} finally {
- if (tmpFile != null
- && tmpFile.exists()) {
+ if (tmpFile != null && tmpFile.exists()) {
FileUtils.delete(tmpFile);
}
}
Propchange:
cxf/branches/2.1.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettySpringTypesFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 19 12:23:59 2009
@@ -1 +1 @@
-/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettySpringTypesFactory.java:735252,735722-735723,735729,735734,735782
+/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettySpringTypesFactory.java:735252,735722-735723,735729,735734,735782,735787
