You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2001/12/06 06:07:15 UTC
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/om/profile BaseProfile.java BaseProfileLocator.java ImportProfile.java
taylor 01/12/05 21:07:15
Modified: src/java/org/apache/jetspeed/om/profile BaseProfile.java
BaseProfileLocator.java ImportProfile.java
Log:
- Changed BaseProfile's and ImportProfile's saveDocument() to store(), fixing a small part of the dbpsml update problem.
- retested on Castor Implementation, still seems to work.
Revision Changes Path
1.12 +8 -2 jakarta-jetspeed/src/java/org/apache/jetspeed/om/profile/BaseProfile.java
Index: BaseProfile.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/profile/BaseProfile.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- BaseProfile.java 2001/11/30 15:50:17 1.11
+++ BaseProfile.java 2001/12/06 05:07:15 1.12
@@ -60,11 +60,16 @@
import org.apache.jetspeed.services.PortalToolkit;
import org.apache.jetspeed.services.PsmlManager;
+import org.apache.jetspeed.portal.Portlet;
+import org.apache.turbine.om.security.User;
+import org.apache.turbine.om.security.Role;
+import org.apache.turbine.om.security.Group;
+
/**
Provides base functionality within a Registry.
@author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
-@version $Id: BaseProfile.java,v 1.11 2001/11/30 15:50:17 kimptoc Exp $
+@version $Id: BaseProfile.java,v 1.12 2001/12/06 05:07:15 taylor Exp $
*/
public class BaseProfile extends BaseProfileLocator implements Profile
@@ -143,7 +148,7 @@
{
if (document != null)
{
- PsmlManager.saveDocument(document);
+ PsmlManager.store(this);
}
}
@@ -162,5 +167,6 @@
getLanguage()+","+
getName()+"]";
}
+
}
1.5 +3 -1 jakarta-jetspeed/src/java/org/apache/jetspeed/om/profile/BaseProfileLocator.java
Index: BaseProfileLocator.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/profile/BaseProfileLocator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BaseProfileLocator.java 2001/12/04 18:10:48 1.4
+++ BaseProfileLocator.java 2001/12/06 05:07:15 1.5
@@ -73,7 +73,7 @@
*
* @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
* @author <a href="mailto:adambalk@cisco.com">Atul Dambalkar</a>
- * @version $Id: BaseProfileLocator.java,v 1.4 2001/12/04 18:10:48 sgala Exp $
+ * @version $Id: BaseProfileLocator.java,v 1.5 2001/12/06 05:07:15 taylor Exp $
*/
public class BaseProfileLocator implements ProfileLocator, Cloneable
@@ -97,6 +97,7 @@
return super.clone();
}
+
/*
* Gets the resource name parameter for this profile.
*
@@ -327,6 +328,7 @@
Role role = locator.getRole();
return nameEquals(name)
+// && locator.getId() == id
&& mediaTypeEquals(mediaType)
&& languageEquals(language)
&& countryEquals(country)
1.2 +2 -2 jakarta-jetspeed/src/java/org/apache/jetspeed/om/profile/ImportProfile.java
Index: ImportProfile.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/profile/ImportProfile.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ImportProfile.java 2001/11/20 04:58:34 1.1
+++ ImportProfile.java 2001/12/06 05:07:15 1.2
@@ -67,7 +67,7 @@
For saveDocument, the consumer service writes the PSML document.
@author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
- @version $Id: ImportProfile.java,v 1.1 2001/11/20 04:58:34 taylor Exp $
+ @version $Id: ImportProfile.java,v 1.2 2001/12/06 05:07:15 taylor Exp $
*/
public class ImportProfile extends BaseProfile implements Profile
@@ -124,7 +124,7 @@
{
if (document != null)
{
- consumer.saveDocument(document);
+ consumer.store(this);
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>