Author: lcorneliussen
Date: Fri Mar 25 14:05:16 2011
New Revision: 1085380
URL: http://svn.apache.org/viewvc?rev=1085380&view=rev
Log:
[NPANDAY-377] reverted changes made in r1083725 - needs a second approach?
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/src/main/csharp/NPanday/Plugin/Settings/SettingsGeneratorMojo.cs
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=1085380&r1=1085379&r2=1085380&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
Fri Mar 25 14:05:16 2011
@@ -22,7 +22,7 @@ under the License.
<repository>
<repository-name>npanday-settings</repository-name>
<repository-class>npanday.vendor.impl.SettingsRepository</repository-class>
- <repository-config>${npanday.settings}</repository-config>
+
<repository-config>${user.home}/.m2/npanday-settings.xml</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=1085380&r1=1085379&r2=1085380&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
Fri Mar 25 14:05:16 2011
@@ -22,7 +22,6 @@ package npanday.plugin.aspx;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Hashtable;
import java.util.List;
import npanday.ArtifactType;
@@ -31,10 +30,7 @@ import npanday.executable.ExecutionExcep
import npanday.executable.compiler.CompilerConfig;
import npanday.executable.compiler.CompilerExecutable;
import npanday.executable.compiler.CompilerRequirement;
-import npanday.registry.RepositoryRegistry;
-import npanday.registry.impl.StandardRepositoryLoader;
import npanday.vendor.VendorFactory;
-import npanday.vendor.impl.SettingsRepository;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
@@ -56,11 +52,6 @@ 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}"
- */
- private String settingsPath;
-
- /**
* The maven project.
*
* @parameter expression="${project}"
@@ -151,17 +142,10 @@ public class AspxCompilerMojo
private File webSourceDirectory;
- /**
- * @component
- */
- private RepositoryRegistry repositoryRegistry;
-
public void execute()
throws MojoExecutionException
{
long startTime = System.currentTimeMillis();
-
- getNPandaySettingsPath();
webSourceDirectory = new File( project.getBuild().getSourceDirectory()
);
@@ -414,37 +398,4 @@ public class AspxCompilerMojo
}
}
- protected void getNPandaySettingsPath()
- {
- if ( settingsPath == null )
- {
- settingsPath = System.getProperty( "user.home" ) + "/.m2";
- }
-
- File settingsFile = new File( settingsPath, "npanday-settings.xml" );
-
- try
- {
- SettingsRepository settingsRepository = (SettingsRepository)
repositoryRegistry.find( "npanday-settings" );
-
- if ( settingsRepository != null )
- {
- repositoryRegistry.removeRepository( "npanday-settings" );
- }
- try
- {
- StandardRepositoryLoader repoLoader = new
StandardRepositoryLoader();
- repoLoader.setRepositoryRegistry( repositoryRegistry );
- settingsRepository = (SettingsRepository)
repoLoader.loadRepository( settingsFile.getAbsolutePath(),
SettingsRepository.class.getName(), new Hashtable() );
- repositoryRegistry.addRepository( "npanday-settings",
settingsRepository );
- }
- catch ( IOException e )
- {
- }
- }
- catch ( Exception ex )
- {
- ex.printStackTrace();
- }
- }
}
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=1085380&r1=1085379&r2=1085380&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
Fri Mar 25 14:05:16 2011
@@ -26,7 +26,6 @@ import npanday.executable.ExecutionExcep
import npanday.executable.compiler.CompilerConfig;
import npanday.executable.compiler.CompilerExecutable;
import npanday.executable.compiler.CompilerRequirement;
-import npanday.registry.impl.StandardRepositoryLoader;
import npanday.registry.RepositoryRegistry;
import npanday.vendor.impl.SettingsRepository;
import org.apache.maven.plugin.AbstractMojo;
@@ -1256,20 +1255,19 @@ public abstract class AbstractCompilerMo
{
repositoryRegistry.removeRepository( "npanday-settings" );
}
- try
- {
- StandardRepositoryLoader repoLoader = new
StandardRepositoryLoader();
- repoLoader.setRepositoryRegistry( repositoryRegistry );
- settingsRepository = (SettingsRepository)
repoLoader.loadRepository( settingsFile.getAbsolutePath(),
SettingsRepository.class.getName(), new Hashtable() );
- repositoryRegistry.addRepository( "npanday-settings",
settingsRepository );
- }
- catch ( IOException e )
- {
- }
- }
+ Hashtable props = new Hashtable();
+ InputStream stream = new FileInputStream( settingsFile );
+ settingsRepository = new SettingsRepository();
+ settingsRepository.setSourceUri( settingsFile.getAbsolutePath() );
+ settingsRepository.setRepositoryRegistry( repositoryRegistry );
+ settingsRepository.load( stream, props );
+ repositoryRegistry.addRepository( "npanday-settings",
settingsRepository );
+ }
catch ( Exception ex )
{
ex.printStackTrace();
- }
+ }
}
+
+
}
Modified:
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/src/main/csharp/NPanday/Plugin/Settings/SettingsGeneratorMojo.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/src/main/csharp/NPanday/Plugin/Settings/SettingsGeneratorMojo.cs?rev=1085380&r1=1085379&r2=1085380&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/src/main/csharp/NPanday/Plugin/Settings/SettingsGeneratorMojo.cs
(original)
+++
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/src/main/csharp/NPanday/Plugin/Settings/SettingsGeneratorMojo.cs
Fri Mar 25 14:05:16 2011
@@ -74,23 +74,27 @@ namespace NPanday.Plugin.Settings
}
npandaySettingsVendorsVendor[] monoVendors = null;
- try
- {
- monoVendors = GetVendorsForMono(monoRegistryKey,
defaultMonoCLR);
- }
- catch(ExecutionException e)
- {
- Console.WriteLine(e.ToString());
- }
-
npandaySettingsVendorsVendor dotGnuVendor = null;
- try
- {
- dotGnuVendor =
GetVendorForGnu(Environment.GetEnvironmentVariable("CSCC_LIB_PATH"));
- }
- catch(ExecutionException e)
+
+ if ( File.Exists( outputFile ))
{
- Console.WriteLine(e.ToString());
+ try
+ {
+ monoVendors = GetVendorsForMono(monoRegistryKey,
defaultMonoCLR);
+ }
+ catch(ExecutionException e)
+ {
+ Console.WriteLine(e.ToString());
+ }
+
+ try
+ {
+ dotGnuVendor =
GetVendorForGnu(Environment.GetEnvironmentVariable("CSCC_LIB_PATH"));
+ }
+ catch(ExecutionException e)
+ {
+ Console.WriteLine(e.ToString());
+ }
}
int monoVendorsLength = (monoVendors == null) ? 0:
monoVendors.Length;
int dotGnuVendorLength = (dotGnuVendor == null) ? 0: 1;
