Author: jvanzyl
Date: Sun Jan 4 07:32:19 2009
New Revision: 731273
URL: http://svn.apache.org/viewvc?rev=731273&view=rev
Log:
o the release plugin manages to somehow get its own instance of a Settings so
the SettingsAdapter which I use everywhere else gets used except in the release
plugin so I have to jack back in the hardcoded RuntimeInfo until I figure out
why. not a big deal, i'll list it in the compatibility notes. on another note
if you start the release process using release:prepare and it fails, you make
code changes, it will happily let you continue and not check the status again.
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/settings/RuntimeInfo.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
maven/components/trunk/maven-core/src/main/mdo/settings.mdo
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/settings/RuntimeInfo.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/settings/RuntimeInfo.java?rev=731273&r1=731272&r2=731273&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/settings/RuntimeInfo.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/settings/RuntimeInfo.java
Sun Jan 4 07:32:19 2009
@@ -29,8 +29,19 @@
*/
public class RuntimeInfo
{
+ public static final String userHome = System.getProperty( "user.home" );
+
+ public static final File userMavenConfigurationHome = new File( userHome,
".m2" );
+
+ public static final File DEFAULT_USER_SETTINGS_FILE = new File(
userMavenConfigurationHome, "settings.xml" );
+
private File settings;
-
+
+ public RuntimeInfo()
+ {
+ this.settings = DEFAULT_USER_SETTINGS_FILE;
+ }
+
public RuntimeInfo( File settings )
{
this.settings = settings;
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java?rev=731273&r1=731272&r2=731273&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
Sun Jan 4 07:32:19 2009
@@ -336,6 +336,7 @@
else if ( "settings".equals( expression ) )
{
value = context.getSettings();
+ System.out.println( value );
}
else if ( expression.startsWith( "settings" ) )
{
Modified: maven/components/trunk/maven-core/src/main/mdo/settings.mdo
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/mdo/settings.mdo?rev=731273&r1=731272&r2=731273&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/mdo/settings.mdo (original)
+++ maven/components/trunk/maven-core/src/main/mdo/settings.mdo Sun Jan 4
07:32:19 2009
@@ -393,6 +393,23 @@
return profileMap;
}
+
+ private RuntimeInfo runtimeInfo;
+
+ public void setRuntimeInfo( RuntimeInfo runtimeInfo )
+ {
+ this.runtimeInfo = runtimeInfo;
+ }
+
+ public RuntimeInfo getRuntimeInfo()
+ {
+ if ( runtimeInfo == null )
+ {
+ runtimeInfo = new RuntimeInfo();
+ }
+ return runtimeInfo;
+ }
+
]]>
</code>
</codeSegment>
