incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r520983 [7/7] - in /incubator/nmaven/trunk: ./ assemblies/ assemblies/NMaven.Core/ assemblies/NMaven.Core/src/ assemblies/NMaven.Core/src/main/ assemblies/NMaven.Core/src/main/csharp/ assemblies/NMaven.Core/src/main/csharp/Core/ assemblies/...
Date Wed, 21 Mar 2007 19:50:56 GMT
Modified: incubator/nmaven/trunk/plugins/maven-wsdl-plugin/src/main/java/org/apache/maven/dotnet/plugin/wsdl/PlatformDetector.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-wsdl-plugin/src/main/java/org/apache/maven/dotnet/plugin/wsdl/PlatformDetector.java?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-wsdl-plugin/src/main/java/org/apache/maven/dotnet/plugin/wsdl/PlatformDetector.java (original)
+++ incubator/nmaven/trunk/plugins/maven-wsdl-plugin/src/main/java/org/apache/maven/dotnet/plugin/wsdl/PlatformDetector.java Wed Mar 21 12:50:36 2007
@@ -33,27 +33,28 @@
  *
  * @author Shane Isbell
  */
-public interface PlatformDetector {
+public interface PlatformDetector
+{
     /**
      * Sets the results that are included in the standard output for Microsoft.
      *
      * @param microsoftContainsString
      */
-    void setMicrosoftContainsString(String microsoftContainsString);
+    void setMicrosoftContainsString( String microsoftContainsString );
 
     /**
      * Sets the results that are included in the standard output for Mono.
      *
      * @param monoContainsString
      */
-    void setMonoContainsString(String monoContainsString);
+    void setMonoContainsString( String monoContainsString );
 
     /**
      * Sets the results that are included in the standard output for DotGnu.
      *
      * @param gnuContainsString
      */
-    void setGnuContainsString(String gnuContainsString);
+    void setGnuContainsString( String gnuContainsString );
 
     /**
      * Returns a Vendor instance for the given command and/or netHomePath. If the command is specified, you may need to
@@ -63,16 +64,22 @@
      * @param command
      * @param netHomePath
      * @return a Vendor instance for the given command and/or netHomePath
-     * @throws org.apache.maven.dotnet.PlatformUnsupportedException if the vendor cannot be matched
+     * @throws org.apache.maven.dotnet.PlatformUnsupportedException
+     *          if the vendor cannot be matched
      */
-    Vendor getVendorFor(String command, File netHomePath) throws PlatformUnsupportedException;
+    Vendor getVendorFor( String command, File netHomePath )
+        throws PlatformUnsupportedException;
 
-    public static class Factory {
-        private Factory() {
+    public static class Factory
+    {
+        private Factory()
+        {
         }
 
-        public static PlatformDetector createDefaultPlatformDetector() {
-            return new PlatformDetector() {
+        public static PlatformDetector createDefaultPlatformDetector()
+        {
+            return new PlatformDetector()
+            {
 
                 /**
                  * String to be matched to standard output for Microsoft
@@ -89,38 +96,56 @@
                  */
                 private String gnuContainsString = "Southern Storm";
 
-                public void setMicrosoftContainsString(String microsoftContainsString) {
+                public void setMicrosoftContainsString( String microsoftContainsString )
+                {
                     this.microsoftContainsString = microsoftContainsString;
                 }
 
-                public void setMonoContainsString(String monoContainsString) {
+                public void setMonoContainsString( String monoContainsString )
+                {
                     this.monoContainsString = monoContainsString;
                 }
 
-                public void setGnuContainsString(String gnuContainsString) {
+                public void setGnuContainsString( String gnuContainsString )
+                {
                     this.gnuContainsString = gnuContainsString;
                 }
 
-                public Vendor getVendorFor(String command, File netHomePath) throws PlatformUnsupportedException {
-                    String netHome = (netHomePath == null) ? null : netHomePath.getAbsolutePath();
-                    if (isEmpty(command) && isEmpty(netHome)) {
-                        throw new PlatformUnsupportedException("NMAVEN-042-000: Both command and netHome params cannot be null or empty");
-                    } else if (!isEmpty(command) && isEmpty(netHome)) {
-                        return getVendorForCommand(command);
-                    } else if (isEmpty(command) && !isEmpty(netHome)) {
-                        return getVendorFromPath(netHome);
-                    } else if (!isEmpty(command) && !isEmpty(netHome)) {
-                        try {
-                            return getVendorFromPath(netHome);
-                        } catch (PlatformUnsupportedException e) {
+                public Vendor getVendorFor( String command, File netHomePath )
+                    throws PlatformUnsupportedException
+                {
+                    String netHome = ( netHomePath == null ) ? null : netHomePath.getAbsolutePath();
+                    if ( isEmpty( command ) && isEmpty( netHome ) )
+                    {
+                        throw new PlatformUnsupportedException(
+                            "NMAVEN-042-000: Both command and netHome params cannot be null or empty" );
+                    }
+                    else if ( !isEmpty( command ) && isEmpty( netHome ) )
+                    {
+                        return getVendorForCommand( command );
+                    }
+                    else if ( isEmpty( command ) && !isEmpty( netHome ) )
+                    {
+                        return getVendorFromPath( netHome );
+                    }
+                    else if ( !isEmpty( command ) && !isEmpty( netHome ) )
+                    {
+                        try
+                        {
+                            return getVendorFromPath( netHome );
+                        }
+                        catch ( PlatformUnsupportedException e )
+                        {
 
                             //log.debug(e);
                         }
-                        try {
-                            return getVendorForCommand(netHome + File.separator
-                                    + "bin" + File.separator + command);
-                        } catch (PlatformUnsupportedException e) {
-                            throw new PlatformUnsupportedException("");
+                        try
+                        {
+                            return getVendorForCommand( netHome + File.separator + "bin" + File.separator + command );
+                        }
+                        catch ( PlatformUnsupportedException e )
+                        {
+                            throw new PlatformUnsupportedException( "" );
                         }
                     }
                     return null;
@@ -131,28 +156,40 @@
                  *
                  * @param command
                  * @return vendor instance
-                 * @throws org.apache.maven.dotnet.PlatformUnsupportedException if the platform cannot be matched.
+                 * @throws org.apache.maven.dotnet.PlatformUnsupportedException
+                 *          if the platform cannot be matched.
                  */
-                private Vendor getVendorForCommand(String command) throws PlatformUnsupportedException {
+                private Vendor getVendorForCommand( String command )
+                    throws PlatformUnsupportedException
+                {
                     CommandExecutor commandExecutor = CommandExecutor.Factory.createDefaultCommmandExecutor();
                     //commandExecutor.setLogger(logger);
-                    try {
+                    try
+                    {
                         List<String> commands = new ArrayList<String>();
-                        commandExecutor.executeCommand(command, commands);
-                    } catch (ExecutionException e) {
-                        throw new PlatformUnsupportedException("", e);
+                        commandExecutor.executeCommand( command, commands );
+                    }
+                    catch ( ExecutionException e )
+                    {
+                        throw new PlatformUnsupportedException( "", e );
                     }
                     String results = commandExecutor.getStandardOut();
-                    if (results.contains(microsoftContainsString)) {
+                    if ( results.contains( microsoftContainsString ) )
+                    {
                         return Vendor.MICROSOFT;
-                    } else if (results.contains(monoContainsString)) {
+                    }
+                    else if ( results.contains( monoContainsString ) )
+                    {
                         return Vendor.MONO;
-                    } else if (results.contains(gnuContainsString) || results.contains("cscc"))
+                    }
+                    else if ( results.contains( gnuContainsString ) || results.contains( "cscc" ) )
                     {//cscc does not contain vendor name
                         return Vendor.DOTGNU;
-                    } else {
-                        throw new PlatformUnsupportedException("NMAVEN-042-001: Platform not supported: Results = "
-                                + results);
+                    }
+                    else
+                    {
+                        throw new PlatformUnsupportedException(
+                            "NMAVEN-042-001: Platform not supported: Results = " + results );
                     }
                 }
 
@@ -163,23 +200,33 @@
                  * @return vendor
                  * @throws PlatformUnsupportedException
                  */
-                private Vendor getVendorFromPath(String path) throws PlatformUnsupportedException {
-                    if (!new File(path).exists()) {
-                        throw new PlatformUnsupportedException("NMAVEN-042-002: Unable to locate path: Path = " + path);
+                private Vendor getVendorFromPath( String path )
+                    throws PlatformUnsupportedException
+                {
+                    if ( !new File( path ).exists() )
+                    {
+                        throw new PlatformUnsupportedException(
+                            "NMAVEN-042-002: Unable to locate path: Path = " + path );
                     }
 
-                    if (path.contains("Microsoft.NET")) {
+                    if ( path.contains( "Microsoft.NET" ) )
+                    {
                         return Vendor.MICROSOFT;
-                    } else if (path.contains("Mono")) {
+                    }
+                    else if ( path.contains( "Mono" ) )
+                    {
                         return Vendor.MONO;
-                    } else if (path.contains("Portable.NET")) {
+                    }
+                    else if ( path.contains( "Portable.NET" ) )
+                    {
                         return Vendor.DOTGNU;
                     }
-                    throw new PlatformUnsupportedException("NMAVEN-042-003: Platform not supported: Path " + path);
+                    throw new PlatformUnsupportedException( "NMAVEN-042-003: Platform not supported: Path " + path );
                 }
 
-                private boolean isEmpty(String value) {
-                    return (value == null || value.trim().equals(""));
+                private boolean isEmpty( String value )
+                {
+                    return ( value == null || value.trim().equals( "" ) );
                 }
             };
         }

Modified: incubator/nmaven/trunk/plugins/maven-wsdl-plugin/src/main/java/org/apache/maven/dotnet/plugin/wsdl/Proxy.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-wsdl-plugin/src/main/java/org/apache/maven/dotnet/plugin/wsdl/Proxy.java?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-wsdl-plugin/src/main/java/org/apache/maven/dotnet/plugin/wsdl/Proxy.java (original)
+++ incubator/nmaven/trunk/plugins/maven-wsdl-plugin/src/main/java/org/apache/maven/dotnet/plugin/wsdl/Proxy.java Wed Mar 21 12:50:36 2007
@@ -23,7 +23,8 @@
  *
  * @author Shane Isbell
  */
-public class Proxy {
+public class Proxy
+{
 
     private String id;
 
@@ -31,42 +32,59 @@
 
     private String hashAlg;
 
-    public String getId() {
+    public String getId()
+    {
         return id;
     }
 
-    public void setId(String id) {
+    public void setId( String id )
+    {
         this.id = id;
     }
 
-    public boolean isHashPassword() {
+    public boolean isHashPassword()
+    {
         return hashPassword;
     }
 
-    public void setHashPassword(boolean hashPassword) {
+    public void setHashPassword( boolean hashPassword )
+    {
         this.hashPassword = hashPassword;
     }
 
-    public String getHashAlg() {
+    public String getHashAlg()
+    {
         return hashAlg;
     }
 
-    public void setHashAlg(String hashAlg) {
+    public void setHashAlg( String hashAlg )
+    {
         this.hashAlg = hashAlg;
     }
 
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+    public boolean equals( Object o )
+    {
+        if ( this == o )
+        {
+            return true;
+        }
+        if ( o == null || getClass() != o.getClass() )
+        {
+            return false;
+        }
 
         final Proxy proxy = (Proxy) o;
 
-        if (!id.equals(proxy.id)) return false;
+        if ( !id.equals( proxy.id ) )
+        {
+            return false;
+        }
 
         return true;
     }
 
-    public int hashCode() {
+    public int hashCode()
+    {
         return id.hashCode();
     }
 }

Modified: incubator/nmaven/trunk/plugins/maven-wsdl-plugin/src/main/java/org/apache/maven/dotnet/plugin/wsdl/Server.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-wsdl-plugin/src/main/java/org/apache/maven/dotnet/plugin/wsdl/Server.java?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-wsdl-plugin/src/main/java/org/apache/maven/dotnet/plugin/wsdl/Server.java (original)
+++ incubator/nmaven/trunk/plugins/maven-wsdl-plugin/src/main/java/org/apache/maven/dotnet/plugin/wsdl/Server.java Wed Mar 21 12:50:36 2007
@@ -23,7 +23,8 @@
  *
  * @author Shane Isbell
  */
-public class Server {
+public class Server
+{
 
     private String id;
 
@@ -31,46 +32,64 @@
 
     private String hashAlg;
 
-    public String getId() {
+    public String getId()
+    {
         return id;
     }
 
-    public void setId(String id) {
+    public void setId( String id )
+    {
         this.id = id;
     }
 
-    public boolean isHashPassword() {
+    public boolean isHashPassword()
+    {
         return hashPassword;
     }
 
-    public void setHashPassword(boolean hashPassword) {
+    public void setHashPassword( boolean hashPassword )
+    {
         this.hashPassword = hashPassword;
     }
 
-    public String getHashAlg() {
+    public String getHashAlg()
+    {
         return hashAlg;
     }
 
-    public void setHashAlg(String hashAlg) {
+    public void setHashAlg( String hashAlg )
+    {
         this.hashAlg = hashAlg;
     }
 
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+    public boolean equals( Object o )
+    {
+        if ( this == o )
+        {
+            return true;
+        }
+        if ( o == null || getClass() != o.getClass() )
+        {
+            return false;
+        }
 
         final Server server = (Server) o;
 
-        if (!id.equals(server.id)) return false;
+        if ( !id.equals( server.id ) )
+        {
+            return false;
+        }
 
         return true;
     }
 
-    public int hashCode() {
+    public int hashCode()
+    {
         return id.hashCode();
     }
 
-    public String toString() {
+    public String toString()
+    {
         return "id = " + id;
     }
 }

Modified: incubator/nmaven/trunk/plugins/maven-wsdl-plugin/src/main/java/org/apache/maven/dotnet/plugin/wsdl/WsdlGeneratorMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-wsdl-plugin/src/main/java/org/apache/maven/dotnet/plugin/wsdl/WsdlGeneratorMojo.java?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-wsdl-plugin/src/main/java/org/apache/maven/dotnet/plugin/wsdl/WsdlGeneratorMojo.java (original)
+++ incubator/nmaven/trunk/plugins/maven-wsdl-plugin/src/main/java/org/apache/maven/dotnet/plugin/wsdl/WsdlGeneratorMojo.java Wed Mar 21 12:50:36 2007
@@ -43,7 +43,9 @@
  * @goal wsdl
  * @phase process-sources
  */
-public class WsdlGeneratorMojo extends AbstractMojo {
+public class WsdlGeneratorMojo
+    extends AbstractMojo
+{
 
     /**
      * The directory to place the generated binding classes.
@@ -166,114 +168,179 @@
      */
     private boolean ignoreUnusedOptions;
 
-    public void execute() throws MojoExecutionException {
+    public void execute()
+        throws MojoExecutionException
+    {
         Vendor vendor = getCompilerVendor();
-        List<String> commands = getCommandsFor(vendor);
+        List<String> commands = getCommandsFor( vendor );
 
-        getLog().debug("NMAVEN-1300-000: Commands = " + commands.toString());
+        getLog().debug( "NMAVEN-1300-000: Commands = " + commands.toString() );
         CommandExecutor commandExecutor = CommandExecutor.Factory.createDefaultCommmandExecutor();
-        //commandExecutor.setLog(getLog());
-        try {
-            commandExecutor.executeCommand(getExecutableFor(vendor, netHome), commands);
-            for (String path : paths) {
-                getLog().info("NMAVEN-1300-008: Generated WSDL: File = " + outputDirectory + File.separator +
-                        getFileNameFor(path));
+        try
+        {
+            commandExecutor.executeCommand( getExecutableFor( vendor, netHome ), commands );
+            for ( String path : paths )
+            {
+                getLog().info( "NMAVEN-1300-008: Generated WSDL: File = " + outputDirectory + File.separator +
+                    getFileNameFor( path ) );
             }
 
-        } catch (ExecutionException e) {
+        }
+        catch ( ExecutionException e )
+        {
             //TODO: This is a hack to get around the fact that MONO returns a result=1 on warnings and MS returns a result=1 on errors.
             //I don't want to fail on MONO warning here.
-            if ((vendor.equals(Vendor.MONO) && commandExecutor.getResult() > 1)
-                    || vendor.equals(Vendor.MICROSOFT))
-                throw new MojoExecutionException("NMAVEN-1300-001: Result = " + commandExecutor.getResult(), e);
+            if ( ( vendor.equals( Vendor.MONO ) && commandExecutor.getResult() > 1 ) ||
+                vendor.equals( Vendor.MICROSOFT ) )
+            {
+                throw new MojoExecutionException( "NMAVEN-1300-001: Result = " + commandExecutor.getResult(), e );
+            }
         }
     }
 
-    public String getExecutableFor(Vendor vendor, String home) {
-        String executable = (vendor.equals(Vendor.MICROSOFT)) ? "wsdl" : "wsdl2";
-        return (!isEmpty(home)) ? home + File.separator + "bin" + File.separator + executable : executable;
+    public String getExecutableFor( Vendor vendor, String home )
+    {
+        String executable = ( vendor.equals( Vendor.MICROSOFT ) ) ? "wsdl" : "wsdl2";
+        return ( !isEmpty( home ) ) ? home + File.separator + "bin" + File.separator + executable : executable;
     }
 
-    public List<String> getCommandsFor(Vendor vendor) throws MojoExecutionException {
-        String commandFlag = vendor.equals(Vendor.MICROSOFT) ? "/" : "-";
+    public List<String> getCommandsFor( Vendor vendor )
+        throws MojoExecutionException
+    {
+        String commandFlag = vendor.equals( Vendor.MICROSOFT ) ? "/" : "-";
 
         List<String> commands = new ArrayList<String>();
-        populateServerCommands(commands, commandFlag);
-        populateProxyCommands(commands, commandFlag);
-        commands.add(commandFlag + "language:" + language);
-        commands.add(commandFlag + "namespace:" + namespace);
-        commands.add(commandFlag + "fields:" + fields);
-        if (!isEmpty(protocol)) commands.add(commandFlag + "protocol:" + protocol);
-
-        for (String path : paths) {
-            commands.add(commandFlag + "out:" + outputDirectory + File.separator +
-                    getFileNameFor(path));
-        }
-
-        for (String path : paths) {
-            commands.add(new File(path).getAbsolutePath());
-        }
-
-        if (vendor.equals(Vendor.MONO)) {
-            if (serverInterface) commands.add("-server");
-            if ((fields || enableDataBinding || order || sharetypes || verbose)) {
-                if (!ignoreUnusedOptions)
-                    throw new MojoExecutionException("NMAVEN-1300-005: Illegal Option(s) for Mono");
+        populateServerCommands( commands, commandFlag );
+        populateProxyCommands( commands, commandFlag );
+        commands.add( commandFlag + "language:" + language );
+        commands.add( commandFlag + "namespace:" + namespace );
+        commands.add( commandFlag + "fields:" + fields );
+        if ( !isEmpty( protocol ) )
+        {
+            commands.add( commandFlag + "protocol:" + protocol );
+        }
+
+        for ( String path : paths )
+        {
+            commands.add( commandFlag + "out:" + outputDirectory + getFileNameFor( path ) );
+        }
+
+        for ( String path : paths )
+        {
+            commands.add( new File( path ).getAbsolutePath() );
+        }
+
+        if ( vendor.equals( Vendor.MONO ) )
+        {
+            if ( serverInterface )
+            {
+                commands.add( "-server" );
+            }
+            if ( ( fields || enableDataBinding || order || sharetypes || verbose ) )
+            {
+                if ( !ignoreUnusedOptions )
+                {
+                    throw new MojoExecutionException( "NMAVEN-1300-005: Illegal Option(s) for Mono" );
+                }
                 else
-                    getLog().warn("NMAVEN-1300-002: Your pom.xml contains an option that is not supported by MONO: Your application" +
-                            " artifact will differ dependening on compiler/platform and may have different behavior.");
+                {
+                    getLog().warn(
+                        "NMAVEN-1300-002: Your pom.xml contains an option that is not supported by MONO: Your application" +
+                            " artifact will differ dependening on compiler/platform and may have different behavior." );
+                }
+            }
+        }
+        else
+        {
+            if ( serverInterface )
+            {
+                commands.add( "/server" );
+            }
+            if ( enableDataBinding )
+            {
+                commands.add( "/enableDataBinding" );
+            }
+            if ( sharetypes )
+            {
+                commands.add( "/sharetypes" );
+            }
+            if ( verbose )
+            {
+                commands.add( "/verbose" );
+            }
+            if ( order )
+            {
+                commands.add( "/order" );
             }
-        } else {
-            if (serverInterface) commands.add("/server");
-            if (enableDataBinding) commands.add("/enableDataBinding");
-            if (sharetypes) commands.add("/sharetypes");
-            if (verbose) commands.add("/verbose");
-            if (order) commands.add("/order");
         }
         return commands;
     }
 
-    private boolean isURL(String path) {
-        try {
-            new URL(path);
-        } catch (MalformedURLException e) {
+    private boolean isURL( String path )
+    {
+        try
+        {
+            new URL( path );
+        }
+        catch ( MalformedURLException e )
+        {
             return false;
         }
         return true;
     }
 
-    private String getFileNameFor(String path) {
+    private String getFileNameFor( String path )
+    {
         String wsdlName;
-        if (isURL(path)) {
-            wsdlName = path.substring(path.lastIndexOf("/"), path.length());
-        } else {
-            if (path.contains("/")) {
-                wsdlName = path.substring(path.lastIndexOf("/"), path.length());
-            } else if (path.contains("\\")) {
-                wsdlName = path.substring(path.lastIndexOf("\\"), path.length());
-            } else {
+        if ( isURL( path ) )
+        {
+            wsdlName = path.substring( path.lastIndexOf( "/" ), path.length() );
+        }
+        else
+        {
+            if ( path.contains( "/" ) )
+            {
+                wsdlName = path.substring( path.lastIndexOf( "/" ), path.length() );
+            }
+            else if ( path.contains( "\\" ) )
+            {
+                wsdlName = path.substring( path.lastIndexOf( "\\" ), path.length() );
+            }
+            else
+            {
                 wsdlName = path;
             }
         }
-        return wsdlName.substring(0, wsdlName.lastIndexOf(".")) + "." + language.toLowerCase();
+        return wsdlName.substring( 0, wsdlName.lastIndexOf( "." ) ) + "." + language.toLowerCase();
     }
 
-    private void populateProxyCommands(List<String> commands, String commandFlag) throws MojoExecutionException {
-        if (proxy != null) {
-            Proxy mProxy = getProxyFor(proxy.getId());
-            if (mProxy != null) {
-                getLog().debug("NMAVEN-1300-003: Found proxy: ID = " + mProxy.getId());
+    private void populateProxyCommands( List<String> commands, String commandFlag )
+        throws MojoExecutionException
+    {
+        if ( proxy != null )
+        {
+            Proxy mProxy = getProxyFor( proxy.getId() );
+            if ( mProxy != null )
+            {
+                getLog().debug( "NMAVEN-1300-003: Found proxy: ID = " + mProxy.getId() );
                 String username = mProxy.getUsername();
                 String password = mProxy.getPassword();
                 boolean isHashed = proxy.isHashPassword();
-                if (!isEmpty(password) && isHashed) {
+                if ( !isEmpty( password ) && isHashed )
+                {
                     String alg = proxy.getHashAlg();
-                    if (isEmpty(alg)) alg = "SHA1";
-                    try {
-                        password = new String(MessageDigest.getInstance(alg).digest(password.getBytes()));
-                    } catch (NoSuchAlgorithmException e) {
-                        throw new MojoExecutionException("NMAVEN-1300-004: No Such Algorithm for hashing the password: " +
-                                "Algorithm = " + alg, e);
+                    if ( isEmpty( alg ) )
+                    {
+                        alg = "SHA1";
+                    }
+                    try
+                    {
+                        password = new String( MessageDigest.getInstance( alg ).digest( password.getBytes() ) );
+                    }
+                    catch ( NoSuchAlgorithmException e )
+                    {
+                        throw new MojoExecutionException(
+                            "NMAVEN-1300-004: No Such Algorithm for hashing the password: " + "Algorithm = " + alg, e );
                     }
                 }
                 String proxyHost = mProxy.getHost();
@@ -281,81 +348,139 @@
                 String proxyProtocol = mProxy.getProtocol();
 
                 StringBuffer proxyUrl = new StringBuffer();
-                if (!isEmpty(proxyProtocol)) proxyUrl.append(proxyProtocol).append("://");
-                if (!isEmpty(proxyHost)) proxyUrl.append(proxyHost);
-                if (proxyPort > 0) proxyUrl.append(":").append(proxyPort);
-                if (proxyUrl.length() != 0) commands.add(commandFlag + "proxy:" + proxyUrl.toString());
-                if (!isEmpty(username)) commands.add(commandFlag + "proxyusername:" + username);
-                if (!isEmpty(password)) commands.add(commandFlag + "proxypassword:" + password);
+                if ( !isEmpty( proxyProtocol ) )
+                {
+                    proxyUrl.append( proxyProtocol ).append( "://" );
+                }
+                if ( !isEmpty( proxyHost ) )
+                {
+                    proxyUrl.append( proxyHost );
+                }
+                if ( proxyPort > 0 )
+                {
+                    proxyUrl.append( ":" ).append( proxyPort );
+                }
+                if ( proxyUrl.length() != 0 )
+                {
+                    commands.add( commandFlag + "proxy:" + proxyUrl.toString() );
+                }
+                if ( !isEmpty( username ) )
+                {
+                    commands.add( commandFlag + "proxyusername:" + username );
+                }
+                if ( !isEmpty( password ) )
+                {
+                    commands.add( commandFlag + "proxypassword:" + password );
+                }
             }
         }
     }
 
-    private void populateServerCommands(List<String> commands, String commandFlag) throws MojoExecutionException {
-        if (server != null) {
-            Server mServer = getServerFor(server.getId());
-            if (mServer != null) {
+    private void populateServerCommands( List<String> commands, String commandFlag )
+        throws MojoExecutionException
+    {
+        if ( server != null )
+        {
+            Server mServer = getServerFor( server.getId() );
+            if ( mServer != null )
+            {
                 String username = mServer.getUsername();
                 String password = mServer.getPassword();
                 boolean isHashed = server.isHashPassword();
-                if (!isEmpty(password) && isHashed) {
+                if ( !isEmpty( password ) && isHashed )
+                {
                     String alg = server.getHashAlg();
-                    if (isEmpty(alg)) alg = "SHA1";
-                    try {
-                        password = new String(MessageDigest.getInstance(alg).digest(password.getBytes()));
-                    } catch (NoSuchAlgorithmException e) {
-                        throw new MojoExecutionException("NMAVEN-1300-005: No Such Algorithm for hashing the password: " +
-                                "Algorithm = " + alg, e);
+                    if ( isEmpty( alg ) )
+                    {
+                        alg = "SHA1";
+                    }
+                    try
+                    {
+                        password = new String( MessageDigest.getInstance( alg ).digest( password.getBytes() ) );
                     }
+                    catch ( NoSuchAlgorithmException e )
+                    {
+                        throw new MojoExecutionException(
+                            "NMAVEN-1300-005: No Such Algorithm for hashing the password: " + "Algorithm = " + alg, e );
+                    }
+                }
+                if ( !isEmpty( username ) )
+                {
+                    commands.add( commandFlag + "username:" + username );
+                }
+                if ( !isEmpty( password ) )
+                {
+                    commands.add( commandFlag + "password:" + password );
                 }
-                if (!isEmpty(username)) commands.add(commandFlag + "username:" + username);
-                if (!isEmpty(password)) commands.add(commandFlag + "password:" + password);
             }
         }
     }
 
-    private Vendor getCompilerVendor() throws MojoExecutionException {
+    private Vendor getCompilerVendor()
+        throws MojoExecutionException
+    {
         Vendor vendor;
         PlatformDetector platformDetector = PlatformDetector.Factory.createDefaultPlatformDetector();
-        if (isEmpty(netHome)) {
-            try {
-                vendor = platformDetector.getVendorFor("wsdl", null);
-            } catch (PlatformUnsupportedException e) {
-                throw new MojoExecutionException("NMAVEN-1300-009", e);
-            }
-        } else {
-            File file = new File(netHome);
-            if (!file.exists()) {
-                throw new MojoExecutionException("NMAVEN-1300-006: Unable to locate netHome - make sure that it exists:" +
-                        " Home = " + netHome);
-            }
-            try {
-                vendor = platformDetector.getVendorFor(null, new File(file.getAbsolutePath() + File.separator
-                        + "bin" + File.separator + "wsdl"));
-            } catch (PlatformUnsupportedException e) {
-                throw new MojoExecutionException("NMAVEN-1300-010", e);
+        if ( isEmpty( netHome ) )
+        {
+            try
+            {
+                vendor = platformDetector.getVendorFor( "wsdl", null );
+            }
+            catch ( PlatformUnsupportedException e )
+            {
+                throw new MojoExecutionException( "NMAVEN-1300-009", e );
+            }
+        }
+        else
+        {
+            File file = new File( netHome );
+            if ( !file.exists() )
+            {
+                throw new MojoExecutionException(
+                    "NMAVEN-1300-006: Unable to locate netHome - make sure that it exists:" + " Home = " + netHome );
+            }
+            try
+            {
+                vendor = platformDetector.getVendorFor( null, new File(
+                    file.getAbsolutePath() + File.separator + "bin" + File.separator + "wsdl" ) );
+            }
+            catch ( PlatformUnsupportedException e )
+            {
+                throw new MojoExecutionException( "NMAVEN-1300-010", e );
             }
 
         }
-        getLog().info("NMAVEN-1300-007: WSDL Vendor found: " + vendor.getVendorName());
+        getLog().info( "NMAVEN-1300-007: WSDL Vendor found: " + vendor.getVendorName() );
         return vendor;
     }
 
-    private Proxy getProxyFor(String id) {
-        for (Proxy proxy : proxies) {
-            if (proxy.getId().trim().equals(id.trim())) return proxy;
+    private Proxy getProxyFor( String id )
+    {
+        for ( Proxy proxy : proxies )
+        {
+            if ( proxy.getId().trim().equals( id.trim() ) )
+            {
+                return proxy;
+            }
         }
         return null;
     }
 
-    private Server getServerFor(String id) {
-        for (Server server : servers) {
-            if (server.getId().trim().equals(id.trim())) return server;
+    private Server getServerFor( String id )
+    {
+        for ( Server server : servers )
+        {
+            if ( server.getId().trim().equals( id.trim() ) )
+            {
+                return server;
+            }
         }
         return null;
     }
 
-    private boolean isEmpty(String value) {
-        return (value == null || value.trim().equals(""));
+    private boolean isEmpty( String value )
+    {
+        return ( value == null || value.trim().equals( "" ) );
     }
 }

Modified: incubator/nmaven/trunk/plugins/maven-xsd-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-xsd-plugin/pom.xml?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-xsd-plugin/pom.xml (original)
+++ incubator/nmaven/trunk/plugins/maven-xsd-plugin/pom.xml Wed Mar 21 12:50:36 2007
@@ -1,27 +1,19 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <parent>
-        <groupId>org.apache.maven.dotnet.plugins</groupId>
-        <version>0.14-SNAPSHOT</version>
-        <artifactId>maven-dotnet-plugins</artifactId>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
     <groupId>org.apache.maven.dotnet.plugins</groupId>
-    <artifactId>maven-xsd-plugin</artifactId>
-    <packaging>maven-plugin</packaging>
     <version>0.14-SNAPSHOT</version>
-    <name>maven-xsd-plugin</name>
-    <description>
-        Maven Plugin for .NET
-    </description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.maven.shared</groupId>
-            <artifactId>maven-plugin-testing-harness</artifactId>
-            <version>1.0-beta-1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+    <artifactId>maven-dotnet-plugins</artifactId>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.maven.dotnet.plugins</groupId>
+  <artifactId>maven-xsd-plugin</artifactId>
+  <packaging>maven-plugin</packaging>
+  <version>0.14-SNAPSHOT</version>
+  <name>maven-xsd-plugin</name>
+  <description>
+    Maven Plugin for .NET
+  </description>
   <distributionManagement>
     <site>
       <id>nmaven-apache-site</id>

Modified: incubator/nmaven/trunk/plugins/maven-xsd-plugin/src/main/java/org/apache/maven/dotnet/plugin/xsd/XmlToXsdGeneratorMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-xsd-plugin/src/main/java/org/apache/maven/dotnet/plugin/xsd/XmlToXsdGeneratorMojo.java?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-xsd-plugin/src/main/java/org/apache/maven/dotnet/plugin/xsd/XmlToXsdGeneratorMojo.java (original)
+++ incubator/nmaven/trunk/plugins/maven-xsd-plugin/src/main/java/org/apache/maven/dotnet/plugin/xsd/XmlToXsdGeneratorMojo.java Wed Mar 21 12:50:36 2007
@@ -38,7 +38,9 @@
  * @goal xml
  * @phase process-sources
  */
-public class XmlToXsdGeneratorMojo extends AbstractMojo {
+public class XmlToXsdGeneratorMojo
+    extends AbstractMojo
+{
 
     /**
      * The directory to place the generated binding classes.
@@ -99,34 +101,50 @@
      */
     private org.apache.maven.dotnet.NMavenRepositoryRegistry nmavenRegistry;
 
-    public void execute() throws MojoExecutionException {
-        try {
+    public void execute()
+        throws MojoExecutionException
+    {
+        try
+        {
             nmavenRegistry.createRepositoryRegistry();
-        } catch (IOException e) {
-            throw new MojoExecutionException("NMAVEN-1401-003: Failed to create the repository registry for this plugin", e);
+        }
+        catch ( IOException e )
+        {
+            throw new MojoExecutionException(
+                "NMAVEN-1401-003: Failed to create the repository registry for this plugin", e );
         }
 
-        FileUtils.mkdir(outputDirectory);
-        try {
-            netExecutableFactory.getNetExecutableFor(vendor, frameworkVersion, profile,
-                    project, getCommands(), netHome).execute();
-        } catch (ExecutionException e) {
-            throw new MojoExecutionException("NMAVEN-1401-000: Unable to execute xsd: Vendor " + vendor
-                    + ", frameworkVersion = " + frameworkVersion + ", Profile = " + profile,  e);
-        } catch (PlatformUnsupportedException e) {
-            throw new MojoExecutionException("NMAVEN-1401-001: Platform Unsupported: Vendor " + vendor
-                    + ", frameworkVersion = " + frameworkVersion + ", Profile = " + profile, e);
+        FileUtils.mkdir( outputDirectory );
+        try
+        {
+            netExecutableFactory.getNetExecutableFor( vendor, frameworkVersion, profile, project, getCommands(),
+                                                      netHome ).execute();
+        }
+        catch ( ExecutionException e )
+        {
+            throw new MojoExecutionException( "NMAVEN-1401-000: Unable to execute xsd: Vendor " + vendor +
+                ", frameworkVersion = " + frameworkVersion + ", Profile = " + profile, e );
+        }
+        catch ( PlatformUnsupportedException e )
+        {
+            throw new MojoExecutionException( "NMAVEN-1401-001: Platform Unsupported: Vendor " + vendor +
+                ", frameworkVersion = " + frameworkVersion + ", Profile = " + profile, e );
         }
     }
 
-    public List<String> getCommands() throws MojoExecutionException {
+    public List<String> getCommands()
+        throws MojoExecutionException
+    {
         List<String> commands = new ArrayList<String>();
-        for (String xmlFile : xmlFiles) {
-            if (!(new File(xmlFile)).exists())
-                throw new MojoExecutionException("NMAVEN-1401-002: XML File does not exist: FileName = " + xmlFile);
-            commands.add(xmlFile);
+        for ( String xmlFile : xmlFiles )
+        {
+            if ( !( new File( xmlFile ) ).exists() )
+            {
+                throw new MojoExecutionException( "NMAVEN-1401-002: XML File does not exist: FileName = " + xmlFile );
+            }
+            commands.add( xmlFile );
         }
-        commands.add("/o:" + outputDirectory);
+        commands.add( "/o:" + outputDirectory );
         return commands;
     }
 }

Modified: incubator/nmaven/trunk/plugins/maven-xsd-plugin/src/main/java/org/apache/maven/dotnet/plugin/xsd/XsdGeneratorMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-xsd-plugin/src/main/java/org/apache/maven/dotnet/plugin/xsd/XsdGeneratorMojo.java?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-xsd-plugin/src/main/java/org/apache/maven/dotnet/plugin/xsd/XsdGeneratorMojo.java (original)
+++ incubator/nmaven/trunk/plugins/maven-xsd-plugin/src/main/java/org/apache/maven/dotnet/plugin/xsd/XsdGeneratorMojo.java Wed Mar 21 12:50:36 2007
@@ -39,9 +39,9 @@
  * @phase process-sources
  */
 
-public class XsdGeneratorMojo extends AbstractMojo {
-
-
+public class XsdGeneratorMojo
+    extends AbstractMojo
+{
     /**
      * The directory to place the generated binding classes.
      *
@@ -133,8 +133,7 @@
     private File netHome;
 
     /**
-     * The Vendor for the executable. Supports MONO and MICROSOFT: the default value is <code>MICROSOFT</code>. Not
-     * case or white-space sensitive.
+     * The Vendor for the executable. Supports MONO and MICROSOFT.
      *
      * @parameter expression="${vendor}"
      */
@@ -163,47 +162,75 @@
      */
     private org.apache.maven.dotnet.NMavenRepositoryRegistry nmavenRegistry;
 
-    public void execute() throws MojoExecutionException {
-        try {
+    public void execute()
+        throws MojoExecutionException
+    {
+        try
+        {
             nmavenRegistry.createRepositoryRegistry();
-        } catch (IOException e) {
-            throw new MojoExecutionException("NMAVEN-1400-0032 Failed to create the repository registry for this plugin", e);
+        }
+        catch ( IOException e )
+        {
+            throw new MojoExecutionException(
+                "NMAVEN-1400-0032 Failed to create the repository registry for this plugin", e );
         }
 
-        FileUtils.mkdir(outputDirectory);
-        try {
-            netExecutableFactory.getNetExecutableFor(vendor, frameworkVersion, profile,
-                    project, getCommands(), netHome).execute();
-        } catch (ExecutionException e) {
-            throw new MojoExecutionException("NMAVEN-1400-000: Unable to execute xsd: Vendor " + vendor
-                    + ", frameworkVersion = " + frameworkVersion + ", Profile = " + profile,  e);
-        } catch (PlatformUnsupportedException e) {
-            throw new MojoExecutionException("NMAVEN-1400-001: Platform Unsupported: Vendor " + vendor
-                    + ", frameworkVersion = " + frameworkVersion + ", Profile = " + profile, e);
+        FileUtils.mkdir( outputDirectory );
+        try
+        {
+            netExecutableFactory.getNetExecutableFor( vendor, frameworkVersion, profile, project, getCommands(),
+                                                      netHome ).execute();
+        }
+        catch ( ExecutionException e )
+        {
+            throw new MojoExecutionException( "NMAVEN-1400-000: Unable to execute xsd: Vendor " + vendor +
+                ", frameworkVersion = " + frameworkVersion + ", Profile = " + profile, e );
+        }
+        catch ( PlatformUnsupportedException e )
+        {
+            throw new MojoExecutionException( "NMAVEN-1400-001: Platform Unsupported: Vendor " + vendor +
+                ", frameworkVersion = " + frameworkVersion + ", Profile = " + profile, e );
         }
     }
 
-    public List<String> getCommands() throws MojoExecutionException {
+    public List<String> getCommands()
+        throws MojoExecutionException
+    {
         List<String> commands = new ArrayList<String>();
-        commands.add(new File(xsdFile.trim()).getAbsolutePath());
-        commands.add("/o:" + outputDirectory);
-        commands.add("/" + generate.trim());
-        commands.add("/language:" + language.trim());
-        commands.add("/namespace:" + namespace.trim());
-        if (!isEmpty(uri)) commands.add("/uri:" + uri);
-        if (enableDataBinding) commands.add("/enableDataBinding");
-        if (fields) commands.add("/fields");
-        if (order) commands.add("/order");
-        if (elements != null) {
-            for (String element : elements) {
-                commands.add("/element:" + element);
+        commands.add( new File( xsdFile.trim() ).getAbsolutePath() );
+        commands.add( "/o:" + outputDirectory );
+        commands.add( "/" + generate.trim() );
+        commands.add( "/language:" + language.trim() );
+        commands.add( "/namespace:" + namespace.trim() );
+        if ( !isEmpty( uri ) )
+        {
+            commands.add( "/uri:" + uri );
+        }
+        if ( enableDataBinding )
+        {
+            commands.add( "/enableDataBinding" );
+        }
+        if ( fields )
+        {
+            commands.add( "/fields" );
+        }
+        if ( order )
+        {
+            commands.add( "/order" );
+        }
+        if ( elements != null )
+        {
+            for ( String element : elements )
+            {
+                commands.add( "/element:" + element );
             }
         }
         // commands.add("/nologo");
         return commands;
     }
 
-    private boolean isEmpty(String value) {
-        return (value == null || value.trim().equals(""));
+    private boolean isEmpty( String value )
+    {
+        return ( value == null || value.trim().equals( "" ) );
     }
 }

Modified: incubator/nmaven/trunk/plugins/maven-xsp-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-xsp-plugin/pom.xml?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-xsp-plugin/pom.xml (original)
+++ incubator/nmaven/trunk/plugins/maven-xsp-plugin/pom.xml Wed Mar 21 12:50:36 2007
@@ -1,18 +1,19 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <parent>
-        <groupId>org.apache.maven.dotnet.plugins</groupId>
-        <version>0.14-SNAPSHOT</version>
-        <artifactId>maven-dotnet-plugins</artifactId>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
     <groupId>org.apache.maven.dotnet.plugins</groupId>
-    <artifactId>maven-xsp-plugin</artifactId>
-    <packaging>maven-plugin</packaging>
     <version>0.14-SNAPSHOT</version>
-    <name>maven-xsp-plugin</name>
-    <description>
-        Maven Plugin for .NET
-    </description>
+    <artifactId>maven-dotnet-plugins</artifactId>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.maven.dotnet.plugins</groupId>
+  <artifactId>maven-xsp-plugin</artifactId>
+  <packaging>maven-plugin</packaging>
+  <version>0.14-SNAPSHOT</version>
+  <name>maven-xsp-plugin</name>
+  <description>
+    Maven Plugin for .NET
+  </description>
   <distributionManagement>
     <site>
       <id>nmaven-apache-site</id>

Modified: incubator/nmaven/trunk/plugins/pom-release.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/pom-release.xml?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/plugins/pom-release.xml (original)
+++ incubator/nmaven/trunk/plugins/pom-release.xml Wed Mar 21 12:50:36 2007
@@ -1,73 +1,72 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.maven.dotnet.plugins</groupId>
-    <artifactId>maven-dotnet-plugins</artifactId>
-    <packaging>pom</packaging>
-    <version>0.14-SNAPSHOT</version>
-    <name>maven-dotnet-plugins</name>
-    <modules>
-        <module>maven-compile-plugin</module>
-        <module>maven-test-plugin</module>
-        <module>maven-webapp-plugin</module>
-        <module>maven-xsd-plugin</module>
-        <module>maven-wsdl-plugin</module>
-        <module>maven-install-plugin</module>
-        <module>maven-resgen-plugin</module>
-        <module>maven-resolver-plugin</module>
-        <module>maven-settings-plugin</module>     
-    </modules>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.maven.dotnet</groupId>
-            <artifactId>dotnet-assembler</artifactId>
-            <version>0.14-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven.dotnet</groupId>
-            <artifactId>dotnet-executable</artifactId>
-            <version>0.14-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven.dotnet</groupId>
-            <artifactId>dotnet-artifact</artifactId>
-            <version>0.14-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <artifactId>maven-release-plugin</artifactId>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <descriptor>src/assembly/src.xml</descriptor>
-                    <outputDirectory>src/target</outputDirectory>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-            <!--
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-plugin-plugin</artifactId>
-                <configuration>
-                    <outputDirectory>${basedir}/src/site/xdoc</outputDirectory>
-                </configuration>
-            </plugin>
-            -->
-        </plugins>
-    </build>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.maven.dotnet.plugins</groupId>
+  <artifactId>maven-dotnet-plugins</artifactId>
+  <packaging>pom</packaging>
+  <version>0.14-SNAPSHOT</version>
+  <name>maven-dotnet-plugins</name>
+  <modules>
+    <module>maven-compile-plugin</module>
+    <module>maven-test-plugin</module>
+    <module>maven-webapp-plugin</module>
+    <module>maven-xsd-plugin</module>
+    <module>maven-wsdl-plugin</module>
+    <module>maven-install-plugin</module>
+    <module>maven-resgen-plugin</module>
+    <module>maven-resolver-plugin</module>
+    <module>maven-settings-plugin</module>
+  </modules>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.dotnet</groupId>
+      <artifactId>dotnet-assembler</artifactId>
+      <version>0.14-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.dotnet</groupId>
+      <artifactId>dotnet-executable</artifactId>
+      <version>0.14-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.dotnet</groupId>
+      <artifactId>dotnet-artifact</artifactId>
+      <version>0.14-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-release-plugin</artifactId>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptor>src/assembly/src.xml</descriptor>
+          <outputDirectory>src/target</outputDirectory>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+      <!--
+      <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-plugin-plugin</artifactId>
+          <configuration>
+              <outputDirectory>${basedir}/src/site/xdoc</outputDirectory>
+          </configuration>
+      </plugin>
+      -->
+    </plugins>
+  </build>
 </project>

Modified: incubator/nmaven/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/pom.xml?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/plugins/pom.xml (original)
+++ incubator/nmaven/trunk/plugins/pom.xml Wed Mar 21 12:50:36 2007
@@ -6,22 +6,21 @@
   <packaging>pom</packaging>
   <version>0.14-SNAPSHOT</version>
   <name>maven-dotnet-plugins</name>
-
   <modules>
     <module>maven-compile-plugin</module>
+    <module>maven-install-plugin</module>
+    <module>maven-link-plugin</module>
+    <module>maven-resgen-plugin</module>
+    <module>maven-resolver-plugin</module>
+    <module>maven-settings-plugin</module>
+    <module>maven-solution-plugin</module>
     <module>maven-test-plugin</module>
+    <module>maven-vstudio-plugin</module>
     <module>maven-webapp-plugin</module>
     <module>maven-xsd-plugin</module>
     <module>maven-xsp-plugin</module>
     <module>maven-wsdl-plugin</module>
-    <module>maven-install-plugin</module>
-    <module>maven-resgen-plugin</module>
-    <module>maven-resolver-plugin</module>
-    <module>maven-settings-plugin</module>
-    <module>nmaven-utility-resx</module>
-    <module>nmaven-utility-settings</module>
   </modules>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.dotnet</groupId>

Modified: incubator/nmaven/trunk/site/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/site/pom.xml?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/site/pom.xml (original)
+++ incubator/nmaven/trunk/site/pom.xml Wed Mar 21 12:50:36 2007
@@ -115,16 +115,16 @@
       </roles>
     </developer>
   </developers>
-      <reporting>
-      <plugins>
-        <plugin>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <configuration>
-            <aggregate>true</aggregate>
-          </configuration>
-        </plugin>
-      </plugins>
-    </reporting>
+  <reporting>
+    <plugins>
+      <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <aggregate>true</aggregate>
+        </configuration>
+      </plugin>
+    </plugins>
+  </reporting>
   <distributionManagement>
     <site>
       <id>nmaven-apache-site</id>

Modified: incubator/nmaven/trunk/site/src/site/apt/getting-started.apt
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/site/src/site/apt/getting-started.apt?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/site/src/site/apt/getting-started.apt (original)
+++ incubator/nmaven/trunk/site/src/site/apt/getting-started.apt Wed Mar 21 12:50:36 2007
@@ -148,10 +148,10 @@
         </dependency>
 
         <dependency>
-            <groupId>org.nunit</groupId>
-            <artifactId>nunit.framework</artifactId>
-            <version>2.2.8.0</version>
-	        <type>library</type>
+          <groupId>NUnit</groupId>
+          <artifactId>nunit.framework</artifactId>
+          <version>2.2.8.0</version>
+          <type>library</type>
         </dependency>
     </dependencies>
 



Mime
View raw message