[wsas-java-dev] svn commit r1983 - in trunk/wsas/java/modules:
admin/test-resources/repository/conf
admin/test-resources/repository/modules
admin/test/org/wso2/wsas/admin core/src/org/wso2/wsas
core/src/org/wso2/wsas/util integration/test/org/wso2
standalone-edition/bin standalone-edition/src/org/wso2/wsas
standalone-edition/test/org/wso2/wsas
svn at wso2.org
svn at wso2.org
Mon Apr 23 23:26:43 PDT 2007
Author: saminda
Date: Mon Apr 23 23:26:14 2007
New Revision: 1983
Removed:
trunk/wsas/java/modules/admin/test-resources/repository/conf/
trunk/wsas/java/modules/admin/test-resources/repository/modules/
Modified:
trunk/wsas/java/modules/admin/test/org/wso2/wsas/admin/AdminTestSuite.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/MainServlet.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerManager.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/util/Utils.java
trunk/wsas/java/modules/integration/test/org/wso2/IntegrationTestSuite.java
trunk/wsas/java/modules/standalone-edition/bin/startup.sh
trunk/wsas/java/modules/standalone-edition/src/org/wso2/wsas/Main.java
trunk/wsas/java/modules/standalone-edition/test/org/wso2/wsas/TomcatServerTest.java
Log:
Fixed server.xml releated problems
Modified: trunk/wsas/java/modules/admin/test/org/wso2/wsas/admin/AdminTestSuite.java
==============================================================================
--- trunk/wsas/java/modules/admin/test/org/wso2/wsas/admin/AdminTestSuite.java (original)
+++ trunk/wsas/java/modules/admin/test/org/wso2/wsas/admin/AdminTestSuite.java Mon Apr 23 23:26:14 2007
@@ -17,9 +17,8 @@
import junit.extensions.TestSetup;
import junit.framework.Test;
-import junit.framework.TestSuite;
import junit.framework.TestCase;
-import org.wso2.utils.ServerConfiguration;
+import junit.framework.TestSuite;
import org.wso2.wsas.ServerConstants;
import org.wso2.wsas.admin.service.logging.LoggingServiceIntegrationTest;
import org.wso2.wsas.util.ServerUtils;
@@ -30,6 +29,7 @@
public class AdminTestSuite extends TestCase {
private static ServerUtils serverUtils;
+
public static Test suite() {
TestSuite suite = new TestSuite(AdminTestSuite.class);
@@ -42,7 +42,8 @@
System.setProperty(org.apache.axis2.Constants.AXIS2_CONF,
"target/tomcat_test/conf/axis2.xml");
System.setProperty(ServerConstants.WSO2WSAS_HOME, "target/tomcat_test");
- ServerConfiguration.configurationXMLLocation = "target/tomcat_test/conf/server.xml";
+ System.setProperty(ServerConstants.WSO2WSAS_SERVER_XML,
+ "target/tomcat_test/conf/server.xml");
serverUtils = new ServerUtils();
serverUtils.startServer();
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/MainServlet.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/MainServlet.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/MainServlet.java Mon Apr 23 23:26:14 2007
@@ -111,10 +111,6 @@
}
}
- System.setProperty(ServerConstants.AXIS2_HOME, wso2wsasHome);
- System.setProperty(ServerConstants.WSO2WSAS_HOME, wso2wsasHome);
- serverConfig = ServerConfiguration.getInstance();
- serverManager = ServerManager.getInstance();
log.info("Using WSO2 WSAS Home = " + wso2wsasHome);
File file = new File(wso2wsasHome);
if (!file.exists()) {
@@ -129,8 +125,22 @@
log.info("WSO2 WSAS startup failed.");
return;
}
+
+ System.setProperty(ServerConstants.AXIS2_HOME, wso2wsasHome);
+ System.setProperty(ServerConstants.WSO2WSAS_HOME, wso2wsasHome);
+
+ // -------------------------------------------------------------------------------------
+ String serverXML = System.getProperty(ServerConstants.WSO2WSAS_SERVER_XML);
+ if (serverXML == null) {
+ serverXML = wso2wsasHome + File.separator + "conf" + File.separator + "server.xml";
+ }
+
+ serverConfig = ServerConfiguration.getInstance();
+ serverConfig.init(serverXML);
+ serverManager = ServerManager.getInstance();
+ // -------------------------------------------------------------------------------------
+
is.close();
- ServerConfiguration.configurationXMLLocation = Utils.getWsasServerXml();
// ServerInfo class
String serverInfoImplClass = props.getProperty(ServerPropertyKeys.APPSERVER_INFO_IMPL);
@@ -160,7 +170,8 @@
ServletContext servletContext = servletConfig.getServletContext();
System.setProperty(ServerConstants.DERBY_HOME,
- new File(serverConfig.getFirstProperty("Database.Home")).getAbsolutePath());
+ new File(serverConfig.getFirstProperty(
+ "Database.Home")).getAbsolutePath());
serverManager.adminResourceBase = servletContext.getRealPath(".");
if (serverManager.adminResourceBase == null) {
serverManager.adminResourceBase = "TODO"; //TODO: Get the path to the resource base
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerManager.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerManager.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerManager.java Mon Apr 23 23:26:14 2007
@@ -100,7 +100,6 @@
wso2wsasHome = System.getProperty(ServerConstants.WSO2WSAS_HOME);
- Utils.getWsasServerXml();
// ------------------------------------------------------------------------------------------
try {
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/util/Utils.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/util/Utils.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/util/Utils.java Mon Apr 23 23:26:14 2007
@@ -46,8 +46,8 @@
public static String getWsasServerXml(){
String serverXML = System.getProperty(ServerConstants.WSO2WSAS_SERVER_XML);
if (serverXML == null) {
- System.setProperty(ServerConstants.WSO2WSAS_SERVER_XML,
- ServerConfiguration.configurationXMLLocation);
+ //TODO provision for improvements. Since server.xml is the main config file of WSAS
+ // TODO use other mechanisms to get the location of server.xml file.
}
return serverXML;
}
Modified: trunk/wsas/java/modules/integration/test/org/wso2/IntegrationTestSuite.java
==============================================================================
--- trunk/wsas/java/modules/integration/test/org/wso2/IntegrationTestSuite.java (original)
+++ trunk/wsas/java/modules/integration/test/org/wso2/IntegrationTestSuite.java Mon Apr 23 23:26:14 2007
@@ -15,28 +15,21 @@
*/
package org.wso2;
+import junit.extensions.TestSetup;
import junit.framework.Test;
-import junit.framework.TestSuite;
import junit.framework.TestCase;
-import junit.extensions.TestSetup;
-import org.wso2.codegen.service.ajax.AjaxClientGeneratorServiceTest;
-import org.wso2.codegen.service.java.JavaClientGeneratorServiceTest;
-import org.wso2.codegen.service.WSDLInfoServiceTest;
-import org.wso2.tracer.service.TracerServiceIntegrationTest;
+import junit.framework.TestSuite;
+import org.wso2.wsas.ServerConstants;
import org.wso2.wsas.rest.RestSupportTest;
import org.wso2.wsas.rest.RestWithSchemasTest;
-import org.wso2.wsas.sample.commodityquote.CommodityQuoteServiceIntegrationTest;
-import org.wso2.wsas.sample.trader.TraderServiceIntegrationTest;
-import org.wso2.wsas.ServerConstants;
import org.wso2.wsas.util.ServerUtils;
-import org.wso2.utils.ServerConfiguration;
/*
*
*/
public class IntegrationTestSuite extends TestCase {
- private static ServerUtils serverUtils;
+ private static ServerUtils serverUtils;
public static Test suite() {
TestSuite suite = new TestSuite("Integration Tests");
@@ -59,7 +52,8 @@
System.setProperty(org.apache.axis2.Constants.AXIS2_CONF,
"target/tomcat_test/conf/axis2.xml");
System.setProperty(ServerConstants.WSO2WSAS_HOME, "target/tomcat_test");
- ServerConfiguration.configurationXMLLocation = "target/tomcat_test/conf/server.xml";
+ System.setProperty(ServerConstants.WSO2WSAS_SERVER_XML,
+ "target/tomcat_test/conf/server.xml");
serverUtils = new ServerUtils();
serverUtils.startServer();
@@ -74,7 +68,7 @@
}
- public void testEmpty() throws Exception{
+ public void testEmpty() throws Exception {
// This is only to get the Maven2 build going. Please dont remove this methd.
}
}
Modified: trunk/wsas/java/modules/standalone-edition/bin/startup.sh
==============================================================================
--- trunk/wsas/java/modules/standalone-edition/bin/startup.sh (original)
+++ trunk/wsas/java/modules/standalone-edition/bin/startup.sh Mon Apr 23 23:26:14 2007
@@ -167,5 +167,6 @@
exec "$JAVACMD" \
$JAVA_OPTS \
-classpath "$WSO2WSAS_CLASSPATH" \
--Dwso2wsas.home="$WSO2WSAS_HOME" -Daxis2.xml="$WSO2WSAS_HOME/conf/axis2.xml" org.wso2.wsas.Main \
+-Djava.endorsed.dirs="$WSO2WSAS_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed" \
+-Dwso2wsas.home="$WSO2WSAS_HOME" -Dwso2wsas.server.xml="$WSO2WSAS_HOME/conf/server.xml" org.wso2.wsas.Main \
start >> "$WSO2WSAS_HOME"/logs/wsas.out 2>&1 &
Modified: trunk/wsas/java/modules/standalone-edition/src/org/wso2/wsas/Main.java
==============================================================================
--- trunk/wsas/java/modules/standalone-edition/src/org/wso2/wsas/Main.java (original)
+++ trunk/wsas/java/modules/standalone-edition/src/org/wso2/wsas/Main.java Mon Apr 23 23:26:14 2007
@@ -20,6 +20,7 @@
import org.wso2.utils.FileManipulator;
import org.wso2.utils.ServerConfiguration;
import org.wso2.utils.ServerException;
+import org.wso2.utils.ServerConfigurationException;
import org.wso2.wsas.util.*;
import java.io.File;
@@ -42,7 +43,7 @@
public static Thread shutdownHookThread;
private WebServer webServer;
- private static ServerConfiguration serverConfig = ServerConfiguration.getInstance();
+ private static ServerConfiguration serverConfig;
private static Logger log = Logger.getLogger(Main.class);
public static XmlConfiguration xmlConfiguration;
@@ -55,6 +56,13 @@
System.setProperty(ServerConstants.AXIS2_HOME,
System.getProperty(ServerConstants.WSO2WSAS_HOME));
}
+ String serverXMLLocation = Utils.getWsasServerXml();
+ try {
+ serverConfig = ServerConfiguration.getInstance();
+ serverConfig.init(serverXMLLocation);
+ } catch (ServerConfigurationException e) {
+ throw new RuntimeException(e);
+ }
System.setProperty(ServerConstants.DERBY_HOME,
serverConfig.getFirstProperty("Database.Home"));
}
Modified: trunk/wsas/java/modules/standalone-edition/test/org/wso2/wsas/TomcatServerTest.java
==============================================================================
--- trunk/wsas/java/modules/standalone-edition/test/org/wso2/wsas/TomcatServerTest.java (original)
+++ trunk/wsas/java/modules/standalone-edition/test/org/wso2/wsas/TomcatServerTest.java Mon Apr 23 23:26:14 2007
@@ -24,7 +24,6 @@
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
import org.wso2.utils.NetworkUtils;
-import org.wso2.utils.ServerConfiguration;
import org.wso2.wsas.util.ServerUtils;
import javax.xml.namespace.QName;
@@ -44,7 +43,8 @@
System.setProperty(org.apache.axis2.Constants.AXIS2_CONF,
"target/tomcat_test/conf/axis2.xml");
System.setProperty(ServerConstants.WSO2WSAS_HOME, "target/tomcat_test");
- ServerConfiguration.configurationXMLLocation = "target/tomcat_test/conf/server.xml";
+ System.setProperty(ServerConstants.WSO2WSAS_SERVER_XML,
+ "target/tomcat_test/conf/server.xml");
serverUtils = new ServerUtils();
serverUtils.startServer();
@@ -65,7 +65,8 @@
EndpointReference targetEPR =
new EndpointReference("http://" + NetworkUtils.getLocalHostname() + ":"
+ (TestConstants.TESTING_PORT)
- + "/" + ServerConstants.SERVICE_PATH + "/version/getVersion");
+ + "/" + ServerConstants.SERVICE_PATH +
+ "/version/getVersion");
testConnect(targetEPR);
removeProperties();
@@ -93,7 +94,8 @@
EndpointReference targetEPR = new EndpointReference(
"http://" + NetworkUtils.getLocalHostname() + ":" +
(TestConstants.TESTING_PORT)
- + "/" + ServerConstants.SERVICE_PATH + "/" + TestConstants.ECHO_SERVICE_NAME.getLocalPart() + "/" +
+ + "/" + ServerConstants.SERVICE_PATH + "/" +
+ TestConstants.ECHO_SERVICE_NAME.getLocalPart() + "/" +
TestConstants.ECHO_OPERATION.getLocalPart());
testConnect(targetEPR);
@@ -110,7 +112,8 @@
OMElement result = sender.sendReceive(payload);
OMElement returnElement = result.getFirstChildWithName(new QName("return"));
- assertXMLEqual(payload.getFirstElement().toString(), returnElement.getFirstElement().toString());
+ assertXMLEqual(payload.getFirstElement().toString(),
+ returnElement.getFirstElement().toString());
assertTrue(true);
}
More information about the Wsas-java-dev
mailing list