[jboss-cvs] JBossAS SVN: r91304 - branches/JBPAPP_5_0/build.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jul 15 12:11:27 EDT 2009
Author: jason.greene at jboss.com
Date: 2009-07-15 12:11:26 -0400 (Wed, 15 Jul 2009)
New Revision: 91304
Modified:
branches/JBPAPP_5_0/build/build.xml
branches/JBPAPP_5_0/build/jbossas-5-disableauth.patch
branches/JBPAPP_5_0/build/jbossas-5-enableauth.patch
Log:
Rename EWP to web
Modified: branches/JBPAPP_5_0/build/build.xml
===================================================================
--- branches/JBPAPP_5_0/build/build.xml 2009-07-15 16:06:36 UTC (rev 91303)
+++ branches/JBPAPP_5_0/build/build.xml 2009-07-15 16:11:26 UTC (rev 91304)
@@ -293,11 +293,11 @@
<property name="install.minimal.deployers" value="${install.minimal}/deployers"/>
<property name="install.minimal.conf" value="${install.minimal}/conf"/>
- <property name="install.ewp" value="${install.server}/ewp"/>
- <property name="install.ewp.lib" value="${install.ewp}/lib"/>
- <property name="install.ewp.deploy" value="${install.ewp}/deploy"/>
- <property name="install.ewp.deployers" value="${install.ewp}/deployers"/>
- <property name="install.ewp.conf" value="${install.ewp}/conf"/>
+ <property name="install.web" value="${install.server}/web"/>
+ <property name="install.web.lib" value="${install.web}/lib"/>
+ <property name="install.web.deploy" value="${install.web}/deploy"/>
+ <property name="install.web.deployers" value="${install.web}/deployers"/>
+ <property name="install.web.conf" value="${install.web}/conf"/>
<property name="install.standard" value="${install.server}/standard"/>
<property name="install.standard.lib" value="${install.standard}/lib"/>
@@ -943,8 +943,8 @@
</fileset>
</copy>
- <!-- Build ewp config manually -->
- <copy todir="${install.ewp}">
+ <!-- Build web config manually -->
+ <copy todir="${install.web}">
<fileset dir="${install.default}">
<include name="conf/**"/>
<include name="deploy/**"/>
Modified: branches/JBPAPP_5_0/build/jbossas-5-disableauth.patch
===================================================================
--- branches/JBPAPP_5_0/build/jbossas-5-disableauth.patch 2009-07-15 16:06:36 UTC (rev 91303)
+++ branches/JBPAPP_5_0/build/jbossas-5-disableauth.patch 2009-07-15 16:11:26 UTC (rev 91304)
@@ -386,9 +386,9 @@
<!-- Interceptor that deals with non-serializable results -->
<interceptor code="org.jboss.jmx.connector.invoker.SerializableInterceptor"
policyClass="StripModelMBeanInfoPolicy"/>
-diff -Naur --exclude='*.class' --exclude='*.jar' ./server/ewp/conf/login-config.xml ./server/ewp/conf/login-config.xml
---- ./server/ewp/conf/login-config.xml 2009-07-01 13:36:17.000000000 -0400
-+++ ./server/ewp/conf/login-config.xml 2009-07-01 13:38:33.000000000 -0400
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/web/conf/login-config.xml ./server/web/conf/login-config.xml
+--- ./server/web/conf/login-config.xml 2009-07-01 13:36:17.000000000 -0400
++++ ./server/web/conf/login-config.xml 2009-07-01 13:38:33.000000000 -0400
@@ -85,8 +85,8 @@
<authentication>
<login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
@@ -400,15 +400,15 @@
</login-module>
</authentication>
</application-policy>
-diff -Naur --exclude='*.class' --exclude='*.jar' ./server/ewp/conf/props/web-console-roles.properties ./server/ewp/conf/props/web-console-roles.properties
---- ./server/ewp/conf/props/web-console-roles.properties 2009-07-01 13:36:17.000000000 -0400
-+++ ./server/ewp/conf/props/web-console-roles.properties 1969-12-31 19:00:00.000000000 -0500
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/web/conf/props/web-console-roles.properties ./server/web/conf/props/web-console-roles.properties
+--- ./server/web/conf/props/web-console-roles.properties 2009-07-01 13:36:17.000000000 -0400
++++ ./server/web/conf/props/web-console-roles.properties 1969-12-31 19:00:00.000000000 -0500
@@ -1,2 +0,0 @@
-# A sample roles.properties file for use with the UsersRolesLoginModule
-admin=JBossAdmin,HttpInvoker
-diff -Naur --exclude='*.class' --exclude='*.jar' ./server/ewp/deploy/jmx-console.war/WEB-INF/jboss-web.xml ./server/ewp/deploy/jmx-console.war/WEB-INF/jboss-web.xml
---- ./server/ewp/deploy/jmx-console.war/WEB-INF/jboss-web.xml 2009-07-01 13:36:17.000000000 -0400
-+++ ./server/ewp/deploy/jmx-console.war/WEB-INF/jboss-web.xml 2009-07-01 13:38:33.000000000 -0400
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/web/deploy/jmx-console.war/WEB-INF/jboss-web.xml ./server/web/deploy/jmx-console.war/WEB-INF/jboss-web.xml
+--- ./server/web/deploy/jmx-console.war/WEB-INF/jboss-web.xml 2009-07-01 13:36:17.000000000 -0400
++++ ./server/web/deploy/jmx-console.war/WEB-INF/jboss-web.xml 2009-07-01 13:38:33.000000000 -0400
@@ -6,6 +6,6 @@
<!-- Uncomment the security-domain to enable security. You will
need to edit the htmladaptor login configuration to setup the
@@ -417,9 +417,9 @@
<security-domain>java:/jaas/jmx-console</security-domain>
+ -->
</jboss-web>
-diff -Naur --exclude='*.class' --exclude='*.jar' ./server/ewp/deploy/jmx-console.war/WEB-INF/web.xml ./server/ewp/deploy/jmx-console.war/WEB-INF/web.xml
---- ./server/ewp/deploy/jmx-console.war/WEB-INF/web.xml 2009-07-01 13:36:17.000000000 -0400
-+++ ./server/ewp/deploy/jmx-console.war/WEB-INF/web.xml 2009-07-01 13:38:33.000000000 -0400
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/web/deploy/jmx-console.war/WEB-INF/web.xml ./server/web/deploy/jmx-console.war/WEB-INF/web.xml
+--- ./server/web/deploy/jmx-console.war/WEB-INF/web.xml 2009-07-01 13:36:17.000000000 -0400
++++ ./server/web/deploy/jmx-console.war/WEB-INF/web.xml 2009-07-01 13:38:33.000000000 -0400
@@ -97,7 +97,6 @@
to users with the role JBossAdmin. Edit the roles to what you want and
uncomment the WEB-INF/jboss-web.xml/security-domain element to enable
@@ -436,9 +436,9 @@
<login-config>
<auth-method>BASIC</auth-method>
-diff -Naur --exclude='*.class' --exclude='*.jar' ./server/ewp/deploy/jmx-invoker-service.xml ./server/ewp/deploy/jmx-invoker-service.xml
---- ./server/ewp/deploy/jmx-invoker-service.xml 2009-07-01 13:36:17.000000000 -0400
-+++ ./server/ewp/deploy/jmx-invoker-service.xml 2009-07-01 13:38:33.000000000 -0400
+diff -Naur --exclude='*.class' --exclude='*.jar' ./server/web/deploy/jmx-invoker-service.xml ./server/web/deploy/jmx-invoker-service.xml
+--- ./server/web/deploy/jmx-invoker-service.xml 2009-07-01 13:36:17.000000000 -0400
++++ ./server/web/deploy/jmx-invoker-service.xml 2009-07-01 13:38:33.000000000 -0400
@@ -111,9 +111,10 @@
<return-type>java.lang.Object</return-type>
<descriptors>
@@ -476,9 +476,9 @@
@@ -1,2 +0,0 @@
-# A sample users.properties file for use with the UsersRolesLoginModule
-# admin=admin
-diff -Naur ./server/ewp/conf/props/web-console-users.properties ./server/ewp/conf/props/web-console-users.properties
---- ./server/ewp/conf/props/web-console-users.properties 2009-07-02 15:16:54.000000000 -0400
-+++ ./server/ewp/conf/props/web-console-users.properties 1969-12-31 19:00:00.000000000 -0500
+diff -Naur ./server/web/conf/props/web-console-users.properties ./server/web/conf/props/web-console-users.properties
+--- ./server/web/conf/props/web-console-users.properties 2009-07-02 15:16:54.000000000 -0400
++++ ./server/web/conf/props/web-console-users.properties 1969-12-31 19:00:00.000000000 -0500
@@ -1,2 +0,0 @@
-# A sample users.properties file for use with the UsersRolesLoginModule
-# admin=admin
Modified: branches/JBPAPP_5_0/build/jbossas-5-enableauth.patch
===================================================================
--- branches/JBPAPP_5_0/build/jbossas-5-enableauth.patch 2009-07-15 16:06:36 UTC (rev 91303)
+++ branches/JBPAPP_5_0/build/jbossas-5-enableauth.patch 2009-07-15 16:11:26 UTC (rev 91304)
@@ -419,9 +419,9 @@
<!-- Interceptor that deals with non-serializable results -->
<interceptor code="org.jboss.jmx.connector.invoker.SerializableInterceptor"
policyClass="StripModelMBeanInfoPolicy"/>
-diff -Naur ./server/ewp/conf/login-config.xml ./server/ewp/conf/login-config.xml
---- ./server/ewp/conf/login-config.xml 2009-06-30 09:32:56.000000000 -0400
-+++ ./server/ewp/conf/login-config.xml 2009-06-30 10:11:15.000000000 -0400
+diff -Naur ./server/web/conf/login-config.xml ./server/web/conf/login-config.xml
+--- ./server/web/conf/login-config.xml 2009-06-30 09:32:56.000000000 -0400
++++ ./server/web/conf/login-config.xml 2009-06-30 10:11:15.000000000 -0400
@@ -85,8 +85,8 @@
<authentication>
<login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
@@ -433,21 +433,21 @@
</login-module>
</authentication>
</application-policy>
-diff -Naur ./server/ewp/conf/props/web-console-roles.properties ./server/ewp/conf/props/web-console-roles.properties
---- ./server/ewp/conf/props/web-console-roles.properties 1969-12-31 19:00:00.000000000 -0500
-+++ ./server/ewp/conf/props/web-console-roles.properties 2009-06-30 10:54:23.000000000 -0400
+diff -Naur ./server/web/conf/props/web-console-roles.properties ./server/web/conf/props/web-console-roles.properties
+--- ./server/web/conf/props/web-console-roles.properties 1969-12-31 19:00:00.000000000 -0500
++++ ./server/web/conf/props/web-console-roles.properties 2009-06-30 10:54:23.000000000 -0400
@@ -0,0 +1,2 @@
+# A sample roles.properties file for use with the UsersRolesLoginModule
+admin=JBossAdmin,HttpInvoker
-diff -Naur ./server/ewp/conf/props/web-console-users.properties ./server/ewp/conf/props/web-console-users.properties
---- ./server/ewp/conf/props/web-console-users.properties 1969-12-31 19:00:00.000000000 -0500
-+++ ./server/ewp/conf/props/web-console-users.properties 2009-06-30 10:19:36.000000000 -0400
+diff -Naur ./server/web/conf/props/web-console-users.properties ./server/web/conf/props/web-console-users.properties
+--- ./server/web/conf/props/web-console-users.properties 1969-12-31 19:00:00.000000000 -0500
++++ ./server/web/conf/props/web-console-users.properties 2009-06-30 10:19:36.000000000 -0400
@@ -0,0 +1,2 @@
+# A sample users.properties file for use with the UsersRolesLoginModule
+# admin=admin
-diff -Naur ./server/ewp/deploy/jmx-console.war/WEB-INF/jboss-web.xml ./server/ewp/deploy/jmx-console.war/WEB-INF/jboss-web.xml
---- ./server/ewp/deploy/jmx-console.war/WEB-INF/jboss-web.xml 2009-06-30 09:32:55.000000000 -0400
-+++ ./server/ewp/deploy/jmx-console.war/WEB-INF/jboss-web.xml 2009-06-30 10:01:01.000000000 -0400
+diff -Naur ./server/web/deploy/jmx-console.war/WEB-INF/jboss-web.xml ./server/web/deploy/jmx-console.war/WEB-INF/jboss-web.xml
+--- ./server/web/deploy/jmx-console.war/WEB-INF/jboss-web.xml 2009-06-30 09:32:55.000000000 -0400
++++ ./server/web/deploy/jmx-console.war/WEB-INF/jboss-web.xml 2009-06-30 10:01:01.000000000 -0400
@@ -6,6 +6,6 @@
<!-- Uncomment the security-domain to enable security. You will
need to edit the htmladaptor login configuration to setup the
@@ -456,9 +456,9 @@
-->
+ <security-domain>java:/jaas/jmx-console</security-domain>
</jboss-web>
-diff -Naur ./server/ewp/deploy/jmx-console.war/WEB-INF/web.xml ./server/ewp/deploy/jmx-console.war/WEB-INF/web.xml
---- ./server/ewp/deploy/jmx-console.war/WEB-INF/web.xml 2009-06-30 09:32:55.000000000 -0400
-+++ ./server/ewp/deploy/jmx-console.war/WEB-INF/web.xml 2009-06-30 09:41:52.000000000 -0400
+diff -Naur ./server/web/deploy/jmx-console.war/WEB-INF/web.xml ./server/web/deploy/jmx-console.war/WEB-INF/web.xml
+--- ./server/web/deploy/jmx-console.war/WEB-INF/web.xml 2009-06-30 09:32:55.000000000 -0400
++++ ./server/web/deploy/jmx-console.war/WEB-INF/web.xml 2009-06-30 09:41:52.000000000 -0400
@@ -97,6 +97,7 @@
to users with the role JBossAdmin. Edit the roles to what you want and
uncomment the WEB-INF/jboss-web.xml/security-domain element to enable
@@ -475,9 +475,9 @@
<login-config>
<auth-method>BASIC</auth-method>
-diff -Naur ./server/ewp/deploy/jmx-invoker-service.xml ./server/ewp/deploy/jmx-invoker-service.xml
---- ./server/ewp/deploy/jmx-invoker-service.xml 2009-06-30 09:32:55.000000000 -0400
-+++ ./server/ewp/deploy/jmx-invoker-service.xml 2009-06-30 16:11:29.000000000 -0400
+diff -Naur ./server/web/deploy/jmx-invoker-service.xml ./server/web/deploy/jmx-invoker-service.xml
+--- ./server/web/deploy/jmx-invoker-service.xml 2009-06-30 09:32:55.000000000 -0400
++++ ./server/web/deploy/jmx-invoker-service.xml 2009-06-30 16:11:29.000000000 -0400
@@ -111,10 +111,9 @@
<return-type>java.lang.Object</return-type>
<descriptors>
@@ -541,9 +541,9 @@
# A sample users.properties file for use with the UsersRolesLoginModule
-admin=admin
+# admin=admin
-diff -Naur ./server/ewp/conf/props/jmx-console-users.properties ./server/ewp/conf/props/jmx-console-users.properties
---- ./server/ewp/conf/props/jmx-console-users.properties 2009-07-02 14:23:39.000000000 -0400
-+++ ./server/ewp/conf/props/jmx-console-users.properties 2009-07-02 14:36:24.000000000 -0400
+diff -Naur ./server/web/conf/props/jmx-console-users.properties ./server/web/conf/props/jmx-console-users.properties
+--- ./server/web/conf/props/jmx-console-users.properties 2009-07-02 14:23:39.000000000 -0400
++++ ./server/web/conf/props/jmx-console-users.properties 2009-07-02 14:36:24.000000000 -0400
@@ -1,2 +1,2 @@
# A sample users.properties file for use with the UsersRolesLoginModule
-admin=admin
More information about the jboss-cvs-commits
mailing list