Author: jvanzyl
Date: Thu Oct 18 11:05:59 2007
New Revision: 586044
URL: http://svn.apache.org/viewvc?rev=586044&view=rev
Log:
o removing jdom from the core for the embedder and we will soon have a
different tool for writing out POMs, trying to slim
down the core
Removed:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/writer/
Modified:
maven/components/trunk/build.xml
maven/components/trunk/maven-core/pom.xml
maven/components/trunk/maven-embedder/pom.xml
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
maven/components/trunk/maven-model/pom.xml
maven/components/trunk/maven-profile/pom.xml
maven/components/trunk/pom.xml
Modified: maven/components/trunk/build.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/build.xml?rev=586044&r1=586043&r2=586044&view=diff
==============================================================================
--- maven/components/trunk/build.xml (original)
+++ maven/components/trunk/build.xml Thu Oct 18 11:05:59 2007
@@ -134,9 +134,7 @@
<pull orgpath="org/codehaus/modello/modello-core"
version="${modello.version}" name="modello-core" repository="codehaus"/>
<pull orgpath="org/codehaus/modello/modello-plugin-xml"
version="${modello.version}" name="modello-plugin-xml" repository="codehaus"/>
<pull orgpath="org/codehaus/modello/modello-plugin-xpp3"
version="${modello.version}" name="modello-plugin-xpp3" repository="codehaus"/>
- <pull orgpath="org/codehaus/modello/modello-plugin-jdom"
version="${modello.version}" name="modello-plugin-jdom" repository="codehaus"/>
<pull orgpath="junit/junit" version="${junit.version}" name="junit"/>
- <pull orgpath="jdom/jdom" version="${jdom.version}" name="jdom"/>
<pull orgpath="org/apache/maven/artifact/maven-artifact"
version="${maven-artifact.version}" name="maven-artifact"/>
</target>
Modified: maven/components/trunk/maven-core/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/pom.xml?rev=586044&r1=586043&r2=586044&view=diff
==============================================================================
--- maven/components/trunk/maven-core/pom.xml (original)
+++ maven/components/trunk/maven-core/pom.xml Thu Oct 18 11:05:59 2007
@@ -148,14 +148,6 @@
<version>1.0.0</version>
<model>src/main/mdo/settings.mdo</model>
</configuration>
- <executions>
- <execution>
- <id>jdom</id>
- <goals>
- <goal>jdom-writer</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
Modified: maven/components/trunk/maven-embedder/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/pom.xml?rev=586044&r1=586043&r2=586044&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/pom.xml (original)
+++ maven/components/trunk/maven-embedder/pom.xml Thu Oct 18 11:05:59 2007
@@ -39,10 +39,6 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</dependency>
- <dependency>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- </dependency>
<!-- CLI -->
<dependency>
<groupId>commons-cli</groupId>
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=586044&r1=586043&r2=586044&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
(original)
+++
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
Thu Oct 18 11:05:59 2007
@@ -31,7 +31,6 @@
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.embedder.execution.MavenExecutionRequestPopulator;
-import org.apache.maven.embedder.writer.WriterUtils;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
import org.apache.maven.execution.DefaultMavenExecutionResult;
import org.apache.maven.execution.MavenExecutionRequest;
@@ -43,8 +42,8 @@
import org.apache.maven.lifecycle.LifecycleUtils;
import org.apache.maven.model.Model;
import org.apache.maven.model.Plugin;
-import org.apache.maven.model.io.jdom.MavenJDOMWriter;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.apache.maven.plugin.InvalidPluginException;
import org.apache.maven.plugin.PluginManager;
import org.apache.maven.plugin.PluginManagerException;
@@ -58,8 +57,8 @@
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.settings.Settings;
import org.apache.maven.settings.SettingsConfigurationException;
-import org.apache.maven.settings.io.jdom.SettingsJDOMWriter;
import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
+import org.apache.maven.settings.io.xpp3.SettingsXpp3Writer;
import org.apache.maven.settings.validation.DefaultSettingsValidator;
import org.apache.maven.settings.validation.SettingsValidationResult;
import org.apache.maven.settings.validation.SettingsValidator;
@@ -80,14 +79,10 @@
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.output.Format;
import java.io.File;
-import java.io.FileOutputStream;
+import java.io.FileWriter;
import java.io.IOException;
-import java.io.OutputStreamWriter;
import java.io.Reader;
import java.io.Writer;
import java.net.URL;
@@ -134,7 +129,9 @@
private MavenXpp3Reader modelReader;
- private MavenJDOMWriter modelWriter;
+ private MavenXpp3Writer modelWriter;
+
+ private SettingsXpp3Writer settingsWriter;
private PluginDescriptorBuilder pluginDescriptorBuilder;
@@ -235,14 +232,14 @@
boolean namespaceDeclaration )
throws IOException
{
- WriterUtils.write( writer, model, true );
+ modelWriter.write( writer, model );
}
public void writeModel( Writer writer,
Model model )
throws IOException
{
- WriterUtils.write( writer, model, false );
+ modelWriter.write( writer, model );
}
// ----------------------------------------------------------------------
@@ -262,25 +259,17 @@
throw new IOException( "Failed to validate Settings.\n" +
validationResult.render( "\n" ) );
}
- Element root = new Element( "settings" );
-
- Document doc = new Document( root );
-
- SettingsJDOMWriter writer = new SettingsJDOMWriter();
+ SettingsXpp3Writer writer = new SettingsXpp3Writer();
- String encoding = settings.getModelEncoding() != null ?
settings.getModelEncoding() : "UTF-8";
-
- Writer fileWriter = new OutputStreamWriter( new FileOutputStream( file
), encoding );
-
- Format format = Format.getPrettyFormat().setEncoding( encoding );
+ Writer fileWriter = new FileWriter( file );
try
{
- writer.write( settings, doc, fileWriter, format );
+ writer.write( fileWriter, settings );
}
finally
{
- fileWriter.close();
+ IOUtil.close( fileWriter );
}
}
@@ -678,7 +667,9 @@
modelReader = new MavenXpp3Reader();
- modelWriter = new MavenJDOMWriter();
+ modelWriter = new MavenXpp3Writer();
+
+ settingsWriter = new SettingsXpp3Writer();
maven = (Maven) container.lookup( Maven.ROLE );
Modified:
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java?rev=586044&r1=586043&r2=586044&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
(original)
+++
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
Thu Oct 18 11:05:59 2007
@@ -451,24 +451,31 @@
throws IOException, SettingsConfigurationException,
MavenEmbedderException, XmlPullParserException
{
Settings s = new Settings();
+
s.setOffline( true );
String localRepoPath = "/path/to/local/repo";
s.setLocalRepository( localRepoPath );
- File settingsFile = File.createTempFile( "embedder-test.settings.", ""
);
+ File settingsFile = new File( System.getProperty( "basedir" ),
"target/test-settings.xml" );
+
+ settingsFile.getParentFile().mkdirs();
+
settingsFile.deleteOnExit();
MavenEmbedder.writeSettings( settingsFile, s );
Reader reader = null;
+
try
{
reader = ReaderFactory.newXmlReader( settingsFile );
+
Settings result = new SettingsXpp3Reader().read( reader );
assertEquals( localRepoPath, result.getLocalRepository() );
+
assertTrue( result.isOffline() );
}
finally
Modified: maven/components/trunk/maven-model/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-model/pom.xml?rev=586044&r1=586043&r2=586044&view=diff
==============================================================================
--- maven/components/trunk/maven-model/pom.xml (original)
+++ maven/components/trunk/maven-model/pom.xml Thu Oct 18 11:05:59 2007
@@ -38,15 +38,7 @@
<configuration>
<version>4.0.0</version>
<model>src/main/mdo/maven.mdo</model>
- </configuration>
- <executions>
- <execution>
- <id>jdom</id>
- <goals>
- <goal>jdom-writer</goal>
- </goals>
- </execution>
- </executions>
+ </configuration>
</plugin>
</plugins>
</build>
@@ -111,10 +103,6 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- </dependency>
- <dependency>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
</dependency>
</dependencies>
</project>
Modified: maven/components/trunk/maven-profile/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-profile/pom.xml?rev=586044&r1=586043&r2=586044&view=diff
==============================================================================
--- maven/components/trunk/maven-profile/pom.xml (original)
+++ maven/components/trunk/maven-profile/pom.xml Thu Oct 18 11:05:59 2007
@@ -38,14 +38,6 @@
<version>1.0.0</version>
<model>profiles.mdo</model>
</configuration>
- <executions>
- <execution>
- <id>jdom</id>
- <goals>
- <goal>jdom-writer</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
@@ -63,10 +55,6 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- </dependency>
- <dependency>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
</dependency>
</dependencies>
</project>
Modified: maven/components/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?rev=586044&r1=586043&r2=586044&view=diff
==============================================================================
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Thu Oct 18 11:05:59 2007
@@ -185,11 +185,6 @@
<version>1.2_Java1.3</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.0</version>
- </dependency>
</dependencies>
</dependencyManagement>
<distributionManagement>
