taylor 02/05/16 16:32:28
Modified: src/java/org/apache/jetspeed/services/psmlmanager
CastorPsmlManagerService.java
Log:
Fixed bug on CreateProfile(locator, entries) where path was getting written out twice
Revision Changes Path
1.23 +8 -8
jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/CastorPsmlManagerService.java
Index: CastorPsmlManagerService.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/CastorPsmlManagerService.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- CastorPsmlManagerService.java 16 May 2002 22:07:32 -0000 1.22
+++ CastorPsmlManagerService.java 16 May 2002 23:32:28 -0000 1.23
@@ -118,7 +118,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Rapha�l Luta</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>David Sean Taylor</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Santiago Gala</a>
- * @version $Id: CastorPsmlManagerService.java,v 1.22 2002/05/16 22:07:32 taylor
Exp $
+ * @version $Id: CastorPsmlManagerService.java,v 1.23 2002/05/16 23:32:28 taylor
Exp $
*/
public class CastorPsmlManagerService extends TurbineBaseService
implements PsmlManagerService
@@ -521,15 +521,10 @@
if (doc == null) return false;
File f = getFile(fileOrUrl);
-
+System.out.println("file or url = " + fileOrUrl);
if (f == null)
{
- String path = TurbineServlet.getRealPath(fileOrUrl);
- if (null == path)
- {
- path = fileOrUrl;
- }
- f = new File(path);
+ f = new File(fileOrUrl);
}
@@ -769,8 +764,11 @@
File base = this.rootDir;
String path = mapLocatorToFile((ProfileLocator)profile);
//Log.info("PSML-Man: calculated resource:" + path);
+System.out.println("path = " + path);
+
File file = new File(base, path);
String name = file.getAbsolutePath();
+System.out.println("name = " + name);
PSMLDocument template = profile.getDocument();
PSMLDocument doc = new BasePSMLDocument( name, template.getPortlets() );
@@ -785,6 +783,8 @@
}
else
{
+System.out.println("2nd name = " + name);
+
doc.setName(name);
}
saveDocument(doc);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
