Author: apadilla Date: Sat Apr 23 13:16:39 2011 New Revision: 1096145 URL: http://svn.apache.org/viewvc?rev=1096145&view=rev Log: [NPANDAY-377] * revised method name * set default values for ${npanday.settings} * revised <repository-config> value in registry-config.xml
Modified: incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/registry-config.xml incubator/npanday/trunk/plugins/maven-aspx-plugin/src/main/java/npanday/plugin/aspx/AspxCompilerMojo.java incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/javabinding/src/main/java/NPanday/Plugin/Settings/SettingsGeneratorMojo.java Modified: incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/registry-config.xml URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/registry-config.xml?rev=1096145&r1=1096144&r2=1096145&view=diff ============================================================================== --- incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/registry-config.xml (original) +++ incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/registry-config.xml Sat Apr 23 13:16:39 2011 @@ -22,7 +22,8 @@ under the License. <repository> <repository-name>npanday-settings</repository-name> <repository-class>npanday.vendor.impl.SettingsRepository</repository-class> - <repository-config>${npanday.settings}</repository-config> + <!--dummy variable - not needed since it will be populated in the code during generation of npanday-settings.xml--> + <repository-config>*</repository-config> <init-param> <param-name>optional</param-name> <param-value>true</param-value> Modified: incubator/npanday/trunk/plugins/maven-aspx-plugin/src/main/java/npanday/plugin/aspx/AspxCompilerMojo.java URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-aspx-plugin/src/main/java/npanday/plugin/aspx/AspxCompilerMojo.java?rev=1096145&r1=1096144&r2=1096145&view=diff ============================================================================== --- incubator/npanday/trunk/plugins/maven-aspx-plugin/src/main/java/npanday/plugin/aspx/AspxCompilerMojo.java (original) +++ incubator/npanday/trunk/plugins/maven-aspx-plugin/src/main/java/npanday/plugin/aspx/AspxCompilerMojo.java Sat Apr 23 13:16:39 2011 @@ -56,7 +56,7 @@ public class AspxCompilerMojo private static final String DEFAULT_EXCLUDES = "obj/**, target/**, **/*.pdb, **/*.csproj, **/*.vbproj, **/*.suo, **/*.user,pom.xml, **/*.sln,build.log,PrecompiledApp.config,csproj.user,Properties/**,**.releaseBackup,^-?(?:\\d+|\\d{1,3}(?:,\\d{3})+)(?:\\.\\d+)?$/**"; /** - * @parameter expression ="${npanday.settings}" + * @parameter expression="${npanday.settings}" default-value="${user.home}/.m2" */ private String settingsPath; @@ -161,7 +161,7 @@ public class AspxCompilerMojo { long startTime = System.currentTimeMillis(); - getNPandaySettingsPath(); + populateSettingsRepository(); webSourceDirectory = new File( project.getBuild().getSourceDirectory() ); @@ -414,13 +414,8 @@ public class AspxCompilerMojo } } - protected void getNPandaySettingsPath() + protected void populateSettingsRepository() { - if ( settingsPath == null ) - { - settingsPath = System.getProperty( "user.home" ) + "/.m2"; - } - File settingsFile = new File( settingsPath, "npanday-settings.xml" ); try Modified: incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java?rev=1096145&r1=1096144&r2=1096145&view=diff ============================================================================== --- incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java (original) +++ incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java Sat Apr 23 13:16:39 2011 @@ -67,7 +67,7 @@ public abstract class AbstractCompilerMo { /** - * @parameter expression ="${npanday.settings}" + * @parameter expression="${npanday.settings}" default-value="${user.home}/.m2" */ private String settingsPath; @@ -1084,7 +1084,7 @@ public abstract class AbstractCompilerMo } - getNPandaySettingsPath(); + populateSettingsRepository(); if (localRepository == null) { @@ -1183,11 +1183,6 @@ public abstract class AbstractCompilerMo protected boolean isUpToDateWithPomAndSettingsAndDependencies(File targetFile) { - if ( settingsPath == null ) - { - settingsPath = System.getProperty( "user.home" ) + "/.m2"; - } - File settingsFile = new File( settingsPath, "npanday-settings.xml" ); Artifact latestDependencyModification = this.getLatestDependencyModification(project.getDependencyArtifacts()); @@ -1239,13 +1234,8 @@ public abstract class AbstractCompilerMo } - protected void getNPandaySettingsPath() + protected void populateSettingsRepository() { - if ( settingsPath == null ) - { - settingsPath = System.getProperty( "user.home" ) + "/.m2"; - } - File settingsFile = new File( settingsPath, "npanday-settings.xml" ); if (!settingsFile.exists()) Modified: incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/javabinding/src/main/java/NPanday/Plugin/Settings/SettingsGeneratorMojo.java URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/javabinding/src/main/java/NPanday/Plugin/Settings/SettingsGeneratorMojo.java?rev=1096145&r1=1096144&r2=1096145&view=diff ============================================================================== --- incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/javabinding/src/main/java/NPanday/Plugin/Settings/SettingsGeneratorMojo.java (original) +++ incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/javabinding/src/main/java/NPanday/Plugin/Settings/SettingsGeneratorMojo.java Sat Apr 23 13:16:39 2011 @@ -94,7 +94,7 @@ public class SettingsGeneratorMojo private npanday.plugin.PluginContext pluginContext; /** - * @parameter expression ="${npanday.settings}" + * @parameter expression="${npanday.settings}" default-value="${user.home}/.m2" */ private String settingsPath; @@ -196,12 +196,6 @@ public class SettingsGeneratorMojo public boolean isFrameworkVersionExisting(String frameworkVersion) throws MojoExecutionException, IOException { - - if ( settingsPath == null ) - { - settingsPath = System.getProperty( "user.home" ) + "/.m2"; - } - File file = new File( settingsPath, "npanday-settings.xml" ); if ( !file.exists() )