Skip to content

Commit

Permalink
Merge pull request #378 from smillidge/PAYARA-343
Browse files Browse the repository at this point in the history
Fixes #373
  • Loading branch information
smillidge committed Jul 29, 2015
2 parents b4539f8 + 34c886b commit d88f1a1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@
<connector-service shutdown-timeout-in-seconds="30">
</connector-service>
<transaction-service tx-log-dir="${com.sun.aas.instanceRoot}/logs" />
<hazelcast-runtime-configuration></hazelcast-runtime-configuration>
<diagnostic-service />
<security-service>
<auth-realm classname="com.sun.enterprise.security.auth.realm.file.FileRealm" name="admin-realm">
Expand Down Expand Up @@ -363,6 +364,7 @@
</message-security-config>
</security-service>
<transaction-service tx-log-dir="${com.sun.aas.instanceRoot}/logs" automatic-recovery="true" />
<hazelcast-runtime-configuration></hazelcast-runtime-configuration>
<diagnostic-service />
<java-config debug-options="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=${JAVA_DEBUGGER_PORT}" system-classpath="" classpath-suffix="">
<jvm-options>-XX:MaxPermSize=192m</jvm-options>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
<connector-service shutdown-timeout-in-seconds="30">
</connector-service>
<transaction-service tx-log-dir="${com.sun.aas.instanceRoot}/logs" />
<hazelcast-runtime-configuration></hazelcast-runtime-configuration>
<diagnostic-service />
<security-service>
<auth-realm classname="com.sun.enterprise.security.auth.realm.file.FileRealm" name="admin-realm">
Expand Down Expand Up @@ -307,6 +308,7 @@
</message-security-config>
</security-service>
<transaction-service tx-log-dir="${com.sun.aas.instanceRoot}/logs" automatic-recovery="true" />
<hazelcast-runtime-configuration></hazelcast-runtime-configuration>
<diagnostic-service />
<java-config debug-options="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=${JAVA_DEBUGGER_PORT}" system-classpath="" classpath-suffix="">
<jvm-options>-XX:MaxPermSize=512m</jvm-options>
Expand Down

0 comments on commit d88f1a1

Please sign in to comment.