Author: dkulp Date: Wed Sep 2 14:50:49 2009 New Revision: 810534 URL: http://svn.apache.org/viewvc?rev=810534&view=rev Log: Merged revisions 810527 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................ r810527 | dkulp | 2009-09-02 10:37:12 -0400 (Wed, 02 Sep 2009) | 9 lines Merged revisions 810526 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r810526 | dkulp | 2009-09-02 10:35:46 -0400 (Wed, 02 Sep 2009) | 2 lines Set eol-style ........ ................ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java (contents, props changed) Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Sep 2 14:50:49 2009 @@ -1,2 +1,2 @@ -/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407,784064,784197,785293,785296,785298-785299,785301,785656,786158,786587,786589,786591-786592,786640,787272,787276,787282-787283,787285,787295,787307,787324,7873 67,788824-788825,788827-788828,788830,789423,789429,789707,789709-789710,789712,789721,789905,789908,789910,789912,790295,790646-790647,790651,790654-790655,790659,791948,791950,791952,791955,792276,792288,792291,792992,792995,792998,794402,794404,794735,794797,794799,794803,795161-795162,796300-796301,796598,797449,797452-797453,797460,797463-797464,797521-797522,797584-797585,797645,797652,797701,797884,797886,798348-798350,798568,798574-798575,798577-798578,798586,798608,798655,798752,798942,799444,799449,799738,799740,800514-800516,801382-801384,803960,803962,803979,804005,805925-805927,805929,806606,806612,806617,806662,808478,808484,808491,808495,808505,808527,808533-808534,808536,808539,809693,809717,809748,809784,809787-809801,810203-810224,810231,810236,810509-810510,810515 -/cxf/trunk:782181,782728-782730,783097,783396,784059,784181,784895,785279-785282,785468,786142,786271,786395,786582-786583,786638,786647,787269,787277-787279,787290,787305,787323,787366,788060,788187,788703,788774,788820,789371,789420,789527-789529,789704-789705,789896,789898-789900,790294,790637-790644,791354,791538,791753,791947,792261-792263,792684,792975,792985,794297,794396,794728,794778-794780,794892,795160,796022-796023,796593,796780,797194,797231-797233,797442,797505,797517,797581-797582,797640,797651,797699,797882-797883,798344-798346,798479,798533,798551,798557,798561-798562,798570,798573,798584,798654,798749,798929,799439,799448,799637,799724,799792,800453,800497,801380-801381,802892,803129,803689,804002,804276,805784,805907,805909,806020-806021,806405,806576,806603-806604,806631,806633,806922,807748,807807,808035,808069,808085,808731,809083,809162,809417-809626,809631,809663,809706,809738,809962,810349,810376,810513 +/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407,784064,784197,785293,785296,785298-785299,785301,785656,786158,786587,786589,786591-786592,786640,787272,787276,787282-787283,787285,787295,787307,787324,7873 67,788824-788825,788827-788828,788830,789423,789429,789707,789709-789710,789712,789721,789905,789908,789910,789912,790295,790646-790647,790651,790654-790655,790659,791948,791950,791952,791955,792276,792288,792291,792992,792995,792998,794402,794404,794735,794797,794799,794803,795161-795162,796300-796301,796598,797449,797452-797453,797460,797463-797464,797521-797522,797584-797585,797645,797652,797701,797884,797886,798348-798350,798568,798574-798575,798577-798578,798586,798608,798655,798752,798942,799444,799449,799738,799740,800514-800516,801382-801384,803960,803962,803979,804005,805925-805927,805929,806606,806612,806617,806662,808478,808484,808491,808495,808505,808527,808533-808534,808536,808539,809693,809717,809748,809784,809787-809801,810203-810224,810231,810236,810509-810510,810515,810527 +/cxf/trunk:782181,782728-782730,783097,783396,784059,784181,784895,785279-785282,785468,786142,786271,786395,786582-786583,786638,786647,787269,787277-787279,787290,787305,787323,787366,788060,788187,788703,788774,788820,789371,789420,789527-789529,789704-789705,789896,789898-789900,790294,790637-790644,791354,791538,791753,791947,792261-792263,792684,792975,792985,794297,794396,794728,794778-794780,794892,795160,796022-796023,796593,796780,797194,797231-797233,797442,797505,797517,797581-797582,797640,797651,797699,797882-797883,798344-798346,798479,798533,798551,798557,798561-798562,798570,798573,798584,798654,798749,798929,799439,799448,799637,799724,799792,800453,800497,801380-801381,802892,803129,803689,804002,804276,805784,805907,805909,806020-806021,806405,806576,806603-806604,806631,806633,806922,807748,807807,808035,808069,808085,808731,809083,809162,809417-809626,809631,809663,809706,809738,809962,810349,810376,810513,810526 Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java?rev=810534&r1=810533&r2=810534&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java (original) +++ cxf/branches/2.1.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java Wed Sep 2 14:50:49 2009 @@ -1,122 +1,122 @@ -/** - * 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.cxf.maven_plugin; - -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.cxf.helpers.CastUtils; -import org.apache.maven.artifact.Artifact; -import org.apache.maven.plugin.logging.Log; -import org.apache.maven.project.MavenProject; - -/** - * Manages switching to the classloader needed for creating the java sources and restoring the old classloader - * when finished - */ -public class ClassLoaderSwitcher { - - private Log log; - private String origClassPath; - private Map<Object, Object> origProps; - private ClassLoader origContextClassloader; - - public ClassLoaderSwitcher(Log log) { - this.log = log; - } - - /** - * Create and set the classloader that is needed for creating the java sources from wsdl - * - * @param project - * @param useCompileClasspath - * @param classesDir - */ - public void switchClassLoader(MavenProject project, boolean useCompileClasspath, File classesDir) { - List<URL> urlList = new ArrayList<URL>(); - StringBuffer buf = new StringBuffer(); - - try { - urlList.add(classesDir.toURI().toURL()); - if (!useCompileClasspath) { - urlList.add(new File(project.getBuild().getOutputDirectory()).toURI().toURL()); - } - } catch (MalformedURLException e) { - // ignore - } - - buf.append(classesDir.getAbsolutePath()); - buf.append(File.pathSeparatorChar); - if (!useCompileClasspath) { - buf.append(project.getBuild().getOutputDirectory()); - buf.append(File.pathSeparatorChar); - } - List<?> artifacts = useCompileClasspath ? project.getCompileArtifacts() : project.getTestArtifacts(); - for (Artifact a : CastUtils.cast(artifacts, Artifact.class)) { - try { - if (a.getFile() != null && a.getFile().exists()) { - urlList.add(a.getFile().toURI().toURL()); - buf.append(a.getFile().getAbsolutePath()); - buf.append(File.pathSeparatorChar); - // System.out.println(" " + - // a.getFile().getAbsolutePath()); - } - } catch (MalformedURLException e) { - // ignore - } - } - - origContextClassloader = Thread.currentThread().getContextClassLoader(); - URLClassLoader loader = new URLClassLoader(urlList.toArray(new URL[urlList.size()]), - origContextClassloader); - String newCp = buf.toString(); - - log.debug("Classpath: " + urlList.toString()); - - origProps = new HashMap<Object, Object>(System.getProperties()); - - origClassPath = System.getProperty("java.class.path"); - - Thread.currentThread().setContextClassLoader(loader); - System.setProperty("java.class.path", newCp); - } - - /** - * Restore the old classloader - */ - public void restoreClassLoader() { - Thread.currentThread().setContextClassLoader(origContextClassloader); - System.setProperty("java.class.path", origClassPath); - - Map<Object, Object> newProps = new HashMap<Object, Object>(System.getProperties()); - for (Object o : newProps.keySet()) { - if (!origProps.containsKey(o)) { - System.clearProperty(o.toString()); - } - } - System.getProperties().putAll(origProps); - } -} +/** + * 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.cxf.maven_plugin; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.cxf.helpers.CastUtils; +import org.apache.maven.artifact.Artifact; +import org.apache.maven.plugin.logging.Log; +import org.apache.maven.project.MavenProject; + +/** + * Manages switching to the classloader needed for creating the java sources and restoring the old classloader + * when finished + */ +public class ClassLoaderSwitcher { + + private Log log; + private String origClassPath; + private Map<Object, Object> origProps; + private ClassLoader origContextClassloader; + + public ClassLoaderSwitcher(Log log) { + this.log = log; + } + + /** + * Create and set the classloader that is needed for creating the java sources from wsdl + * + * @param project + * @param useCompileClasspath + * @param classesDir + */ + public void switchClassLoader(MavenProject project, boolean useCompileClasspath, File classesDir) { + List<URL> urlList = new ArrayList<URL>(); + StringBuffer buf = new StringBuffer(); + + try { + urlList.add(classesDir.toURI().toURL()); + if (!useCompileClasspath) { + urlList.add(new File(project.getBuild().getOutputDirectory()).toURI().toURL()); + } + } catch (MalformedURLException e) { + // ignore + } + + buf.append(classesDir.getAbsolutePath()); + buf.append(File.pathSeparatorChar); + if (!useCompileClasspath) { + buf.append(project.getBuild().getOutputDirectory()); + buf.append(File.pathSeparatorChar); + } + List<?> artifacts = useCompileClasspath ? project.getCompileArtifacts() : project.getTestArtifacts(); + for (Artifact a : CastUtils.cast(artifacts, Artifact.class)) { + try { + if (a.getFile() != null && a.getFile().exists()) { + urlList.add(a.getFile().toURI().toURL()); + buf.append(a.getFile().getAbsolutePath()); + buf.append(File.pathSeparatorChar); + // System.out.println(" " + + // a.getFile().getAbsolutePath()); + } + } catch (MalformedURLException e) { + // ignore + } + } + + origContextClassloader = Thread.currentThread().getContextClassLoader(); + URLClassLoader loader = new URLClassLoader(urlList.toArray(new URL[urlList.size()]), + origContextClassloader); + String newCp = buf.toString(); + + log.debug("Classpath: " + urlList.toString()); + + origProps = new HashMap<Object, Object>(System.getProperties()); + + origClassPath = System.getProperty("java.class.path"); + + Thread.currentThread().setContextClassLoader(loader); + System.setProperty("java.class.path", newCp); + } + + /** + * Restore the old classloader + */ + public void restoreClassLoader() { + Thread.currentThread().setContextClassLoader(origContextClassloader); + System.setProperty("java.class.path", origClassPath); + + Map<Object, Object> newProps = new HashMap<Object, Object>(System.getProperties()); + for (Object o : newProps.keySet()) { + if (!origProps.containsKey(o)) { + System.clearProperty(o.toString()); + } + } + System.getProperties().putAll(origProps); + } +} Propchange: cxf/branches/2.1.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/branches/2.1.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java ------------------------------------------------------------------------------ svn:keywords = Rev Date
