pnever 2004/04/20 04:12:29
Modified: proposals/tamino/src/store/org/apache/slide/store/tamino/store
Tag: TWS421_BRANCH XChildStore.java
Log:
Removed usage of org.apache.slide.util.os.Catalina to allow deploying under anthor
container, e.g. WebLogic
Revision Changes Path
No revision
No revision
1.1.4.1 +16 -14
jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/store/XChildStore.java
Index: XChildStore.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/store/XChildStore.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- XChildStore.java 25 Mar 2004 16:18:03 -0000 1.1
+++ XChildStore.java 20 Apr 2004 11:12:29 -0000 1.1.4.1
@@ -299,16 +299,18 @@
String taminoBase = getParameter("taminoBase");
if ( (dbSession instanceof XDbSession) ) {
- Catalina catalina;
+// Catalina catalina;
+ String context = System.getProperty("webapp.context",
"taminowebdavserver");
+ System.out.println("@@@ webapp.context: "+context);
- try {
- catalina = Catalina.create();
- } catch (Abort e) {
- throw new ServiceInitializationFailedException(this, e);
- }
+// try {
+// catalina = Catalina.create();
+// } catch (Abort e) {
+// throw new ServiceInitializationFailedException(this, e);
+// }
try {
String host = Domain.getParameter(HOST_SELECTION_NAME,
InetAddress.getLocalHost().getHostAddress());
- String port = Domain.getParameter(PORT_SELECTION_NAME, "" +
catalina.getHttpPort());
+ String port = Domain.getParameter(PORT_SELECTION_NAME, "4000");
XConnection xcon = ((XDbSession)dbSession).getXConnection();
TConnection tcon = xcon.getTConnection();
String taminoDb = getParameter(TAMINO_DATABASE);
@@ -321,14 +323,14 @@
if ( (oldURL != null) &&
(!oldURL.equals(urls.getDefaultWebdavURL())) &&
- (!oldURL.equals(urls.getWebdavURL(host, port,
catalina.getContext()))) &&
+ (!oldURL.equals(urls.getWebdavURL(host, port, context))) &&
(!getParameter(FORCE_CONNECT_SELECTION_NAME,
"").equals("true")) ) {
throw new ServiceInitializationFailedException(
this,
- "WebDAV Server " + oldURL + " is already defined. " +
urls.getWebdavURL(host, port, catalina.getContext()) + " can not initialize");
+ "WebDAV Server " + oldURL + " is already defined. " +
urls.getWebdavURL(host, port, context) + " can not initialize");
}
urls.storeWebdavURL(
- getParameter(TAMINO_COLLECTION), host, port,
catalina.getContext());
+ getParameter(TAMINO_COLLECTION), host, port, context);
GlobalsAccessor globAccessor = new GlobalsAccessor( xcon );
Element taminoGlobals = globAccessor.readGlobalsElm(
taminoCollection );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
