# This patch file was generated by NetBeans IDE
# This patch can be applied using context Tools: Apply Diff Patch action on respective folder.
# It uses platform neutral UTF-8 encoding.
# Above lines and this line are ignored by the patching process.
--- C:\gf\v3\distributions\glassfish\target\glassfish3\glassfish\domains\domain1\config\normalized-3.0.1-default-config-after-upgrade.xml
+++ C:\gf\v3\distributions\glassfish\target\glassfish3\glassfish\domains\domain1\config\normalized-3.1-default-config.xml
@@ -1,101 +1,100 @@
-    <config name="default-config">
+     <config name="default-config" dynamic-reconfiguration-enabled="true" >
          <http-service>
-      	     <access-log></access-log>
-             <virtual-server id="server" network-listeners="http-listener-1, http-listener-2">
-                 <property name="default-web-xml" value="${com.sun.aas.instanceRoot}/config/default-web.xml"></property>
+             <access-log/>
+             <virtual-server id="server" network-listeners="http-listener-1, http-listener-2" >
+                 <property name="default-web-xml" value="${com.sun.aas.instanceRoot}/config/default-web.xml"/>
              </virtual-server>
-             <virtual-server id="__asadmin" network-listeners="admin-listener"></virtual-server>
+             <virtual-server id="__asadmin" network-listeners="admin-listener" />
          </http-service>
          <iiop-service>
-      	     <orb use-thread-pool-ids="thread-pool-1"></orb>
-             <iiop-listener port="${IIOP_LISTENER_PORT}" id="orb-listener-1" address="0.0.0.0"></iiop-listener>
+             <orb use-thread-pool-ids="thread-pool-1" />
+             <iiop-listener port="${IIOP_LISTENER_PORT}" id="orb-listener-1" address="0.0.0.0" />
              <iiop-listener port="${IIOP_SSL_LISTENER_PORT}" id="SSL" address="0.0.0.0" security-enabled="true">
-                 <ssl classname="com.sun.enterprise.security.ssl.GlassfishSSLImpl" cert-nickname="s1as"></ssl>
+                 <ssl classname="com.sun.enterprise.security.ssl.GlassfishSSLImpl" cert-nickname="s1as" />
              </iiop-listener>
              <iiop-listener port="${IIOP_SSL_MUTUALAUTH_PORT}" id="SSL_MUTUALAUTH" address="0.0.0.0" security-enabled="true">
-                <ssl classname="com.sun.enterprise.security.ssl.GlassfishSSLImpl" cert-nickname="s1as" client-auth-enabled="true"></ssl>
+                 <ssl classname="com.sun.enterprise.security.ssl.GlassfishSSLImpl" cert-nickname="s1as" client-auth-enabled="true" />
              </iiop-listener>    
          </iiop-service>
-         <admin-service system-jmx-connector-name="system">
-             <jmx-connector port="${JMX_SYSTEM_CONNECTOR_PORT}" address="0.0.0.0" security-enabled="false" auth-realm-name="admin-realm" name="system"></jmx-connector>
-             <property name="adminConsoleDownloadLocation" value="${com.sun.aas.installRoot}/lib/install/applications/admingui.war"></property>
-             <das-config></das-config>
+         <admin-service system-jmx-connector-name="system" type="server">
+             <!-- JSR 160  "system-jmx-connector" -->
+             <jmx-connector address="0.0.0.0" auth-realm-name="admin-realm" name="system" port="${JMX_SYSTEM_CONNECTOR_PORT}" protocol="rmi_jrmp" security-enabled="false"/>
+             <!-- JSR 160  "system-jmx-connector" -->
+             <property value="${com.sun.aas.installRoot}/lib/install/applications/admingui.war" name="adminConsoleDownloadLocation" />
          </admin-service>
          <web-container>
 	         <session-config>
 	           <session-manager>
-	             <manager-properties></manager-properties>
-	             <store-properties></store-properties>
+                     <manager-properties/>
+                     <store-properties />
 	           </session-manager>
-	           <session-properties></session-properties>
+                 <session-properties />
 	         </session-config>
       </web-container>
       <ejb-container session-store="${com.sun.aas.instanceRoot}/session-store">
-              <ejb-timer-service>
-                <property name="ejb-timer-service-upgraded" value="false"></property>
-              </ejb-timer-service>
+             <ejb-timer-service />
       </ejb-container>
-      <mdb-container></mdb-container>
-      <jms-service addresslist-behavior="priority" default-jms-host="default_JMS_host" type="EMBEDDED">
-              <jms-host port="${JMS_PROVIDER_PORT}" host="localhost" name="default_JMS_host"></jms-host>
+         <mdb-container />
+         <jms-service type="EMBEDDED" default-jms-host="default_JMS_host" addresslist-behavior="priority">
+             <jms-host name="default_JMS_host" host="localhost" port="${JMS_PROVIDER_PORT}" admin-user-name="admin" admin-password="admin" lazy-init="true"/>
       </jms-service>
       <log-service log-rotation-limit-in-bytes="2000000" file="${com.sun.aas.instanceRoot}/logs/server.log">
-              <module-log-levels></module-log-levels>
+             <module-log-levels />
       </log-service>
       <security-service>
         <auth-realm classname="com.sun.enterprise.security.auth.realm.file.FileRealm" name="admin-realm">
-	   <property name="file" value="${com.sun.aas.instanceRoot}/config/admin-keyfile"></property>
-	   <property name="jaas-context" value="fileRealm"></property>
+                 <property name="file" value="${com.sun.aas.instanceRoot}/config/admin-keyfile" />
+                 <property name="jaas-context" value="fileRealm" />
         </auth-realm>
         <auth-realm classname="com.sun.enterprise.security.auth.realm.file.FileRealm" name="file">
-	   <property name="file" value="${com.sun.aas.instanceRoot}/config/keyfile"></property>
-	   <property name="jaas-context" value="fileRealm"></property>
+                 <property name="file" value="${com.sun.aas.instanceRoot}/config/keyfile" />
+                 <property name="jaas-context" value="fileRealm" />
         </auth-realm>
-        <auth-realm classname="com.sun.enterprise.security.auth.realm.certificate.CertificateRealm" name="certificate"></auth-realm>
+             <auth-realm classname="com.sun.enterprise.security.auth.realm.certificate.CertificateRealm" name="certificate" />
         <jacc-provider policy-provider="com.sun.enterprise.security.provider.PolicyWrapper" name="default" policy-configuration-factory-provider="com.sun.enterprise.security.provider.PolicyConfigurationFactoryImpl">
-          <property name="repository" value="${com.sun.aas.instanceRoot}/generated/policy"></property>
+                 <property name="repository" value="${com.sun.aas.instanceRoot}/generated/policy" />
         </jacc-provider>
-        <jacc-provider policy-provider="com.sun.enterprise.security.jacc.provider.SimplePolicyProvider" name="simple" policy-configuration-factory-provider="com.sun.enterprise.security.jacc.provider.SimplePolicyConfigurationFactory"></jacc-provider>
+             <jacc-provider policy-provider="com.sun.enterprise.security.jacc.provider.SimplePolicyProvider" name="simple" policy-configuration-factory-provider="com.sun.enterprise.security.jacc.provider.SimplePolicyConfigurationFactory" />
         <audit-module classname="com.sun.enterprise.security.Audit" name="default">
-	  <property name="auditOn" value="false"></property>
+                 <property name="auditOn" value="false" />
         </audit-module>
         <message-security-config auth-layer="SOAP">
           <provider-config provider-type="client" provider-id="XWS_ClientProvider" class-name="com.sun.xml.wss.provider.ClientSecurityAuthModule">
-            <request-policy auth-source="content"></request-policy>
-            <response-policy auth-source="content"></response-policy>
-            <property name="encryption.key.alias" value="s1as"></property>
-            <property name="signature.key.alias" value="s1as"></property>
-            <property name="dynamic.username.password" value="false"></property>
-            <property name="debug" value="false"></property>
+                     <request-policy auth-source="content" />
+                     <response-policy auth-source="content" />
+                     <property name="encryption.key.alias" value="s1as" />
+                     <property name="signature.key.alias" value="s1as" />
+                     <property name="dynamic.username.password" value="false" />
+                     <property name="debug" value="false" />
           </provider-config>
           <provider-config provider-type="client" provider-id="ClientProvider" class-name="com.sun.xml.wss.provider.ClientSecurityAuthModule">
-            <request-policy auth-source="content"></request-policy>
-            <response-policy auth-source="content"></response-policy>
-            <property name="encryption.key.alias" value="s1as"></property>
-            <property name="signature.key.alias" value="s1as"></property>
-            <property name="dynamic.username.password" value="false"></property>
-            <property name="debug" value="false"></property>
-            <property name="security.config" value="${com.sun.aas.instanceRoot}/config/wss-server-config-1.0.xml"></property>
+                     <request-policy auth-source="content" />
+                     <response-policy auth-source="content" />
+                     <property name="encryption.key.alias" value="s1as" />
+                     <property name="signature.key.alias" value="s1as" />
+                     <property name="dynamic.username.password" value="false" />
+                     <property name="debug" value="false" />
+                     <property name="security.config" value="${com.sun.aas.instanceRoot}/config/wss-server-config-1.0.xml" />
           </provider-config>
           <provider-config provider-type="server" provider-id="XWS_ServerProvider" class-name="com.sun.xml.wss.provider.ServerSecurityAuthModule">
-            <request-policy auth-source="content"></request-policy>
-            <response-policy auth-source="content"></response-policy>
-            <property name="encryption.key.alias" value="s1as"></property>
-            <property name="signature.key.alias" value="s1as"></property>
-            <property name="debug" value="false"></property>
+                     <request-policy auth-source="content" />
+                     <response-policy auth-source="content" />
+                     <property name="encryption.key.alias" value="s1as" />
+                     <property name="signature.key.alias" value="s1as" />
+                     <property name="debug" value="false" />
           </provider-config>
           <provider-config provider-type="server" provider-id="ServerProvider" class-name="com.sun.xml.wss.provider.ServerSecurityAuthModule">
-            <request-policy auth-source="content"></request-policy>
-            <response-policy auth-source="content"></response-policy>
-            <property name="encryption.key.alias" value="s1as"></property>
-            <property name="signature.key.alias" value="s1as"></property>
-            <property name="debug" value="false"></property>
-            <property name="security.config" value="${com.sun.aas.instanceRoot}/config/wss-server-config-1.0.xml"></property>
+                     <request-policy auth-source="content" />
+                     <response-policy auth-source="content" />
+                     <property name="encryption.key.alias" value="s1as" />
+                     <property name="signature.key.alias" value="s1as" />
+                     <property name="debug" value="false" />
+                     <property name="security.config" value="${com.sun.aas.instanceRoot}/config/wss-server-config-1.0.xml" />
           </provider-config>
         </message-security-config>
       </security-service>
-      <transaction-service tx-log-dir="${com.sun.aas.instanceRoot}/logs" automatic-recovery="true"></transaction-service>
-      <diagnostic-service></diagnostic-service>
+         <transaction-service tx-log-dir="${com.sun.aas.instanceRoot}/logs" automatic-recovery="true" />
+         <diagnostic-service />
       <java-config debug-options="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=${JAVA_DEBUGGER_PORT}" system-classpath="" classpath-suffix="">
         <jvm-options>-XX:MaxPermSize=192m</jvm-options>
         <jvm-options>-server</jvm-options>
@@ -112,70 +111,79 @@
         <jvm-options>-Dcom.sun.enterprise.config.config_environment_factory_class=com.sun.enterprise.config.serverbeans.AppserverConfigEnvironmentFactory</jvm-options>
         <jvm-options>-XX:NewRatio=2</jvm-options>
         <jvm-options>-Xmx512m</jvm-options>
+             <!-- Port on which remote shell listens for connections.-->
         <jvm-options>-Dosgi.shell.telnet.port=${OSGI_SHELL_TELNET_PORT}</jvm-options>
+             <!-- How many concurrent users can connect to this remote shell -->
         <jvm-options>-Dosgi.shell.telnet.maxconn=1</jvm-options>
+             <!-- From which hosts users can connect -->
         <jvm-options>-Dosgi.shell.telnet.ip=127.0.0.1</jvm-options>
+             <!-- Gogo shell configuration -->
         <jvm-options>-Dgosh.args=--noshutdown -c noop=true</jvm-options>
+             <!-- Directory being watched by fileinstall. -->
         <jvm-options>-Dfelix.fileinstall.dir=${com.sun.aas.installRoot}/modules/autostart/</jvm-options>
+             <!-- Time period fileinstaller thread in ms. -->
         <jvm-options>-Dfelix.fileinstall.poll=5000</jvm-options>
+             <!-- log level: 1 for error, 2 for warning, 3 for info and 4 for debug. -->
         <jvm-options>-Dfelix.fileinstall.log.level=3</jvm-options>
+             <!-- should new bundles be started or installed only?
+                 true => start, false => only install
+             -->
         <jvm-options>-Dfelix.fileinstall.bundles.new.start=true</jvm-options>
+             <!-- should watched bundles be started transiently or persistently -->
         <jvm-options>-Dfelix.fileinstall.bundles.startTransient=true</jvm-options>
+             <!-- Should changes to configuration be saved in corresponding cfg file? false: no, true: yes
+                  If we don't set false, everytime server starts from clean osgi cache, the file gets rewritten.
+             -->
         <jvm-options>-Dfelix.fileinstall.disableConfigSave=false</jvm-options>
+             <!-- End of OSGi bundle configurations -->
       </java-config>
       <availability-service>
-              <web-container-availability></web-container-availability>
-              <ejb-container-availability sfsb-store-pool-name="jdbc/hastore"></ejb-container-availability>
-              <jms-availability></jms-availability>
+             <web-container-availability availability-enabled="true" persistence-frequency="web-method" persistence-scope="session" persistence-type="replicated" sso-failover-enabled="false"/>
+             <ejb-container-availability availability-enabled="true" sfsb-store-pool-name="jdbc/hastore"/>
+             <jms-availability availability-enabled="false"/>
       </availability-service>
       <network-config>
         <protocols>
           <protocol name="http-listener-1">
             <http default-virtual-server="server">
-              <file-cache></file-cache>
+                         <file-cache />
             </http>
           </protocol>
           <protocol security-enabled="true" name="http-listener-2">
             <http default-virtual-server="server">
-              <file-cache></file-cache>
+                         <file-cache />
             </http>
-            <ssl classname="com.sun.enterprise.security.ssl.GlassfishSSLImpl" ssl3-enabled="false" cert-nickname="s1as"></ssl>
+                     <ssl classname="com.sun.enterprise.security.ssl.GlassfishSSLImpl" ssl3-enabled="false" cert-nickname="s1as" />
           </protocol>
           <protocol name="admin-listener">
-            <http default-virtual-server="__asadmin" max-connections="250" encoded-slash-enabled="true">
-              <file-cache></file-cache>
+                     <http default-virtual-server="__asadmin" max-connections="250">
+                         <file-cache enabled="false" />
             </http>
           </protocol>
         </protocols>
         <network-listeners>
-          <network-listener port="${HTTP_LISTENER_PORT}" protocol="http-listener-1" transport="tcp" name="http-listener-1" thread-pool="http-thread-pool"></network-listener>
-          <network-listener port="${HTTP_SSL_LISTENER_PORT}" protocol="http-listener-2" transport="tcp" name="http-listener-2" thread-pool="http-thread-pool"></network-listener>
-          <network-listener port="${ASADMIN_LISTENER_PORT}" protocol="admin-listener" transport="tcp" name="admin-listener" thread-pool="http-thread-pool"></network-listener>
+                 <network-listener address="0.0.0.0" port="${HTTP_LISTENER_PORT}" protocol="http-listener-1" transport="tcp" name="http-listener-1" thread-pool="http-thread-pool" />
+                 <network-listener address="0.0.0.0" port="${HTTP_SSL_LISTENER_PORT}" protocol="http-listener-2" transport="tcp" name="http-listener-2" thread-pool="http-thread-pool" />
+                 <network-listener port="${ASADMIN_LISTENER_PORT}" protocol="admin-listener" transport="tcp" name="admin-listener" thread-pool="http-thread-pool" />
         </network-listeners>
         <transports>
-	   <transport name="tcp"></transport>
+                 <transport name="tcp" />
         </transports>
       </network-config>
       <thread-pools>
-        <thread-pool name="http-thread-pool"></thread-pool>
-        <thread-pool max-thread-pool-size="200" name="thread-pool-1" idle-thread-timeout-seconds="120"></thread-pool>
+             <thread-pool name="http-thread-pool" />
+             <thread-pool max-thread-pool-size="200" idle-thread-timeout-in-seconds="120" name="thread-pool-1" />
       </thread-pools>
-      <group-management-service>
-              <failure-detection></failure-detection>
-      </group-management-service>
-      <management-rules></management-rules>
-      <system-property name="ASADMIN_LISTENER_PORT" value="24848"></system-property>
-      <system-property name="HTTP_LISTENER_PORT" value="28080"></system-property>
-      <system-property name="HTTP_SSL_LISTENER_PORT" value="28181"></system-property>
-      <system-property name="JMS_PROVIDER_PORT" value="27676"></system-property>
-      <system-property name="IIOP_LISTENER_PORT" value="23700"></system-property>
-      <system-property name="IIOP_SSL_LISTENER_PORT" value="23820"></system-property>
-      <system-property name="IIOP_SSL_MUTUALAUTH_PORT" value="23920"></system-property>
-      <system-property name="JMX_SYSTEM_CONNECTOR_PORT" value="28686"></system-property>
-      <system-property name="OSGI_SHELL_TELNET_PORT" value="26666"></system-property>
-      <system-property name="JAVA_DEBUGGER_PORT" value="29009"></system-property>
-      <monitoring-service>
-            <module-monitoring-levels></module-monitoring-levels>
-      </monitoring-service>
-      <connector-service></connector-service>
\ No newline at end of file
+         <group-management-service/>
+         <management-rules />
+         <system-property name="ASADMIN_LISTENER_PORT" value="24848"/>
+         <system-property name="HTTP_LISTENER_PORT" value="28080"/>
+         <system-property name="HTTP_SSL_LISTENER_PORT" value="28181"/>
+         <system-property name="JMS_PROVIDER_PORT" value="27676"/>
+         <system-property name="IIOP_LISTENER_PORT" value="23700"/>
+         <system-property name="IIOP_SSL_LISTENER_PORT" value="23820"/>
+         <system-property name="IIOP_SSL_MUTUALAUTH_PORT" value="23920"/>
+         <system-property name="JMX_SYSTEM_CONNECTOR_PORT" value="28686"/>
+         <system-property name="OSGI_SHELL_TELNET_PORT" value="26666"/>
+         <system-property name="JAVA_DEBUGGER_PORT" value="29009"/>
     </config>