[embjopr-commits] EMBJOPR SVN: r69 - in trunk: jbas5/src/main/webapp/WEB-INF and 1 other directory.

[embjopr-commits at lists.jboss.org]

Author: ips
Date: 2008-12-11 16:50:09 -0500 (Thu, 11 Dec 2008)
New Revision: 69

Modified:
   trunk/jbas4/src/main/webapp/WEB-INF/jboss-web.xml
   trunk/jbas5/src/main/webapp/WEB-INF/jboss-web.xml
Log:
fix DOCTYPE and element ordering in jboss-web.xml files


Modified: trunk/jbas4/src/main/webapp/WEB-INF/jboss-web.xml
===================================================================
--- trunk/jbas4/src/main/webapp/WEB-INF/jboss-web.xml	2008-12-09 21:06:12 UTC (rev 68)
+++ trunk/jbas4/src/main/webapp/WEB-INF/jboss-web.xml	2008-12-11 21:50:09 UTC (rev 69)
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 
-<!DOCTYPE jboss-web>
+<!DOCTYPE jboss-web PUBLIC 
+   "-//JBoss//DTD Web Application 4.2//EN"
+   "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd">
 
 <!--
   ~ Embedded Jopr Project
@@ -21,9 +23,8 @@
   ~ License along with this program; if not, write to the Free Software
   ~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
   -->
-<jboss-web>
-    <context-root>${contextRoot}</context-root>
-    
+<jboss-web>       
+
     <class-loading>
         <loader-repository>
             org.jboss.on:loader=embedded
@@ -32,4 +33,7 @@
     </class-loading>
 
     <security-domain>java:/jaas/jmx-console</security-domain>
+    
+    <context-root>admin-console</context-root>
+    
 </jboss-web>

Modified: trunk/jbas5/src/main/webapp/WEB-INF/jboss-web.xml
===================================================================
--- trunk/jbas5/src/main/webapp/WEB-INF/jboss-web.xml	2008-12-09 21:06:12 UTC (rev 68)
+++ trunk/jbas5/src/main/webapp/WEB-INF/jboss-web.xml	2008-12-11 21:50:09 UTC (rev 69)
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 
-<!DOCTYPE jboss-web>
+<!DOCTYPE jboss-web PUBLIC
+   "-//JBoss//DTD Web Application 5.0//EN"
+   "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd">
 
 <!--
   ~ Embedded Jopr Project
@@ -21,9 +23,8 @@
   ~ License along with this program; if not, write to the Free Software
   ~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
   -->
-<jboss-web>
-    <context-root>${contextRoot}</context-root>
-    
+<jboss-web>       
+
     <class-loading>
         <loader-repository>
             org.jboss.on:loader=embedded
@@ -32,4 +33,7 @@
     </class-loading>
 
     <security-domain>java:/jaas/jmx-console</security-domain>
+    
+    <context-root>admin-console</context-root>
+    
 </jboss-web>