taylor 01/12/05 21:12:41
Modified: src/java/org/apache/jetspeed/services/psmlmanager
CastorPsmlManagerService.java
src/java/org/apache/jetspeed/services/psmlmanager/db
DatabasePsmlManagerService.java
Log:
fixed bug in CastorPsmlService.store to properly build path to file on file system.
Revision Changes Path
1.14 +9 -3
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- CastorPsmlManagerService.java 2001/11/30 10:53:59 1.13
+++ CastorPsmlManagerService.java 2001/12/06 05:12:40 1.14
@@ -112,7 +112,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.13 2001/11/30 10:53:59 kimptoc
Exp $
+ * @version $Id: CastorPsmlManagerService.java,v 1.14 2001/12/06 05:12:40 taylor
Exp $
*/
public class CastorPsmlManagerService extends TurbineBaseService
implements PsmlManagerService
@@ -465,8 +465,14 @@
public boolean store(Profile profile)
{
PSMLDocument doc = profile.getDocument();
+
+ File base = this.rootDir;
String path = mapLocatorToFile(profile);
- return saveDocument(path, doc);
+
+ File file = new File(base, path);
+ String fullpath = file.getAbsolutePath();
+
+ return saveDocument(fullpath, doc);
}
/** Save the PSML document on disk, using its name as filepath
@@ -498,7 +504,7 @@
writer = new FileWriter(f);
save(writer, doc.getPortlets());
success = true;
- }
+ }
catch (MarshalException e)
{
Log.error("PSMLManager: Could not marshal the file
"+f.getAbsolutePath(), e);
1.12 +7 -3
jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/db/DatabasePsmlManagerService.java
Index: DatabasePsmlManagerService.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/db/DatabasePsmlManagerService.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DatabasePsmlManagerService.java 2001/12/04 18:28:26 1.11
+++ DatabasePsmlManagerService.java 2001/12/06 05:12:41 1.12
@@ -125,7 +125,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Atul Dambalkar</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Medha Vaidya</a>
- * @version $Id: DatabasePsmlManagerService.java,v 1.11 2001/12/04 18:28:26 sgala
Exp $
+ * @version $Id: DatabasePsmlManagerService.java,v 1.12 2001/12/06 05:12:41 taylor
Exp $
*/
public class DatabasePsmlManagerService extends TurbineBaseService
implements PsmlManagerService, DBOperations
@@ -379,7 +379,8 @@
{
String dollarToken = dollarTokens.nextToken().trim();
- StringTokenizer colonTokens = new StringTokenizer(dollarToken, ":");
String colonToken = colonTokens.nextToken();
+ StringTokenizer colonTokens = new StringTokenizer(dollarToken, ":");
+ String colonToken = colonTokens.nextToken();
if (colonToken.equals("User"))
{
entity = colonTokens.nextToken().trim();
@@ -429,18 +430,21 @@
public PSMLDocument getDocument(String name)
{
// do nothing, deprecated
+ Log.info("*** NOT SUPPORTED: GETDOC FROM DATABASE PSML MANAGER!!!");
return null;
}
public boolean saveDocument(String fileOrUrl, PSMLDocument doc)
{
// do nothing, deprecated
+ Log.info("*** NOT SUPPORTED: SAVING DOC FROM DATABASE PSML MANAGER!!!");
return false;
}
public boolean saveDocument(PSMLDocument doc)
{
// do nothing, will be deprecated
+ Log.info("*** NOT SUPPORTED: SAVING DOC FROM DATABASE PSML MANAGER!!!");
return false;
}
@@ -533,7 +537,7 @@
try
{
if (user != null && !anonymous)
- {
+ {
tableName = "JETSPEED_USER_PROFILE";
if (operation == INSERT)
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
