Author: krosenvold
Date: Wed Oct 24 20:49:36 2012
New Revision: 1401874
URL: http://svn.apache.org/viewvc?rev=1401874&view=rev
Log:
o Renamed Xpp3Dom to package that corresponds to plexus 1:1
Added:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java
- copied, changed from r1401872,
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/pull/Xpp3Dom.java
Removed:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/pull/Xpp3Dom.java
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomWriter.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilderTest.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/xml/pull/Xpp3DomTest.java
Copied:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java
(from r1401872,
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/pull/Xpp3Dom.java)
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java?p2=maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java&p1=maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/pull/Xpp3Dom.java&r1=1401872&r2=1401874&rev=1401874&view=diff
==============================================================================
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/pull/Xpp3Dom.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java
Wed Oct 24 20:49:36 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.utils.xml.pull;
+package org.apache.maven.shared.utils.xml;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,8 +26,6 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.maven.shared.utils.xml.PrettyPrintXMLWriter;
-import org.apache.maven.shared.utils.xml.Xpp3DomWriter;
import javax.annotation.Nonnull;
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java?rev=1401874&r1=1401873&r2=1401874&view=diff
==============================================================================
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
Wed Oct 24 20:49:36 2012
@@ -21,7 +21,7 @@ package org.apache.maven.shared.utils.xm
import org.apache.maven.shared.utils.io.IOUtil;
import org.apache.maven.shared.utils.xml.pull.XmlPullParserException;
-import org.apache.maven.shared.utils.xml.pull.Xpp3Dom;
+
import org.xml.sax.*;
import org.xml.sax.helpers.DefaultHandler;
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomWriter.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomWriter.java?rev=1401874&r1=1401873&r2=1401874&view=diff
==============================================================================
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomWriter.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomWriter.java
Wed Oct 24 20:49:36 2012
@@ -19,8 +19,6 @@ package org.apache.maven.shared.utils.xm
* under the License.
*/
-import org.apache.maven.shared.utils.xml.pull.Xpp3Dom;
-
import java.io.PrintWriter;
import java.io.Writer;
Modified:
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilderTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilderTest.java?rev=1401874&r1=1401873&r2=1401874&view=diff
==============================================================================
---
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilderTest.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilderTest.java
Wed Oct 24 20:49:36 2012
@@ -21,7 +21,7 @@ package org.apache.maven.shared.utils.xm
import org.apache.maven.shared.utils.StringUtils;
import org.apache.maven.shared.utils.xml.pull.XmlPullParserException;
-import org.apache.maven.shared.utils.xml.pull.Xpp3Dom;
+
import org.junit.Test;
import java.io.IOException;
Modified:
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/xml/pull/Xpp3DomTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/xml/pull/Xpp3DomTest.java?rev=1401874&r1=1401873&r2=1401874&view=diff
==============================================================================
---
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/xml/pull/Xpp3DomTest.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/xml/pull/Xpp3DomTest.java
Wed Oct 24 20:49:36 2012
@@ -21,11 +21,12 @@ package org.apache.maven.shared.utils.xm
import java.io.IOException;
import java.io.StringReader;
+import org.apache.maven.shared.utils.xml.Xpp3Dom;
import org.apache.maven.shared.utils.xml.Xpp3DomBuilder;
import org.junit.Test;
-import static org.apache.maven.shared.utils.xml.pull.Xpp3Dom.mergeXpp3Dom;
+import static org.apache.maven.shared.utils.xml.Xpp3Dom.mergeXpp3Dom;
import static org.junit.Assert.*;
/**
