[jboss-cvs] JBossAS SVN: r112266 - branches/JBPAPP_5_1/build.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Sep 27 15:57:43 EDT 2011 

Author: mbenitez
Date: 2011-09-27 15:57:43 -0400 (Tue, 27 Sep 2011)
New Revision: 112266

Modified:
   branches/JBPAPP_5_1/build/build.properties
   branches/JBPAPP_5_1/build/jbossas-5-enableauth.patch
   branches/JBPAPP_5_1/build/jbossas-5-ewp.patch
   branches/JBPAPP_5_1/build/jbossas-5.patch
Log:
Merge changes made to patches in 5.1.2 ER1 tag (rev. r112227, r112229, r112233)

Modified: branches/JBPAPP_5_1/build/build.properties
===================================================================
--- branches/JBPAPP_5_1/build/build.properties	2011-09-27 12:15:29 UTC (rev 112265)
+++ branches/JBPAPP_5_1/build/build.properties	2011-09-27 19:57:43 UTC (rev 112266)
@@ -4,5 +4,5 @@
 version.minor=1
 version.revision=2
 version.tag=Branch
-version.name=EAP
+version.name=EWP
 

Modified: branches/JBPAPP_5_1/build/jbossas-5-enableauth.patch
===================================================================
--- branches/JBPAPP_5_1/build/jbossas-5-enableauth.patch	2011-09-27 12:15:29 UTC (rev 112265)
+++ branches/JBPAPP_5_1/build/jbossas-5-enableauth.patch	2011-09-27 19:57:43 UTC (rev 112266)
@@ -15,9 +15,9 @@
 +         <url-pattern>/JNDIFactory/*</url-pattern>
 +         <url-pattern>/EJBInvokerServlet/*</url-pattern>
 +         <url-pattern>/JMXInvokerServlet/*</url-pattern>
-          <http-method>GET</http-method>
-          <http-method>POST</http-method>
        </web-resource-collection>
+       <auth-constraint>
+          <role-name>HttpInvoker</role-name>
 diff -Naur ./server/production/deploy/jmx-console.war/WEB-INF/jboss-web.xml ./server/production/deploy/jmx-console.war/WEB-INF/jboss-web.xml
 --- ./server/production/deploy/jmx-console.war/WEB-INF/jboss-web.xml	2009-06-30 09:32:55.000000000 -0400
 +++ ./server/production/deploy/jmx-console.war/WEB-INF/jboss-web.xml	2009-06-30 10:01:01.000000000 -0400
@@ -113,9 +113,9 @@
 +         <url-pattern>/JNDIFactory/*</url-pattern>
 +         <url-pattern>/EJBInvokerServlet/*</url-pattern>
 +         <url-pattern>/JMXInvokerServlet/*</url-pattern>
-          <http-method>GET</http-method>
-          <http-method>POST</http-method>
        </web-resource-collection>
+       <auth-constraint>
+          <role-name>HttpInvoker</role-name>
 diff -Naur ./server/all/deploy/jmx-console.war/WEB-INF/jboss-web.xml ./server/all/deploy/jmx-console.war/WEB-INF/jboss-web.xml
 --- ./server/all/deploy/jmx-console.war/WEB-INF/jboss-web.xml	2009-06-30 09:32:55.000000000 -0400
 +++ ./server/all/deploy/jmx-console.war/WEB-INF/jboss-web.xml	2009-06-30 10:01:01.000000000 -0400
@@ -711,9 +711,9 @@
 +         <url-pattern>/JNDIFactory/*</url-pattern>
 +         <url-pattern>/EJBInvokerServlet/*</url-pattern>
 +         <url-pattern>/JMXInvokerServlet/*</url-pattern>
-          <http-method>GET</http-method>
-          <http-method>POST</http-method>
        </web-resource-collection>
+       <auth-constraint>
+          <role-name>HttpInvoker</role-name>
 diff -Naur server/all/deploy/jbossws.sar/jbossws-management.war/WEB-INF/jboss-web.xml server/all/deploy/jbossws.sar/jbossws-management.war/WEB-INF/jboss-web.xml
 --- server/all/deploy/jbossws.sar/jbossws-management.war/WEB-INF/jboss-web.xml	2009-08-27 15:00:51.000000000 -0400
 +++ server/all/deploy/jbossws.sar/jbossws-management.war/WEB-INF/jboss-web.xml	2009-08-27 15:03:30.000000000 -0400

Modified: branches/JBPAPP_5_1/build/jbossas-5-ewp.patch
===================================================================
--- branches/JBPAPP_5_1/build/jbossas-5-ewp.patch	2011-09-27 12:15:29 UTC (rev 112265)
+++ branches/JBPAPP_5_1/build/jbossas-5-ewp.patch	2011-09-27 19:57:43 UTC (rev 112266)
@@ -38,7 +38,7 @@
  #
 -product.name=JBoss EAP Admin Console
 +product.name=JBoss EWP Admin Console
- product.version=1.3.4.SP4
+ product.version=1.3.4.SP5
 -product.buildNumber=${buildNumber}
 +product.buildNumber=999
  product.copyright=&copy; 2002-2010 Red Hat Middleware, LLC.  All rights reserved.  JBoss is a registered trademark of Red Hat, Inc.

Modified: branches/JBPAPP_5_1/build/jbossas-5.patch
===================================================================
--- branches/JBPAPP_5_1/build/jbossas-5.patch	2011-09-27 12:15:29 UTC (rev 112265)
+++ branches/JBPAPP_5_1/build/jbossas-5.patch	2011-09-27 19:57:43 UTC (rev 112266)
@@ -1,24 +1,26 @@
 diff -Naur server/standard/deploy/ROOT.war/index.html server/standard/deploy/ROOT.war/index.html
 --- server/standard/deploy/ROOT.war/index.html	2009-08-18 21:53:40.000000000 -0400
 +++ server/standard/deploy/ROOT.war/index.html	2009-08-19 08:48:47.000000000 -0400
-@@ -17,9 +17,7 @@
+@@ -17,10 +17,8 @@
  
  <h3>Manage this JBoss EAP Instance</h3>
     <ul>      
 -      <li><a href="/admin-console/">Admin Console</a></li>
        <li><a href="/jmx-console/">JMX Console</a></li>
 -      <li><a href="/web-console/">JBoss Web Console</a></li>
+       <li><a href="/jbossws/">JBoss WS Console</a></li>
        <li><a href="/status">Tomcat status</a>
            <a href="/status?full=true">(full)</a>
            <a href="/status?XML=true">(XML)</a></li>
 diff -Naur server/web/deploy/ROOT.war/index.html server/web/deploy/ROOT.war/index.html
 --- server/web/deploy/ROOT.war/index.html	2009-08-18 21:53:43.000000000 -0400
 +++ server/web/deploy/ROOT.war/index.html	2009-08-19 08:07:35.000000000 -0400
-@@ -19,7 +19,6 @@
+@@ -19,8 +19,7 @@
     <ul>      
        <li><a href="/admin-console/">Admin Console</a></li>
        <li><a href="/jmx-console/">JMX Console</a></li>
 -      <li><a href="/web-console/">JBoss Web Console</a></li>
+       <li><a href="/jbossws/">JBoss WS Console</a></li>
        <li><a href="/status">Tomcat status</a>
            <a href="/status?full=true">(full)</a>
            <a href="/status?XML=true">(XML)</a></li>

More information about the jboss-cvs-commits mailing list