Index: v2/appserv-tests/devtests/web/authPassthroughRequestIsSecure/build.xml
===================================================================
--- v2/appserv-tests/devtests/web/authPassthroughRequestIsSecure/build.xml	(revision 30767)
+++ v2/appserv-tests/devtests/web/authPassthroughRequestIsSecure/build.xml	(working copy)
@@ -77,7 +77,7 @@
         <antcall target="asadmin-common-ignore-fail">
             <param name="admin.command" value="set" />
             <param name="operand.props"
-                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.enable-auth-pass-through=true"/>
+                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.auth-pass-through-enabled=true"/>
         </antcall>
     </target>
 
@@ -109,7 +109,7 @@
         <antcall target="asadmin-common-ignore-fail">
             <param name="admin.command" value="set" />
             <param name="operand.props"
-                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.enable-auth-pass-through="/>
+                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.auth-pass-through-enabled="/>
         </antcall>
     </target>
 
Index: v2/appserv-tests/devtests/web/authPassthroughGetRemoteAddress/build.xml
===================================================================
--- v2/appserv-tests/devtests/web/authPassthroughGetRemoteAddress/build.xml	(revision 30767)
+++ v2/appserv-tests/devtests/web/authPassthroughGetRemoteAddress/build.xml	(working copy)
@@ -77,7 +77,7 @@
         <antcall target="asadmin-common-ignore-fail">
             <param name="admin.command" value="set" />
             <param name="operand.props"
-                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.enable-auth-pass-through=true"/>
+                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.auth-pass-through-enabled=true"/>
         </antcall>
     </target>
 
@@ -109,7 +109,7 @@
         <antcall target="asadmin-common-ignore-fail">
             <param name="admin.command" value="set" />
             <param name="operand.props"
-                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.enable-auth-pass-through="/>
+                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.auth-pass-through-enabled="/>
         </antcall>
     </target>
 
Index: v2/appserv-tests/devtests/web/authPassthroughGetRemoteHost/build.xml
===================================================================
--- v2/appserv-tests/devtests/web/authPassthroughGetRemoteHost/build.xml	(revision 30767)
+++ v2/appserv-tests/devtests/web/authPassthroughGetRemoteHost/build.xml	(working copy)
@@ -77,12 +77,12 @@
         <antcall target="asadmin-common-ignore-fail">
             <param name="admin.command" value="set" />
             <param name="operand.props"
-                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.enable-auth-pass-through=true"/>
+                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.auth-pass-through-enabled=true"/>
         </antcall>
         <antcall target="asadmin-common-ignore-fail">
             <param name="admin.command" value="set" />
             <param name="operand.props"
-                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.enable-dns-lookup=true"/>
+                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.dns-lookup-enabled=true"/>
         </antcall>
     </target>
 
@@ -114,12 +114,12 @@
         <antcall target="asadmin-common-ignore-fail">
             <param name="admin.command" value="set" />
             <param name="operand.props"
-                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.enable-auth-pass-through="/>
+                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.auth-pass-through-enabled="/>
         </antcall>
         <antcall target="asadmin-common-ignore-fail">
             <param name="admin.command" value="set" />
             <param name="operand.props"
-                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.enable-dns-lookup="/>
+                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.dns-lookup-enabled="/>
         </antcall>
     </target>
 
Index: v2/appserv-tests/devtests/web/traceEnabled/build.xml
===================================================================
--- v2/appserv-tests/devtests/web/traceEnabled/build.xml	(revision 30767)
+++ v2/appserv-tests/devtests/web/traceEnabled/build.xml	(working copy)
@@ -64,7 +64,7 @@
         <antcall target="asadmin-common-ignore-fail">
             <param name="admin.command" value="set" />
             <param name="operand.props"
-                   value="${appserver.instance.name}.http-service.property.traceEnabled=false"/>
+                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.trace-enabled=false"/>
         </antcall>
     </target>
 
@@ -72,7 +72,7 @@
         <antcall target="asadmin-common-ignore-fail">
             <param name="admin.command" value="set" />
             <param name="operand.props"
-                   value="${appserver.instance.name}.http-service.property.traceEnabled="/>
+                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.trace-enabled="/>
         </antcall>
     </target>
 
Index: v2/appserv-tests/devtests/web/proxyAuthCert/build.xml
===================================================================
--- v2/appserv-tests/devtests/web/proxyAuthCert/build.xml	(revision 30767)
+++ v2/appserv-tests/devtests/web/proxyAuthCert/build.xml	(working copy)
@@ -77,7 +77,7 @@
         <antcall target="asadmin-common-ignore-fail">
             <param name="admin.command" value="set" />
             <param name="operand.props"
-                   value="${appserver.instance.name}.http-service.property.authPassthroughEnabled=true"/>
+                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.auth-pass-through-enabled=true"/>
         </antcall>
         <antcall target="restart-server-instance-common"/>
     </target>
@@ -110,7 +110,7 @@
         <antcall target="asadmin-common-ignore-fail">
             <param name="admin.command" value="set" />
             <param name="operand.props"
-                   value="${appserver.instance.name}.http-service.property.authPassthroughEnabled="/>
+                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.auth-pass-through-enabled="/>
         </antcall>
         <antcall target="restart-server-instance-common"/>
     </target>
Index: v2/appserv-tests/devtests/web/authPassthroughSendRedirectFromJspWithHttpsServerName/build.xml
===================================================================
--- v2/appserv-tests/devtests/web/authPassthroughSendRedirectFromJspWithHttpsServerName/build.xml	(revision 30767)
+++ v2/appserv-tests/devtests/web/authPassthroughSendRedirectFromJspWithHttpsServerName/build.xml	(working copy)
@@ -77,7 +77,7 @@
         <antcall target="asadmin-common-ignore-fail">
             <param name="admin.command" value="set" />
             <param name="operand.props"
-                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.enable-auth-pass-through=true"/>
+                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.auth-pass-through-enabled=true"/>
         </antcall>
         <antcall target="asadmin-common-ignore-fail">
             <param name="admin.command" value="set" />
@@ -114,7 +114,7 @@
         <antcall target="asadmin-common-ignore-fail">
             <param name="admin.command" value="set" />
             <param name="operand.props"
-                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.enable-auth-pass-through="/>
+                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.auth-pass-through-enabled="/>
         </antcall>
         <antcall target="asadmin-common-ignore-fail">
             <param name="admin.command" value="set" />
Index: v2/appserv-tests/devtests/web/authPassthroughSendRedirectHostRequestHeaderWithoutPort/build.xml
===================================================================
--- v2/appserv-tests/devtests/web/authPassthroughSendRedirectHostRequestHeaderWithoutPort/build.xml	(revision 30767)
+++ v2/appserv-tests/devtests/web/authPassthroughSendRedirectHostRequestHeaderWithoutPort/build.xml	(working copy)
@@ -77,7 +77,7 @@
         <antcall target="asadmin-common-ignore-fail">
             <param name="admin.command" value="set" />
             <param name="operand.props"
-                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.enable-auth-pass-through=true"/>
+                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.auth-pass-through-enabled=true"/>
         </antcall>
     </target>
 
@@ -109,7 +109,7 @@
         <antcall target="asadmin-common-ignore-fail">
             <param name="admin.command" value="set" />
             <param name="operand.props"
-                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.enable-auth-pass-through="/>
+                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.auth-pass-through-enabled="/>
         </antcall>
     </target>
 
Index: v2/appserv-tests/devtests/web/proxyKeysize/build.xml
===================================================================
--- v2/appserv-tests/devtests/web/proxyKeysize/build.xml	(revision 30767)
+++ v2/appserv-tests/devtests/web/proxyKeysize/build.xml	(working copy)
@@ -77,7 +77,7 @@
         <antcall target="asadmin-common-ignore-fail">
             <param name="admin.command" value="set" />
             <param name="operand.props"
-                   value="${appserver.instance.name}.http-service.property.authPassthroughEnabled=true"/>
+                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.auth-pass-through-enabled=true"/>
         </antcall>
         <antcall target="restart-server-instance-common"/>
     </target>
@@ -110,7 +110,7 @@
         <antcall target="asadmin-common-ignore-fail">
             <param name="admin.command" value="set" />
             <param name="operand.props"
-                   value="${appserver.instance.name}.http-service.property.authPassthroughEnabled="/>
+                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.auth-pass-through-enabled="/>
         </antcall>
         <antcall target="restart-server-instance-common"/>
     </target>
Index: v2/appserv-tests/devtests/web/authPassthroughGetScheme/build.xml
===================================================================
--- v2/appserv-tests/devtests/web/authPassthroughGetScheme/build.xml	(revision 30767)
+++ v2/appserv-tests/devtests/web/authPassthroughGetScheme/build.xml	(working copy)
@@ -77,7 +77,7 @@
         <antcall target="asadmin-common-ignore-fail">
             <param name="admin.command" value="set" />
             <param name="operand.props"
-                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.enable-auth-pass-through=true"/>
+                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.auth-pass-through-enabled=true"/>
         </antcall>
     </target>
 
@@ -109,7 +109,7 @@
         <antcall target="asadmin-common-ignore-fail">
             <param name="admin.command" value="set" />
             <param name="operand.props"
-                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.enable-auth-pass-through="/>
+                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.auth-pass-through-enabled="/>
         </antcall>
     </target>
 
Index: v2/appserv-tests/devtests/web/build.xml
===================================================================
--- v2/appserv-tests/devtests/web/build.xml	(revision 30767)
+++ v2/appserv-tests/devtests/web/build.xml	(working copy)
@@ -500,6 +500,7 @@
         </delete>
         
         <record name="web.output" action="start" />
+        <antcall target="stopDomain"/>
         <antcall target="startDomain"/>
         <antcall target="jsp"/>
         <antcall target="taglib"/>
Index: v2/appserv-tests/devtests/web/authPassthroughSendRedirectWithHttpsServerName/build.xml
===================================================================
--- v2/appserv-tests/devtests/web/authPassthroughSendRedirectWithHttpsServerName/build.xml	(revision 30767)
+++ v2/appserv-tests/devtests/web/authPassthroughSendRedirectWithHttpsServerName/build.xml	(working copy)
@@ -77,7 +77,7 @@
         <antcall target="asadmin-common-ignore-fail">
             <param name="admin.command" value="set" />
             <param name="operand.props"
-                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.enable-auth-pass-through=true"/>
+                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.auth-pass-through-enabled=true"/>
         </antcall>
         <antcall target="asadmin-common-ignore-fail">
             <param name="admin.command" value="set" />
@@ -114,7 +114,7 @@
         <antcall target="asadmin-common-ignore-fail">
             <param name="admin.command" value="set" />
             <param name="operand.props"
-                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.enable-auth-pass-through="/>
+                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.auth-pass-through-enabled="/>
         </antcall>
         <antcall target="asadmin-common-ignore-fail">
             <param name="admin.command" value="set" />
Index: v2/appserv-tests/devtests/web/chunkingDisabled/build.xml
===================================================================
--- v2/appserv-tests/devtests/web/chunkingDisabled/build.xml	(revision 30767)
+++ v2/appserv-tests/devtests/web/chunkingDisabled/build.xml	(working copy)
@@ -75,7 +75,7 @@
         <antcall target="asadmin-common-ignore-fail">
             <param name="admin.command" value="set" />
             <param name="operand.props"
-                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.chunking-disabled=true"/>
+                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.chunking-enabled=false"/>
         </antcall>
     </target>
 
@@ -105,7 +105,7 @@
         <antcall target="asadmin-common-ignore-fail">
             <param name="admin.command" value="set" />
             <param name="operand.props"
-                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.chunking-disabled=false"/>
+                   value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.chunking-enabled=true"/>
         </antcall>
     </target>
 
Index: v3/admin/config-api/src/main/java/org/glassfish/config/support/GrizzlyConfigSchemaMigrator.java
===================================================================
--- v3/admin/config-api/src/main/java/org/glassfish/config/support/GrizzlyConfigSchemaMigrator.java	(revision 30742)
+++ v3/admin/config-api/src/main/java/org/glassfish/config/support/GrizzlyConfigSchemaMigrator.java	(working copy)
@@ -417,10 +417,9 @@
                         @Override
                         public Object run(Http http) {
                             http.setVersion(httpProtocol.getVersion());
-                            http.setEnableDnsLookup(httpProtocol.getDnsLookupEnabled());
+                            http.setDnsLookupEnabled(httpProtocol.getDnsLookupEnabled());
                             http.setForcedResponseType(httpProtocol.getForcedResponseType());
                             http.setDefaultResponseType(httpProtocol.getDefaultResponseType());
-                            http.setEnableDnsLookup(httpProtocol.getDnsLookupEnabled());
                             return null;
                         }
                     }, protocol.getHttp());
Index: v3/web/web-glue/src/main/java/com/sun/enterprise/web/connector/coyote/PECoyoteConnector.java
===================================================================
--- v3/web/web-glue/src/main/java/com/sun/enterprise/web/connector/coyote/PECoyoteConnector.java	(revision 30742)
+++ v3/web/web-glue/src/main/java/com/sun/enterprise/web/connector/coyote/PECoyoteConnector.java	(working copy)
@@ -940,7 +940,7 @@
         setDefaultHost(http.getDefaultVirtualServer());
         setDefaultResponseType(http.getDefaultResponseType());
         setForcedRequestType(http.getForcedResponseType());
-        setEnableLookups(ConfigBeansUtilities.toBoolean(http.getEnableDnsLookup()));
+        setEnableLookups(ConfigBeansUtilities.toBoolean(http.getDnsLookupEnabled()));
         
         setXpoweredBy(Boolean.valueOf(http.getXpoweredBy()));
         
@@ -1137,57 +1137,25 @@
     }
 
     public void configHttpProperties(Http http, Transport transport, Ssl ssl) {
-        if (http.getMaxConnections() != null) {
-            setMaxKeepAliveRequests(Integer.parseInt(http.getMaxConnections()));
-        }
-        if (http.getTimeoutSeconds() != null) {
-            setKeepAliveTimeoutInSeconds(Integer.parseInt(http.getTimeoutSeconds()));
-        }
-        if (http.getEnableAuthPassThrough() != null) {
-            setAuthPassthroughEnabled(ConfigBeansUtilities.toBoolean(
-                http.getEnableAuthPassThrough()));
-        }
-        if (http.getMaxPostSizeBytes() != null) {
-            setMaxPostSize(Integer.parseInt(http.getMaxPostSizeBytes()));
-        }
-        if (http.getCompression() != null) {
-            setProperty("compression", http.getCompression());
-        }
-        if (http.getCompressableMimeType() != null) {
-            setProperty("compressableMimeType", http.getCompressableMimeType());
-        }
+        setMaxKeepAliveRequests(Integer.parseInt(http.getMaxConnections()));
+        setKeepAliveTimeoutInSeconds(Integer.parseInt(http.getTimeoutSeconds()));
+        setAuthPassthroughEnabled(ConfigBeansUtilities.toBoolean(http.getAuthPassThroughEnabled()));
+        setMaxPostSize(Integer.parseInt(http.getMaxPostSizeBytes()));
+        setProperty("compression", http.getCompression());
+        setProperty("compressableMimeType", http.getCompressableMimeType());
         if (http.getNoCompressionUserAgents() != null) {
             setProperty("noCompressionUserAgents", http.getNoCompressionUserAgents());
         }
-        if (http.getCompressionMinSizeBytes() != null) {
-            setProperty("compressionMinSize", http.getCompressionMinSizeBytes());
-        }
+        setProperty("compressionMinSize", http.getCompressionMinSizeBytes());
         if (http.getRestrictedUserAgents() != null) {
             setProperty("restrictedUserAgents", http.getRestrictedUserAgents());
         }
-        if (http.getEnableCometSupport() != null) {
-            setProperty("cometSupport",ConfigBeansUtilities.toBoolean(
-                http.getEnableCometSupport()));
-        }
-        if (http.getEnableRcmSupport() != null) {
-            setProperty("rcmSupport",ConfigBeansUtilities.toBoolean(
-                http.getEnableRcmSupport()));
-        }
-        if (http.getConnectionUploadTimeoutMillis() != null) {
-            setConnectionUploadTimeout(Integer.parseInt(
-                http.getConnectionUploadTimeoutMillis()));
-        }
-        if (http.getDisableUploadTimeout() != null) {
-            setDisableUploadTimeout(ConfigBeansUtilities.toBoolean(
-                http.getDisableUploadTimeout()));
-        }
-        if (http.getUriEncoding() != null) {
-            setURIEncoding(http.getUriEncoding());
-        }
-        if (http.getChunkingDisabled() != null) {
-            setChunkingDisabled(ConfigBeansUtilities.toBoolean(
-                http.getChunkingDisabled()));
-        }
+        setProperty("cometSupport",ConfigBeansUtilities.toBoolean(http.getCometSupportEnabled()));
+        setProperty("rcmSupport",ConfigBeansUtilities.toBoolean(http.getRcmSupportEnabled()));
+        setConnectionUploadTimeout(Integer.parseInt(http.getConnectionUploadTimeoutMillis()));
+        setDisableUploadTimeout(!ConfigBeansUtilities.toBoolean(http.getUploadTimeoutEnabled()));
+        setURIEncoding(http.getUriEncoding());
+        setChunkingDisabled(!ConfigBeansUtilities.toBoolean(http.getChunkingEnabled()));
         configSslOptions(ssl);
     }