Issue 110: rename package 'snakeyaml_external' to 'snakeyaml.external'. OSGi bundle plugin for Maven will export the external package
diff --git a/pom.xml b/pom.xml
index 79c58de..22192bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,7 @@
</formats>
<instrumentation>
<excludes>
- <exclude>org/yaml/snakeyaml_external/**</exclude>
+ <exclude>org/yaml/snakeyaml/external/**</exclude>
</excludes>
</instrumentation>
</configuration>
@@ -192,7 +192,7 @@
<include>src/**/*.java</include>
</includes>
<excludes>
- <exclude>src/main/java/org/yaml/snakeyaml_external/**</exclude>
+ <exclude>src/main/java/org/yaml/snakeyaml/external/**</exclude>
</excludes>
<useDefaultExcludes>true</useDefaultExcludes>
<useDefaultMapping>true</useDefaultMapping>
@@ -216,7 +216,6 @@
<configuration>
<instructions>
<Export-Package>org.yaml.snakeyaml.*</Export-Package>
- <Private-Package>org.yaml.snakeyaml_external.*</Private-Package>
<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
</instructions>
</configuration>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 0d78a51..5c57b7f 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -9,7 +9,7 @@
<release version="1.9-SNAPSHOT" date="in Mercurial" description="Development">
<action dev="py4fun" type="fix" issue="110" due-to="dmitry.s.mamonov">
Fix: introduce a package for external libraries and move there the 64Coder
- and the google URL encoder (2011-02-24)
+ and the Google's URL encoder (2011-02-24)
</action>
<action dev="py4fun" type="fix" issue="109" due-to="cjalmeida">
Fix: ancient years must be dumped with leading zeros (2011-02-19)
diff --git a/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java b/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java
index c26cc1a..fc599fd 100644
--- a/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java
+++ b/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java
@@ -30,6 +30,7 @@
import java.util.regex.Pattern;
import org.yaml.snakeyaml.error.YAMLException;
+import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
import org.yaml.snakeyaml.nodes.MappingNode;
import org.yaml.snakeyaml.nodes.Node;
import org.yaml.snakeyaml.nodes.NodeId;
@@ -37,7 +38,6 @@
import org.yaml.snakeyaml.nodes.ScalarNode;
import org.yaml.snakeyaml.nodes.SequenceNode;
import org.yaml.snakeyaml.nodes.Tag;
-import org.yaml.snakeyaml_external.biz.base64Coder.Base64Coder;
/**
* Construct standard Java classes
diff --git a/src/main/java/org/yaml/snakeyaml_external/biz/base64Coder/Base64Coder.java b/src/main/java/org/yaml/snakeyaml/external/biz/base64Coder/Base64Coder.java
similarity index 99%
rename from src/main/java/org/yaml/snakeyaml_external/biz/base64Coder/Base64Coder.java
rename to src/main/java/org/yaml/snakeyaml/external/biz/base64Coder/Base64Coder.java
index 1706592..034d573 100644
--- a/src/main/java/org/yaml/snakeyaml_external/biz/base64Coder/Base64Coder.java
+++ b/src/main/java/org/yaml/snakeyaml/external/biz/base64Coder/Base64Coder.java
@@ -13,7 +13,7 @@
// Please contact the author if you need another license.
// This module is provided "as is", without warranties of any kind.
-package org.yaml.snakeyaml_external.biz.base64Coder;
+package org.yaml.snakeyaml.external.biz.base64Coder;
/**
* A Base64 encoder/decoder.
diff --git a/src/main/java/org/yaml/snakeyaml_external/google/gdata/util/common/base/Escaper.java b/src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/Escaper.java
similarity index 97%
rename from src/main/java/org/yaml/snakeyaml_external/google/gdata/util/common/base/Escaper.java
rename to src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/Escaper.java
index a6e8cb0..c26e3cb 100644
--- a/src/main/java/org/yaml/snakeyaml_external/google/gdata/util/common/base/Escaper.java
+++ b/src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/Escaper.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.yaml.snakeyaml_external.google.gdata.util.common.base;
+package org.yaml.snakeyaml.external.com.google.gdata.util.common.base;
/**
* An object that converts literal text into a format safe for inclusion in a
diff --git a/src/main/java/org/yaml/snakeyaml_external/google/gdata/util/common/base/PercentEscaper.java b/src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/PercentEscaper.java
similarity index 99%
rename from src/main/java/org/yaml/snakeyaml_external/google/gdata/util/common/base/PercentEscaper.java
rename to src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/PercentEscaper.java
index 68f4978..5e2f902 100644
--- a/src/main/java/org/yaml/snakeyaml_external/google/gdata/util/common/base/PercentEscaper.java
+++ b/src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/PercentEscaper.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.yaml.snakeyaml_external.google.gdata.util.common.base;
+package org.yaml.snakeyaml.external.com.google.gdata.util.common.base;
/**
* A {@code UnicodeEscaper} that escapes some set of Java characters using the
diff --git a/src/main/java/org/yaml/snakeyaml_external/google/gdata/util/common/base/UnicodeEscaper.java b/src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/UnicodeEscaper.java
similarity index 99%
rename from src/main/java/org/yaml/snakeyaml_external/google/gdata/util/common/base/UnicodeEscaper.java
rename to src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/UnicodeEscaper.java
index b09faa4..5403185 100644
--- a/src/main/java/org/yaml/snakeyaml_external/google/gdata/util/common/base/UnicodeEscaper.java
+++ b/src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/UnicodeEscaper.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.yaml.snakeyaml_external.google.gdata.util.common.base;
+package org.yaml.snakeyaml.external.com.google.gdata.util.common.base;
import java.io.IOException;
diff --git a/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java b/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java
index a3a0e5c..b52d22e 100644
--- a/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java
+++ b/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java
@@ -29,9 +29,9 @@
import java.util.TimeZone;
import java.util.regex.Pattern;
+import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
import org.yaml.snakeyaml.nodes.Node;
import org.yaml.snakeyaml.nodes.Tag;
-import org.yaml.snakeyaml_external.biz.base64Coder.Base64Coder;
/**
* Represent standard Java classes
diff --git a/src/main/java/org/yaml/snakeyaml/util/UriEncoder.java b/src/main/java/org/yaml/snakeyaml/util/UriEncoder.java
index 22a4c09..7f386f2 100644
--- a/src/main/java/org/yaml/snakeyaml/util/UriEncoder.java
+++ b/src/main/java/org/yaml/snakeyaml/util/UriEncoder.java
@@ -26,8 +26,8 @@
import java.nio.charset.CodingErrorAction;
import org.yaml.snakeyaml.error.YAMLException;
-import org.yaml.snakeyaml_external.google.gdata.util.common.base.Escaper;
-import org.yaml.snakeyaml_external.google.gdata.util.common.base.PercentEscaper;
+import org.yaml.snakeyaml.external.com.google.gdata.util.common.base.Escaper;
+import org.yaml.snakeyaml.external.com.google.gdata.util.common.base.PercentEscaper;
public abstract class UriEncoder {
private static final CharsetDecoder UTF8Decoder = Charset.forName("UTF-8").newDecoder()
diff --git a/src/test/java/biz/source_code/base64Coder/Base64CoderTest.java b/src/test/java/biz/source_code/base64Coder/Base64CoderTest.java
index 5e6d28b..4aaf312 100644
--- a/src/test/java/biz/source_code/base64Coder/Base64CoderTest.java
+++ b/src/test/java/biz/source_code/base64Coder/Base64CoderTest.java
@@ -20,7 +20,7 @@
import junit.framework.TestCase;
-import org.yaml.snakeyaml_external.biz.base64Coder.Base64Coder;
+import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
public class Base64CoderTest extends TestCase {
diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java b/src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java
index 25e0c49..fd1e52c 100644
--- a/src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java
+++ b/src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java
@@ -28,10 +28,10 @@
import org.yaml.snakeyaml.YamlDocument;
import org.yaml.snakeyaml.constructor.AbstractConstruct;
import org.yaml.snakeyaml.constructor.Constructor;
+import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
import org.yaml.snakeyaml.nodes.Node;
import org.yaml.snakeyaml.nodes.ScalarNode;
import org.yaml.snakeyaml.nodes.Tag;
-import org.yaml.snakeyaml_external.biz.base64Coder.Base64Coder;
/**
* Example for issue 99
