|
 |
6fbf3cb |
diff -Nru maven-jaxb2-plugin-0.13.0/plugin/src/main/java/org/jvnet/mjiip/v_2/OptionsFactory.java maven-jaxb2-plugin-0.13.0.enconding/plugin/src/main/java/org/jvnet/mjiip/v_2/OptionsFactory.java
|
|
|
6fbf3cb |
--- maven-jaxb2-plugin-0.13.0/plugin/src/main/java/org/jvnet/mjiip/v_2/OptionsFactory.java 2015-08-30 11:39:57.000000000 +0200
|
|
|
6fbf3cb |
+++ maven-jaxb2-plugin-0.13.0.enconding/plugin/src/main/java/org/jvnet/mjiip/v_2/OptionsFactory.java 2015-10-26 07:13:24.427916727 +0100
|
|
|
6fbf3cb |
@@ -33,12 +33,6 @@
|
|
|
6fbf3cb |
options.target = createSpecVersion(optionsConfiguration
|
|
|
6fbf3cb |
.getSpecVersion());
|
|
|
6fbf3cb |
|
|
|
6fbf3cb |
- final String encoding = optionsConfiguration.getEncoding();
|
|
|
6fbf3cb |
-
|
|
|
6fbf3cb |
- if (encoding != null) {
|
|
|
6fbf3cb |
- options.encoding = createEncoding(encoding);
|
|
|
6fbf3cb |
- }
|
|
|
6fbf3cb |
-
|
|
|
6fbf3cb |
options.setSchemaLanguage(createLanguage(optionsConfiguration
|
|
|
6fbf3cb |
.getSchemaLanguage()));
|
|
|
6fbf3cb |
|
|
|
6fbf3cb |
@@ -105,26 +99,6 @@
|
|
|
6fbf3cb |
}
|
|
|
6fbf3cb |
|
|
|
6fbf3cb |
}
|
|
|
6fbf3cb |
-
|
|
|
6fbf3cb |
- private String createEncoding(String encoding)
|
|
|
6fbf3cb |
- throws MojoExecutionException {
|
|
|
6fbf3cb |
- if (encoding == null) {
|
|
|
6fbf3cb |
- return null;
|
|
|
6fbf3cb |
- }
|
|
|
6fbf3cb |
- try {
|
|
|
6fbf3cb |
- if (!Charset.isSupported(encoding)) {
|
|
|
6fbf3cb |
- throw new MojoExecutionException(
|
|
|
6fbf3cb |
-
|
|
|
6fbf3cb |
- MessageFormat.format("Unsupported encoding [{0}].", encoding));
|
|
|
6fbf3cb |
- }
|
|
|
6fbf3cb |
- return encoding;
|
|
|
6fbf3cb |
- } catch (IllegalCharsetNameException icne) {
|
|
|
6fbf3cb |
- throw new MojoExecutionException(
|
|
|
6fbf3cb |
-
|
|
|
6fbf3cb |
- MessageFormat.format("Unsupported encoding [{0}].", encoding));
|
|
|
6fbf3cb |
- }
|
|
|
6fbf3cb |
-
|
|
|
6fbf3cb |
- }
|
|
|
6fbf3cb |
|
|
|
6fbf3cb |
private Language createLanguage(String schemaLanguage)
|
|
|
6fbf3cb |
throws MojoExecutionException {
|
|
|
6fbf3cb |
diff -Nru maven-jaxb2-plugin-0.13.0/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java maven-jaxb2-plugin-0.13.0.enconding/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java
|
|
|
6fbf3cb |
--- maven-jaxb2-plugin-0.13.0/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java 2015-08-30 11:39:57.000000000 +0200
|
|
|
6fbf3cb |
+++ maven-jaxb2-plugin-0.13.0.enconding/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java 2015-10-26 07:13:24.428916678 +0100
|
|
|
6fbf3cb |
@@ -32,12 +32,6 @@
|
|
|
6fbf3cb |
|
|
|
6fbf3cb |
options.target = SpecVersion.V2_2;
|
|
|
6fbf3cb |
|
|
|
6fbf3cb |
- final String encoding = optionsConfiguration.getEncoding();
|
|
|
6fbf3cb |
-
|
|
|
6fbf3cb |
- if (encoding != null) {
|
|
|
6fbf3cb |
- options.encoding = createEncoding(encoding);
|
|
|
6fbf3cb |
- }
|
|
|
6fbf3cb |
-
|
|
|
6fbf3cb |
options.setSchemaLanguage(createLanguage(optionsConfiguration
|
|
|
6fbf3cb |
.getSchemaLanguage()));
|
|
|
6fbf3cb |
|
|
|
6fbf3cb |
@@ -94,24 +88,6 @@
|
|
|
6fbf3cb |
return options;
|
|
|
6fbf3cb |
}
|
|
|
6fbf3cb |
|
|
|
6fbf3cb |
- private String createEncoding(String encoding)
|
|
|
6fbf3cb |
- throws MojoExecutionException {
|
|
|
6fbf3cb |
- if (encoding == null) {
|
|
|
6fbf3cb |
- return null;
|
|
|
6fbf3cb |
- }
|
|
|
6fbf3cb |
- try {
|
|
|
6fbf3cb |
- if (!Charset.isSupported(encoding)) {
|
|
|
6fbf3cb |
- throw new MojoExecutionException(MessageFormat.format(
|
|
|
6fbf3cb |
- "Unsupported encoding [{0}].", encoding));
|
|
|
6fbf3cb |
- }
|
|
|
6fbf3cb |
- return encoding;
|
|
|
6fbf3cb |
- } catch (IllegalCharsetNameException icne) {
|
|
|
6fbf3cb |
- throw new MojoExecutionException(MessageFormat.format(
|
|
|
6fbf3cb |
- "Unsupported encoding [{0}].", encoding));
|
|
|
6fbf3cb |
- }
|
|
|
6fbf3cb |
-
|
|
|
6fbf3cb |
- }
|
|
|
6fbf3cb |
-
|
|
|
6fbf3cb |
private Language createLanguage(String schemaLanguage)
|
|
|
6fbf3cb |
throws MojoExecutionException {
|
|
|
6fbf3cb |
if (StringUtils.isEmpty(schemaLanguage)) {
|