Author: dkulp Date: Tue Aug 26 08:57:18 2008 New Revision: 689121 URL: http://svn.apache.org/viewvc?rev=689121&view=rev Log: Merged revisions 689112 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................ r689112 | dkulp | 2008-08-26 11:27:08 -0400 (Tue, 26 Aug 2008) | 10 lines Merged revisions 688102 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r688102 | seanoc | 2008-08-22 11:45:22 -0400 (Fri, 22 Aug 2008) | 2 lines Fix for https://issues.apache.org/jira/browse/CXF-1076 Wsdl2Java out of memory if the wsdl has tons of imports ........ ................ Modified: cxf/branches/2.0.x-fixes/ (props changed) cxf/branches/2.0.x-fixes/distribution/src/main/release/bin/wsdl2java cxf/branches/2.0.x-fixes/distribution/src/main/release/bin/wsdl2java.bat Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Aug 26 08:57:18 2008 @@ -1,3 +1,3 @@ -/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109 -/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086 +/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112 +/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102 /incubator/cxf/trunk:434594-651668 Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Tue Aug 26 08:57:18 2008 @@ -1 +1 @@ -/cxf/branches/2.1.x-fixes:1-686313,686315-686332,686334-686346,686348-686828,687097,687464-687465,689109 +/cxf/branches/2.1.x-fixes:1-686313,686315-686332,686334-686346,686348-686828,687097,687464-687465,689109,689112 Modified: cxf/branches/2.0.x-fixes/distribution/src/main/release/bin/wsdl2java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/distribution/src/main/release/bin/wsdl2java?rev=689121&r1=689120&r2=689121&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/distribution/src/main/release/bin/wsdl2java (original) +++ cxf/branches/2.0.x-fixes/distribution/src/main/release/bin/wsdl2java Tue Aug 26 08:57:18 2008 @@ -74,7 +74,7 @@ cxf_classpath=${cxf_jar}:${CLASSPATH}:${sun_tool_path} fi -$JAVA_HOME/bin/java -cp ${cxf_classpath} -Djava.util.logging.config.file=$log_config org.apache.cxf.tools.wsdlto.WSDLToJava "$@" +$JAVA_HOME/bin/java -Xmx128M -cp "${cxf_classpath}" -Djava.util.logging.config.file=$log_config org.apache.cxf.tools.wsdlto.WSDLToJava "$@" Modified: cxf/branches/2.0.x-fixes/distribution/src/main/release/bin/wsdl2java.bat URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/distribution/src/main/release/bin/wsdl2java.bat?rev=689121&r1=689120&r2=689121&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/distribution/src/main/release/bin/wsdl2java.bat (original) +++ cxf/branches/2.0.x-fixes/distribution/src/main/release/bin/wsdl2java.bat Tue Aug 26 08:57:18 2008 @@ -37,7 +37,7 @@ set CXF_JAR=%CXF_HOME%\lib\cxf-manifest.jar -"%JAVA_HOME%\bin\java" -cp "%CXF_JAR%;%SUN_TOOL_PATH%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.tools.wsdlto.WSDLToJava %* +"%JAVA_HOME%\bin\java" -Xmx128M -cp "%CXF_JAR%;%SUN_TOOL_PATH%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.tools.wsdlto.WSDLToJava %* @endlocal
