[wsas-java-dev] svn commit r128 - in wsas/java/trunk/modules:
admin/src/org/wso2/wsas/admin/service/logging core/bin
core/src/org/wso2/wsas core/src/org/wso2/wsas/util
servlet-edition/src/org/wso2/wsas
wsf-common-core/src/org/wso2/wsf/common/util
svn at wso2.com
svn at wso2.com
Sun Dec 3 22:54:41 PST 2006
Author: azeez
Date: Sun Dec 3 22:54:40 2006
New Revision: 128
Modified:
wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/logging/LoggingAdmin.java
wsas/java/trunk/modules/core/bin/shutdown.bat
wsas/java/trunk/modules/core/bin/shutdown.sh
wsas/java/trunk/modules/core/bin/startup.bat
wsas/java/trunk/modules/core/bin/startup.sh
wsas/java/trunk/modules/core/bin/wso2wsas.bat
wsas/java/trunk/modules/core/bin/wso2wsas.sh
wsas/java/trunk/modules/core/src/org/wso2/wsas/Main.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerManager.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/util/LoggingUtil.java
wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/MainServlet.java
wsas/java/trunk/modules/wsf-common-core/src/org/wso2/wsf/common/util/NetworkUtils.java
wsas/java/trunk/modules/wsf-common-core/src/org/wso2/wsf/common/util/ServerConfiguration.java
Log:
1. Pass in WSO2WSAS_HOME from the scripts
2. Fix for WSAS-62
3. Improvements to NetworkUtils logic
4. Improvements to handling logging administration
Modified: wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/logging/LoggingAdmin.java
==============================================================================
--- wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/logging/LoggingAdmin.java (original)
+++ wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/logging/LoggingAdmin.java Sun Dec 3 22:54:40 2006
@@ -171,14 +171,21 @@
// Check if the file is valid
logFileName = logFileName.replace('\\', '/');
File logFile = new File(logFileName);
+ if (!logFile.isAbsolute()) {
+ if (logFileName.startsWith("./")) {
+ logFileName = logFileName.substring(2);
+ }
+ logFileName = (System.getProperty(ServerConstants.WSO2WSAS_HOME) + "/" +
+ logFileName).replace('\\', '/');
+ logFile = new File(logFileName);
+ }
if (!logFile.exists()) {
int lastIndex = logFileName.lastIndexOf("/");
- String msg = null;
+ String msg = "Cannot create logfile " + logFileName +
+ ". Please verify that the log file name is valid " +
+ "and that you have read-write access to this file.";
if (lastIndex != -1) {
String dirName = logFileName.substring(0, lastIndex);
- msg = "Cannot create logfile " + logFileName +
- ". Please verify that the log file name is valid " +
- "and that you have read-write access to this file.";
File dir = new File(dirName);
if (!dir.exists() && !dir.mkdirs()) {
throw new AxisFault(msg);
@@ -192,7 +199,6 @@
throw new AxisFault(msg);
}
}
-
pm.updateAppenderData(appenderName, appenderPattern, threshold,
logFileName, null, null, true, false);
} else if (appenderDO.getIsSysLogAppender()) {
Modified: wsas/java/trunk/modules/core/bin/shutdown.bat
==============================================================================
--- wsas/java/trunk/modules/core/bin/shutdown.bat (original)
+++ wsas/java/trunk/modules/core/bin/shutdown.bat Sun Dec 3 22:54:40 2006
@@ -122,7 +122,7 @@
echo Using JAVA_HOME: %JAVA_HOME%
set JAVA_ENDORSED = "%WSO2WSAS_HOME%\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HOME%\lib\endorsed"
-"%JAVA_HOME%\bin\java" -classpath %WSO2WSAS_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Daxis2.xml=%WSO2WSAS_HOME%\conf\axis2.xml org.wso2.wsas.Main %CMD%
+"%JAVA_HOME%\bin\java" -classpath %WSO2WSAS_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dwso2wsas.home="%WSO2WSAS_HOME%" -Daxis2.xml=%WSO2WSAS_HOME%\conf\axis2.xml org.wso2.wsas.Main %CMD%
:end
endlocal
Modified: wsas/java/trunk/modules/core/bin/shutdown.sh
==============================================================================
--- wsas/java/trunk/modules/core/bin/shutdown.sh (original)
+++ wsas/java/trunk/modules/core/bin/shutdown.sh Sun Dec 3 22:54:40 2006
@@ -117,5 +117,5 @@
echo " Using JAVA_HOME: $JAVA_HOME"
$JAVA_HOME/bin/java -classpath "$WSO2WSAS_CLASSPATH" \
--Daxis2.xml="$WSO2WSAS_HOME/conf/axis2.xml" org.wso2.wsas.Main \
+-Dwso2wsas.home="$WSO2WSAS_HOME" -Daxis2.xml="$WSO2WSAS_HOME/conf/axis2.xml" org.wso2.wsas.Main \
stop
\ No newline at end of file
Modified: wsas/java/trunk/modules/core/bin/startup.bat
==============================================================================
--- wsas/java/trunk/modules/core/bin/startup.bat (original)
+++ wsas/java/trunk/modules/core/bin/startup.bat Sun Dec 3 22:54:40 2006
@@ -122,7 +122,7 @@
echo Using JAVA_HOME: %JAVA_HOME%
set JAVA_ENDORSED = "%WSO2WSAS_HOME%\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HOME%\lib\endorsed"
-start "Web services application server" "%JAVA_HOME%\bin\java" -classpath %WSO2WSAS_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Daxis2.xml=%WSO2WSAS_HOME%\conf\axis2.xml org.wso2.wsas.Main %CMD%
+start "Web services application server" "%JAVA_HOME%\bin\java" -classpath %WSO2WSAS_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dwso2wsas.home="%WSO2WSAS_HOME%" -Daxis2.xml=%WSO2WSAS_HOME%\conf\axis2.xml org.wso2.wsas.Main %CMD%
:end
endlocal
Modified: wsas/java/trunk/modules/core/bin/startup.sh
==============================================================================
--- wsas/java/trunk/modules/core/bin/startup.sh (original)
+++ wsas/java/trunk/modules/core/bin/startup.sh Sun Dec 3 22:54:40 2006
@@ -121,5 +121,5 @@
$JAVA_HOME/bin/java -classpath "$WSO2WSAS_CLASSPATH" \
$JAVA_OPTS \
--Daxis2.xml="$WSO2WSAS_HOME/conf/axis2.xml" org.wso2.wsas.Main \
+-Dwso2wsas.home="$WSO2WSAS_HOME" -Daxis2.xml="$WSO2WSAS_HOME/conf/axis2.xml" org.wso2.wsas.Main \
start >> "$WSO2WSAS_HOME"/logs/wsas.out 2>&1 &
Modified: wsas/java/trunk/modules/core/bin/wso2wsas.bat
==============================================================================
--- wsas/java/trunk/modules/core/bin/wso2wsas.bat (original)
+++ wsas/java/trunk/modules/core/bin/wso2wsas.bat Sun Dec 3 22:54:40 2006
@@ -209,7 +209,7 @@
endlocal
:startNewPrompt
-start "Web Services Application Server" "%JAVA_HOME%\bin\java" -classpath %WSO2WSAS_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Daxis2.xml=%WSO2WSAS_HOME%\conf\axis2.xml org.wso2.wsas.Main %CMD%
+start "Web Services Application Server" "%JAVA_HOME%\bin\java" -classpath %WSO2WSAS_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dwso2wsas.home="%WSO2WSAS_HOME%" -Daxis2.xml=%WSO2WSAS_HOME%\conf\axis2.xml org.wso2.wsas.Main %CMD%
endlocal
Modified: wsas/java/trunk/modules/core/bin/wso2wsas.sh
==============================================================================
--- wsas/java/trunk/modules/core/bin/wso2wsas.sh (original)
+++ wsas/java/trunk/modules/core/bin/wso2wsas.sh Sun Dec 3 22:54:40 2006
@@ -172,5 +172,5 @@
$JAVA_HOME/bin/java -classpath "$WSO2WSAS_CLASSPATH" \
$JAVA_OPTS \
-Djava.endorsed.dirs="$WSO2WSAS_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed" \
--Daxis2.xml="$WSO2WSAS_HOME/conf/axis2.xml" org.wso2.wsas.Main \
+-Dwso2wsas.home="$WSO2WSAS_HOME" -Daxis2.xml="$WSO2WSAS_HOME/conf/axis2.xml" org.wso2.wsas.Main \
$CMD
\ No newline at end of file
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/Main.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/Main.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/Main.java Sun Dec 3 22:54:40 2006
@@ -56,8 +56,13 @@
private static JettyWebConfiguration jettyConfig = JettyWebConfiguration.getInstance();
public Main() {
- System.setProperty(ServerConstants.AXIS2_HOME, ".");
- System.setProperty(ServerConstants.WSO2WSAS_HOME, ".");
+ if (System.getProperty(ServerConstants.WSO2WSAS_HOME) == null) {
+ System.setProperty(ServerConstants.WSO2WSAS_HOME, ".");
+ System.setProperty(ServerConstants.AXIS2_HOME, ".");
+ } else {
+ System.setProperty(ServerConstants.AXIS2_HOME,
+ System.getProperty(ServerConstants.WSO2WSAS_HOME));
+ }
serverConfig = ServerConfiguration.getInstance();
System.setProperty(ServerConstants.DERBY_HOME,
serverConfig.getFirstProperty("Database.Home"));
@@ -121,7 +126,7 @@
}
serverManager.configContext.setProperty(ServerConstants.WSO2WSAS_INSTANCE, this);
serverManager.configContext.setProperty(ServerConstants.WORK_DIR,
- serverConfig.getFirstProperty("WorkDirectory"));
+ serverConfig.getFirstProperty("WorkDirectory"));
}
private void startListeners() {
@@ -181,7 +186,7 @@
if (cmd.toUpperCase().endsWith(COMMAND_START)) {
// when starting the server with start command, a server socket starts to
// listen to the incoming commands. but no shutdown hooks are registered
- log.info("Using Repository " + new File(".").getAbsolutePath() +
+ log.info("Using Repository " + System.getProperty(ServerConstants.WSO2WSAS_HOME) +
File.separator + main.getAxis2RepoLocation());
main.startServer();
startServerController(main);
@@ -190,7 +195,7 @@
(System.currentTimeMillis() - before) + " ms");
} else if (cmd.toUpperCase().endsWith(COMMAND_RUN)) {
// when running with run command server runs in the console and starts a shutdown hook
- log.info("Using Repository " + new File(".").getAbsolutePath() +
+ log.info("Using Repository " + System.getProperty(ServerConstants.WSO2WSAS_HOME) +
File.separator + main.getAxis2RepoLocation());
main.startServer();
addShutdownHook(main);
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerManager.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerManager.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerManager.java Sun Dec 3 22:54:40 2006
@@ -109,6 +109,7 @@
// ------------------------------------------------------------------------------------------
try {
+ ServerConfiguration.getInstance().init();
initHouseKeeping();
initLoggingConfiguration();
@@ -149,9 +150,9 @@
persistSecurityKeyStore();
persistSecurityScenarios();
+ NetworkUtils.init(serverConfig.getFirstProperty("HostName"));
- NetworkUtils.hostName = serverConfig.getFirstProperty("HostName");
- NetworkUtils.init();
+ initKeystoresDir();
} catch (Exception e) {
String msg = "Cannot start WSO2 WSAS";
log.fatal(msg, e);
@@ -159,6 +160,17 @@
}
}
+ private void initKeystoresDir() {
+ ServerConfiguration serverConfig = ServerConfiguration.getInstance();
+ String ksDirName = serverConfig.getFirstProperty("Security.KeyStoresDir");
+ File ksDir = new File(ksDirName);
+ if (!ksDir.isAbsolute()) { // set the ks dir only if not already set
+ serverConfig.setConfigurationProperty("Security.KeyStoresDir",
+ wso2wsasHome + File.separator +
+ ksDirName);
+ }
+ }
+
private void persistSecurityScenarios() throws ServerException {
String scenarioConfigXml = wso2wsasHome + File.separator + "conf" +
File.separator + "rampart" +
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/util/LoggingUtil.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/util/LoggingUtil.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/util/LoggingUtil.java Sun Dec 3 22:54:40 2006
@@ -214,9 +214,19 @@
}
}
if (appender instanceof FileAppender) {
- String file = System.getProperty(ServerConstants.WSO2WSAS_HOME) + File.separator +
- ((FileAppender) appender).getFile();
- appenderDO.setLogFileName(file);
+ FileAppender fileAppender = (FileAppender) appender;
+ String fileName = fileAppender.getFile();
+ File logFile = new File(fileName);
+ if (!logFile.isAbsolute()) {
+ if (fileName.startsWith(".")) {
+ fileName = fileName.substring(1);
+ }
+ fileName = (System.getProperty(ServerConstants.WSO2WSAS_HOME) + "/" +
+ fileName).replace('\\', '/');
+ fileAppender.setFile(fileName);
+ fileAppender.activateOptions();
+ }
+ appenderDO.setLogFileName(fileName);
appenderDO.setIsFileAppender(true);
} else {
appenderDO.setIsFileAppender(false);
Modified: wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/MainServlet.java
==============================================================================
--- wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/MainServlet.java (original)
+++ wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/MainServlet.java Sun Dec 3 22:54:40 2006
@@ -95,6 +95,7 @@
log.info("WSO2 WSAS startup failed.");
return;
}
+ System.setProperty(ServerConstants.AXIS2_HOME, wso2wsasHome);
System.setProperty(ServerConstants.WSO2WSAS_HOME, wso2wsasHome);
log.info("Using WSO2 WSAS Home = " + wso2wsasHome);
File file = new File(wso2wsasHome);
@@ -111,8 +112,6 @@
return;
}
- System.setProperty(ServerConstants.AXIS2_HOME, wso2wsasHome);
- System.setProperty(ServerConstants.WSO2WSAS_HOME, wso2wsasHome);
// -------------------------------------------------------------------------------------
String serverXML = System.getProperty("server.xml");
@@ -135,14 +134,6 @@
serverInfo.setProperties(props);
serverInfo.process();
is.close();
-
- ServerConfiguration serverConfig = ServerConfiguration.getInstance();
- String ksDir = serverConfig.getFirstProperty("Security.KeyStoresDir");
- if (ksDir.indexOf(wso2wsasHome) == -1) { // set the ks dir only if not already set
- serverConfig.setConfigurationProperty("Security.KeyStoresDir",
- wso2wsasHome + File.separator +
- ksDir);
- }
} catch (IOException e) {
log.error("wso2wsas.properties file cannot be read", e);
log.info("WSO2 WSAS startup failed.");
Modified: wsas/java/trunk/modules/wsf-common-core/src/org/wso2/wsf/common/util/NetworkUtils.java
==============================================================================
--- wsas/java/trunk/modules/wsf-common-core/src/org/wso2/wsf/common/util/NetworkUtils.java (original)
+++ wsas/java/trunk/modules/wsf-common-core/src/org/wso2/wsf/common/util/NetworkUtils.java Sun Dec 3 22:54:40 2006
@@ -36,7 +36,7 @@
*/
public static final String LOCALHOST_IPV6 = "0:0:0:0:0:0:0:1";
- public static String hostName;
+ private static String hostName;
/**
* keep this uninstantiable.
@@ -44,9 +44,11 @@
private NetworkUtils() {
}
- public static void init() throws SocketException {
+ public static void init(String hostName) throws SocketException {
if (hostName == null) {
- hostName = HttpUtils.getIpAddress();
+ NetworkUtils.hostName = HttpUtils.getIpAddress();
+ } else {
+ NetworkUtils.hostName = hostName;
}
}
Modified: wsas/java/trunk/modules/wsf-common-core/src/org/wso2/wsf/common/util/ServerConfiguration.java
==============================================================================
--- wsas/java/trunk/modules/wsf-common-core/src/org/wso2/wsf/common/util/ServerConfiguration.java (original)
+++ wsas/java/trunk/modules/wsf-common-core/src/org/wso2/wsf/common/util/ServerConfiguration.java Sun Dec 3 22:54:40 2006
@@ -57,7 +57,7 @@
init();
}
- protected void init() {
+ public void init() {
try {
loadConfigurationFile(configurationXMLLocation);
} catch (FileNotFoundException e) {
More information about the Wsas-java-dev
mailing list