taylor 01/05/07 08:39:48
Modified: src/java/org/apache/jetspeed/modules/actions
CreateNewUserAndConfirm.java JLoginUser.java
src/java/org/apache/jetspeed/modules/screens Home.java
Log:
updated several actions, Home.java to new naming conventions for Profiler service
Revision Changes Path
1.13 +3 -3
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/CreateNewUserAndConfirm.java
Index: CreateNewUserAndConfirm.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/CreateNewUserAndConfirm.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- CreateNewUserAndConfirm.java 2001/04/25 00:09:22 1.12
+++ CreateNewUserAndConfirm.java 2001/05/07 15:39:24 1.13
@@ -78,7 +78,7 @@
import org.apache.turbine.om.security.TurbineUser;
import com.workingdogs.village.TableDataSet;
import com.workingdogs.village.Record;
-import org.apache.jetspeed.services.profiler.*;
+import org.apache.jetspeed.services.Profiler;
import org.apache.jetspeed.services.resources.JetspeedResources;
import org.apache.turbine.util.security.TurbineSecurityException;
import org.apache.turbine.services.security.TurbineSecurity;
@@ -255,12 +255,12 @@
data.setACL(acl);
data.save();
- if (JetspeedResources.getBoolean("services.ProfileManager.enable",
false))
+ if (JetspeedResources.getBoolean("services.Profiler.enable", false))
{
// As the user is already in the db, we better
// send the email, no matter the error we get here
try {
- ProfileManager.createUserProfile(data, username);
+ Profiler.createUserProfile(data, username);
} catch (Throwable t) {
Log.error(t);
}
1.11 +3 -3
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JLoginUser.java
Index: JLoginUser.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JLoginUser.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JLoginUser.java 2001/04/25 00:09:22 1.10
+++ JLoginUser.java 2001/05/07 15:39:27 1.11
@@ -80,7 +80,7 @@
import com.workingdogs.village.QueryDataSet;
import com.workingdogs.village.Record;
import org.apache.jetspeed.services.resources.JetspeedResources;
-import org.apache.jetspeed.services.profiler.ProfileManager;
+import org.apache.jetspeed.services.Profiler;
/**
This class is responsible for logging a user into the system. It is also
responsible for making sure that the user has been marked as confirmed.
@@ -229,13 +229,13 @@
Log.note("User hasLoggedIn1: " + data.getUser().hasLoggedIn() );
if ( data.getUser().hasLoggedIn() )
{
- if (JetspeedResources.getBoolean("services.ProfileManager.enable",
false))
+ if (JetspeedResources.getBoolean("services.Profiler.enable", false))
{
// As the user is already in the db, we better
// send the email, no matter the error we get here
try {
String username = data.getParameters().getString("username");
- ProfileManager.createUserProfile(data, username);
+ Profiler.createUserProfile(data, username);
} catch (Throwable t) {
Log.error(t);
}
1.16 +5 -5
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/screens/Home.java
Index: Home.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/screens/Home.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Home.java 2001/05/02 10:46:10 1.15
+++ Home.java 2001/05/07 15:39:40 1.16
@@ -71,7 +71,7 @@
//import org.apache.jetspeed.util.*;
import org.apache.jetspeed.profiler.*;
-import org.apache.jetspeed.services.profiler.ProfileManager;
+import org.apache.jetspeed.services.Profiler;
import org.apache.jetspeed.om.profile.*;
import org.apache.jetspeed.capability.*;
@@ -96,7 +96,7 @@
@author <a href="mailto:[EMAIL PROTECTED]";>Kevin A. Burton</a>
@author <a href="mailto:[EMAIL PROTECTED]";>Tom Adams</a>
-@version $Id: Home.java,v 1.15 2001/05/02 10:46:10 raphael Exp $
+@version $Id: Home.java,v 1.16 2001/05/07 15:39:40 taylor Exp $
*/
public class Home extends BaseJetspeedScreen {
@@ -175,16 +175,16 @@
try {
// temporary until we get stabilize
- if (false ==
JetspeedResources.getBoolean("services.ProfileManager.enable", false))
+ if (false == JetspeedResources.getBoolean("services.Profiler.enable",
false))
{
- Profiler profiler = ProfilerFactory.getProfiler();
+ org.apache.jetspeed.profiler.Profiler profiler =
ProfilerFactory.getProfiler();
Portlet portlet = PortletSetFactory.getInstance(
profiler.getResourceURL( rundata ) )
.getPortletSet( rundata );
root.addElement( portlet.getContent( rundata ) );
}
else
{
- Profile profile = ProfileManager.getProfile( rundata, cm );
+ Profile profile = Profiler.getProfile( rundata, cm );
Portlet portlet = profile.getRootSet(rundata);
root.addElement( portlet.getContent( rundata ) );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
