svn commit: r673582 - /incubator/nmaven/branches/NMAVEN_0.14/bootstrap-build.bat

[brett]

Author: brett
Date: Wed Jul  2 21:40:22 2008
New Revision: 673582

URL: http://svn.apache.org/viewvc?rev=673582&view=rev
Log:
clean as part of build

Modified:
incubator/nmaven/branches/NMAVEN_0.14/bootstrap-build.bat

Modified: incubator/nmaven/branches/NMAVEN_0.14/bootstrap-build.bat
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN_0.14/bootstrap-build.bat?rev=673582&r1=673581&r2=673582&view=diff
==
--- incubator/nmaven/branches/NMAVEN_0.14/bootstrap-build.bat (original)
+++ incubator/nmaven/branches/NMAVEN_0.14/bootstrap-build.bat Wed Jul  2 
21:40:22 2008
@@ -5,11 +5,11 @@
 cmd /C mvn.bat install:install-file 
-Dfile=./thirdparty/org.apache.ws/XmlSchema-1.1.jar 
-DpomFile=./thirdparty/org.apache.ws/XmlSchema-1.1.pom 
-DgroupId=org.apache.ws.commons -DartifactId=XmlSchema -Dversion=1.1 
-Dpackaging=jar
 if "%1"=="-DrdfProfile.none" (
 ECHO Building Without RDF Profile
-cmd /C mvn.bat %phase% %*
+cmd /C mvn.bat clean %phase% %*
 
  ) else (
 ECHO Building With RDF Profile
-cmd /C mvn.bat %phase% -DRdf %*
+cmd /C mvn.bat clean %phase% -DRdf %*
  )
 
 :END
@@ -27,15 +27,15 @@
 
 if "%1" == "-DMicrosoft" (
 ECHO Compiling Assemblies with Microsoft
-cmd /C mvn.bat -f pom-dotnet.xml -Dmaven.test.skip=true -Dbootstrap 
-Dvendor=MICROSOFT %phase% %*
+cmd /C mvn.bat -f pom-dotnet.xml -Dmaven.test.skip=true -Dbootstrap 
-Dvendor=MICROSOFT clean %phase% %*
 IF errorlevel 1 GOTO END
  ) else  if "%1" == "-DMono" (
 ECHO Compiling Assemblies with Mono
-cmd /C mvn.bat -f pom-dotnet.xml -Dmaven.test.skip=true -Dbootstrap 
-Dvendor=MONO %phase% %*
+cmd /C mvn.bat -f pom-dotnet.xml -Dmaven.test.skip=true -Dbootstrap 
-Dvendor=MONO clean %phase% %*
 IF errorlevel 1 GOTO END
  ) else (
 ECHO Compiling Assemblies with Unknown Vendor
-cmd /C mvn.bat -f pom-dotnet.xml -Dmaven.test.skip=true -Dbootstrap 
%phase% %*
+cmd /C mvn.bat -f pom-dotnet.xml -Dmaven.test.skip=true -Dbootstrap clean 
%phase% %*
 IF errorlevel 1 GOTO END
  )
 

svn commit: r673584 - /incubator/nmaven/branches/NMAVEN_0.14/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectFactory.java

[brett]

Author: brett
Date: Wed Jul  2 22:12:13 2008
New Revision: 673584

URL: http://svn.apache.org/viewvc?rev=673584&view=rev
Log:
[NMAVEN-154] Unable to build a project that uses a parent pom
Submitted by: Jan Ancajas

Modified:

incubator/nmaven/branches/NMAVEN_0.14/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectFactory.java

Modified: 
incubator/nmaven/branches/NMAVEN_0.14/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectFactory.java
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN_0.14/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectFactory.java?rev=673584&r1=673583&r2=673584&view=diff
==
--- 
incubator/nmaven/branches/NMAVEN_0.14/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectFactory.java
 (original)
+++ 
incubator/nmaven/branches/NMAVEN_0.14/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectFactory.java
 Wed Jul  2 22:12:13 2008
@@ -28,6 +28,7 @@
 import org.apache.maven.dotnet.ArtifactType;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.IOUtil;
 
 import java.util.List;
 import java.util.ArrayList;
@@ -99,21 +100,29 @@
 String parentPomName = FileUtils.filename( 
parent.getRelativePath() ).replace( "\\", File.separator)
 .replace( "/", File.separator);
 File parentPomFile = new File( pomFileDirectory, parentPomName );
-FileReader fileReader = new FileReader( parentPomFile );
-
-MavenXpp3Reader reader = new MavenXpp3Reader();
-Model parentModel;
-try
-{
-parentModel = reader.read( fileReader );
-}
-catch ( XmlPullParserException e )
+
+if (  parentPomFile.exists() ) // if pom resides in remote repo, 
Maven should already handle this.
 {
-throw new IOException( "NMAVEN-180-000: Unable to read model: 
Message = " + e.getMessage() );
+FileReader fileReader = new FileReader( parentPomFile );
 
+MavenXpp3Reader reader = new MavenXpp3Reader();
+Model parentModel;
+try
+{
+parentModel = reader.read( fileReader );
+}
+catch ( XmlPullParserException e )
+{
+throw new IOException( "NMAVEN-180-000: Unable to read 
model: Message = " + e.getMessage() );
+
+}
+finally
+{
+IOUtil.close( fileReader );
+}
+//Project parentProject = createProjectFrom( parentModel, 
parentPomFile.getParentFile() );
+//project.setParentProject( parentProject );
 }
-//Project parentProject = createProjectFrom( parentModel, 
parentPomFile.getParentFile() );
-//project.setParentProject( parentProject );
 }
 
 //TODO: publickey/classifier