You are viewing a plain text version of this content. The canonical link for it is here.
Posted to npanday-commits@incubator.apache.org by lc...@apache.org on 2011/12/05 10:09:33 UTC
svn commit: r1210393 [3/3] - in
/incubator/npanday/branches/1.5.0-azuresupport:
archetypes/maven-archetype-netexecutable/src/main/resources/archetype-resources/src/main/java/
components/ components/dotnet-artifact/src/main/java/npanday/artifact/
compon...
Copied: incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-test-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml (from r1207095, incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-core/src/main/resources/META-INF/npanday/executable-plugins.xml)
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-test-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml?p2=incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-test-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml&p1=incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-core/src/main/resources/META-INF/npanday/executable-plugins.xml&r1=1207095&r2=1210393&rev=1210393&view=diff
==============================================================================
--- incubator/npanday/branches/1.5.0-azuresupport/components/dotnet-core/src/main/resources/META-INF/npanday/executable-plugins.xml (original)
+++ incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-test-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml Mon Dec 5 10:09:31 2011
@@ -109,478 +109,4 @@ under the License.
</platform>
</platforms>
</executablePlugin>
- <executablePlugin>
- <identifier>ncover</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MICROSOFT</vendor>
- <executable>NCover.Console</executable>
- <profile>NCover:NCover.Console</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- </platforms>
- </executablePlugin>
- <executablePlugin>
- <identifier>fxcop</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MICROSOFT</vendor>
- <executable>FxCopCmd</executable>
- <profile>Microsoft:FxCop:FxCopCmd</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- </platforms>
- </executablePlugin>
- <executablePlugin>
- <identifier>BuildAssembler</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MICROSOFT</vendor>
- <executable>BuildAssembler</executable>
- <profile>Microsoft:SandCastle:BuildAssembler</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- </platforms>
- </executablePlugin>
- <executablePlugin>
- <identifier>XslTransform</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MICROSOFT</vendor>
- <executable>XslTransform</executable>
- <profile>Microsoft:SandCastle:XslTransform</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- </platforms>
- </executablePlugin>
- <executablePlugin>
- <identifier>MRefBuilder</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MICROSOFT</vendor>
- <executable>MRefBuilder</executable>
- <profile>Microsoft:SandCastle:MRefBuilder</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- </platforms>
- </executablePlugin>
- <executablePlugin>
- <identifier>dotnet-jetty</identifier>
- <pluginClass>npanday.executable.impl.ThreadedNetExecutable</pluginClass>
- <vendor>MICROSOFT</vendor>
- <executable>java</executable>
- <profile>dotnet-jetty:start</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- </platforms>
- </executablePlugin>
- <executablePlugin>
- <identifier>MONO:XSP</identifier>
- <pluginClass>npanday.executable.impl.ThreadedNetExecutable</pluginClass>
- <vendor>MONO</vendor>
- <executable>startXSP</executable>
- <profile>XSP:START</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- <frameworkVersion>1.1.4322</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Mac OS X</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Linux</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Solaris</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>FreeBSD</operatingSystem>
- </platform>
- </platforms>
- </executablePlugin>
- <executablePlugin>
- <identifier>MONO:XSD</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MONO</vendor>
- <executable>xsd</executable>
- <profile>XSD:SCHEMA</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- <frameworkVersion>1.1.4322</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Mac OS X</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Linux</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Solaris</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>FreeBSD</operatingSystem>
- </platform>
- </platforms>
- <commandFilter>
- <includes>
- <include>classes</include>
- <include>dataset</include>
- <include>element</include>
- <include>namespace</include>
- <include>language</include>
- <include>generator</include>
- <include>o</include>
- <include>type</include>
- <include>uri</include>
- </includes>
- </commandFilter>
- </executablePlugin>
- <executablePlugin>
- <identifier>MONO:XSD:XML_INSTANCE</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MONO</vendor>
- <executable>xsd</executable>
- <profile>XSD:XML_INSTANCE</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- <frameworkVersion>1.1.4322</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Mac OS X</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Linux</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Solaris</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>FreeBSD</operatingSystem>
- </platform>
- </platforms>
- <commandFilter>
- <includes>
- <include>o</include>
- </includes>
- </commandFilter>
- </executablePlugin>
- <executablePlugin>
- <identifier>MS:XSD:XML_INSTANCE</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MICROSOFT</vendor>
- <executable>xsd</executable>
- <profile>XSD:XML_INSTANCE</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- <frameworkVersion>1.1.4322</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- </platforms>
- <commandFilter>
- <includes>
- <include>o</include>
- </includes>
- </commandFilter>
- </executablePlugin>
- <executablePlugin>
- <identifier>MS:XSD:SCHEMA</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MICROSOFT</vendor>
- <executable>xsd</executable>
- <profile>XSD:SCHEMA</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- <frameworkVersion>1.1.4322</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- </platforms>
- <commandFilter>
- <includes>
- <include>classes</include>
- <include>dataset</include>
- <include>element</include>
- <include>fields</include>
- <include>enableDataBinding</include>
- <include>namespace</include>
- <include>language</include>
- <include>out</include>
- <include>o</include>
- <include>type</include>
- <include>uri</include>
- <include>parameters</include>
- </includes>
- </commandFilter>
- </executablePlugin>
- <executablePlugin>
- <identifier>MS:RESGEN</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MICROSOFT</vendor>
- <executable>resgen</executable>
- <profile>RESGEN</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- <frameworkVersion>1.1.4322</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- </platforms>
- </executablePlugin>
- <executablePlugin>
- <identifier>MS:GACUTIL</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MICROSOFT</vendor>
- <executable>gacutil</executable>
- <profile>GACUTIL</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- <frameworkVersion>1.1.4322</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- </platforms>
- </executablePlugin>
- <executablePlugin>
- <identifier>MONO:GACUTIL</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MONO</vendor>
- <executable>gacutil</executable>
- <profile>GACUTIL</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- <frameworkVersion>1.1.4322</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Mac OS X</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Linux</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Solaris</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>FreeBSD</operatingSystem>
- </platform>
- </platforms>
- </executablePlugin>
- <executablePlugin>
- <identifier>MONO:RESGEN</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MONO</vendor>
- <executable>resgen</executable>
- <profile>RESGEN</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- <frameworkVersion>1.1.4322</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Mac OS X</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Linux</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Solaris</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>FreeBSD</operatingSystem>
- </platform>
- </platforms>
- </executablePlugin>
- <executablePlugin>
- <identifier>MS:AL</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MICROSOFT</vendor>
- <executable>al</executable>
- <profile>AL</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- <frameworkVersion>1.1.4322</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- </platforms>
- </executablePlugin>
- <executablePlugin>
- <identifier>MONO:AL</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MONO</vendor>
- <executable>al</executable>
- <profile>AL</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- <frameworkVersion>1.1.4322</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Mac OS X</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Linux</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Solaris</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>FreeBSD</operatingSystem>
- </platform>
- </platforms>
- </executablePlugin>
- <executablePlugin>
- <identifier>MS:ILMERGE</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MICROSOFT</vendor>
- <executable>ILMerge</executable>
- <profile>ILMERGE</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- </platforms>
- </executablePlugin>
- <executablePlugin>
- <identifier>MS:ILREPACK</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MICROSOFT</vendor>
- <executable>ILRepack</executable>
- <profile>ILREPACK</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- </platforms>
- </executablePlugin>
- <executablePlugin>
- <identifier>MONO:ILREPACK</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MONO</vendor>
- <executable>ILRepack</executable>
- <profile>ILREPACK</profile>
- <frameworkVersions>
- <frameworkVersion>4.0</frameworkVersion>
- <frameworkVersion>3.5</frameworkVersion>
- <frameworkVersion>2.0.50727</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Mac OS X</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Linux</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>Solaris</operatingSystem>
- </platform>
- <platform>
- <operatingSystem>FreeBSD</operatingSystem>
- </platform>
- </platforms>
- </executablePlugin>
</executablePlugins>
Modified: incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java?rev=1210393&r1=1210392&r2=1210393&view=diff
==============================================================================
--- incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java (original)
+++ incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java Mon Dec 5 10:09:31 2011
@@ -27,9 +27,12 @@ import npanday.artifact.NetDependencyMat
import npanday.executable.ExecutionException;
import npanday.executable.NetExecutable;
import npanday.model.netdependency.NetDependency;
-import npanday.registry.NPandayRepositoryException;
import npanday.registry.RepositoryRegistry;
import npanday.vendor.Vendor;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.filefilter.FileFileFilter;
+import org.apache.commons.io.filefilter.FileFilterUtils;
+import org.apache.commons.io.filefilter.IOFileFilter;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
@@ -38,10 +41,9 @@ import org.apache.maven.plugin.AbstractM
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.settings.Settings;
-import org.apache.commons.io.filefilter.*;
-import org.apache.commons.io.FileUtils;
import org.codehaus.plexus.util.IOUtil;
+import javax.swing.filechooser.FileSystemView;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -50,8 +52,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.swing.*;
-import javax.swing.filechooser.FileSystemView;
/**
* Installs Visual Studio 2005 addin.
@@ -97,7 +97,7 @@ public class VsInstallerMojo
*
* @component
*/
- private npanday.NPandayRepositoryRegistry npandayRegistry;
+ private RepositoryRegistry repositoryRegistry;
/**
* Provides services to obtain executables.
@@ -129,22 +129,6 @@ public class VsInstallerMojo
logs.mkdir();
}
- RepositoryRegistry repositoryRegistry;
- try
- {
- repositoryRegistry = npandayRegistry.createRepositoryRegistry();
- }
- catch ( IOException e )
- {
- throw new MojoExecutionException(
- "NPANDAY-1600-000: Failed to create the repository registry for this plugin", e );
- }
- catch( NPandayRepositoryException e )
- {
- throw new MojoExecutionException(
- "NPANDAY-1600-007: Failed to create the repository registry for this plugin", e );
- }
-
NetDependenciesRepository netRepository = (NetDependenciesRepository) repositoryRegistry.find(
"net-dependencies" );
Modified: incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-xsd-plugin/src/main/java/npanday/plugin/xsd/XmlToXsdGeneratorMojo.java
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-xsd-plugin/src/main/java/npanday/plugin/xsd/XmlToXsdGeneratorMojo.java?rev=1210393&r1=1210392&r2=1210393&view=diff
==============================================================================
--- incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-xsd-plugin/src/main/java/npanday/plugin/xsd/XmlToXsdGeneratorMojo.java (original)
+++ incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-xsd-plugin/src/main/java/npanday/plugin/xsd/XmlToXsdGeneratorMojo.java Mon Dec 5 10:09:31 2011
@@ -18,19 +18,17 @@
*/
package npanday.plugin.xsd;
-import npanday.registry.NPandayRepositoryException;
+import npanday.PlatformUnsupportedException;
+import npanday.executable.ExecutionException;
+import npanday.registry.RepositoryRegistry;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.FileUtils;
-import java.util.List;
-import java.util.ArrayList;
import java.io.File;
-import java.io.IOException;
-
-import npanday.executable.ExecutionException;
-import npanday.PlatformUnsupportedException;
+import java.util.ArrayList;
+import java.util.List;
/**
* Generates XSD from XML instance
@@ -101,26 +99,11 @@ public class XmlToXsdGeneratorMojo
/**
* @component
*/
- private npanday.NPandayRepositoryRegistry npandayRegistry;
+ private RepositoryRegistry repositoryRegistry;
public void execute()
throws MojoExecutionException
{
- try
- {
- npandayRegistry.createRepositoryRegistry();
- }
- catch ( IOException e )
- {
- throw new MojoExecutionException(
- "NPANDAY-1401-003: Failed to create the repository registry for this plugin", e );
- }
- catch( NPandayRepositoryException e )
- {
- throw new MojoExecutionException(
- "NPANDAY-1401-004: Failed to create the repository registry for this plugin", e );
- }
-
FileUtils.mkdir( outputDirectory );
try
{
Modified: incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-xsd-plugin/src/main/java/npanday/plugin/xsd/XsdGeneratorMojo.java
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-xsd-plugin/src/main/java/npanday/plugin/xsd/XsdGeneratorMojo.java?rev=1210393&r1=1210392&r2=1210393&view=diff
==============================================================================
--- incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-xsd-plugin/src/main/java/npanday/plugin/xsd/XsdGeneratorMojo.java (original)
+++ incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-xsd-plugin/src/main/java/npanday/plugin/xsd/XsdGeneratorMojo.java Mon Dec 5 10:09:31 2011
@@ -18,19 +18,19 @@
*/
package npanday.plugin.xsd;
-import npanday.registry.NPandayRepositoryException;
+import npanday.PlatformUnsupportedException;
+import npanday.executable.ExecutionException;
+import npanday.registry.RepositoryRegistry;
+import npanday.vendor.SettingsException;
+import npanday.vendor.SettingsUtil;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.FileUtils;
-import java.util.List;
-import java.util.ArrayList;
import java.io.File;
-import java.io.IOException;
-
-import npanday.executable.ExecutionException;
-import npanday.PlatformUnsupportedException;
+import java.util.ArrayList;
+import java.util.List;
/**
* Generates XSD class.
@@ -45,6 +45,11 @@ public class XsdGeneratorMojo
extends AbstractMojo
{
/**
+ * @parameter expression="${npanday.settings}" default-value="${user.home}/.m2"
+ */
+ private String settingsPath;
+
+ /**
* The directory to place the generated binding classes.
*
* @parameter expression="${outputDirectory}" default-value = "${project.build.directory}${file.separator}build-sources"
@@ -162,24 +167,20 @@ public class XsdGeneratorMojo
/**
* @component
*/
- private npanday.NPandayRepositoryRegistry npandayRegistry;
+ private RepositoryRegistry repositoryRegistry;
public void execute()
throws MojoExecutionException
{
+
try
{
- npandayRegistry.createRepositoryRegistry();
- }
- catch ( IOException e )
- {
- throw new MojoExecutionException(
- "NPANDAY-1400-0032 Failed to create the repository registry for this plugin", e );
+ SettingsUtil.getOrPopulateSettingsRepository( repositoryRegistry, settingsPath );
}
- catch( NPandayRepositoryException e )
+ catch ( SettingsException e )
{
- throw new MojoExecutionException(
- "NPANDAY-1400-0033 Failed to create the repository registry for this plugin", e );
+ throw new MojoExecutionException(
+ "NPANDAY-114-0035 Failed to create the repository registry for this plugin", e );
}
FileUtils.mkdir( outputDirectory );
@@ -190,12 +191,12 @@ public class XsdGeneratorMojo
}
catch ( ExecutionException e )
{
- throw new MojoExecutionException( "NPANDAY-1400-000: Unable to execute xsd: Vendor " + vendor +
+ throw new MojoExecutionException( "NPANDAY-114-000: Unable to execute xsd: Vendor " + vendor +
", frameworkVersion = " + frameworkVersion + ", Profile = " + profile, e );
}
catch ( PlatformUnsupportedException e )
{
- throw new MojoExecutionException( "NPANDAY-1400-001: Platform Unsupported: Vendor " + vendor +
+ throw new MojoExecutionException( "NPANDAY-114-001: Platform Unsupported: Vendor " + vendor +
", frameworkVersion = " + frameworkVersion + ", Profile = " + profile, e );
}
}
Modified: incubator/npanday/branches/1.5.0-azuresupport/plugins/netplugins/NPanday.Plugin.Settings/javabinding/src/main/java/NPanday/Plugin/Settings/SettingsGeneratorMojo.java
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/plugins/netplugins/NPanday.Plugin.Settings/javabinding/src/main/java/NPanday/Plugin/Settings/SettingsGeneratorMojo.java?rev=1210393&r1=1210392&r2=1210393&view=diff
==============================================================================
--- incubator/npanday/branches/1.5.0-azuresupport/plugins/netplugins/NPanday.Plugin.Settings/javabinding/src/main/java/NPanday/Plugin/Settings/SettingsGeneratorMojo.java (original)
+++ incubator/npanday/branches/1.5.0-azuresupport/plugins/netplugins/NPanday.Plugin.Settings/javabinding/src/main/java/NPanday/Plugin/Settings/SettingsGeneratorMojo.java Mon Dec 5 10:09:31 2011
@@ -20,31 +20,27 @@
package NPanday.Plugin.Settings;
import npanday.PathUtil;
+import npanday.plugin.FieldAnnotation;
import npanday.registry.NPandayRepositoryException;
import npanday.registry.RepositoryRegistry;
-import npanday.registry.impl.StandardRepositoryLoader;
import npanday.vendor.SettingsException;
import npanday.vendor.SettingsUtil;
import npanday.vendor.impl.SettingsRepository;
-import npanday.plugin.FieldAnnotation;
+import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
-
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-
import java.io.File;
import java.io.IOException;
-import java.util.List;
import java.util.Iterator;
-import org.apache.maven.model.Plugin;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
-
-import java.util.Hashtable;
+import java.util.List;
/**
* @phase validate
@@ -281,7 +277,7 @@ public class SettingsGeneratorMojo
SettingsRepository settingsRepository = (SettingsRepository) repositoryRegistry.find( "npanday-settings" );
if ( settingsRepository != null )
{
- settingsRepository.reload();
+ settingsRepository.reloadAll();
}
}
catch ( ComponentLookupException e )