From nmaven-commits-return-230-apmail-incubator-nmaven-commits-archive=incubator.apache.org@incubator.apache.org Mon Apr 23 23:28:46 2007 Return-Path: Delivered-To: apmail-incubator-nmaven-commits-archive@locus.apache.org Received: (qmail 94256 invoked from network); 23 Apr 2007 23:28:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 Apr 2007 23:28:45 -0000 Received: (qmail 35385 invoked by uid 500); 23 Apr 2007 23:28:52 -0000 Delivered-To: apmail-incubator-nmaven-commits-archive@incubator.apache.org Received: (qmail 35365 invoked by uid 500); 23 Apr 2007 23:28:52 -0000 Mailing-List: contact nmaven-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: nmaven-dev@incubator.apache.org Delivered-To: mailing list nmaven-commits@incubator.apache.org Received: (qmail 35355 invoked by uid 99); 23 Apr 2007 23:28:52 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Apr 2007 16:28:52 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Apr 2007 16:28:43 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 22CB51A9842; Mon, 23 Apr 2007 16:28:23 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r531653 [2/2] - in /incubator/nmaven/branches/SI_XPT/components: ./ dotnet-artifact/ dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ dotnet-assembler/ dotn... Date: Mon, 23 Apr 2007 23:28:21 -0000 To: nmaven-commits@incubator.apache.org From: sisbell@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070423232823.22CB51A9842@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/test/java/ServiceTest.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/test/java/ServiceTest.java?view=diff&rev=531653&r1=531652&r2=531653 ============================================================================== --- incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/test/java/ServiceTest.java (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/test/java/ServiceTest.java Mon Apr 23 16:28:17 2007 @@ -2,6 +2,7 @@ import org.apache.maven.dotnet.embedder.MavenEmbedderService; import org.apache.maven.dotnet.embedder.MavenExecutionRequest; import org.apache.maven.dotnet.embedder.MavenProject; +import org.apache.maven.dotnet.embedder.Artifact; import org.apache.maven.dotnet.embedder.impl.MavenEmbedderServiceImpl; import org.apache.maven.dotnet.embedder.impl.MavenExecutionRequestImpl; @@ -24,7 +25,7 @@ // new Thread( serverThread ).start(); } - public void testA() + public void atestA() { MavenEmbedderServiceImpl service = new MavenEmbedderServiceImpl(); @@ -35,6 +36,18 @@ request.setGoal( "compile" ); service.execute( request ); // fail(""); + } + + public void testC() + { + MavenEmbedderServiceImpl service = new MavenEmbedderServiceImpl(); + service.initialize(); + Set artifacts = + service.getRepositoryArtifacts( ); + for(Artifact artifact : artifacts) + { + System.out.println(artifact.getArtifactId() + ":" + artifact.getPomPath()); + } } public void atestB() Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/pom.xml?view=diff&rev=531653&r1=531652&r2=531653 ============================================================================== --- incubator/nmaven/branches/SI_XPT/components/dotnet-executable/pom.xml (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-executable/pom.xml Mon Apr 23 16:28:17 2007 @@ -1,3 +1,21 @@ + Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/NetExecutable.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/NetExecutable.java?view=diff&rev=531653&r1=531652&r2=531653 ============================================================================== --- incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/NetExecutable.java (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/NetExecutable.java Mon Apr 23 16:28:17 2007 @@ -53,9 +53,9 @@ throws ExecutionException; /** - * Returns the executable that this compiler will use to compile the application. + * Returns the executable file name that this compiler will use to compile the application. * - * @return the executable that this compiler will use to compile the application + * @return the executable file name that this compiler will use to compile the application * @throws org.apache.maven.dotnet.executable.ExecutionException * */ @@ -63,7 +63,9 @@ throws ExecutionException; /** - * @return excution path + * Returns the parent directory of the executable. + * + * @return the parent directory of the executable */ File getExecutionPath(); Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/NetExecutableFactory.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/NetExecutableFactory.java?view=diff&rev=531653&r1=531652&r2=531653 ============================================================================== --- incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/NetExecutableFactory.java (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/NetExecutableFactory.java Mon Apr 23 16:28:17 2007 @@ -55,7 +55,8 @@ * @param commands the user-defined command options to use with the executable * @param netHome the install root of the .NET framework * @return the executable that matches the vendor, framework version and profile - * @throws org.apache.maven.dotnet.PlatformUnsupportedException if no executable is found + * @throws org.apache.maven.dotnet.PlatformUnsupportedException + * if no executable is found */ NetExecutable getNetExecutableFor( String vendor, String frameworkVersion, String profile, MavenProject project, List commands, File netHome ) @@ -78,16 +79,21 @@ /** * Returns an executable for compiling .NET applications. * - * @param compilerRequirement the requirements for the compiler - * @param compilerConfig the configuration for the compiler - * @param project the maven project - * @param assemblyPath an optional parameter for replacing the system assemblies + * @param compilerRequirement the requirements for the compiler + * @param compilerConfig the configuration for the compiler + * @param project the maven project + * @param assemblyPath an optional parameter for replacing the system assemblies * @return the executable for compiling .NET applications - * @throws org.apache.maven.dotnet.PlatformUnsupportedException if no executable is found - * + * @throws org.apache.maven.dotnet.PlatformUnsupportedException + * if no executable is found */ CompilerExecutable getCompilerExecutableFor( CompilerRequirement compilerRequirement, CompilerConfig compilerConfig, MavenProject project, File assemblyPath ) + throws PlatformUnsupportedException; + + + NetExecutable getPluginLoaderFor( String groupId, String artifactId, VendorInfo vendorInfo, MavenProject project, + String localRepository, File parameterFile, String mojoName ) throws PlatformUnsupportedException; } Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java?view=diff&rev=531653&r1=531652&r2=531653 ============================================================================== --- incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java Mon Apr 23 16:28:17 2007 @@ -57,7 +57,7 @@ String sourceDirectory = compilerContext.getSourceDirectoryName(); String artifactFilePath = compilerContext.getArtifact().getAbsolutePath(); - String targetArtifactType = config.getArtifactType().getArtifactTypeName(); + String targetArtifactType = config.getArtifactType().getTargetCompileType(); compilerContext.getCompilerRequirement().getFrameworkVersion(); Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DotGNUCompiler.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DotGNUCompiler.java?view=diff&rev=531653&r1=531652&r2=531653 ============================================================================== --- incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DotGNUCompiler.java (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DotGNUCompiler.java Mon Apr 23 16:28:17 2007 @@ -55,7 +55,7 @@ String sourceDirectory = compilerContext.getSourceDirectoryName(); String artifactFilePath = compilerContext.getArtifact().getAbsolutePath(); - String targetArtifactType = config.getArtifactType().getArtifactTypeName(); + String targetArtifactType = config.getArtifactType().getTargetCompileType(); List commands = new ArrayList(); commands.add( "/out:" + artifactFilePath ); Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/NemerleCompiler.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/NemerleCompiler.java?view=diff&rev=531653&r1=531652&r2=531653 ============================================================================== --- incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/NemerleCompiler.java (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/NemerleCompiler.java Mon Apr 23 16:28:17 2007 @@ -51,7 +51,7 @@ String sourceDirectory = compilerContext.getSourceDirectoryName(); String artifactFilePath = compilerContext.getArtifact().getAbsolutePath(); - String targetArtifactType = config.getArtifactType().getArtifactTypeName(); + String targetArtifactType = config.getArtifactType().getTargetCompileType(); List commands = new ArrayList(); commands.add( "/out:" + artifactFilePath ); Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/PhpCompiler.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/PhpCompiler.java?view=diff&rev=531653&r1=531652&r2=531653 ============================================================================== --- incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/PhpCompiler.java (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/PhpCompiler.java Mon Apr 23 16:28:17 2007 @@ -48,7 +48,7 @@ String sourceDirectory = compilerContext.getSourceDirectoryName(); String artifactFilePath = compilerContext.getArtifact().getAbsolutePath(); - String targetArtifactType = config.getArtifactType().getArtifactTypeName(); + String targetArtifactType = config.getArtifactType().getTargetCompileType(); List commands = new ArrayList(); commands.add( "/out:" + artifactFilePath ); Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/package.html URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/package.html?view=diff&rev=531653&r1=531652&r2=531653 ============================================================================== --- incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/package.html (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/package.html Mon Apr 23 16:28:17 2007 @@ -4,20 +4,23 @@ Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java?view=diff&rev=531653&r1=531652&r2=531653 ============================================================================== --- incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java Mon Apr 23 16:28:17 2007 @@ -136,7 +136,7 @@ } if ( config.isTestCompile() && - project.getArtifact().getType().equals( ArtifactType.MODULE.getArtifactTypeName() ) && + project.getArtifact().getType().equals( ArtifactType.MODULE.getPackagingType() ) && project.getArtifact().getFile() != null && project.getArtifact().getFile().exists() ) { artifacts.add( project.getArtifact() ); @@ -159,9 +159,10 @@ public List getLibraryDependencies() { - if ( config.isTestCompile() && config.getArtifactType().equals( ArtifactType.LIBRARY ) && - project.getArtifact().getFile() != null && project.getArtifact().getFile().exists() && - !libraries.contains( project.getArtifact() ) && !project.getArtifact().getType().equals( "module" ) ) + if ( config.isTestCompile() && ( config.getArtifactType().equals( ArtifactType.LIBRARY ) || + config.getArtifactType().equals( ArtifactType.NETPLUGIN )) && project.getArtifact().getFile() != null && + project.getArtifact().getFile().exists() && !libraries.contains( project.getArtifact() ) && + !project.getArtifact().getType().equals( "module" ) ) { libraries.add( project.getArtifact() ); } @@ -261,7 +262,7 @@ { modules.add( artifact ); } - else if ( type.equals( "library" ) ) + else if ( type.equals( "library" ) || type.equals( "exe" ) ) { libraries.add( artifact ); } @@ -298,13 +299,13 @@ } else if ( type.equals( "gac_32" ) ) { - String gacRoot = "C:\\WINDOWS\\assembly\\GAC_32\\"; + String gacRoot = "C:\\WINDOWS\\assembly\\GAC_32\\"; setArtifactGacFile( gacRoot, artifact ); libraries.add( artifact ); } else if ( type.equals( "gac_msil" ) ) { - String gacRoot = "C:\\WINDOWS\\assembly\\GAC_MSIL\\"; + String gacRoot = "C:\\WINDOWS\\assembly\\GAC_MSIL\\"; setArtifactGacFile( gacRoot, artifact ); libraries.add( artifact ); } Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultRepositoryNetExecutable.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultRepositoryNetExecutable.java?view=diff&rev=531653&r1=531652&r2=531653 ============================================================================== --- incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultRepositoryNetExecutable.java (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultRepositoryNetExecutable.java Mon Apr 23 16:28:17 2007 @@ -117,7 +117,7 @@ } } } - throw new ExecutionException( "NMAVEN-063-003: Executable path has not been set" ); + throw new ExecutionException( "NMAVEN-063-003: Executable path has not been set or is invalid" ); } Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java?view=diff&rev=531653&r1=531652&r2=531653 ============================================================================== --- incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java Mon Apr 23 16:28:17 2007 @@ -158,6 +158,36 @@ } } + public NetExecutable getPluginLoaderFor( String groupId, String artifactId, VendorInfo vendorInfo, + MavenProject project, String localRepository, File parameterFile, + String mojoName ) + throws PlatformUnsupportedException + { + List artifacts = artifactContext.getArtifactsFor( groupId, artifactId, null, null ); + if ( artifacts.size() == 0 ) + { + throw new PlatformUnsupportedException( + "NMAVEN-066-023: Could not locate the plugin: GroupId = " + groupId + ", ArtifactId = " + artifactId ); + } + + Artifact artifact = artifacts.get( 0 ); + if ( artifact == null ) + { + throw new PlatformUnsupportedException( + "NMAVEN-066-021: Could not locate the plugin: GroupId = " + groupId + ", ArtifactId = " + artifactId ); + } + + AssemblyRepositoryLayout layout = new AssemblyRepositoryLayout(); + File artifactPath = new File( localRepository + File.separator + layout.pathOf( artifact ) ); + List commands = new ArrayList(); + //commands.add( "mojoName=NMaven.Plugin.Solution" ); + commands.add( "parameterFile=" + parameterFile.getAbsolutePath() ); + commands.add( "assemblyFile=" + artifactPath.getAbsolutePath() ); + commands.add( "mojoName=" + artifactId + "." + mojoName );//ArtifactId = namespace + return getNetExecutableFromRepository( "NMaven.Plugin", "NMaven.Plugin.Runner", vendorInfo, project, + localRepository, commands ); + } + public NetExecutable getNetExecutableFromRepository( String groupId, String artifactId, VendorInfo vendorInfo, MavenProject project, String localRepository, List commands ) @@ -182,8 +212,14 @@ { throw new PlatformUnsupportedException( "NMAVEN-066-018: Missing Vendor Information: " + vendorInfo ); } + List artifacts = artifactContext.getArtifactsFor( groupId, artifactId, null, null ); + if ( artifacts.size() == 0 ) + { + throw new PlatformUnsupportedException( "NMAVEN-066-022: Could not locate the executable: GroupId = " + + groupId + ", ArtifactId = " + artifactId ); + } + Artifact artifact = artifacts.get( 0 ); - Artifact artifact = artifactContext.getArtifactsFor( groupId, artifactId, null, null ).get( 0 ); logger.debug( "NMAVEN-066-003: Found Vendor: " + vendorInfo ); AssemblyRepositoryLayout layout = new AssemblyRepositoryLayout(); Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/package.html URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/package.html?view=diff&rev=531653&r1=531652&r2=531653 ============================================================================== --- incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/package.html (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/package.html Mon Apr 23 16:28:17 2007 @@ -4,20 +4,23 @@ Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-model/assembly-plugins/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-model/assembly-plugins/pom.xml?view=diff&rev=531653&r1=531652&r2=531653 ============================================================================== --- incubator/nmaven/branches/SI_XPT/components/dotnet-model/assembly-plugins/pom.xml (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-model/assembly-plugins/pom.xml Mon Apr 23 16:28:17 2007 @@ -1,3 +1,21 @@ + Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-model/compiler-plugins/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-model/compiler-plugins/pom.xml?view=diff&rev=531653&r1=531652&r2=531653 ============================================================================== --- incubator/nmaven/branches/SI_XPT/components/dotnet-model/compiler-plugins/pom.xml (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-model/compiler-plugins/pom.xml Mon Apr 23 16:28:17 2007 @@ -1,3 +1,21 @@ + Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-model/entries/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-model/entries/pom.xml?view=diff&rev=531653&r1=531652&r2=531653 ============================================================================== --- incubator/nmaven/branches/SI_XPT/components/dotnet-model/entries/pom.xml (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-model/entries/pom.xml Mon Apr 23 16:28:17 2007 @@ -1,3 +1,21 @@ + Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-model/executable-plugins/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-model/executable-plugins/pom.xml?view=diff&rev=531653&r1=531652&r2=531653 ============================================================================== --- incubator/nmaven/branches/SI_XPT/components/dotnet-model/executable-plugins/pom.xml (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-model/executable-plugins/pom.xml Mon Apr 23 16:28:17 2007 @@ -1,3 +1,21 @@ + Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-model/netdependency/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-model/netdependency/pom.xml?view=diff&rev=531653&r1=531652&r2=531653 ============================================================================== --- incubator/nmaven/branches/SI_XPT/components/dotnet-model/netdependency/pom.xml (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-model/netdependency/pom.xml Mon Apr 23 16:28:17 2007 @@ -1,3 +1,21 @@ + Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-model/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-model/pom.xml?view=diff&rev=531653&r1=531652&r2=531653 ============================================================================== --- incubator/nmaven/branches/SI_XPT/components/dotnet-model/pom.xml (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-model/pom.xml Mon Apr 23 16:28:17 2007 @@ -1,22 +1,41 @@ - - - org.apache.maven.dotnet - 0.14-SNAPSHOT - dotnet-components - - 4.0.0 + + + org.apache.maven.dotnet - dotnet-model - pom 0.14-SNAPSHOT - dotnet-model + dotnet-components + + 4.0.0 + org.apache.maven.dotnet + dotnet-model + pom + 0.14-SNAPSHOT + dotnet-model - - assembly-plugins - compiler-plugins - executable-plugins - netdependency - settings - entries - + + assembly-plugins + compiler-plugins + executable-plugins + netdependency + settings + entries + Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-model/settings/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-model/settings/pom.xml?view=diff&rev=531653&r1=531652&r2=531653 ============================================================================== --- incubator/nmaven/branches/SI_XPT/components/dotnet-model/settings/pom.xml (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-model/settings/pom.xml Mon Apr 23 16:28:17 2007 @@ -1,3 +1,21 @@ + Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-registry/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-registry/pom.xml?view=diff&rev=531653&r1=531652&r2=531653 ============================================================================== --- incubator/nmaven/branches/SI_XPT/components/dotnet-registry/pom.xml (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-registry/pom.xml Mon Apr 23 16:28:17 2007 @@ -1,3 +1,21 @@ + Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/impl/package.html URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/impl/package.html?view=diff&rev=531653&r1=531652&r2=531653 ============================================================================== --- incubator/nmaven/branches/SI_XPT/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/impl/package.html (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/impl/package.html Mon Apr 23 16:28:17 2007 @@ -5,19 +5,22 @@ @(#)package.html - Copyright 2006 Shane Isbell + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. --> Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/package.html URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/package.html?view=diff&rev=531653&r1=531652&r2=531653 ============================================================================== --- incubator/nmaven/branches/SI_XPT/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/package.html (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/package.html Mon Apr 23 16:28:17 2007 @@ -4,20 +4,22 @@ Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-service/embedder/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-service/embedder/pom.xml?view=diff&rev=531653&r1=531652&r2=531653 ============================================================================== --- incubator/nmaven/branches/SI_XPT/components/dotnet-service/embedder/pom.xml (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-service/embedder/pom.xml Mon Apr 23 16:28:17 2007 @@ -1,3 +1,21 @@ + 4.0.0 @@ -9,7 +27,6 @@ NMaven - org.apache.maven.dotnet Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/pom.xml?view=diff&rev=531653&r1=531652&r2=531653 ============================================================================== --- incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/pom.xml (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/pom.xml Mon Apr 23 16:28:17 2007 @@ -1,3 +1,21 @@ + Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/package.html URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/package.html?view=diff&rev=531653&r1=531652&r2=531653 ============================================================================== --- incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/package.html (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/package.html Mon Apr 23 16:28:17 2007 @@ -5,19 +5,22 @@ @(#)package.html - Copyright 2006 Shane Isbell + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. --> Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/package.html URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/package.html?view=diff&rev=531653&r1=531652&r2=531653 ============================================================================== --- incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/package.html (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/package.html Mon Apr 23 16:28:17 2007 @@ -5,19 +5,22 @@ @(#)package.html - Copyright 2006 Shane Isbell + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. --> Modified: incubator/nmaven/branches/SI_XPT/components/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/pom.xml?view=diff&rev=531653&r1=531652&r2=531653 ============================================================================== --- incubator/nmaven/branches/SI_XPT/components/pom.xml (original) +++ incubator/nmaven/branches/SI_XPT/components/pom.xml Mon Apr 23 16:28:17 2007 @@ -1,3 +1,21 @@ + 4.0.0 @@ -121,6 +139,7 @@ dotnet-assembler dotnet-embedder dotnet-executable + dotnet-plugin dotnet-registry dotnet-service/embedder dotnet-vendor