You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2013/02/09 16:45:05 UTC
svn commit: r850026 [13/26] - in
/websites/production/maven/content/ref/3-LATEST: ./ apache-maven/ apidocs/
apidocs/org/apache/maven/cli/ apidocs/org/apache/maven/execution/
apidocs/org/apache/maven/execution/class-use/
apidocs/src-html/org/apache/mave...
Modified: websites/production/maven/content/ref/3-LATEST/maven-embedder/apidocs/constant-values.html
==============================================================================
--- websites/production/maven/content/ref/3-LATEST/maven-embedder/apidocs/constant-values.html (original)
+++ websites/production/maven/content/ref/3-LATEST/maven-embedder/apidocs/constant-values.html Sat Feb 9 15:44:20 2013
@@ -210,6 +210,12 @@ org.apache.*</FONT></TH>
<TD ALIGN="right"><CODE>104</CODE></TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="org.apache.maven.cli.CLIManager.LEGACY_LOCAL_REPOSITORY"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public static final <A HREF="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</A></CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="org/apache/maven/cli/CLIManager.html#LEGACY_LOCAL_REPOSITORY">LEGACY_LOCAL_REPOSITORY</A></CODE></TD>
+<TD ALIGN="right"><CODE>"llr"</CODE></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<A NAME="org.apache.maven.cli.CLIManager.LOG_FILE"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
<CODE>public static final <A HREF="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</A></CODE></FONT></TD>
<TD ALIGN="left"><CODE><A HREF="org/apache/maven/cli/CLIManager.html#LOG_FILE">LOG_FILE</A></CODE></TD>
@@ -258,12 +264,6 @@ org.apache.*</FONT></TH>
<TD ALIGN="right"><CODE>86</CODE></TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.apache.maven.cli.CLIManager.SIMPLE_LOCAL_REPOSITORY_MANAGER"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public static final <A HREF="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/apache/maven/cli/CLIManager.html#SIMPLE_LOCAL_REPOSITORY_MANAGER">SIMPLE_LOCAL_REPOSITORY_MANAGER</A></CODE></TD>
-<TD ALIGN="right"><CODE>"slrm"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
<A NAME="org.apache.maven.cli.CLIManager.SUPRESS_SNAPSHOT_UPDATES"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
<CODE>public static final <A HREF="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</A></CODE></FONT></TD>
<TD ALIGN="left"><CODE><A HREF="org/apache/maven/cli/CLIManager.html#SUPRESS_SNAPSHOT_UPDATES">SUPRESS_SNAPSHOT_UPDATES</A></CODE></TD>
Modified: websites/production/maven/content/ref/3-LATEST/maven-embedder/apidocs/index-all.html
==============================================================================
--- websites/production/maven/content/ref/3-LATEST/maven-embedder/apidocs/index-all.html (original)
+++ websites/production/maven/content/ref/3-LATEST/maven-embedder/apidocs/index-all.html Sat Feb 9 15:44:20 2013
@@ -459,6 +459,9 @@ Method in class org.apache.maven.cli.log
<A NAME="_L_"><!-- --></A><H2>
<B>L</B></H2>
<DL>
+<DT><A HREF="./org/apache/maven/cli/CLIManager.html#LEGACY_LOCAL_REPOSITORY"><B>LEGACY_LOCAL_REPOSITORY</B></A> -
+Static variable in class org.apache.maven.cli.<A HREF="./org/apache/maven/cli/CLIManager.html" title="class in org.apache.maven.cli">CLIManager</A>
+<DD>
<DT><A HREF="./org/apache/maven/cli/MavenCli.html#LOCAL_REPO_PROPERTY"><B>LOCAL_REPO_PROPERTY</B></A> -
Static variable in class org.apache.maven.cli.<A HREF="./org/apache/maven/cli/MavenCli.html" title="class in org.apache.maven.cli">MavenCli</A>
<DD>
@@ -632,9 +635,6 @@ Static method in class org.apache.maven.
<DT><A HREF="./org/apache/maven/cli/CLIReportingUtils.html#showVersion()"><B>showVersion()</B></A> -
Static method in class org.apache.maven.cli.<A HREF="./org/apache/maven/cli/CLIReportingUtils.html" title="class in org.apache.maven.cli">CLIReportingUtils</A>
<DD>
-<DT><A HREF="./org/apache/maven/cli/CLIManager.html#SIMPLE_LOCAL_REPOSITORY_MANAGER"><B>SIMPLE_LOCAL_REPOSITORY_MANAGER</B></A> -
-Static variable in class org.apache.maven.cli.<A HREF="./org/apache/maven/cli/CLIManager.html" title="class in org.apache.maven.cli">CLIManager</A>
-<DD>
<DT><A HREF="./org/apache/maven/cli/logging/Slf4jConfiguration.html" title="interface in org.apache.maven.cli.logging"><B>Slf4jConfiguration</B></A> - Interface in <A HREF="./org/apache/maven/cli/logging/package-summary.html">org.apache.maven.cli.logging</A><DD>Interface for configuration operations on loggers, which are not available in slf4j, then require per-slf4f-binding
implementation.<DT><A HREF="./org/apache/maven/cli/logging/Slf4jConfiguration.Level.html" title="enum in org.apache.maven.cli.logging"><B>Slf4jConfiguration.Level</B></A> - Enum in <A HREF="./org/apache/maven/cli/logging/package-summary.html">org.apache.maven.cli.logging</A><DD> <DT><A HREF="./org/apache/maven/cli/logging/Slf4jConfigurationFactory.html" title="class in org.apache.maven.cli.logging"><B>Slf4jConfigurationFactory</B></A> - Class in <A HREF="./org/apache/maven/cli/logging/package-summary.html">org.apache.maven.cli.logging</A><DD>Slf4jConfiguration factory, loading implementations from <code>META-INF/maven/slf4j-configuration.properties</code>
configuration files in class loader.<DT><A HREF="./org/apache/maven/cli/logging/Slf4jConfigurationFactory.html#Slf4jConfigurationFactory()"><B>Slf4jConfigurationFactory()</B></A> -
Modified: websites/production/maven/content/ref/3-LATEST/maven-embedder/apidocs/org/apache/maven/cli/CLIManager.html
==============================================================================
--- websites/production/maven/content/ref/3-LATEST/maven-embedder/apidocs/org/apache/maven/cli/CLIManager.html (original)
+++ websites/production/maven/content/ref/3-LATEST/maven-embedder/apidocs/org/apache/maven/cli/CLIManager.html Sat Feb 9 15:44:20 2013
@@ -262,6 +262,14 @@ Class CLIManager</H2>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>static <A HREF="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../org/apache/maven/cli/CLIManager.html#LEGACY_LOCAL_REPOSITORY">LEGACY_LOCAL_REPOSITORY</A></B></CODE>
+
+<BR>
+ </TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static <A HREF="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</A></CODE></FONT></TD>
<TD><CODE><B><A HREF="../../../../org/apache/maven/cli/CLIManager.html#LOG_FILE">LOG_FILE</A></B></CODE>
<BR>
@@ -334,14 +342,6 @@ Class CLIManager</H2>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>static <A HREF="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/apache/maven/cli/CLIManager.html#SIMPLE_LOCAL_REPOSITORY_MANAGER">SIMPLE_LOCAL_REPOSITORY_MANAGER</A></B></CODE>
-
-<BR>
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static <A HREF="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</A></CODE></FONT></TD>
<TD><CODE><B><A HREF="../../../../org/apache/maven/cli/CLIManager.html#SUPRESS_SNAPSHOT_UPDATES">SUPRESS_SNAPSHOT_UPDATES</A></B></CODE>
<BR>
@@ -736,13 +736,13 @@ public static final <A HREF="http://docs
</DL>
<HR>
-<A NAME="SIMPLE_LOCAL_REPOSITORY_MANAGER"><!-- --></A><H3>
-SIMPLE_LOCAL_REPOSITORY_MANAGER</H3>
+<A NAME="LEGACY_LOCAL_REPOSITORY"><!-- --></A><H3>
+LEGACY_LOCAL_REPOSITORY</H3>
<PRE>
-public static final <A HREF="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</A> <A HREF="../../../../src-html/org/apache/maven/cli/CLIManager.html#line.100"><B>SIMPLE_LOCAL_REPOSITORY_MANAGER</B></A></PRE>
+public static final <A HREF="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</A> <A HREF="../../../../src-html/org/apache/maven/cli/CLIManager.html#line.100"><B>LEGACY_LOCAL_REPOSITORY</B></A></PRE>
<DL>
<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#org.apache.maven.cli.CLIManager.SIMPLE_LOCAL_REPOSITORY_MANAGER">Constant Field Values</A></DL>
+<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#org.apache.maven.cli.CLIManager.LEGACY_LOCAL_REPOSITORY">Constant Field Values</A></DL>
</DL>
<HR>
@@ -785,7 +785,7 @@ public <A HREF="../../../../src-html/org
<A NAME="parse(java.lang.String[])"><!-- --></A><H3>
parse</H3>
<PRE>
-public <A HREF="http://commons.apache.org/cli/apidocs/org/apache/commons/cli/CommandLine.html?is-external=true" title="class or interface in org.apache.commons.cli">CommandLine</A> <A HREF="../../../../src-html/org/apache/maven/cli/CLIManager.html#line.150"><B>parse</B></A>(<A HREF="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</A>[] args)
+public <A HREF="http://commons.apache.org/cli/apidocs/org/apache/commons/cli/CommandLine.html?is-external=true" title="class or interface in org.apache.commons.cli">CommandLine</A> <A HREF="../../../../src-html/org/apache/maven/cli/CLIManager.html#line.147"><B>parse</B></A>(<A HREF="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</A>[] args)
throws <A HREF="http://commons.apache.org/cli/apidocs/org/apache/commons/cli/ParseException.html?is-external=true" title="class or interface in org.apache.commons.cli">ParseException</A></PRE>
<DL>
<DD><DL>
@@ -799,7 +799,7 @@ public <A HREF="http://commons.apache.or
<A NAME="displayHelp(java.io.PrintStream)"><!-- --></A><H3>
displayHelp</H3>
<PRE>
-public void <A HREF="../../../../src-html/org/apache/maven/cli/CLIManager.html#line.257"><B>displayHelp</B></A>(<A HREF="http://docs.oracle.com/javase/1.5.0/docs/api/java/io/PrintStream.html?is-external=true" title="class or interface in java.io">PrintStream</A> stdout)</PRE>
+public void <A HREF="../../../../src-html/org/apache/maven/cli/CLIManager.html#line.254"><B>displayHelp</B></A>(<A HREF="http://docs.oracle.com/javase/1.5.0/docs/api/java/io/PrintStream.html?is-external=true" title="class or interface in java.io">PrintStream</A> stdout)</PRE>
<DL>
<DD><DL>
</DL>
Modified: websites/production/maven/content/ref/3-LATEST/maven-embedder/apidocs/src-html/org/apache/maven/cli/CLIManager.html
==============================================================================
--- websites/production/maven/content/ref/3-LATEST/maven-embedder/apidocs/src-html/org/apache/maven/cli/CLIManager.html (original)
+++ websites/production/maven/content/ref/3-LATEST/maven-embedder/apidocs/src-html/org/apache/maven/cli/CLIManager.html Sat Feb 9 15:44:20 2013
@@ -100,7 +100,7 @@
<FONT color="green">097</FONT> <a name="line.97"></a>
<FONT color="green">098</FONT> public static final String THREADS = "T";<a name="line.98"></a>
<FONT color="green">099</FONT> <a name="line.99"></a>
-<FONT color="green">100</FONT> public static final String SIMPLE_LOCAL_REPOSITORY_MANAGER ="slrm";<a name="line.100"></a>
+<FONT color="green">100</FONT> public static final String LEGACY_LOCAL_REPOSITORY ="llr";<a name="line.100"></a>
<FONT color="green">101</FONT> <a name="line.101"></a>
<FONT color="green">102</FONT> protected Options options;<a name="line.102"></a>
<FONT color="green">103</FONT> <a name="line.103"></a>
@@ -138,139 +138,136 @@
<FONT color="green">135</FONT> options.addOption( OptionBuilder.withLongOpt( "encrypt-master-password" ).hasArg().withDescription( "Encrypt master security password" ).create( ENCRYPT_MASTER_PASSWORD ) );<a name="line.135"></a>
<FONT color="green">136</FONT> options.addOption( OptionBuilder.withLongOpt( "encrypt-password" ).hasArg().withDescription( "Encrypt server password" ).create( ENCRYPT_PASSWORD ) );<a name="line.136"></a>
<FONT color="green">137</FONT> options.addOption( OptionBuilder.withLongOpt( "threads" ).hasArg().withDescription( "Thread count, for instance 2.0C where C is core multiplied" ).create( THREADS ) );<a name="line.137"></a>
-<FONT color="green">138</FONT> <a name="line.138"></a>
-<FONT color="green">139</FONT> options.addOption( OptionBuilder.withLongOpt( "simple-local-repository-manager" ).withDescription(<a name="line.139"></a>
-<FONT color="green">140</FONT> "Use a simple Local Repository Manager, ie no use of _maven.repositories. Can be activated using -Dmaven.simpleLocalRepoMan=true" ).create(<a name="line.140"></a>
-<FONT color="green">141</FONT> SIMPLE_LOCAL_REPOSITORY_MANAGER ) );<a name="line.141"></a>
-<FONT color="green">142</FONT> <a name="line.142"></a>
-<FONT color="green">143</FONT> // Adding this back in for compatibility with the verifier that hard codes this option.<a name="line.143"></a>
-<FONT color="green">144</FONT> options.addOption( OptionBuilder.withLongOpt( "no-plugin-registry" ).withDescription( "Ineffective, only kept for backward compatibility" ).create( "npr" ) );<a name="line.144"></a>
-<FONT color="green">145</FONT> options.addOption( OptionBuilder.withLongOpt( "check-plugin-updates" ).withDescription( "Ineffective, only kept for backward compatibility" ).create( "cpu" ) );<a name="line.145"></a>
-<FONT color="green">146</FONT> options.addOption( OptionBuilder.withLongOpt( "update-plugins" ).withDescription( "Ineffective, only kept for backward compatibility" ).create( "up" ) );<a name="line.146"></a>
-<FONT color="green">147</FONT> options.addOption( OptionBuilder.withLongOpt( "no-plugin-updates" ).withDescription( "Ineffective, only kept for backward compatibility" ).create( "npu" ) );<a name="line.147"></a>
-<FONT color="green">148</FONT> }<a name="line.148"></a>
-<FONT color="green">149</FONT> <a name="line.149"></a>
-<FONT color="green">150</FONT> public CommandLine parse( String[] args )<a name="line.150"></a>
-<FONT color="green">151</FONT> throws ParseException<a name="line.151"></a>
-<FONT color="green">152</FONT> {<a name="line.152"></a>
-<FONT color="green">153</FONT> // We need to eat any quotes surrounding arguments...<a name="line.153"></a>
-<FONT color="green">154</FONT> String[] cleanArgs = cleanArgs( args );<a name="line.154"></a>
-<FONT color="green">155</FONT> <a name="line.155"></a>
-<FONT color="green">156</FONT> CommandLineParser parser = new GnuParser();<a name="line.156"></a>
+<FONT color="green">138</FONT> options.addOption( OptionBuilder.withLongOpt( "legacy-local-repository" ).withDescription( "Use Laven 2 Legacy Local Repository behaviour, ie no use of _maven.repositories. Can be activated using -Dmaven.legacyLocalRepo=true" ).create( LEGACY_LOCAL_REPOSITORY ) );<a name="line.138"></a>
+<FONT color="green">139</FONT> <a name="line.139"></a>
+<FONT color="green">140</FONT> // Adding this back in for compatibility with the verifier that hard codes this option.<a name="line.140"></a>
+<FONT color="green">141</FONT> options.addOption( OptionBuilder.withLongOpt( "no-plugin-registry" ).withDescription( "Ineffective, only kept for backward compatibility" ).create( "npr" ) );<a name="line.141"></a>
+<FONT color="green">142</FONT> options.addOption( OptionBuilder.withLongOpt( "check-plugin-updates" ).withDescription( "Ineffective, only kept for backward compatibility" ).create( "cpu" ) );<a name="line.142"></a>
+<FONT color="green">143</FONT> options.addOption( OptionBuilder.withLongOpt( "update-plugins" ).withDescription( "Ineffective, only kept for backward compatibility" ).create( "up" ) );<a name="line.143"></a>
+<FONT color="green">144</FONT> options.addOption( OptionBuilder.withLongOpt( "no-plugin-updates" ).withDescription( "Ineffective, only kept for backward compatibility" ).create( "npu" ) );<a name="line.144"></a>
+<FONT color="green">145</FONT> }<a name="line.145"></a>
+<FONT color="green">146</FONT> <a name="line.146"></a>
+<FONT color="green">147</FONT> public CommandLine parse( String[] args )<a name="line.147"></a>
+<FONT color="green">148</FONT> throws ParseException<a name="line.148"></a>
+<FONT color="green">149</FONT> {<a name="line.149"></a>
+<FONT color="green">150</FONT> // We need to eat any quotes surrounding arguments...<a name="line.150"></a>
+<FONT color="green">151</FONT> String[] cleanArgs = cleanArgs( args );<a name="line.151"></a>
+<FONT color="green">152</FONT> <a name="line.152"></a>
+<FONT color="green">153</FONT> CommandLineParser parser = new GnuParser();<a name="line.153"></a>
+<FONT color="green">154</FONT> <a name="line.154"></a>
+<FONT color="green">155</FONT> return parser.parse( options, cleanArgs );<a name="line.155"></a>
+<FONT color="green">156</FONT> }<a name="line.156"></a>
<FONT color="green">157</FONT> <a name="line.157"></a>
-<FONT color="green">158</FONT> return parser.parse( options, cleanArgs );<a name="line.158"></a>
-<FONT color="green">159</FONT> }<a name="line.159"></a>
-<FONT color="green">160</FONT> <a name="line.160"></a>
-<FONT color="green">161</FONT> private String[] cleanArgs( String[] args )<a name="line.161"></a>
-<FONT color="green">162</FONT> {<a name="line.162"></a>
-<FONT color="green">163</FONT> List<String> cleaned = new ArrayList<String>();<a name="line.163"></a>
-<FONT color="green">164</FONT> <a name="line.164"></a>
-<FONT color="green">165</FONT> StringBuilder currentArg = null;<a name="line.165"></a>
-<FONT color="green">166</FONT> <a name="line.166"></a>
-<FONT color="green">167</FONT> for ( int i = 0; i < args.length; i++ )<a name="line.167"></a>
-<FONT color="green">168</FONT> {<a name="line.168"></a>
-<FONT color="green">169</FONT> String arg = args[i];<a name="line.169"></a>
-<FONT color="green">170</FONT> <a name="line.170"></a>
-<FONT color="green">171</FONT> boolean addedToBuffer = false;<a name="line.171"></a>
-<FONT color="green">172</FONT> <a name="line.172"></a>
-<FONT color="green">173</FONT> if ( arg.startsWith( "\"" ) )<a name="line.173"></a>
-<FONT color="green">174</FONT> {<a name="line.174"></a>
-<FONT color="green">175</FONT> // if we're in the process of building up another arg, push it and start over.<a name="line.175"></a>
-<FONT color="green">176</FONT> // this is for the case: "-Dfoo=bar "-Dfoo2=bar two" (note the first unterminated quote)<a name="line.176"></a>
-<FONT color="green">177</FONT> if ( currentArg != null )<a name="line.177"></a>
-<FONT color="green">178</FONT> {<a name="line.178"></a>
-<FONT color="green">179</FONT> cleaned.add( currentArg.toString() );<a name="line.179"></a>
-<FONT color="green">180</FONT> }<a name="line.180"></a>
-<FONT color="green">181</FONT> <a name="line.181"></a>
-<FONT color="green">182</FONT> // start building an argument here.<a name="line.182"></a>
-<FONT color="green">183</FONT> currentArg = new StringBuilder( arg.substring( 1 ) );<a name="line.183"></a>
-<FONT color="green">184</FONT> addedToBuffer = true;<a name="line.184"></a>
-<FONT color="green">185</FONT> }<a name="line.185"></a>
-<FONT color="green">186</FONT> <a name="line.186"></a>
-<FONT color="green">187</FONT> // this has to be a separate "if" statement, to capture the case of: "-Dfoo=bar"<a name="line.187"></a>
-<FONT color="green">188</FONT> if ( arg.endsWith( "\"" ) )<a name="line.188"></a>
-<FONT color="green">189</FONT> {<a name="line.189"></a>
-<FONT color="green">190</FONT> String cleanArgPart = arg.substring( 0, arg.length() - 1 );<a name="line.190"></a>
-<FONT color="green">191</FONT> <a name="line.191"></a>
-<FONT color="green">192</FONT> // if we're building an argument, keep doing so.<a name="line.192"></a>
-<FONT color="green">193</FONT> if ( currentArg != null )<a name="line.193"></a>
-<FONT color="green">194</FONT> {<a name="line.194"></a>
-<FONT color="green">195</FONT> // if this is the case of "-Dfoo=bar", then we need to adjust the buffer.<a name="line.195"></a>
-<FONT color="green">196</FONT> if ( addedToBuffer )<a name="line.196"></a>
-<FONT color="green">197</FONT> {<a name="line.197"></a>
-<FONT color="green">198</FONT> currentArg.setLength( currentArg.length() - 1 );<a name="line.198"></a>
-<FONT color="green">199</FONT> }<a name="line.199"></a>
-<FONT color="green">200</FONT> // otherwise, we trim the trailing " and append to the buffer.<a name="line.200"></a>
-<FONT color="green">201</FONT> else<a name="line.201"></a>
-<FONT color="green">202</FONT> {<a name="line.202"></a>
-<FONT color="green">203</FONT> // TODO: introducing a space here...not sure what else to do but collapse whitespace<a name="line.203"></a>
-<FONT color="green">204</FONT> currentArg.append( ' ' ).append( cleanArgPart );<a name="line.204"></a>
-<FONT color="green">205</FONT> }<a name="line.205"></a>
-<FONT color="green">206</FONT> <a name="line.206"></a>
-<FONT color="green">207</FONT> cleaned.add( currentArg.toString() );<a name="line.207"></a>
-<FONT color="green">208</FONT> }<a name="line.208"></a>
-<FONT color="green">209</FONT> else<a name="line.209"></a>
-<FONT color="green">210</FONT> {<a name="line.210"></a>
-<FONT color="green">211</FONT> cleaned.add( cleanArgPart );<a name="line.211"></a>
-<FONT color="green">212</FONT> }<a name="line.212"></a>
-<FONT color="green">213</FONT> <a name="line.213"></a>
-<FONT color="green">214</FONT> currentArg = null;<a name="line.214"></a>
+<FONT color="green">158</FONT> private String[] cleanArgs( String[] args )<a name="line.158"></a>
+<FONT color="green">159</FONT> {<a name="line.159"></a>
+<FONT color="green">160</FONT> List<String> cleaned = new ArrayList<String>();<a name="line.160"></a>
+<FONT color="green">161</FONT> <a name="line.161"></a>
+<FONT color="green">162</FONT> StringBuilder currentArg = null;<a name="line.162"></a>
+<FONT color="green">163</FONT> <a name="line.163"></a>
+<FONT color="green">164</FONT> for ( int i = 0; i < args.length; i++ )<a name="line.164"></a>
+<FONT color="green">165</FONT> {<a name="line.165"></a>
+<FONT color="green">166</FONT> String arg = args[i];<a name="line.166"></a>
+<FONT color="green">167</FONT> <a name="line.167"></a>
+<FONT color="green">168</FONT> boolean addedToBuffer = false;<a name="line.168"></a>
+<FONT color="green">169</FONT> <a name="line.169"></a>
+<FONT color="green">170</FONT> if ( arg.startsWith( "\"" ) )<a name="line.170"></a>
+<FONT color="green">171</FONT> {<a name="line.171"></a>
+<FONT color="green">172</FONT> // if we're in the process of building up another arg, push it and start over.<a name="line.172"></a>
+<FONT color="green">173</FONT> // this is for the case: "-Dfoo=bar "-Dfoo2=bar two" (note the first unterminated quote)<a name="line.173"></a>
+<FONT color="green">174</FONT> if ( currentArg != null )<a name="line.174"></a>
+<FONT color="green">175</FONT> {<a name="line.175"></a>
+<FONT color="green">176</FONT> cleaned.add( currentArg.toString() );<a name="line.176"></a>
+<FONT color="green">177</FONT> }<a name="line.177"></a>
+<FONT color="green">178</FONT> <a name="line.178"></a>
+<FONT color="green">179</FONT> // start building an argument here.<a name="line.179"></a>
+<FONT color="green">180</FONT> currentArg = new StringBuilder( arg.substring( 1 ) );<a name="line.180"></a>
+<FONT color="green">181</FONT> addedToBuffer = true;<a name="line.181"></a>
+<FONT color="green">182</FONT> }<a name="line.182"></a>
+<FONT color="green">183</FONT> <a name="line.183"></a>
+<FONT color="green">184</FONT> // this has to be a separate "if" statement, to capture the case of: "-Dfoo=bar"<a name="line.184"></a>
+<FONT color="green">185</FONT> if ( arg.endsWith( "\"" ) )<a name="line.185"></a>
+<FONT color="green">186</FONT> {<a name="line.186"></a>
+<FONT color="green">187</FONT> String cleanArgPart = arg.substring( 0, arg.length() - 1 );<a name="line.187"></a>
+<FONT color="green">188</FONT> <a name="line.188"></a>
+<FONT color="green">189</FONT> // if we're building an argument, keep doing so.<a name="line.189"></a>
+<FONT color="green">190</FONT> if ( currentArg != null )<a name="line.190"></a>
+<FONT color="green">191</FONT> {<a name="line.191"></a>
+<FONT color="green">192</FONT> // if this is the case of "-Dfoo=bar", then we need to adjust the buffer.<a name="line.192"></a>
+<FONT color="green">193</FONT> if ( addedToBuffer )<a name="line.193"></a>
+<FONT color="green">194</FONT> {<a name="line.194"></a>
+<FONT color="green">195</FONT> currentArg.setLength( currentArg.length() - 1 );<a name="line.195"></a>
+<FONT color="green">196</FONT> }<a name="line.196"></a>
+<FONT color="green">197</FONT> // otherwise, we trim the trailing " and append to the buffer.<a name="line.197"></a>
+<FONT color="green">198</FONT> else<a name="line.198"></a>
+<FONT color="green">199</FONT> {<a name="line.199"></a>
+<FONT color="green">200</FONT> // TODO: introducing a space here...not sure what else to do but collapse whitespace<a name="line.200"></a>
+<FONT color="green">201</FONT> currentArg.append( ' ' ).append( cleanArgPart );<a name="line.201"></a>
+<FONT color="green">202</FONT> }<a name="line.202"></a>
+<FONT color="green">203</FONT> <a name="line.203"></a>
+<FONT color="green">204</FONT> cleaned.add( currentArg.toString() );<a name="line.204"></a>
+<FONT color="green">205</FONT> }<a name="line.205"></a>
+<FONT color="green">206</FONT> else<a name="line.206"></a>
+<FONT color="green">207</FONT> {<a name="line.207"></a>
+<FONT color="green">208</FONT> cleaned.add( cleanArgPart );<a name="line.208"></a>
+<FONT color="green">209</FONT> }<a name="line.209"></a>
+<FONT color="green">210</FONT> <a name="line.210"></a>
+<FONT color="green">211</FONT> currentArg = null;<a name="line.211"></a>
+<FONT color="green">212</FONT> <a name="line.212"></a>
+<FONT color="green">213</FONT> continue;<a name="line.213"></a>
+<FONT color="green">214</FONT> }<a name="line.214"></a>
<FONT color="green">215</FONT> <a name="line.215"></a>
-<FONT color="green">216</FONT> continue;<a name="line.216"></a>
-<FONT color="green">217</FONT> }<a name="line.217"></a>
-<FONT color="green">218</FONT> <a name="line.218"></a>
-<FONT color="green">219</FONT> // if we haven't added this arg to the buffer, and we ARE building an argument<a name="line.219"></a>
-<FONT color="green">220</FONT> // buffer, then append it with a preceding space...again, not sure what else to<a name="line.220"></a>
-<FONT color="green">221</FONT> // do other than collapse whitespace.<a name="line.221"></a>
-<FONT color="green">222</FONT> // NOTE: The case of a trailing quote is handled by nullifying the arg buffer.<a name="line.222"></a>
-<FONT color="green">223</FONT> if ( !addedToBuffer )<a name="line.223"></a>
-<FONT color="green">224</FONT> {<a name="line.224"></a>
-<FONT color="green">225</FONT> if ( currentArg != null )<a name="line.225"></a>
-<FONT color="green">226</FONT> {<a name="line.226"></a>
-<FONT color="green">227</FONT> currentArg.append( ' ' ).append( arg );<a name="line.227"></a>
-<FONT color="green">228</FONT> }<a name="line.228"></a>
-<FONT color="green">229</FONT> else<a name="line.229"></a>
-<FONT color="green">230</FONT> {<a name="line.230"></a>
-<FONT color="green">231</FONT> cleaned.add( arg );<a name="line.231"></a>
-<FONT color="green">232</FONT> }<a name="line.232"></a>
-<FONT color="green">233</FONT> }<a name="line.233"></a>
-<FONT color="green">234</FONT> }<a name="line.234"></a>
-<FONT color="green">235</FONT> <a name="line.235"></a>
-<FONT color="green">236</FONT> if ( currentArg != null )<a name="line.236"></a>
-<FONT color="green">237</FONT> {<a name="line.237"></a>
-<FONT color="green">238</FONT> cleaned.add( currentArg.toString() );<a name="line.238"></a>
-<FONT color="green">239</FONT> }<a name="line.239"></a>
-<FONT color="green">240</FONT> <a name="line.240"></a>
-<FONT color="green">241</FONT> int cleanedSz = cleaned.size();<a name="line.241"></a>
-<FONT color="green">242</FONT> <a name="line.242"></a>
-<FONT color="green">243</FONT> String[] cleanArgs = null;<a name="line.243"></a>
-<FONT color="green">244</FONT> <a name="line.244"></a>
-<FONT color="green">245</FONT> if ( cleanedSz == 0 )<a name="line.245"></a>
-<FONT color="green">246</FONT> {<a name="line.246"></a>
-<FONT color="green">247</FONT> cleanArgs = args;<a name="line.247"></a>
-<FONT color="green">248</FONT> }<a name="line.248"></a>
-<FONT color="green">249</FONT> else<a name="line.249"></a>
-<FONT color="green">250</FONT> {<a name="line.250"></a>
-<FONT color="green">251</FONT> cleanArgs = cleaned.toArray( new String[cleanedSz] );<a name="line.251"></a>
-<FONT color="green">252</FONT> }<a name="line.252"></a>
+<FONT color="green">216</FONT> // if we haven't added this arg to the buffer, and we ARE building an argument<a name="line.216"></a>
+<FONT color="green">217</FONT> // buffer, then append it with a preceding space...again, not sure what else to<a name="line.217"></a>
+<FONT color="green">218</FONT> // do other than collapse whitespace.<a name="line.218"></a>
+<FONT color="green">219</FONT> // NOTE: The case of a trailing quote is handled by nullifying the arg buffer.<a name="line.219"></a>
+<FONT color="green">220</FONT> if ( !addedToBuffer )<a name="line.220"></a>
+<FONT color="green">221</FONT> {<a name="line.221"></a>
+<FONT color="green">222</FONT> if ( currentArg != null )<a name="line.222"></a>
+<FONT color="green">223</FONT> {<a name="line.223"></a>
+<FONT color="green">224</FONT> currentArg.append( ' ' ).append( arg );<a name="line.224"></a>
+<FONT color="green">225</FONT> }<a name="line.225"></a>
+<FONT color="green">226</FONT> else<a name="line.226"></a>
+<FONT color="green">227</FONT> {<a name="line.227"></a>
+<FONT color="green">228</FONT> cleaned.add( arg );<a name="line.228"></a>
+<FONT color="green">229</FONT> }<a name="line.229"></a>
+<FONT color="green">230</FONT> }<a name="line.230"></a>
+<FONT color="green">231</FONT> }<a name="line.231"></a>
+<FONT color="green">232</FONT> <a name="line.232"></a>
+<FONT color="green">233</FONT> if ( currentArg != null )<a name="line.233"></a>
+<FONT color="green">234</FONT> {<a name="line.234"></a>
+<FONT color="green">235</FONT> cleaned.add( currentArg.toString() );<a name="line.235"></a>
+<FONT color="green">236</FONT> }<a name="line.236"></a>
+<FONT color="green">237</FONT> <a name="line.237"></a>
+<FONT color="green">238</FONT> int cleanedSz = cleaned.size();<a name="line.238"></a>
+<FONT color="green">239</FONT> <a name="line.239"></a>
+<FONT color="green">240</FONT> String[] cleanArgs = null;<a name="line.240"></a>
+<FONT color="green">241</FONT> <a name="line.241"></a>
+<FONT color="green">242</FONT> if ( cleanedSz == 0 )<a name="line.242"></a>
+<FONT color="green">243</FONT> {<a name="line.243"></a>
+<FONT color="green">244</FONT> cleanArgs = args;<a name="line.244"></a>
+<FONT color="green">245</FONT> }<a name="line.245"></a>
+<FONT color="green">246</FONT> else<a name="line.246"></a>
+<FONT color="green">247</FONT> {<a name="line.247"></a>
+<FONT color="green">248</FONT> cleanArgs = cleaned.toArray( new String[cleanedSz] );<a name="line.248"></a>
+<FONT color="green">249</FONT> }<a name="line.249"></a>
+<FONT color="green">250</FONT> <a name="line.250"></a>
+<FONT color="green">251</FONT> return cleanArgs;<a name="line.251"></a>
+<FONT color="green">252</FONT> }<a name="line.252"></a>
<FONT color="green">253</FONT> <a name="line.253"></a>
-<FONT color="green">254</FONT> return cleanArgs;<a name="line.254"></a>
-<FONT color="green">255</FONT> }<a name="line.255"></a>
-<FONT color="green">256</FONT> <a name="line.256"></a>
-<FONT color="green">257</FONT> public void displayHelp( PrintStream stdout )<a name="line.257"></a>
-<FONT color="green">258</FONT> {<a name="line.258"></a>
-<FONT color="green">259</FONT> stdout.println();<a name="line.259"></a>
-<FONT color="green">260</FONT> <a name="line.260"></a>
-<FONT color="green">261</FONT> PrintWriter pw = new PrintWriter( stdout );<a name="line.261"></a>
-<FONT color="green">262</FONT> <a name="line.262"></a>
-<FONT color="green">263</FONT> HelpFormatter formatter = new HelpFormatter();<a name="line.263"></a>
+<FONT color="green">254</FONT> public void displayHelp( PrintStream stdout )<a name="line.254"></a>
+<FONT color="green">255</FONT> {<a name="line.255"></a>
+<FONT color="green">256</FONT> stdout.println();<a name="line.256"></a>
+<FONT color="green">257</FONT> <a name="line.257"></a>
+<FONT color="green">258</FONT> PrintWriter pw = new PrintWriter( stdout );<a name="line.258"></a>
+<FONT color="green">259</FONT> <a name="line.259"></a>
+<FONT color="green">260</FONT> HelpFormatter formatter = new HelpFormatter();<a name="line.260"></a>
+<FONT color="green">261</FONT> <a name="line.261"></a>
+<FONT color="green">262</FONT> formatter.printHelp( pw, HelpFormatter.DEFAULT_WIDTH, "mvn [options] [<goal(s)>] [<phase(s)>]", "\nOptions:",<a name="line.262"></a>
+<FONT color="green">263</FONT> options, HelpFormatter.DEFAULT_LEFT_PAD, HelpFormatter.DEFAULT_DESC_PAD, "\n", false );<a name="line.263"></a>
<FONT color="green">264</FONT> <a name="line.264"></a>
-<FONT color="green">265</FONT> formatter.printHelp( pw, HelpFormatter.DEFAULT_WIDTH, "mvn [options] [<goal(s)>] [<phase(s)>]", "\nOptions:",<a name="line.265"></a>
-<FONT color="green">266</FONT> options, HelpFormatter.DEFAULT_LEFT_PAD, HelpFormatter.DEFAULT_DESC_PAD, "\n", false );<a name="line.266"></a>
-<FONT color="green">267</FONT> <a name="line.267"></a>
-<FONT color="green">268</FONT> pw.flush();<a name="line.268"></a>
-<FONT color="green">269</FONT> }<a name="line.269"></a>
-<FONT color="green">270</FONT> }<a name="line.270"></a>
+<FONT color="green">265</FONT> pw.flush();<a name="line.265"></a>
+<FONT color="green">266</FONT> }<a name="line.266"></a>
+<FONT color="green">267</FONT> }<a name="line.267"></a>
Modified: websites/production/maven/content/ref/3-LATEST/maven-embedder/apidocs/src-html/org/apache/maven/cli/MavenCli.html
==============================================================================
--- websites/production/maven/content/ref/3-LATEST/maven-embedder/apidocs/src-html/org/apache/maven/cli/MavenCli.html (original)
+++ websites/production/maven/content/ref/3-LATEST/maven-embedder/apidocs/src-html/org/apache/maven/cli/MavenCli.html Sat Feb 9 15:44:20 2013
@@ -545,9 +545,9 @@
<FONT color="green">542</FONT> private void repository( CliRequest cliRequest )<a name="line.542"></a>
<FONT color="green">543</FONT> throws Exception<a name="line.543"></a>
<FONT color="green">544</FONT> {<a name="line.544"></a>
-<FONT color="green">545</FONT> if ( cliRequest.commandLine.hasOption( CLIManager.SIMPLE_LOCAL_REPOSITORY_MANAGER ) || Boolean.getBoolean( "maven.simpleLocalRepoMan" ) )<a name="line.545"></a>
+<FONT color="green">545</FONT> if ( cliRequest.commandLine.hasOption( CLIManager.LEGACY_LOCAL_REPOSITORY ) || Boolean.getBoolean( "maven.legacyLocalRepo" ) )<a name="line.545"></a>
<FONT color="green">546</FONT> {<a name="line.546"></a>
-<FONT color="green">547</FONT> cliRequest.request.setUseSimpleLocalRepositoryManager( true );<a name="line.547"></a>
+<FONT color="green">547</FONT> cliRequest.request.setUseLegacyLocalRepository( true );<a name="line.547"></a>
<FONT color="green">548</FONT> }<a name="line.548"></a>
<FONT color="green">549</FONT> }<a name="line.549"></a>
<FONT color="green">550</FONT> <a name="line.550"></a>