taylor 01/12/02 21:22:30
Modified: src/java/org/apache/jetspeed/portal/portlets
AbstractPortlet.java
src/java/org/apache/jetspeed/services/profiler
JetspeedProfilerService.java
src/java/org/apache/jetspeed/services/psmlmanager/db
DatabasePsmlManagerService.java
Log:
- fixed bug with creating a new user's psml
- put check for null into AbstractPortlet, removing stack trace when persistence
service cant find page
Revision Changes Path
1.48 +5 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/AbstractPortlet.java
Index: AbstractPortlet.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/AbstractPortlet.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- AbstractPortlet.java 2001/10/18 18:17:40 1.47
+++ AbstractPortlet.java 2001/12/03 05:22:30 1.48
@@ -94,7 +94,7 @@
@author <A HREF="mailto:[EMAIL PROTECTED]";>Kevin A. Burton</A>
@author <A HREF="mailto:[EMAIL PROTECTED]";>Raphaël Luta</A>
@author <A HREF="mailto:[EMAIL PROTECTED]";>Santiago Gala</A>
-@version $Id: AbstractPortlet.java,v 1.47 2001/10/18 18:17:40 sgala Exp $
+@version $Id: AbstractPortlet.java,v 1.48 2001/12/03 05:22:30 taylor Exp $
*/
public abstract class AbstractPortlet implements Portlet, PortletState, Cacheable
{
@@ -647,7 +647,10 @@
PersistenceService ps = (PersistenceService)ServiceFactory
.getService( PersistenceService.class,
rundata, params);
- attrValue = ps.getPage().getAttribute( attrName );
+ PersistenceService.Page page = ps.getPage();
+ if (page != null)
+ attrValue = page.getAttribute( attrName );
+
if( attrValue == null )
{
attrValue = attrDefValue ;
1.16 +3 -2
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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- JetspeedProfilerService.java 2001/09/21 05:07:02 1.15
+++ JetspeedProfilerService.java 2001/12/03 05:22:30 1.16
@@ -131,7 +131,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.15 2001/09/21 05:07:02 taylor Exp
$
+ * @version $Id: JetspeedProfilerService.java,v 1.16 2001/12/03 05:22:30 taylor Exp
$
*/
public class JetspeedProfilerService extends TurbineBaseService
@@ -469,7 +469,7 @@
*/
protected PSMLDocument fallback( ProfileLocator locator, RunData rundata )
{
- Log.debug( "Profiler fallback called with: " + locator );
+ Log.debug( "Profiler fallback called with: " + locator );
PSMLDocument doc = PsmlManager.getDocument( locator );
if (null != doc)
@@ -651,6 +651,7 @@
PSMLDocument doc = fallback(locator, data);
if (doc != null)
profile.setDocument(doc);
+ profile.setName( resourceDefault + resourceExt );
}
catch (Exception e)
{
1.10 +30 -4
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DatabasePsmlManagerService.java 2001/11/30 18:19:42 1.9
+++ DatabasePsmlManagerService.java 2001/12/03 05:22:30 1.10
@@ -202,8 +202,8 @@
throw new InitializationException("Missing default refresh rate
parameter, during initializing DatabasePsmlManagerService, using defaults");
}
-// this.refresher = new CacheRefresher();
- // refresher.start();
+ this.refresher = new CacheRefresher();
+ refresher.start();
}
@@ -468,7 +468,7 @@
synchronized (psmlCache)
{
- Log.note("Getting profile from cache, Locator string: " +
locatorToString(locator));
+ Log.note("Getting profile from cache, Locator string: " +
locatorToString(locator));
psmldoc = (PSMLDocument)psmlCache.get(locatorToString(locator));
}
@@ -1015,6 +1015,32 @@
*/
public int export(PsmlManagerService consumer, QueryLocator locator)
{
- return 0; // TODO: implement
+ Iterator profiles = null;
+ int count = 0;
+ try
+ {
+ this.consumer = consumer;
+ profiles = query(locator);
+
+ while (profiles.hasNext() )
+ {
+ Profile profile = (Profile)profiles.next();
+ //dumpProfile(profile);
+ consumer.createDocument(profile);
+ count++;
+ }
+ }
+ catch(Exception e)
+ {
+ e.printStackTrace();
+ Log.error("Failed to export profiles to File System: " , e );
+
+ }
+ finally
+ {
+ }
+ return count;
}
+
+
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
