r1019 - in xwiki/trunk: . src/main/java/com/xpn/xwiki/web

[Ludovic Dubost]

Author: ludovic
Date: 2006-03-31 00:18:13 +0200 (Fri, 31 Mar 2006)
New Revision: 1019

Modified:
   xwiki/trunk/src/main/java/com/xpn/xwiki/web/XWikiRequestProcessor.java
   xwiki/trunk/xwiki.iml
   xwiki/trunk/xwiki.ipr
Log:
Fix bug XWIKI-178 broken XML-RPC
Latest intellij project files

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/web/XWikiRequestProcessor.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/web/XWikiRequestProcessor.java	2006-03-30 21:59:59 UTC (rev 1018)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/web/XWikiRequestProcessor.java	2006-03-30 22:18:13 UTC (rev 1019)
@@ -1,25 +1,25 @@
-/*
- * Copyright 2006, XpertNet SARL, and individual contributors as indicated
- * by the contributors.txt.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- *
- * @author ludovic
- * @author sdumitriu
- */
+/*
+ * Copyright 2006, XpertNet SARL, and individual contributors as indicated
+ * by the contributors.txt.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+ * @author ludovic
+ * @author sdumitriu
+ */
 
 package com.xpn.xwiki.web;
 
@@ -34,7 +34,10 @@
     protected String processPath(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws IOException {
         String result = super.processPath(httpServletRequest, httpServletResponse);
         if (StringUtils.countMatches(result, "/")<=2) {
-          return "/view/";
+            if (result.startsWith("/xmlrpc/"))
+                return "/xmlrpc/";
+            else
+                return "/view/";
         }
         else
           return result.substring(0,result.indexOf("/",1)+1);

Modified: xwiki/trunk/xwiki.iml
===================================================================
--- xwiki/trunk/xwiki.iml	2006-03-30 21:59:59 UTC (rev 1018)
+++ xwiki/trunk/xwiki.iml	2006-03-30 22:18:13 UTC (rev 1019)
@@ -54,8 +54,8 @@
     <setting name="EXPLODED_URL" value="file://$MODULE_DIR$/release/xwiki/web" />
     <setting name="EXPLODED_ENABLED" value="true" />
     <setting name="JAR_URL" value="file://$MODULE_DIR$/release/xwiki.war" />
-    <setting name="JAR_ENABLED" value="true" />
-    <setting name="SYNC_EXPLODED_DIR" value="false" />
+    <setting name="JAR_ENABLED" value="false" />
+    <setting name="SYNC_EXPLODED_DIR" value="true" />
     <setting name="BUILD_ON_FRAME_DEACTIVATION" value="false" />
     <setting name="RUN_JASPER_VALIDATION" value="false" />
   </component>
@@ -153,8 +153,13 @@
       <attribute name="method" value="1" />
       <attribute name="URI" value="/WEB-INF/lib" />
     </containerElement>
-    <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/web-test.xml" version="2.3" />
-    <deploymentDescriptor name="context.xml" url="file://$MODULE_DIR$/src/main/web/META-INF/context.xml" version="5.x" />
+    <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/web-test.xml" optional="false" version="2.3" />
+    <deploymentDescriptor name="context.xml" url="file://$MODULE_DIR$/src/main/web/META-INF/context.xml" optional="false" version="5.x" />
+    <deploymentDescriptor name="" url="file://$MODULE_DIR$/src/main/web/META-INF/context.xml" optional="false">
+      <option name="DEFAULT_DIR" value="WEB-INF" />
+      <option name="NAME" value="" />
+      <option name="DESCRIPTION" value="" />
+    </deploymentDescriptor>
     <webroots>
       <root url="file://$MODULE_DIR$/src/main/web" relative="/" />
     </webroots>

Modified: xwiki/trunk/xwiki.ipr
===================================================================
--- xwiki/trunk/xwiki.ipr	2006-03-30 21:59:59 UTC (rev 1018)
+++ xwiki/trunk/xwiki.ipr	2006-03-30 22:18:13 UTC (rev 1019)
@@ -2,6 +2,13 @@
 <project version="4" relativePaths="false">
   <component name="AntConfiguration">
     <defaultAnt bundledAnt="true" />
+    <buildFile url="file://$PROJECT_DIR$/build.xml">
+      <additionalClassPath />
+      <antReference projectDefault="true" />
+      <customJdkName value="" />
+      <maximumHeapSize value="128" />
+      <properties />
+    </buildFile>
   </component>
   <component name="CodeStyleSettingsManager">
     <option name="PER_PROJECT_SETTINGS" />
@@ -206,7 +213,7 @@
       <module fileurl="file://$PROJECT_DIR$/xwikibase.iml" filepath="$PROJECT_DIR$/xwikibase.iml" />
     </modules>
   </component>
-  <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="false" project-jdk-name="1.5 (1)" />
+  <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="false" project-jdk-name="1.5" />
   <component name="RegexPlugin">
     <option name="pos1" value="92" />
     <option name="pos2" value="100" />