maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snic...@apache.org
Subject svn commit: r682486 - in /maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects: project-031/expected-META-INF/ project-032/expected-META-INF/ project-033/expected-META-INF/ project-034/expected-META-INF/ project-036/expected-META-INF/ proje...
Date Mon, 04 Aug 2008 20:08:57 GMT
Author: snicoll
Date: Mon Aug  4 13:08:56 2008
New Revision: 682486

URL: http://svn.apache.org/viewvc?rev=682486&view=rev
Log:
Fixed test failure. Workaround for now, xml unit should be configured to ignore the elements
order.

Modified:
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-031/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-032/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-033/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-033/expected-META-INF/jboss-app.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-034/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-036/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-039/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-041/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-042/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-042/expected-META-INF/jboss-app.xml

Modified: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-031/expected-META-INF/application.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-031/expected-META-INF/application.xml?rev=682486&r1=682485&r2=682486&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-031/expected-META-INF/application.xml
(original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-031/expected-META-INF/application.xml
Mon Aug  4 13:08:56 2008
@@ -24,9 +24,9 @@
 <application>
   <display-name>maven-ear-plugin-test-project-031</display-name>
   <module>
-    <ejb>ejb-sample-two-1.0.jar</ejb>
+    <ejb>ejb-sample-one-1.0.jar</ejb>
   </module>
   <module>
-    <ejb>ejb-sample-one-1.0.jar</ejb>
+    <ejb>ejb-sample-two-1.0.jar</ejb>
   </module>
-</application>
+</application>
\ No newline at end of file

Modified: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-032/expected-META-INF/application.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-032/expected-META-INF/application.xml?rev=682486&r1=682485&r2=682486&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-032/expected-META-INF/application.xml
(original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-032/expected-META-INF/application.xml
Mon Aug  4 13:08:56 2008
@@ -24,9 +24,9 @@
 <application>
   <display-name>maven-ear-plugin-test-project-032</display-name>
   <module>
-    <ejb>ejb-sample-two-1.0.jar</ejb>
+    <ejb>ejb-sample-one-1.0.jar</ejb>
   </module>
   <module>
-    <ejb>ejb-sample-one-1.0.jar</ejb>
+    <ejb>ejb-sample-two-1.0.jar</ejb>
   </module>
-</application>
+</application>
\ No newline at end of file

Modified: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-033/expected-META-INF/application.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-033/expected-META-INF/application.xml?rev=682486&r1=682485&r2=682486&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-033/expected-META-INF/application.xml
(original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-033/expected-META-INF/application.xml
Mon Aug  4 13:08:56 2008
@@ -24,9 +24,9 @@
 <application>
   <display-name>maven-ear-plugin-test-project-033</display-name>
   <module>
-    <ejb>ejb-sample-two-1.0.jar</ejb>
+    <ejb>ejb-sample-one-1.0.jar</ejb>
   </module>
   <module>
-    <ejb>ejb-sample-one-1.0.jar</ejb>
+    <ejb>ejb-sample-two-1.0.jar</ejb>
   </module>
-</application>
+</application>
\ No newline at end of file

Modified: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-033/expected-META-INF/jboss-app.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-033/expected-META-INF/jboss-app.xml?rev=682486&r1=682485&r2=682486&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-033/expected-META-INF/jboss-app.xml
(original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-033/expected-META-INF/jboss-app.xml
Mon Aug  4 13:08:56 2008
@@ -23,9 +23,9 @@
 	"http://www.jboss.org/j2ee/dtd/jboss-app_4_0.dtd">
 <jboss-app>
   <module>
-    <har>har-sample-one-1.0.har</har>
+    <service>sar-sample-one-1.0.sar</service>
   </module>
   <module>
-    <service>sar-sample-one-1.0.sar</service>
+    <har>har-sample-one-1.0.har</har>
   </module>
 </jboss-app>
\ No newline at end of file

Modified: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-034/expected-META-INF/application.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-034/expected-META-INF/application.xml?rev=682486&r1=682485&r2=682486&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-034/expected-META-INF/application.xml
(original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-034/expected-META-INF/application.xml
Mon Aug  4 13:08:56 2008
@@ -24,10 +24,10 @@
 <application>
   <display-name>maven-ear-plugin-test-project-034</display-name>
   <module>
-    <ejb>ejb-sample-two-1.0.jar</ejb>
+    <ejb>ejb-sample-one-1.0.jar</ejb>
   </module>
   <module>
-    <ejb>ejb-sample-one-1.0.jar</ejb>
+    <ejb>ejb-sample-two-1.0.jar</ejb>
   </module>
   <security-role id="SecurityRole_1234">
     <role-name>manager</role-name>

Modified: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-036/expected-META-INF/application.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-036/expected-META-INF/application.xml?rev=682486&r1=682485&r2=682486&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-036/expected-META-INF/application.xml
(original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-036/expected-META-INF/application.xml
Mon Aug  4 13:08:56 2008
@@ -30,12 +30,12 @@
     <ejb>foo/eartest-ejb-sample-one-1.0.jar</ejb>
   </module>
   <module>
-    <ejb>com-foo-bar-ejb-sample-one-1.0.jar</ejb>
+    <ejb>eartest-ejb-sample-two-1.0.jar</ejb>
   </module>
   <module>
-    <ejb>com-foo-bar-ejb-sample-two-1.0.jar</ejb>
+    <ejb>com-foo-bar-ejb-sample-one-1.0.jar</ejb>
   </module>
   <module>
-    <ejb>eartest-ejb-sample-two-1.0.jar</ejb>
+    <ejb>com-foo-bar-ejb-sample-two-1.0.jar</ejb>
   </module>
 </application>
\ No newline at end of file

Modified: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-039/expected-META-INF/application.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-039/expected-META-INF/application.xml?rev=682486&r1=682485&r2=682486&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-039/expected-META-INF/application.xml
(original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-039/expected-META-INF/application.xml
Mon Aug  4 13:08:56 2008
@@ -24,9 +24,9 @@
 <application>
   <display-name>maven-ear-plugin-test-project-039</display-name>
   <module>
-    <ejb>ejb-sample-two-1.0.jar</ejb>
+    <ejb>ejb-sample-one-1.0.jar</ejb>
   </module>
   <module>
-    <ejb>ejb-sample-one-1.0.jar</ejb>
+    <ejb>ejb-sample-two-1.0.jar</ejb>
   </module>
-</application>
+</application>
\ No newline at end of file

Modified: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-041/expected-META-INF/application.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-041/expected-META-INF/application.xml?rev=682486&r1=682485&r2=682486&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-041/expected-META-INF/application.xml
(original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-041/expected-META-INF/application.xml
Mon Aug  4 13:08:56 2008
@@ -19,14 +19,14 @@
 -->
 
 <!DOCTYPE application PUBLIC
-    "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
-    "http://java.sun.com/dtd/application_1_3.dtd">
+	"-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+	"http://java.sun.com/dtd/application_1_3.dtd">
 <application>
   <display-name>maven-ear-plugin-test-project-041</display-name>
   <module>
-    <ejb>ejb-sample-two-1.0.jar</ejb>
+    <ejb>ejb-sample-one-1.0.jar</ejb>
   </module>
   <module>
-    <ejb>ejb-sample-one-1.0.jar</ejb>
+    <ejb>ejb-sample-two-1.0.jar</ejb>
   </module>
-</application>
+</application>
\ No newline at end of file

Modified: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-042/expected-META-INF/application.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-042/expected-META-INF/application.xml?rev=682486&r1=682485&r2=682486&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-042/expected-META-INF/application.xml
(original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-042/expected-META-INF/application.xml
Mon Aug  4 13:08:56 2008
@@ -19,14 +19,14 @@
 -->
 
 <!DOCTYPE application PUBLIC
-    "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
-    "http://java.sun.com/dtd/application_1_3.dtd">
+	"-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+	"http://java.sun.com/dtd/application_1_3.dtd">
 <application>
   <display-name>maven-ear-plugin-test-project-042</display-name>
   <module>
-    <ejb>ejb-sample-two-1.0.jar</ejb>
+    <ejb>ejb-sample-one-1.0.jar</ejb>
   </module>
   <module>
-    <ejb>ejb-sample-one-1.0.jar</ejb>
+    <ejb>ejb-sample-two-1.0.jar</ejb>
   </module>
-</application>
+</application>
\ No newline at end of file

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=682486&r1=682485&r2=682486&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
Mon Aug  4 13:08:56 2008
@@ -19,10 +19,6 @@
 -->
 
 <!DOCTYPE jboss-app PUBLIC
-    "-//JBoss//DTD J2EE Application 1.4//EN"
-    "http://www.jboss.org/j2ee/dtd/jboss-app_4_2.dtd">
-<jboss-app>
-  <module>
-    <service>my-ds.xml</service>
-  </module>
-</jboss-app>
\ No newline at end of file
+	"-//JBoss//DTD J2EE Application 1.4//EN"
+	"http://www.jboss.org/j2ee/dtd/jboss-app_4_2.dtd">
+<jboss-app/>
\ No newline at end of file



Mime
View raw message