1:17 p.m.
Author: nfilotto
Date: 2011-02-21 14:17:43 -0500 (Mon, 21 Feb 2011)
New Revision: 4000
Modified:
jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/container-configuration.xml
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/monitor/jvm/J2EEServerInfo.java
Log:
EXOJCR-1160: GlassFish home directory is set to ${com.sun.aas.instanceRoot}
Modified:
jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/container-configuration.xml
===================================================================
---
jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/container-configuration.xml 2011-02-21
18:34:50 UTC (rev 3999)
+++
jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/container-configuration.xml 2011-02-21
19:17:43 UTC (rev 4000)
@@ -176,7 +176,47 @@
<note>
<para><emphasis>$AS_HOME</emphasis> - application server
home
directory, or <emphasis>user.dir</emphasis> JVM system property
- value in case of Java Standalone application.</para>
+ value in case of Java Standalone application. The application server
+ home is:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>For <envar>Jonas</envar>, the value of the
variable
+ <emphasis>${jonas.base}.</emphasis></para>
+ </listitem>
+
+ <listitem>
+ <para>For <envar>Jetty</envar>, the value of the
variable
+ <emphasis>${jetty.home}.</emphasis></para>
+ </listitem>
+
+ <listitem>
+ <para>For <envar>Websphere</envar>, the value of the
variable
+ <emphasis>${was.install.root}.</emphasis></para>
+ </listitem>
+
+ <listitem>
+ <para>For <envar>Weblogic</envar>, the value of the
variable
+ <emphasis>${wls.home}</emphasis>.</para>
+ </listitem>
+
+ <listitem>
+ <para>For <envar>Glassfish</envar>, the value of the
variable
+ <emphasis>${com.sun.aas.instanceRoot}</emphasis>.</para>
+ </listitem>
+
+ <listitem>
+ <para>For <envar>Tomcat</envar>, the value of the
variable
+ <emphasis>${catalina.home}</emphasis>.</para>
+ </listitem>
+
+ <listitem>
+ <para>For <envar>JBoss AS</envar>, the value of the
variable
+ <emphasis>${jboss.server.config.url}</emphasis> if the
exo-conf
+ directory can be found there otherwise it will be the value of
+ the variable
<emphasis>${jboss.home.dir}</emphasis>.</para>
+ </listitem>
+ </itemizedlist>
</note>
<note>
@@ -208,14 +248,6 @@
</note>
<note>
- <para>Under JBoss application server
<emphasis>exo-conf</emphasis>
- will be looked up in directory described by JBoss System property
- <emphasis>jboss.server.config.url</emphasis>. If the property is
not
- found or empty <emphasis>$AS_HOME/exo-conf</emphasis> will be
- asked.</para>
- </note>
-
- <note>
<para>The search looks for a configuration file in each JAR/WAR
available from the classpath using the current thread context
classloader. During the search these configurations are added to a
Modified:
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/monitor/jvm/J2EEServerInfo.java
===================================================================
---
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/monitor/jvm/J2EEServerInfo.java 2011-02-21
18:34:50 UTC (rev 3999)
+++
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/monitor/jvm/J2EEServerInfo.java 2011-02-21
19:17:43 UTC (rev 4000)
@@ -76,6 +76,7 @@
String jettyHome = PrivilegedSystemHelper.getProperty("jetty.home");
String websphereHome =
PrivilegedSystemHelper.getProperty("was.install.root");
String weblogicHome = PrivilegedSystemHelper.getProperty("wls.home");
+ String glassfishHome =
PrivilegedSystemHelper.getProperty("com.sun.aas.instanceRoot");
String catalinaHome =
PrivilegedSystemHelper.getProperty("catalina.home");
String testHome =
PrivilegedSystemHelper.getProperty("maven.exoplatform.dir");
@@ -85,7 +86,6 @@
{
serverName_ = "jonas";
serverHome_ = jonasHome;
- exoConfDir_ = serverHome_ + "/" + confDirName;
}
else if (jbossHome != null)
{
@@ -104,11 +104,8 @@
catch (Throwable e)
{
// don't care about it
- exoConfDir_ = serverHome_ + "/" + confDirName;
}
}
- else
- exoConfDir_ = serverHome_ + "/" + confDirName;
//
try
@@ -134,38 +131,41 @@
{
serverName_ = "jetty";
serverHome_ = jettyHome;
- exoConfDir_ = serverHome_ + "/" + confDirName;
}
else if (websphereHome != null)
{
serverName_ = "websphere";
serverHome_ = websphereHome;
- exoConfDir_ = serverHome_ + "/" + confDirName;
}
else if (weblogicHome != null)
{
serverName_ = "weblogic";
serverHome_ = weblogicHome;
- exoConfDir_ = serverHome_ + "/" + confDirName;
- // Catalina has to be processed at the end as other servers may embed it
}
+ else if (glassfishHome != null)
+ {
+ serverName_ = "glassfish";
+ serverHome_ = glassfishHome;
+ }
else if (catalinaHome != null)
{
+ // Catalina has to be processed at the end as other servers may embed it
serverName_ = "tomcat";
serverHome_ = catalinaHome;
- exoConfDir_ = serverHome_ + "/" + confDirName;
}
else if (testHome != null)
{
serverName_ = "test";
serverHome_ = testHome;
- exoConfDir_ = serverHome_ + "/" + confDirName;
}
else
{
// throw new UnsupportedOperationException("unknown server platform")
;
serverName_ = "standalone";
serverHome_ = PrivilegedSystemHelper.getProperty("user.dir");
+ }
+ if (exoConfDir_ == null)
+ {
exoConfDir_ = serverHome_ + "/" + confDirName;
}
if (mbeanServer == null)