taylor 02/05/16 13:00:43
Modified: src/java/org/apache/jetspeed/services Profiler.java
src/java/org/apache/jetspeed/services/profiler
JetspeedProfilerService.java ProfilerService.java
src/java/org/apache/jetspeed/services/psmlmanager
CastorPsmlManagerService.java
Log:
New method added to Profiler interface: createProfile( ProfileLocator locator,
Portlets portlets)
This method supports creating new profiles without cloning another profile.
You can pass in a PSML tree constructed in memory in the second 'portlets'
parameter, and the locator is used to specify the location of the psml resource.
Revision Changes Path
1.14 +11 -1
jakarta-jetspeed/src/java/org/apache/jetspeed/services/Profiler.java
Index: Profiler.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/Profiler.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Profiler.java 4 Apr 2002 18:39:49 -0000 1.13
+++ Profiler.java 16 May 2002 20:00:43 -0000 1.14
@@ -58,6 +58,7 @@
import org.apache.jetspeed.om.profile.ProfileLocator;
import org.apache.jetspeed.om.profile.QueryLocator;
import org.apache.jetspeed.om.profile.ProfileException;
+import org.apache.jetspeed.om.profile.Portlets;
import org.apache.jetspeed.services.profiler.ProfilerService;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.util.RunData;
@@ -75,7 +76,7 @@
* @see org.apache.jetspeed.services.Profiler
* @see org.apache.jetspeed.services.profiler.ProfilerService
* @author <a href="mailto:[EMAIL PROTECTED]";>David Sean Taylor</a>
- * @version $Id: Profiler.java,v 1.13 2002/04/04 18:39:49 taylor Exp $
+ * @version $Id: Profiler.java,v 1.14 2002/05/16 20:00:43 taylor Exp $
*/
public class Profiler
{
@@ -170,6 +171,15 @@
throws ProfileException
{
return getService().createProfile( data, profile, mt );
+ }
+
+ /**
+ * @see ProfilerService#createProfile
+ */
+ public static Profile createProfile(ProfileLocator locator, Portlets portlets)
+ throws ProfileException
+ {
+ return getService().createProfile(locator, portlets);
}
/**
1.28 +31 -1
jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/JetspeedProfilerService.java
Index: JetspeedProfilerService.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/JetspeedProfilerService.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- JetspeedProfilerService.java 16 Apr 2002 17:22:12 -0000 1.27
+++ JetspeedProfilerService.java 16 May 2002 20:00:43 -0000 1.28
@@ -94,6 +94,7 @@
// jetspeed.om
import org.apache.jetspeed.om.profile.*;
+import org.apache.jetspeed.om.profile.psml.PsmlPortlets;
import org.apache.jetspeed.om.registry.RegistryException;
import org.apache.jetspeed.om.registry.MediaTypeEntry;
@@ -133,7 +134,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>David Sean Taylor</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Santiago Gala</a>
- * @version $Id: JetspeedProfilerService.java,v 1.27 2002/04/16 17:22:12 taylor Exp
$
+ * @version $Id: JetspeedProfilerService.java,v 1.28 2002/05/16 20:00:43 taylor Exp
$
*/
public class JetspeedProfilerService extends TurbineBaseService
@@ -211,6 +212,7 @@
}
return current;
}
+
// --------------------------------------------------------------------------
/**
@@ -745,6 +747,28 @@
}
/**
+ * Create a new profile given a profile locator
+ *
+ * @param locator The description of the new profile to be created.
+ * @param portlets The PSML tree
+ */
+
+ public Profile createProfile(ProfileLocator locator, Portlets portlets)
+ throws ProfileException
+ {
+ if (portlets == null)
+ {
+ portlets = new PsmlPortlets();
+ }
+ Profile profile = new BaseProfile(locator);
+ PSMLDocument doc = new BasePSMLDocument(null, portlets);
+ profile.setDocument(doc);
+ doc = PsmlManager.createDocument(profile);
+ profile.setDocument(doc);
+ return profile;
+ }
+
+ /**
* Create a new profile.
* The profile parameter's document will be cloned.
*
@@ -756,6 +780,12 @@
* -----------------------------------------------------------
* Andreas Kempf, Siemens ICM S CP PE, Munich
*/
+
+ /**
+ * This methode creates a wml profile and a html profile
+ * for a new user
+ */
+
public Profile createProfile( RunData data, Profile profile, String
contentType, String from )
throws ProfileException
{
1.12 +9 -1
jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/ProfilerService.java
Index: ProfilerService.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/ProfilerService.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ProfilerService.java 4 Apr 2002 18:39:50 -0000 1.11
+++ ProfilerService.java 16 May 2002 20:00:43 -0000 1.12
@@ -70,7 +70,7 @@
*
* @see org.apache.jetspeed.om.profile.Profile
* @author <a href="mailto:[EMAIL PROTECTED]";>David Sean Taylor</a>
- * @version $Id: ProfilerService.java,v 1.11 2002/04/04 18:39:50 taylor Exp $
+ * @version $Id: ProfilerService.java,v 1.12 2002/05/16 20:00:43 taylor Exp $
*/
public interface ProfilerService extends Service
@@ -147,6 +147,14 @@
* @return The newly created profile.
*/
public Profile createProfile( RunData data, Profile profile, MimeType mt )
+ throws ProfileException;
+
+ /** Create a new profile.
+ *
+ * @param locator The description of the new profile to be created.
+ * @param portlets The PSML tree
+ */
+ public Profile createProfile(ProfileLocator locator, Portlets portlets)
throws ProfileException;
/**
1.21 +20 -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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- CastorPsmlManagerService.java 16 May 2002 00:50:58 -0000 1.20
+++ CastorPsmlManagerService.java 16 May 2002 20:00:43 -0000 1.21
@@ -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.20 2002/05/16 00:50:58 taylor
Exp $
+ * @version $Id: CastorPsmlManagerService.java,v 1.21 2002/05/16 20:00:43 taylor
Exp $
*/
public class CastorPsmlManagerService extends TurbineBaseService
implements PsmlManagerService
@@ -520,7 +520,6 @@
boolean success = false;
if (doc == null) return false;
-
File f = getFile(fileOrUrl);
FileWriter writer = null;
@@ -639,16 +638,22 @@
{
return f;
}
-/*
else
{
// try as a relative path
- f = new File(TurbineServlet.getRealPath(fileOrUrl));
+ String path = TurbineServlet.getRealPath(fileOrUrl);
+ if (null == path)
+ {
+ path = fileOrUrl;
+ }
+
+ f = new File(path);
if (f.exists())
{
return f;
}
-
+
+/*
// try through the disk cache
try
{
@@ -658,11 +663,10 @@
{
Log.error("PSMLManager: unabel to retrieve file from diskcache for
"+fileOrUrl,e);
}
+*/
}
return f;
-*/
- return null;
}
protected class DocumentWatcher extends Thread
@@ -754,6 +758,7 @@
//Log.info("PSML-Man: calculated resource:" + path);
File file = new File(base, path);
String name = file.getAbsolutePath();
+
PSMLDocument template = profile.getDocument();
PSMLDocument doc = new BasePSMLDocument( name, template.getPortlets() );
try
@@ -761,7 +766,14 @@
String parent = file.getParent();
File filePath = new File(parent);
filePath.mkdirs();
- FileCopy.copy( template.getName(), name );
+ if (template.getName() != null)
+ {
+ FileCopy.copy( template.getName(), name );
+ }
+ else
+ {
+ doc.setName(name);
+ }
saveDocument(doc);
}
catch (Exception e)
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
