[wsas-java-dev] svn commit r1041 - in
branches/wsas/java/standalone-tomcat/java: .
modules/admin/src/org/wso2/wsas/admin/service
modules/core/conf modules/core/src/org/wso2/wsas
modules/core/src/org/wso2/wsas/transport
modules/core/src/org/wso2/wsas/util modules/servlet-edition/conf
modules/standalone-edition/src/org/wso2/wsas
svn at wso2.org
svn at wso2.org
Fri Feb 23 07:16:34 PST 2007
Author: azeez
Date: Fri Feb 23 07:16:07 2007
New Revision: 1041
Added:
branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/util/Controllable.java
- copied, changed from r1027, branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/util/Restartable.java
branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/util/ServerController.java
- copied, changed from r1027, branches/wsas/java/standalone-tomcat/java/modules/standalone-edition/src/org/wso2/wsas/ServerController.java
Removed:
branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/util/Restartable.java
branches/wsas/java/standalone-tomcat/java/modules/standalone-edition/src/org/wso2/wsas/ServerController.java
Modified:
branches/wsas/java/standalone-tomcat/java/modules/admin/src/org/wso2/wsas/admin/service/ServerAdmin.java
branches/wsas/java/standalone-tomcat/java/modules/core/conf/web.xml
branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/ServerConstants.java
branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/transport/MainServlet.java
branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/util/SystemRestarter.java
branches/wsas/java/standalone-tomcat/java/modules/servlet-edition/conf/server.xml
branches/wsas/java/standalone-tomcat/java/modules/standalone-edition/src/org/wso2/wsas/Main.java
branches/wsas/java/standalone-tomcat/java/modules/standalone-edition/src/org/wso2/wsas/TomcatRepositoryListener.java
branches/wsas/java/standalone-tomcat/java/modules/standalone-edition/src/org/wso2/wsas/TomcatServer.java
branches/wsas/java/standalone-tomcat/java/pom.xml
Log:
Making the server controller work properly with the MainServlet
Modified: branches/wsas/java/standalone-tomcat/java/modules/admin/src/org/wso2/wsas/admin/service/ServerAdmin.java
==============================================================================
--- branches/wsas/java/standalone-tomcat/java/modules/admin/src/org/wso2/wsas/admin/service/ServerAdmin.java (original)
+++ branches/wsas/java/standalone-tomcat/java/modules/admin/src/org/wso2/wsas/admin/service/ServerAdmin.java Fri Feb 23 07:16:07 2007
@@ -24,7 +24,7 @@
import org.wso2.wsas.ServerManager;
import org.wso2.wsas.admin.service.util.*;
import org.wso2.wsas.persistence.FileBasedConfigSerializer;
-import org.wso2.wsas.util.Restartable;
+import org.wso2.wsas.util.Controllable;
/**
@@ -48,10 +48,10 @@
try {
ConfigurationContext configurationContext =
MessageContext.getCurrentMessageContext().getConfigurationContext();
- Restartable restartable =
- (Restartable) configurationContext.
+ Controllable controllable =
+ (Controllable) configurationContext.
getProperty(ServerConstants.WSO2WSAS_INSTANCE);
- restartable.restartServer();
+ controllable.restartServer();
} catch (ServerException e) {
String msg = "Cannot restart server";
log.error(msg, e);
Modified: branches/wsas/java/standalone-tomcat/java/modules/core/conf/web.xml
==============================================================================
--- branches/wsas/java/standalone-tomcat/java/modules/core/conf/web.xml (original)
+++ branches/wsas/java/standalone-tomcat/java/modules/core/conf/web.xml Fri Feb 23 07:16:07 2007
@@ -76,11 +76,11 @@
<url-pattern>/filedownload/*</url-pattern>
</servlet-mapping>
- <!--<resource-ref>
+ <resource-ref>
<description>WSO2 WSAS DB Connection</description>
<res-ref-name>jdbc/wso2wsas_db</res-ref-name>
<res-type>javax.sql.DataSource</res-type>
<res-auth>Container</res-auth>
<res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>-->
+ </resource-ref>
</web-app>
Modified: branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/ServerConstants.java
==============================================================================
--- branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/ServerConstants.java (original)
+++ branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/ServerConstants.java Fri Feb 23 07:16:07 2007
@@ -83,7 +83,7 @@
public static final String FILE_RESOURCE_MAP = "file.resource.map";
public static final String WORK_DIR = "WORK_DIR";
- public static final String WSO2WSAS_INSTANCE = "WSO2 WSAS";
+ public static final String WSO2WSAS_INSTANCE = "wso2.wsas.instance";
public static final String WEB_RESOURCE_LOCATION = "web.location";
public static final String GENERATED_PAGES = "wso2wsas.generated.pages";
public static final String CONFIGURATION_CONTEXT = "CONFIGURATION_CONTEXT";
Modified: branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/transport/MainServlet.java
==============================================================================
--- branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/transport/MainServlet.java (original)
+++ branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/transport/MainServlet.java Fri Feb 23 07:16:07 2007
@@ -18,7 +18,7 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.log4j.Logger;
import org.wso2.adminui.AdminUIServletFilter;
-import org.wso2.wsas.util.Restartable;
+import org.wso2.wsas.util.Controllable;
import org.wso2.wsas.util.SystemRestarter;
import org.wso2.wsas.util.*;
import org.wso2.wsas.ServerManager;
@@ -40,16 +40,17 @@
import java.util.Map;
import java.util.Properties;
-public class MainServlet extends HttpServlet implements Restartable {
+public class MainServlet extends HttpServlet implements Controllable {
private static final long serialVersionUID = 4517849288538613640L;
private ServerManager serverManager = ServerManager.getInstance();
private static Logger log = Logger.getLogger(MainServlet.class);
private ServletConfig servletConfig;
- private String wso2wsasHome;
- private boolean isShutdownHookAdded;
+ private String wso2wsasHome;
private static final ServerConfiguration serverConfig = ServerConfiguration.getInstance();
+ private Thread shutdownHook;
+ private static ServerController serverController;
protected void doGet(HttpServletRequest request,
HttpServletResponse response) throws ServletException,
@@ -153,6 +154,7 @@
ServerManager.httpPort = serverInfo.getHttpPort();
ServerManager.httpsPort = serverInfo.getHttpsPort();
printInfo(startTime);
+ System.getProperties().remove(ServerConstants.WSO2WSAS_START_TIME);
}
public void start(ServletConfig servletConfig) {
@@ -177,8 +179,7 @@
ConfigurationContext configCtx = serverManager.configContext;
servletConfig.getServletContext().setAttribute(ServerConstants.CONFIGURATION_CONTEXT,
configCtx);
- configCtx.setProperty(org.apache.axis2.Constants.CONTAINER_MANAGED,
- "true");
+ configCtx.setProperty(org.apache.axis2.Constants.CONTAINER_MANAGED, "true");
configCtx.setProperty(ServerConstants.WORK_DIR,
wso2wsasHome + File.separator +
serverConfig.getFirstProperty("WorkDirectory"));
@@ -195,6 +196,7 @@
getAttribute(RequestRedirectionFilter.class.getName());
requestRedirectionFilter.init(configCtx.getContextRoot());
+ startServerController();
} catch (Exception e) {
log.fatal("WSO2 WSAS start failed", e);
}
@@ -210,13 +212,12 @@
}
private void addShutdownHook() {
- if (isShutdownHookAdded) {
+ if (shutdownHook != null) {
return;
}
final MainServlet main = this;
- isShutdownHookAdded = true;
- Runtime.getRuntime().addShutdownHook(new Thread() {
+ shutdownHook = new Thread() {
public void run() {
log.info("Shutting down WSO2 WSAS...");
try {
@@ -227,7 +228,8 @@
log.warn("Error occurred while shutting down WSO2 WSAS : " + e);
}
}
- });
+ };
+ Runtime.getRuntime().addShutdownHook(shutdownHook);
}
public void setAxis2RepoLocation(String axis2RepoLocation) {
@@ -284,10 +286,31 @@
new Thread(st).start();
}
+ public Thread getShutdownHook(){
+ return shutdownHook;
+ }
+
public void shutdown() throws ServerException {
cleanupSystem();
}
+ private void startServerController() {
+ if(serverController != null){
+ return;
+ }
+ serverController = new ServerController(this);
+ String cmdListenerPortStr =
+ serverConfig.getFirstProperty(ServerConfiguration.COMMAND_LISTENER_PORT);
+ if(cmdListenerPortStr == null) {
+ return;
+ }
+ int cmdListenerPort = Integer.parseInt(cmdListenerPortStr);
+ serverController.setPort(cmdListenerPort);
+ Thread thread = new Thread(serverController);
+ thread.start();
+ log.info("Command listener starting on port ----> " + cmdListenerPort);
+ }
+
private void cleanupSystem() {
log.info("Cleaning up system...");
new FileManipulator().deleteDir(new File(wso2wsasHome + File.separator +
Copied: branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/util/Controllable.java (from r1027, branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/util/Restartable.java)
==============================================================================
--- branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/util/Restartable.java (original)
+++ branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/util/Controllable.java Fri Feb 23 07:16:07 2007
@@ -22,7 +22,7 @@
* Any Server implementaion which should support restarting,
* should implement this interface
*/
-public interface Restartable {
+public interface Controllable {
void setAxis2RepoLocation(String axis2RepoLocation);
@@ -33,4 +33,8 @@
void startServer() throws ServerException;
void restartServer() throws ServerException;
+
+ void shutdown() throws ServerException;
+
+ Thread getShutdownHook();
}
Copied: branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/util/ServerController.java (from r1027, branches/wsas/java/standalone-tomcat/java/modules/standalone-edition/src/org/wso2/wsas/ServerController.java)
==============================================================================
--- branches/wsas/java/standalone-tomcat/java/modules/standalone-edition/src/org/wso2/wsas/ServerController.java (original)
+++ branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/util/ServerController.java Fri Feb 23 07:16:07 2007
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.wso2.wsas;
+package org.wso2.wsas.util;
-import org.wso2.utils.ServerException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.wso2.utils.ServerException;
import java.io.IOException;
import java.io.InputStream;
@@ -25,6 +25,7 @@
import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.Socket;
+import java.net.SocketTimeoutException;
/**
* ServerController listens to incoming commands on a designated socket
@@ -36,14 +37,17 @@
public static final String LOCAL_HOST_IP = "127.0.0.1";
public static final String SHUTDOWN_COMMAND = "shutdownserver";
public static final String RESTART_COMMAND = "restartserver";
+ public static ServerSocket serverSocket;
- // standalone server instance
- private Main main;
+ private Controllable controllable;
private int port;
private static Log log = LogFactory.getLog(ServerController.class);
- public ServerController(Main main) {
- this.main = main;
+ public ServerController(Controllable controllable) {
+ this.controllable = controllable;
+ }
+
+ public ServerController() {
}
public void run() {
@@ -51,10 +55,15 @@
}
private void listenForCommands() {
+ try {
+ serverSocket =
+ new ServerSocket(port, 1, InetAddress.getByName(LOCAL_HOST_IP));
+ } catch (IOException e) {
+ log.error("Cannot listen on port " + port + ". It is in use.");
+ System.exit(1);
+ }
while (true) {
try {
- ServerSocket serverSocket =
- new ServerSocket(port, 1, InetAddress.getByName(LOCAL_HOST_IP));
// wait here until some one talks to server
Socket socket = serverSocket.accept();
@@ -67,12 +76,12 @@
String command = stringBuffer.toString();
log.debug("Received Command ==> " + command);
if (command.equals(SHUTDOWN_COMMAND)) {
- if (Main.shutdownHookThread != null) {
- Runtime.getRuntime().removeShutdownHook(Main.shutdownHookThread);
+ if (controllable.getShutdownHook() != null) {
+ Runtime.getRuntime().removeShutdownHook(controllable.getShutdownHook());
}
try {
log.info("Shuting down WSO2 WSAS");
- main.shutdown();
+ controllable.shutdown();
log.info("Shutdown complete");
log.info("Halting JVM");
} catch (ServerException e) {
@@ -87,7 +96,7 @@
} else if (command.equals(RESTART_COMMAND)) {
try {
log.info("Restarting WSO2 WSAS");
- main.restartServer();
+ controllable.restartServer();
} catch (ServerException e) {
log.error("Exception while restarting the server");
} finally {
Modified: branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/util/SystemRestarter.java
==============================================================================
--- branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/util/SystemRestarter.java (original)
+++ branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/util/SystemRestarter.java Fri Feb 23 07:16:07 2007
@@ -18,19 +18,18 @@
package org.wso2.wsas.util;
-import org.wso2.utils.ServerException;
-import org.wso2.wsas.util.Monitor;
-import org.wso2.wsas.util.Restartable;
import org.apache.log4j.Logger;
+import org.wso2.utils.ServerException;
+import org.wso2.wsas.ServerConstants;
public class SystemRestarter implements Runnable {
- private Restartable newInstance;
- private Restartable currentInstance;
+ private Controllable newInstance;
+ private Controllable currentInstance;
private static Logger log = Logger.getLogger(SystemRestarter.class);
- public SystemRestarter(Restartable currentInstance,
- Restartable newInstance,
+ public SystemRestarter(Controllable currentInstance,
+ Controllable newInstance,
String axis2RepoLocation,
Monitor m) {
@@ -42,12 +41,11 @@
public void run() {
try {
- long before = System.currentTimeMillis();
+ System.setProperty(ServerConstants.WSO2WSAS_START_TIME,
+ String.valueOf(System.currentTimeMillis()));
log.info("Restarting WSO2 WSAS...");
this.currentInstance.stopListeners();
this.newInstance.startServer();
- log.info("WSO2 WSAS restarted in " +
- (System.currentTimeMillis() - before) + " ms");
} catch (ServerException e) {
String msg = "Cannot restart system";
log.fatal(msg, e);
Modified: branches/wsas/java/standalone-tomcat/java/modules/servlet-edition/conf/server.xml
==============================================================================
--- branches/wsas/java/standalone-tomcat/java/modules/servlet-edition/conf/server.xml (original)
+++ branches/wsas/java/standalone-tomcat/java/modules/servlet-edition/conf/server.xml Fri Feb 23 07:16:07 2007
@@ -59,6 +59,13 @@
<ServiceGroupContextIdleTime>30000</ServiceGroupContextIdleTime>
</Axis2Config>
+ <!--
+ Command Listener - Listens to external commands
+ -->
+ <CommandListener>
+ <Port>6666</Port>
+ </CommandListener>
+
<!-- ************************************************* -->
<!--Configuration related to WSO2 WSAS Servlet Edition -->
<!-- ************************************************* -->
Modified: branches/wsas/java/standalone-tomcat/java/modules/standalone-edition/src/org/wso2/wsas/Main.java
==============================================================================
--- branches/wsas/java/standalone-tomcat/java/modules/standalone-edition/src/org/wso2/wsas/Main.java (original)
+++ branches/wsas/java/standalone-tomcat/java/modules/standalone-edition/src/org/wso2/wsas/Main.java Fri Feb 23 07:16:07 2007
@@ -42,10 +42,8 @@
public static Thread shutdownHookThread;
private WebServer webServer;
- private ServerManager serverManager;
private static ServerConfiguration serverConfig = ServerConfiguration.getInstance();
private static Logger log = Logger.getLogger(Main.class);
- private static boolean isShutdownHookAdded;
public static XmlConfiguration xmlConfiguration;
@@ -61,7 +59,6 @@
}
System.setProperty(ServerConstants.DERBY_HOME,
serverConfig.getFirstProperty("Database.Home"));
- serverManager = ServerManager.getInstance();
}
@@ -79,16 +76,16 @@
}
public void setTestMode(boolean isTestMode) {
- serverManager.isTestMode = isTestMode;
+ ServerManager.getInstance().isTestMode = isTestMode;
}
public void stop() throws IOException, ServerException {
- serverManager.stop();
+ ServerManager.getInstance().stop();
stopListeners();
}
public void status() throws IOException {
- serverManager.status();
+ ServerManager.getInstance().status();
}
public void shutdown() throws ServerException {
@@ -102,7 +99,7 @@
throw new ServerException(msg, e);
}
webServer = null;
- serverManager.stopHouseKeeping();
+ ServerManager.getInstance().stopHouseKeeping();
cleanupSystem();
}
@@ -118,25 +115,11 @@
long before = System.currentTimeMillis();
final Main main = new Main();
- 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 " + System.getProperty(ServerConstants.WSO2WSAS_HOME) +
- File.separator + main.getAxis2RepoLocation());
+ if (cmd.toUpperCase().endsWith(COMMAND_START) || cmd.toUpperCase().endsWith(COMMAND_RUN)) {
main.startServer();
- startServerController(main);
- main.serverManager.printMgtConsoleURL();
- log.info("WSO2 WSAS started in " + (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 " + System.getProperty(ServerConstants.WSO2WSAS_HOME) +
- File.separator + main.getAxis2RepoLocation());
- main.startServer();
- addShutdownHook(main);
- startServerController(main);
} else if (cmd.toUpperCase().endsWith(COMMAND_RESTART)) {
try {
- ServerController serverController = new ServerController(main);
+ ServerController serverController = new ServerController();
int serverPort =
Integer.parseInt(serverConfig.
getFirstProperty(ServerConfiguration.COMMAND_LISTENER_PORT));
@@ -148,7 +131,7 @@
}
} else if (cmd.toUpperCase().endsWith(COMMAND_STOP)) {
try {
- ServerController serverController = new ServerController(main);
+ ServerController serverController = new ServerController();
int serverPort =
Integer.parseInt(serverConfig.
getFirstProperty(ServerConfiguration.COMMAND_LISTENER_PORT));
@@ -172,17 +155,6 @@
}
}
- private static void startServerController(Main main) {
- ServerController serverController = new ServerController(main);
- int cmdListenerPort =
- Integer.parseInt(serverConfig.
- getFirstProperty(ServerConfiguration.COMMAND_LISTENER_PORT));
- serverController.setPort(cmdListenerPort);
- Thread thread = new Thread(serverController);
- thread.start();
- log.info("Command listener starting on port ----> " + cmdListenerPort);
- }
-
private static void printUsages() {
System.out.println("======================================================");
System.out.println("= WSO2 WSAS Help =");
@@ -192,28 +164,20 @@
System.out.println();
System.out.println("<action> \t\t : Current actions supported - " +
COMMAND_START + ", " +
- COMMAND_RUN + "," +
- COMMAND_RESTART + "," +
- COMMAND_STATUS + "," +
- COMMAND_STOP + "," +
+ COMMAND_RUN + ", " +
+ COMMAND_RESTART + ", " +
+ COMMAND_STATUS + ", " +
+ COMMAND_STOP + ", " +
COMMAND_HELP);
System.out.println();
}
- public String getAxis2RepoLocation() {
- return serverManager.axis2RepoLocation;
- }
-
- public void setAxis2RepoLocation(String axis2RepoLocation) {
- serverManager.axis2RepoLocation = axis2RepoLocation;
- }
-
public ConfigurationContext getConfigContext() {
- return serverManager.configContext;
+ return ServerManager.getInstance().configContext;
}
public void setMonitor(Monitor m) {
- serverManager.monitor = m;
+ ServerManager.getInstance().monitor = m;
}
public void stopListeners() throws ServerException {
@@ -226,41 +190,10 @@
}
}
- public void restartServer() throws ServerException {
- /*SystemRestarter st = new SystemRestarter(this,
- new Main(),
- serverManager.axis2RepoLocation,
- serverManager.monitor);
- new Thread(st).start();*/
- //TODO: Need to fiugre out the restart logic
- }
-
-
- private static void addShutdownHook(final Main main) {
- if (isShutdownHookAdded) {
- return;
- }
- isShutdownHookAdded = true;
- shutdownHookThread = new Thread() {
- public void run() {
- log.info("Shutting down WSO2 WSAS...");
- try {
- main.shutdown();
- log.info("Shutdown complete");
- log.info("Halting JVM");
- } catch (Exception e) {
- e.printStackTrace();
- log.warn("Error occurred while shutting down WSO2 WSAS", e);
- }
- }
- };
- Runtime.getRuntime().addShutdownHook(shutdownHookThread);
- }
-
private void cleanupSystem() {
log.info("Cleaning up system...");
new FileManipulator().deleteDir(new File(serverConfig.getFirstProperty("WorkDirectory")));
- ConfigurationContext configContext = serverManager.configContext;
+ ConfigurationContext configContext = ServerManager.getInstance().configContext;
if (configContext != null) {
Object property = configContext.getProperty(ServerConstants.FILE_RESOURCE_MAP);
if (property != null) {
Modified: branches/wsas/java/standalone-tomcat/java/modules/standalone-edition/src/org/wso2/wsas/TomcatRepositoryListener.java
==============================================================================
--- branches/wsas/java/standalone-tomcat/java/modules/standalone-edition/src/org/wso2/wsas/TomcatRepositoryListener.java (original)
+++ branches/wsas/java/standalone-tomcat/java/modules/standalone-edition/src/org/wso2/wsas/TomcatRepositoryListener.java Fri Feb 23 07:16:07 2007
@@ -106,6 +106,11 @@
"./" + filename);
host.addChild(context);
}
+
+
+
+
+
log.info("Deployed Web application: " + filename);
repoMap.put(filename, new WebContext(file.lastModified(), context));
} else if (filename.endsWith(".war")) { // Handle WAR
Modified: branches/wsas/java/standalone-tomcat/java/modules/standalone-edition/src/org/wso2/wsas/TomcatServer.java
==============================================================================
--- branches/wsas/java/standalone-tomcat/java/modules/standalone-edition/src/org/wso2/wsas/TomcatServer.java (original)
+++ branches/wsas/java/standalone-tomcat/java/modules/standalone-edition/src/org/wso2/wsas/TomcatServer.java Fri Feb 23 07:16:07 2007
@@ -15,9 +15,9 @@
*/
package org.wso2.wsas;
+import org.apache.catalina.Context;
import org.apache.catalina.Engine;
import org.apache.catalina.Host;
-import org.apache.catalina.Context;
import org.apache.catalina.realm.MemoryRealm;
import org.apache.catalina.startup.Embedded;
import org.apache.commons.logging.Log;
@@ -53,6 +53,7 @@
// Create an engine
engine = embedded.createEngine();
+ engine.setName("Catalina");
engine.setDefaultHost(NetworkUtils.getLocalHostname());
embedded.addEngine(engine);
Modified: branches/wsas/java/standalone-tomcat/java/pom.xml
==============================================================================
--- branches/wsas/java/standalone-tomcat/java/pom.xml (original)
+++ branches/wsas/java/standalone-tomcat/java/pom.xml Fri Feb 23 07:16:07 2007
@@ -271,79 +271,85 @@
<dependency>
<groupId>tomcat</groupId>
<artifactId>catalina</artifactId>
- <version>${embedded.tomcat}</version>
+ <version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>catalina-optional</artifactId>
- <version>${embedded.tomcat}</version>
+ <version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-compiler</artifactId>
- <version>${embedded.tomcat}</version>
+ <version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-compiler-jdt</artifactId>
- <version>${embedded.tomcat}</version>
+ <version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
- <version>${embedded.tomcat}</version>
+ <version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>jsp-api</artifactId>
- <version>${embedded.tomcat}</version>
+ <version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>naming-factory</artifactId>
- <version>${embedded.tomcat}</version>
+ <version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>naming-resources</artifactId>
- <version>${embedded.tomcat}</version>
+ <version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>servlet-api</artifactId>
- <version>${embedded.tomcat}</version>
+ <version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>servlets-default</artifactId>
- <version>${embedded.tomcat}</version>
+ <version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>tomcat-coyote</artifactId>
- <version>${embedded.tomcat}</version>
+ <version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>tomcat-http</artifactId>
- <version>${embedded.tomcat}</version>
+ <version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>tomcat-util</artifactId>
- <version>${embedded.tomcat}</version>
+ <version>${tomcat.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>naming-factory-dbcp</artifactId>
+ <version>${tomcat.version}</version>
</dependency>
<dependency>
@@ -1074,7 +1080,7 @@
<dist.dir.temp.war.www>target/temp_war_www</dist.dir.temp.war.www>
<war.temp.assembly.dir>war_zip/temp</war.temp.assembly.dir>
- <embedded.tomcat>5.5.15</embedded.tomcat>
+ <tomcat.version>5.5.15</tomcat.version>
</properties>
More information about the Wsas-java-dev
mailing list