From 2096c75bcf1f1704f61620a575c6dca218287171 Mon Sep 17 00:00:00 2001 From: antelder Date: Mon, 7 Dec 2009 11:36:47 +0000 Subject: Add default domain uri to default context.xml git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@887893 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/tuscany/sca/war/Installer.java | 33 +++++++++++++++++++--- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/sca-java-2.x/trunk/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/Installer.java b/sca-java-2.x/trunk/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/Installer.java index e469ed235a..aa2d059300 100644 --- a/sca-java-2.x/trunk/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/Installer.java +++ b/sca-java-2.x/trunk/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/Installer.java @@ -115,6 +115,7 @@ public class Installer { } removeServerXml(serverXml); removeHostConfigXml(serverXml); + removeContextXml(); } private boolean doInstall() { @@ -154,9 +155,10 @@ public class Installer { // Add Tuscany HostConfig to Hosts definitions in server.xml updateHostConfigXml(serverXml); - // Add Tuscany specific default web.xml + // Add Tuscany specific default web.xml and context.xml definitions addTuscanyWebXml(); - + addTuscanyContextXml(); + return true; } @@ -188,6 +190,30 @@ public class Installer { writeAll(tuscanyWebXmlFile, newWebXml); } } + + private static final String tuscanyContextXML = + "\r\n\r\n \r\n" + + " "; + + private void addTuscanyContextXml() { + File contextXmlFile = new File(catalinaBase, "/conf/context.xml"); + if ((contextXmlFile.exists())) { + String contextXML = readAll(contextXmlFile); + String newcontextXml = replace(contextXML, "", "" + tuscanyContextXML, "<", "<"); + backup(contextXmlFile); + writeAll(contextXmlFile, newcontextXml); + } + } + private void removeContextXml() { + File contextXmlFile = new File(catalinaBase, "/conf/context.xml"); + if ((contextXmlFile.exists())) { + String contextXML = readAll(contextXmlFile); + String oldContextXml = replace(contextXML, "" + tuscanyContextXML, "", "<", "<"); + writeAll(contextXmlFile, oldContextXml); + } + } private File findTuscanyTomcatJar(File tuscanyWAR) { File lib = new File(tuscanyWAR, "/tomcat-lib"); @@ -199,8 +225,7 @@ public class Installer { return null; } - - static final String tuscanyListener = + private static final String tuscanyListener = "\r\n" + " \r\n" + " "; -- cgit v1.2.3