Author: snicoll
Date: Tue Feb 28 10:37:58 2012
New Revision: 1294559
URL: http://svn.apache.org/viewvc?rev=1294559&view=rev
Log:
MEAR-147: Fixed doctype declaration for JBoss 4.2. Patch submitted by Andreas
Wurzer
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossAppXmlWriter.java
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-041/expected-META-INF/jboss-app.xml
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-042/expected-META-INF/jboss-app.xml
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-049/expected-META-INF/jboss-app.xml
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-057/expected-META-INF/jboss-app.xml
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossAppXmlWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossAppXmlWriter.java?rev=1294559&r1=1294558&r2=1294559&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossAppXmlWriter.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossAppXmlWriter.java
Tue Feb 28 10:37:58 2012
@@ -42,7 +42,7 @@ final class JbossAppXmlWriter
public static final String DOCTYPE_4 = "jboss-app PUBLIC\n" +
"\t\"-//JBoss//DTD J2EE Application 1.4//EN\"\n"
+ "\t\"http://www.jboss.org/j2ee/dtd/jboss-app_4_0.dtd\"";;
- public static final String DOCTYPE_4_2 = "jboss-app PUBLIC\n" +
"\t\"-//JBoss//DTD J2EE Application 1.4//EN\"\n"
+ public static final String DOCTYPE_4_2 = "jboss-app PUBLIC\n" +
"\t\"-//JBoss//DTD J2EE Application 4.2//EN\"\n"
+ "\t\"http://www.jboss.org/j2ee/dtd/jboss-app_4_2.dtd\"";;
public static final String DOCTYPE_5 = "jboss-app PUBLIC\n" +
"\t\"-//JBoss//DTD Java EE Application 5.0//EN\"\n"
Modified:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-041/expected-META-INF/jboss-app.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-041/expected-META-INF/jboss-app.xml?rev=1294559&r1=1294558&r2=1294559&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-041/expected-META-INF/jboss-app.xml
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-041/expected-META-INF/jboss-app.xml
Tue Feb 28 10:37:58 2012
@@ -19,7 +19,7 @@ under the License.
-->
<!DOCTYPE jboss-app PUBLIC
- "-//JBoss//DTD J2EE Application 1.4//EN"
+ "-//JBoss//DTD J2EE Application 4.2//EN"
"http://www.jboss.org/j2ee/dtd/jboss-app_4_2.dtd";>
<jboss-app>
<module-order>strict</module-order>
Modified:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-042/expected-META-INF/jboss-app.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-042/expected-META-INF/jboss-app.xml?rev=1294559&r1=1294558&r2=1294559&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-042/expected-META-INF/jboss-app.xml
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-042/expected-META-INF/jboss-app.xml
Tue Feb 28 10:37:58 2012
@@ -19,7 +19,7 @@ under the License.
-->
<!DOCTYPE jboss-app PUBLIC
- "-//JBoss//DTD J2EE Application 1.4//EN"
+ "-//JBoss//DTD J2EE Application 4.2//EN"
"http://www.jboss.org/j2ee/dtd/jboss-app_4_2.dtd";>
<jboss-app>
<module>
Modified:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-049/expected-META-INF/jboss-app.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-049/expected-META-INF/jboss-app.xml?rev=1294559&r1=1294558&r2=1294559&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-049/expected-META-INF/jboss-app.xml
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-049/expected-META-INF/jboss-app.xml
Tue Feb 28 10:37:58 2012
@@ -19,7 +19,7 @@ under the License.
-->
<!DOCTYPE jboss-app PUBLIC
- "-//JBoss//DTD J2EE Application 1.4//EN"
+ "-//JBoss//DTD J2EE Application 4.2//EN"
"http://www.jboss.org/j2ee/dtd/jboss-app_4_2.dtd";>
<jboss-app>
<library-directory>/APP-INF/lib</library-directory>
Modified:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-057/expected-META-INF/jboss-app.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-057/expected-META-INF/jboss-app.xml?rev=1294559&r1=1294558&r2=1294559&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-057/expected-META-INF/jboss-app.xml
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-057/expected-META-INF/jboss-app.xml
Tue Feb 28 10:37:58 2012
@@ -18,7 +18,7 @@ specific language governing permissions
under the License.
-->
<!DOCTYPE jboss-app PUBLIC
- "-//JBoss//DTD J2EE Application 1.4//EN"
+ "-//JBoss//DTD J2EE Application 4.2//EN"
"http://www.jboss.org/j2ee/dtd/jboss-app_4_2.dtd";>
<jboss-app>
<module-order>strict</module-order>
