r1020 - in xwiki/trunk: src/main src/main/java/com/xpn/xwiki src/main/java/com/xpn/xwiki/web src/test/cactus/com/xpn/xwiki/test src/test/java/com/xpn/xwiki/test standalone/config
Ludovic Dubost
ludovic at users.forge.objectweb.org
Fri Mar 31 02:11:17 CEST 2006
Author: ludovic
Date: 2006-03-31 02:11:08 +0200 (Fri, 31 Mar 2006)
New Revision: 1020
Modified:
xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
xwiki/trunk/src/main/java/com/xpn/xwiki/XWikiContext.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/XWikiServletURLFactory.java
xwiki/trunk/src/main/web-exo.xml
xwiki/trunk/src/main/web-test.xml
xwiki/trunk/src/main/web.xml
xwiki/trunk/src/test/cactus/com/xpn/xwiki/test/ServletVirtualTest.java
xwiki/trunk/src/test/java/com/xpn/xwiki/test/HibernateTestCase.java
xwiki/trunk/standalone/config/xwiki.cfg
Log:
Fix cactus virtual wiki tests
Removed error.jsp from web xml file
Updated standalone wiki config
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java 2006-03-30 22:18:13 UTC (rev 1019)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java 2006-03-31 00:11:08 UTC (rev 1020)
@@ -165,6 +165,15 @@
XWikiEngineContext econtext = context.getEngineContext();
try {
+ if (context.getRequest().getRequestURL().indexOf("/testbin/")!=-1) {
+ xwikiname = "xwikitest";
+ context.setDatabase("xwikitest");
+ }
+ } catch (Exception e) {}
+
+ context.setMainXWiki(xwikiname);
+
+ try {
xwikicfg = getConfigPath();
xwiki = (XWiki) econtext.getAttribute(xwikiname);
if (xwiki == null) {
@@ -259,7 +268,7 @@
}
;
- if (host.equals("")||host.equals("localhost")||host.equals("127.0.0.1"))
+ if (host.equals(""))
return xwiki;
String appname = findWikiServer(host, context);
@@ -272,7 +281,7 @@
XWikiURLFactory urlf = context.getURLFactory();
if ((urlf != null) && (urlf instanceof XWikiServletURLFactory)
&& ("".equals(((XWikiServletURLFactory) urlf).getServletPath())))
- appname = "xwiki";
+ appname = context.getMainXWiki();
else
appname = uri.substring(1, uri.indexOf("/", 2));
@@ -280,7 +289,8 @@
appname = servername;
} else {
if ((servername.equals("www"))
- || (context.getUtil().match("m|[0-9]+\\.|[0-9]+\\.[0-9]+\\.[0-9]|", host))) {
+ || (host.equals("localhost")
+ || (context.getUtil().match("m|[0-9]+\\.|[0-9]+\\.[0-9]+\\.[0-9]|", host)))) {
if (appname.equals("xwiki"))
return xwiki;
} else {
@@ -338,7 +348,7 @@
if (wikiserver != null)
return wikiserver;
- String hql = ", BaseObject as obj, StringProperty as prop where obj.name=" + context.getWiki().getFullNameSQL()
+ String hql = ", BaseObject as obj, StringProperty as prop where obj.name=doc.fullName"
+ " and obj.className='XWiki.XWikiServerClass' and prop.id.id = obj.id "
+ "and prop.id.name = 'server' and prop.value='" + host + "'";
try {
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/XWikiContext.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/XWikiContext.java 2006-03-30 22:18:13 UTC (rev 1019)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/XWikiContext.java 2006-03-31 00:11:08 UTC (rev 1020)
@@ -256,4 +256,11 @@
this.cacheDuration = cacheDuration;
}
+ public String getMainXWiki() {
+ return (String ) get("mainxwiki");
+ }
+
+ public void setMainXWiki(String str) {
+ put("mainxwiki", str);
+ }
}
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/web/XWikiServletURLFactory.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/web/XWikiServletURLFactory.java 2006-03-30 22:18:13 UTC (rev 1019)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/web/XWikiServletURLFactory.java 2006-03-31 00:11:08 UTC (rev 1020)
@@ -72,8 +72,6 @@
actionPath = "bin/";
}
else if (context.getRequest().getServletPath().startsWith ("/testbin")) {
- context.setDatabase("xwikitest");
- context.setOriginalDatabase("xwikitest");
actionPath = "testbin/";
} else {
actionPath = context.getWiki().Param("xwiki.defaultactionpath", "xwiki/");;
Modified: xwiki/trunk/src/main/web-exo.xml
===================================================================
--- xwiki/trunk/src/main/web-exo.xml 2006-03-30 22:18:13 UTC (rev 1019)
+++ xwiki/trunk/src/main/web-exo.xml 2006-03-31 00:11:08 UTC (rev 1020)
@@ -111,6 +111,7 @@
<url-pattern>/xwiki/*</url-pattern>
</servlet-mapping>
+ <!--
<error-page>
<error-code>500</error-code>
<location>/error.jsp</location>
@@ -119,6 +120,7 @@
<error-code>404</error-code>
<location>/error.jsp</location>
</error-page>
+ -->
<!-- The Usual Welcome File List -->
<welcome-file-list>
Modified: xwiki/trunk/src/main/web-test.xml
===================================================================
--- xwiki/trunk/src/main/web-test.xml 2006-03-30 22:18:13 UTC (rev 1019)
+++ xwiki/trunk/src/main/web-test.xml 2006-03-31 00:11:08 UTC (rev 1020)
@@ -112,6 +112,7 @@
<url-pattern>/xwiki/*</url-pattern>
</servlet-mapping>
+ <!--
<error-page>
<error-code>500</error-code>
<location>/error.jsp</location>
@@ -120,6 +121,7 @@
<error-code>404</error-code>
<location>/error.jsp</location>
</error-page>
+ -->
<!-- The Usual Welcome File List -->
<welcome-file-list>
Modified: xwiki/trunk/src/main/web.xml
===================================================================
--- xwiki/trunk/src/main/web.xml 2006-03-30 22:18:13 UTC (rev 1019)
+++ xwiki/trunk/src/main/web.xml 2006-03-31 00:11:08 UTC (rev 1020)
@@ -92,6 +92,7 @@
<welcome-file>index.html</welcome-file>
</welcome-file-list>
+ <!--
<error-page>
<error-code>500</error-code>
<location>/error.jsp</location>
@@ -100,6 +101,7 @@
<error-code>404</error-code>
<location>/error.jsp</location>
</error-page>
+ -->
<!-- Example Application Tag Library Descriptor
<taglib>
Modified: xwiki/trunk/src/test/cactus/com/xpn/xwiki/test/ServletVirtualTest.java
===================================================================
--- xwiki/trunk/src/test/cactus/com/xpn/xwiki/test/ServletVirtualTest.java 2006-03-30 22:18:13 UTC (rev 1019)
+++ xwiki/trunk/src/test/cactus/com/xpn/xwiki/test/ServletVirtualTest.java 2006-03-31 00:11:08 UTC (rev 1020)
@@ -87,7 +87,7 @@
// Setup database xwikitest2
context.setDatabase("xwikitest2");
- StoreHibernateTest.cleanUp(hibstore, true, true, context);
+ StoreHibernateTest.cleanUp(hibstore, false, true, context);
Utils.createDoc(hibstore, "Main", "VirtualViewOkTest2", context);
setVirtualUrl(webRequest, "127.0.0.1", "xwikitest2", "view", "VirtualViewOkTest2", "");
@@ -96,7 +96,7 @@
public void endVirtualView2(WebResponse webResponse) throws HibernateException {
try {
String result = webResponse.getText();
- assertTrue("Could not find WebHome Content: " + result, result.indexOf("Hello 1")!=-1);
+ assertTrue("Could not find VirtualViewOkTest2 Content: " + result, result.indexOf("Hello 1")!=-1);
} finally {
clientTearDown();
}
Modified: xwiki/trunk/src/test/java/com/xpn/xwiki/test/HibernateTestCase.java
===================================================================
--- xwiki/trunk/src/test/java/com/xpn/xwiki/test/HibernateTestCase.java 2006-03-30 22:18:13 UTC (rev 1019)
+++ xwiki/trunk/src/test/java/com/xpn/xwiki/test/HibernateTestCase.java 2006-03-31 00:11:08 UTC (rev 1020)
@@ -116,8 +116,8 @@
Statement st = connection.createStatement();
st.execute(sql);
} catch (Exception e) {
- if (e.getMessage().indexOf("xwikiextlistclasses")==-1)
- e.printStackTrace();
+ if ((e.getMessage().indexOf("doesn't exist")==-1)||(sql.indexOf("delete")==-1))
+ e.printStackTrace();
}
}
@@ -172,10 +172,9 @@
String database = context.getDatabase();
if (database==null)
context.setDatabase("xwikitest");
+ try {
if (bFullCleanup) {
- try {
- runSQL(hibstore, "drop database if exists " + context.getDatabase(), context);
- } catch (Exception e) {}
+ runSQL(hibstore, "drop database if exists " + context.getDatabase(), context);
runSQL(hibstore, "create database " + context.getDatabase(), context);
} else {
runSQL(hibstore, "delete from xwikibooleanclasses", context);
@@ -209,8 +208,11 @@
runSQL(hibstore, "delete from xwikilinks", context);
}
hibstore.endTransaction(context, true);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
- if (bFullCleanup&&bSchemaUpdate)
+ if (bSchemaUpdate)
hibstore.updateSchema(context, true);
}
}
Modified: xwiki/trunk/standalone/config/xwiki.cfg
===================================================================
--- xwiki/trunk/standalone/config/xwiki.cfg 2006-03-30 22:18:13 UTC (rev 1019)
+++ xwiki/trunk/standalone/config/xwiki.cfg 2006-03-31 00:11:08 UTC (rev 1020)
@@ -9,7 +9,7 @@
xwiki.store.cache=1
xwiki.store.cache.capacity=100
xwiki.monitor=1
-xwiki.plugins=com.xpn.xwiki.plugin.calendar.CalendarPlugin,com.xpn.xwiki.plugin.feed.FeedPlugin,com.xpn.xwiki.plugin.ldap.LDAPPlugin,com.xpn.xwiki.plugin.google.GooglePlugin,com.xpn.xwiki.plugin.flickr.FlickrPlugin,com.xpn.xwiki.plugin.mail.MailPlugin,com.xpn.xwiki.plugin.packaging.PackagePlugin,com.xpn.xwiki.plugin.query.QueryPlugin,com.xpn.xwiki.plugin.graphviz.GraphVizPlugin,com.xpn.xwiki.plugin.svg.SVGPlugin,com.xpn.xwiki.plugin.charts.ChartingPlugin,com.xpn.xwiki.plugin.fileupload.FileUploadPlugin,com.xpn.xwiki.plugin.laszlo.LaszloPlugin
+xwiki.plugins=com.xpn.xwiki.plugin.calendar.CalendarPlugin,com.xpn.xwiki.plugin.feed.FeedPlugin,com.xpn.xwiki.plugin.ldap.LDAPPlugin,com.xpn.xwiki.plugin.google.GooglePlugin,com.xpn.xwiki.plugin.flickr.FlickrPlugin,com.xpn.xwiki.plugin.mail.MailPlugin,com.xpn.xwiki.plugin.packaging.PackagePlugin,com.xpn.xwiki.plugin.query.QueryPlugin,com.xpn.xwiki.plugin.graphviz.GraphVizPlugin,com.xpn.xwiki.plugin.svg.SVGPlugin,com.xpn.xwiki.plugin.charts.ChartingPlugin,com.xpn.xwiki.plugin.fileupload.FileUploadPlugin,com.xpn.xwiki.plugin.image.ImagePlugin
# This parameter allows XWiki to operate in Hosting mode
# allowing to create multiple wikis having their own database
@@ -38,7 +38,5 @@
xwiki.plugin.graphviz.dotpath=c:/Program Files/ATT/GraphViz/bin/dot.exe
xwiki.plugin.graphviz.neatopath=c:/Program Files/ATT/GraphViz/bin/neato.exe
-xwiki.plugin.laszlo.baseurl=/openlaszlo/xwiki/
-xwiki.plugin.laszlo.path=c:/Program Files/Apache Software Foundation/Tomcat 5.0/webapps/openlaszlo/xwiki/
xwiki.authentication.superadminpassword=toto
xwiki.superadminpassword=toto
More information about the Xwiki-notifications
mailing list