[wsas-java-dev] svn commit r1207 - in
trunk/wsas/java/modules/servlet-edition: conf/tomcat/4.x
src/org/wso2/wsas/installer
svn at wso2.org
svn at wso2.org
Fri Mar 9 01:55:40 PST 2007
Author: azeez
Date: Fri Mar 9 01:55:11 2007
New Revision: 1207
Modified:
trunk/wsas/java/modules/servlet-edition/conf/tomcat/4.x/server.xml
trunk/wsas/java/modules/servlet-edition/src/org/wso2/wsas/installer/AbstractInstaller.java
trunk/wsas/java/modules/servlet-edition/src/org/wso2/wsas/installer/GeronimoInstaller.java
trunk/wsas/java/modules/servlet-edition/src/org/wso2/wsas/installer/JBossInstaller.java
trunk/wsas/java/modules/servlet-edition/src/org/wso2/wsas/installer/TomcatInstaller.java
Log:
Updating the TomcatInstaller to write the wso2wsas home
Modified: trunk/wsas/java/modules/servlet-edition/conf/tomcat/4.x/server.xml
==============================================================================
--- trunk/wsas/java/modules/servlet-edition/conf/tomcat/4.x/server.xml (original)
+++ trunk/wsas/java/modules/servlet-edition/conf/tomcat/4.x/server.xml Fri Mar 9 01:55:11 2007
@@ -105,7 +105,7 @@
acceptCount="100" debug="0" scheme="https" secure="true"
useURIValidationHack="false" disableUploadTimeout="true">
<Factory className="org.apache.coyote.tomcat4.CoyoteServerSocketFactory"
- keystoreFile="/home/azeez/.wso2wsas/conf/wso2wsas.jks" keystorePass="wso2wsas"
+ keystoreFile="${wso2wsas.home}/conf/wso2wsas.jks" keystorePass="wso2wsas"
clientAuth="false" protocol="TLS" />
</Connector>
@@ -219,7 +219,7 @@
</parameter>
<parameter>
<name>url</name>
- <value>jdbc:derby:../database/WSO2WSAS_DB</value>
+ <value>jdbc:derby:${wso2wsas.home}/database/WSO2WSAS_DB</value>
</parameter>
</ResourceParams>
</Context>
Modified: trunk/wsas/java/modules/servlet-edition/src/org/wso2/wsas/installer/AbstractInstaller.java
==============================================================================
--- trunk/wsas/java/modules/servlet-edition/src/org/wso2/wsas/installer/AbstractInstaller.java (original)
+++ trunk/wsas/java/modules/servlet-edition/src/org/wso2/wsas/installer/AbstractInstaller.java Fri Mar 9 01:55:11 2007
@@ -31,7 +31,7 @@
public abstract class AbstractInstaller implements Installable {
protected String serverHome;
- protected String wsasHome;
+ protected String wso2wsasHome;
protected String javaHome;
public void setServerHome(String serverHome) {
@@ -43,7 +43,7 @@
}
public String getWSASHome() {
- return this.wsasHome;
+ return this.wso2wsasHome;
}
public String setJavaHome(String javaHome) {
@@ -51,12 +51,12 @@
}
public void setWSASHome(String wsasHome) {
- this.wsasHome = wsasHome;
+ this.wso2wsasHome = wsasHome;
}
protected void rearchiveWsasWAR() throws IOException {
// Create the wso2wsas.properties file in wso2wsas.war/WEB-INF/classes/wso2wsas.properties
- createWSASPropertiesFile(wsasHome);
+ createWSASPropertiesFile(wso2wsasHome);
// Archive the extracted wso2wsas.war
System.out.println("Rearchiving wso2wsas.war with " + InstallerConstants.WSO2WSAS_PROPERTIES +
Modified: trunk/wsas/java/modules/servlet-edition/src/org/wso2/wsas/installer/GeronimoInstaller.java
==============================================================================
--- trunk/wsas/java/modules/servlet-edition/src/org/wso2/wsas/installer/GeronimoInstaller.java (original)
+++ trunk/wsas/java/modules/servlet-edition/src/org/wso2/wsas/installer/GeronimoInstaller.java Fri Mar 9 01:55:11 2007
@@ -176,7 +176,7 @@
OMElement docEle = staxOMBuilder.getDocumentElement();
OMElement omElement = getOMElement("//ns:config-property-setting[@name='ConnectionURL']",
docEle);
- omElement.setText("jdbc:derby:" + wsasHome + "/database/WSO2WSAS_DB");
+ omElement.setText("jdbc:derby:" + wso2wsasHome + "/database/WSO2WSAS_DB");
XMLStreamWriter writer =
XMLOutputFactory.newInstance().
createXMLStreamWriter(new FileWriter(planXml));
Modified: trunk/wsas/java/modules/servlet-edition/src/org/wso2/wsas/installer/JBossInstaller.java
==============================================================================
--- trunk/wsas/java/modules/servlet-edition/src/org/wso2/wsas/installer/JBossInstaller.java (original)
+++ trunk/wsas/java/modules/servlet-edition/src/org/wso2/wsas/installer/JBossInstaller.java Fri Mar 9 01:55:11 2007
@@ -256,7 +256,7 @@
OMElement omEle = (OMElement) iter.next();
OMAttribute ksfAttr = omEle.getAttribute(new QName("keystoreFile"));
if (ksfAttr != null) {
- ksfAttr.setAttributeValue(wsasHome + File.separator + "conf" +
+ ksfAttr.setAttributeValue(wso2wsasHome + File.separator + "conf" +
File.separator + "wso2wsas.jks");
XMLStreamWriter writer =
Modified: trunk/wsas/java/modules/servlet-edition/src/org/wso2/wsas/installer/TomcatInstaller.java
==============================================================================
--- trunk/wsas/java/modules/servlet-edition/src/org/wso2/wsas/installer/TomcatInstaller.java (original)
+++ trunk/wsas/java/modules/servlet-edition/src/org/wso2/wsas/installer/TomcatInstaller.java Fri Mar 9 01:55:11 2007
@@ -25,7 +25,10 @@
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMXMLParserWrapper;
+import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.axiom.om.impl.llom.factory.OMXMLBuilderFactory;
+import org.jaxen.SimpleNamespaceContext;
+import org.jaxen.XPath;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLInputFactory;
@@ -124,9 +127,9 @@
fileMan.copyFile(new File("conf" + File.separator + "log4j.properties"),
new File(serverHome + File.separator + "common" +
File.separator + "classes" + File.separator + "log4j.properties"));
- fileMan.copyFile(new File("lib" + File.separator + "wso2wsf-common-core-1.1.jar"),
- new File(serverHome + File.separator + "common" +
- File.separator + "lib" + File.separator + "wso2wsf-common-core-1.1.jar"));
+// fileMan.copyFile(new File("lib" + File.separator + "wso2wsf-common-core-1.1.jar"),
+// new File(serverHome + File.separator + "common" +
+// File.separator + "lib" + File.separator + "wso2wsf-common-core-1.1.jar"));
} catch (IOException e) {
e.printStackTrace();
throw new InstallationException("Cannot create Tomcat 4.x specific directories.");
@@ -180,33 +183,54 @@
OMElement factoryEle =
omEle.getFirstChildWithName(new QName("Factory"));
factoryEle.getAttribute(new QName("keystoreFile")).
- setAttributeValue(wsasHome + File.separator + "conf" +
+ setAttributeValue(wso2wsasHome + File.separator + "conf" +
File.separator + "wso2wsas.jks");
-
- XMLStreamWriter writer =
- XMLOutputFactory.newInstance().
- createXMLStreamWriter(new FileWriter(ourServerXML));
- docEle.serialize(writer);
break;
}
}
- } else {
- for (Iterator iter = serviceEle.getChildrenWithName(new QName("Connector"));
- iter.hasNext();) {
- OMElement omEle = (OMElement) iter.next();
- OMAttribute ksfAttr = omEle.getAttribute(new QName("keystoreFile"));
- if (ksfAttr != null) {
- ksfAttr.setAttributeValue(wsasHome + File.separator + "conf" +
- File.separator + "wso2wsas.jks");
- XMLStreamWriter writer =
- XMLOutputFactory.newInstance().
- createXMLStreamWriter(new FileWriter(ourServerXML));
- docEle.serialize(writer);
+ // Set the Database path
+ // TODO: this is broken
+ SimpleNamespaceContext nsCtx = new SimpleNamespaceContext();
+ XPath xp =
+ new AXIOMXPath("//Host/Context/ResourceParams[@name=\"jdbc/wso2wsas_db\"]/parameter/name");
+ xp.setNamespaceContext(nsCtx);
+ OMElement nameEle = (OMElement) xp.selectSingleNode(docEle);
+ if (nameEle.getText().equals("url")) {
+ nameEle.getParent().
+ getFirstChildWithName(new QName("value")).setText("jdbc:derby:" +
+ wso2wsasHome +
+ "/database/WSO2WSAS_DBDD");
+ }
+ /*for (Iterator iter = xp.selectNodes(docEle).iterator(); iter.hasNext();) {
+ OMElement omElement = (OMElement) iter.next();
+ if (omElement.getText().equals("url")) {
+ omElement.getParent().getFirstChildWithName(new QName("value")).
+ setText("jdbc:derby:" + wso2wsasHome + "/database/WSO2WSAS_DBDD");
break;
}
- }
+ }*/
+ } else {
+ SimpleNamespaceContext nsCtx = new SimpleNamespaceContext();
+
+ // Set the keystore path
+ XPath xp1 = new AXIOMXPath("//Service/Connector/@keystoreFile");
+ xp1.setNamespaceContext(nsCtx);
+ OMAttribute ksFileAttrib = (OMAttribute) xp1.selectSingleNode(docEle);
+ ksFileAttrib.setAttributeValue(wso2wsasHome + File.separator + "conf" +
+ File.separator + "wso2wsas.jks");
+
+ // Set the Database path
+ XPath xp = new AXIOMXPath("//Service/Engine/Host/Context/Resource/@url");
+ xp.setNamespaceContext(nsCtx);
+ OMAttribute attrib = (OMAttribute) xp.selectSingleNode(docEle);
+ attrib.setAttributeValue("jdbc:derby:" + wso2wsasHome + "/database/WSO2WSAS_DB");
}
+
+ XMLStreamWriter writer =
+ XMLOutputFactory.newInstance().
+ createXMLStreamWriter(new FileWriter(ourServerXML));
+ docEle.serialize(writer);
} catch (Exception e) {
String msg = "Could not modify server.xml file: " + e;
System.err.println(" " + msg);
@@ -219,7 +243,7 @@
tomcatConfDir.getAbsolutePath() + "\"");
serverXml = tomcatConfDir.getAbsolutePath() + File.separator + "server.xml";
File tomcatServerXML = new File(serverXml);
- String delete;
+ String replace;
if (tomcatServerXML.exists()) {
do {
System.out.println("\nWSO2 WSAS requires HTTPS to be enabled for the administration" +
@@ -237,10 +261,10 @@
tomcatConfDir.getAbsolutePath() +
File.separator + "conf" + File.separator +
"server.xml file(y/n)? [n]: ");
- delete = InputReader.readInput();
- } while (!delete.equalsIgnoreCase("y") && !delete.equalsIgnoreCase("n") &&
- !(delete.trim().length() == 0));
- if (delete.equalsIgnoreCase("y")) {
+ replace = InputReader.readInput();
+ } while (!replace.equalsIgnoreCase("y") && !replace.equalsIgnoreCase("n") &&
+ !(replace.trim().length() == 0));
+ if (replace.equalsIgnoreCase("y")) {
File origServerXML = new File(tomcatConfDir.getAbsolutePath() +
File.separator + "server.xml");
String backedupServerXML = "server-" + System.currentTimeMillis() + ".xml.bak";
More information about the Wsas-java-dev
mailing list