this patch avoid usage of deprectaed turbine-2.2 methods
i tried to add it as attachement in bugzilla with no luck .. so i send it to the list ..
martin
Index: org/apache/jetspeed/capability/TestCapabilityMap.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/capability/TestCapabilityMap.java,v
retrieving revision 1.2
diff -u -r1.2 TestCapabilityMap.java
--- org/apache/jetspeed/capability/TestCapabilityMap.java 8 Aug 2003 18:28:03
-0000 1.2
+++ org/apache/jetspeed/capability/TestCapabilityMap.java 31 Aug 2003 12:48:22
-0000
@@ -211,7 +211,7 @@
try
{
config = new TurbineConfig( "../webapp",
"/WEB-INF/conf/TurbineResources.properties");
- config.init();
+ config.initialize();
}
catch (Exception e)
{
Index: org/apache/jetspeed/modules/actions/ChangePassword.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/ChangePassword.java,v
retrieving revision 1.6
diff -u -r1.6 ChangePassword.java
--- org/apache/jetspeed/modules/actions/ChangePassword.java 23 Jul 2003 19:50:10
-0000 1.6
+++ org/apache/jetspeed/modules/actions/ChangePassword.java 31 Aug 2003 12:48:23
-0000
@@ -87,7 +87,7 @@
public void doPerform(RunData rundata) throws Exception
{
- String cancelBtn =
rundata.getParameters().getString(Localization.getString(rundata,
"PASSWORDFORM_CANCEL"));
+ String cancelBtn =
rundata.getParameters().getString(Localization.getBundle(rundata.getRequest()).getString("PASSWORDFORM_CANCEL"));
String username = rundata.getParameters().getString("username" , "");
String oldPassword =
JetspeedSecurity.convertPassword(rundata.getParameters().getString("old_password" ,
""));
String password =
JetspeedSecurity.convertPassword(rundata.getParameters().getString("password", ""));
@@ -97,7 +97,7 @@
//
// check to see if the Cancel button was pressed.
// if so, return to default portal page
- if (cancelBtn != null &&
cancelBtn.equalsIgnoreCase(Localization.getString(rundata, "PASSWORDFORM_CANCEL")))
+ if (cancelBtn != null &&
cancelBtn.equalsIgnoreCase(Localization.getBundle(rundata.getRequest()).getString("PASSWORDFORM_CANCEL")))
{
return;
}
@@ -111,21 +111,21 @@
if (!password.equals(password2))
{
- rundata.setMessage(Localization.getString(rundata,
"UPDATEACCOUNT_PWNOTMATCH"));
+
rundata.setMessage(Localization.getBundle(rundata.getRequest()).getString("UPDATEACCOUNT_PWNOTMATCH"));
rundata.setScreenTemplate(returnTemplate);
return;
}
if (password.equals(oldPassword))
{
- rundata.setMessage(Localization.getString(rundata,
"PASSWORDFORM_THESAME_MSG"));
+
rundata.setMessage(Localization.getBundle(rundata.getRequest()).getString("PASSWORDFORM_THESAME_MSG"));
rundata.setScreenTemplate(returnTemplate);
return;
}
// Change the password
JetspeedSecurity.changePassword(user, oldPassword, password);
- rundata.setMessage(Localization.getString(rundata, "PASSWORDFORM_DONE"));
+
rundata.setMessage(Localization.getBundle(rundata.getRequest()).getString("PASSWORDFORM_DONE"));
// Login again
rundata.getParameters().setString("username", username);
Index: org/apache/jetspeed/modules/actions/CreateNewUserAndConfirm.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/CreateNewUserAndConfirm.java,v
retrieving revision 1.37
diff -u -r1.37 CreateNewUserAndConfirm.java
--- org/apache/jetspeed/modules/actions/CreateNewUserAndConfirm.java 23 Jul 2003
19:50:10 -0000 1.37
+++ org/apache/jetspeed/modules/actions/CreateNewUserAndConfirm.java 31 Aug 2003
12:48:23 -0000
@@ -131,7 +131,7 @@
if ( (pass1.length() == 0 || pass2.length() == 0 )
|| ! pass1.equals ( pass2 ) )
{
- data.setMessage(Localization.getString(data,
"CREATENEWUSERANDCONFIRM_PWNOTMATCH"));
+
data.setMessage(Localization.getBundle(data.getRequest()).getString("CREATENEWUSERANDCONFIRM_PWNOTMATCH"));
data.setScreenTemplate("NewAccount");
return;
}
@@ -146,7 +146,7 @@
// make sure the username exists
if ( username.length() == 0 )
{
- data.setMessage(Localization.getString(data,
"CREATENEWUSERANDCONFIRM_NOUSERNAME"));
+
data.setMessage(Localization.getBundle(data.getRequest()).getString("CREATENEWUSERANDCONFIRM_NOUSERNAME"));
data.setScreenTemplate("NewAccount");
return;
}
@@ -155,12 +155,12 @@
// make sure the email exists
if ( email.length() == 0 )
{
- data.setMessage(Localization.getString(data,
"CREATENEWUSERANDCONFIRM_NOEMAIL"));
+
data.setMessage(Localization.getBundle(data.getRequest()).getString("CREATENEWUSERANDCONFIRM_NOEMAIL"));
data.setScreenTemplate("NewAccount");
return;
}
- String CHNAME = Localization.getString(data,
"CREATENEWUSERANDCONFIRM_DUPLICATEMSG");
+ String CHNAME =
Localization.getBundle(data.getRequest()).getString("CREATENEWUSERANDCONFIRM_DUPLICATEMSG");
boolean accountExists = true;
try
@@ -212,7 +212,7 @@
user.setHasLoggedIn(new Boolean (true));
user.setLastLogin(new Date(0));
}
- data.setMessage(Localization.getString(data,
"CREATENEWUSERANDCONFIRM_CREATE"));
+
data.setMessage(Localization.getBundle(data.getRequest()).getString("CREATENEWUSERANDCONFIRM_CREATE"));
if (enableMail || newUserNotification || newUserApproval)
{
data.setUser(JetspeedSecurity.getAnonymousUser());
@@ -242,7 +242,7 @@
}
else // username exists. show the screen again.
{
- data.setMessage(Localization.getString(data,
"CREATENEWUSERANDCONFIRM_CHOOSENEWNAME"));
+
data.setMessage(Localization.getBundle(data.getRequest()).getString("CREATENEWUSERANDCONFIRM_CHOOSENEWNAME"));
data.setScreenTemplate("NewAccount");
// set the username to be the CHNAME string so that it is
// clear that this needs to be replaced
Index: org/apache/jetspeed/modules/actions/JLoginUser.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JLoginUser.java,v
retrieving revision 1.36
diff -u -r1.36 JLoginUser.java
--- org/apache/jetspeed/modules/actions/JLoginUser.java 23 Jul 2003 19:50:10 -0000
1.36
+++ org/apache/jetspeed/modules/actions/JLoginUser.java 31 Aug 2003 12:48:25 -0000
@@ -125,7 +125,7 @@
data.setScreenTemplate("LoginHelp");
data.setMessage(Localization.getString("JLOGINUSER_PASSWORDREMINDER_INVALIDUSER"));
if (logger.isDebugEnabled())
- logger.debug(Localization.getString(rundata,
"JLOGINUSER_PASSWORDREMINDER_INVALIDUSER"));
+
logger.debug(Localization.getBundle(rundata.getRequest()).getString("JLOGINUSER_PASSWORDREMINDER_INVALIDUSER"));
return;
}
@@ -169,13 +169,13 @@
se.send();
- data.setMessage (Localization.getString(rundata,
"JLOGINUSER_PASSWORDREMINDER_SENT"));
+ data.setMessage
(Localization.getBundle(rundata.getRequest()).getString("JLOGINUSER_PASSWORDREMINDER_SENT"));
logger.info( "Password for user " + user.getUserName() + " was sent to "
+ user.getEmail());
- logger.info(Localization.getString(rundata,
"JLOGINUSER_PASSWORDREMINDER_SENT"));
+
logger.info(Localization.getBundle(rundata.getRequest()).getString("JLOGINUSER_PASSWORDREMINDER_SENT"));
data.setScreenTemplate("Login");
} catch ( Exception e ) {
data.setScreenTemplate("LoginHelp");
- String errorTitle = Localization.getString(rundata,
"JLOGINUSER_PASSWORDREMINDER_ERROR") ;
+ String errorTitle =
Localization.getBundle(rundata.getRequest()).getString("JLOGINUSER_PASSWORDREMINDER_ERROR")
;
String errorMessage = errorTitle + e.toString();
logger.warn( errorMessage, e );
@@ -220,7 +220,7 @@
{
if ( newUserApproval )
{
- data.setMessage(Localization.getString(rundata,
"JLOGINUSER_KEYNOTVALID"));
+
data.setMessage(Localization.getBundle(rundata.getRequest()).getString("JLOGINUSER_KEYNOTVALID"));
data.setScreenTemplate("NewUserAwaitingAcceptance");
return;
}
@@ -228,13 +228,13 @@
{
if (
user.getConfirmed().equals(JetspeedResources.CONFIRM_VALUE_REJECTED))
{
- data.setMessage(Localization.getString(rundata,
"JLOGINUSER_KEYNOTVALID"));
+
data.setMessage(Localization.getBundle(rundata.getRequest()).getString("JLOGINUSER_KEYNOTVALID"));
data.setScreenTemplate("NewUserRejected");
return;
}
else
{
- data.setMessage(Localization.getString(rundata,
"JLOGINUSER_KEYNOTVALID"));
+
data.setMessage(Localization.getBundle(rundata.getRequest()).getString("JLOGINUSER_KEYNOTVALID"));
data.setScreenTemplate("ConfirmRegistration");
return;
}
@@ -242,7 +242,7 @@
}
user.setConfirmed( JetspeedResources.CONFIRM_VALUE );
- data.setMessage (Localization.getString(rundata, "JLOGINUSER_WELCOME"));
+ data.setMessage
(Localization.getBundle(rundata.getRequest()).getString("JLOGINUSER_WELCOME"));
}
JetspeedUser user = null;
@@ -262,7 +262,7 @@
if (e instanceof FailedLoginException)
{
logger.info("JLoginUser: Credential Failure on login for user: " +
username);
- data.setMessage(Localization.getString(rundata,
"PASSWORDFORM_FAILED_MSG"));
+
data.setMessage(Localization.getBundle(rundata.getRequest()).getString("PASSWORDFORM_FAILED_MSG"));
}
else if (e instanceof AccountExpiredException)
{
@@ -274,7 +274,7 @@
data.setScreenTemplate(
JetspeedResources.getString(JetspeedResources.CHANGE_PASSWORD_TEMPLATE,
"ChangePassword")
);
- data.setMessage(Localization.getString(rundata,
"PASSWORDFORM_EXPIRED_MSG"));
+
data.setMessage(Localization.getBundle(rundata.getRequest()).getString("PASSWORDFORM_EXPIRED_MSG"));
data.getParameters().setString("username", username);
}
@@ -293,7 +293,7 @@
if (user.getDisabled())
{
- data.setMessage(Localization.getString(rundata,
"JLOGINUSER_ACCOUNT_DISABLED"));
+
data.setMessage(Localization.getBundle(rundata.getRequest()).getString("JLOGINUSER_ACCOUNT_DISABLED"));
data.setScreenTemplate(JetspeedResources.getString("logon.disabled.form"));
data.getUser().setHasLoggedIn(new Boolean (false) );
return;
@@ -314,14 +314,14 @@
{
if (confirmed != null &&
confirmed.equals(JetspeedResources.CONFIRM_VALUE_REJECTED))
{
- data.setMessage(Localization.getString(rundata,
"JLOGINUSER_KEYNOTVALID"));
+
data.setMessage(Localization.getBundle(rundata.getRequest()).getString("JLOGINUSER_KEYNOTVALID"));
data.setScreenTemplate("NewUserRejected");
data.getUser().setHasLoggedIn(new Boolean (false) );
return;
}
else
{
- data.setMessage(Localization.getString(rundata,
"JLOGINUSER_CONFIRMFIRST"));
+
data.setMessage(Localization.getBundle(rundata.getRequest()).getString("JLOGINUSER_CONFIRMFIRST"));
data.setScreenTemplate("ConfirmRegistration");
data.getUser().setHasLoggedIn(new Boolean (false) );
return;
@@ -397,7 +397,7 @@
boolean disabled =
JetspeedSecurity.checkDisableAccount(data.getParameters().getString("username", ""));
if (disabled)
{
- data.setMessage(Localization.getString(rundata,
"JLOGINUSER_ACCOUNT_DISABLED"));
+
data.setMessage(Localization.getBundle(rundata.getRequest()).getString("JLOGINUSER_ACCOUNT_DISABLED"));
data.setScreenTemplate(JetspeedResources.getString("logon.disabled.form"));
data.getUser().setHasLoggedIn(new Boolean (false) );
}
Index: org/apache/jetspeed/modules/actions/SendConfirmationEmail.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/SendConfirmationEmail.java,v
retrieving revision 1.18
diff -u -r1.18 SendConfirmationEmail.java
--- org/apache/jetspeed/modules/actions/SendConfirmationEmail.java 23 Jul 2003
19:50:10 -0000 1.18
+++ org/apache/jetspeed/modules/actions/SendConfirmationEmail.java 31 Aug 2003
12:48:25 -0000
@@ -127,7 +127,7 @@
se.send();
- data.setMessage (Localization.getString(data,
"SENDCONFIRMATIONEMAIL_SENT"));
+ data.setMessage
(Localization.getBundle(data.getRequest()).getString("SENDCONFIRMATIONEMAIL_SENT"));
}
catch ( Exception e )
{
Index: org/apache/jetspeed/modules/actions/SendNewUserNotificationEmail.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/SendNewUserNotificationEmail.java,v
retrieving revision 1.4
diff -u -r1.4 SendNewUserNotificationEmail.java
--- org/apache/jetspeed/modules/actions/SendNewUserNotificationEmail.java 23 Jul
2003 19:50:10 -0000 1.4
+++ org/apache/jetspeed/modules/actions/SendNewUserNotificationEmail.java 31 Aug
2003 12:48:25 -0000
@@ -133,10 +133,10 @@
se.send();
- data.setMessage (Localization.getString(data,
"SENDCONFIRMATIONEMAIL_SENT"));
+ data.setMessage
(Localization.getBundle(data.getRequest()).getString("SENDCONFIRMATIONEMAIL_SENT"));
} catch ( Exception e )
{
- String errorTitle = Localization.getString(data,
"SENDCONFIRMATIONEMAIL_ERROR") ;
+ String errorTitle =
Localization.getBundle(data.getRequest()).getString("SENDCONFIRMATIONEMAIL_ERROR") ;
String errorMessage = errorTitle + e.getMessage();
logger.error( errorMessage, e );
Index: org/apache/jetspeed/modules/actions/UpdateAccount.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/UpdateAccount.java,v
retrieving revision 1.21
diff -u -r1.21 UpdateAccount.java
--- org/apache/jetspeed/modules/actions/UpdateAccount.java 9 Jul 2003 16:23:42
-0000 1.21
+++ org/apache/jetspeed/modules/actions/UpdateAccount.java 31 Aug 2003 12:48:27
-0000
@@ -131,7 +131,7 @@
if ( changepass == true && ! password.equals( password2 ) )
{
- data.setMessage(Localization.getString(rundata,
"UPDATEACCOUNT_PWNOTMATCH"));
+
data.setMessage(Localization.getBundle(rundata.getRequest()).getString("UPDATEACCOUNT_PWNOTMATCH"));
backToEditAccount( data, screenData );
return;
}
@@ -147,7 +147,7 @@
// make sure the firstname exists
if ( firstname.length() == 0 )
{
- data.setMessage(Localization.getString(rundata,
"UPDATEACCOUNT_NOFIRSTNAME"));
+
data.setMessage(Localization.getBundle(rundata.getRequest()).getString("UPDATEACCOUNT_NOFIRSTNAME"));
backToEditAccount( data, screenData );
return;
}
@@ -157,7 +157,7 @@
// make sure the lastname exists
if ( lastname.length() == 0 )
{
- data.setMessage(Localization.getString(rundata,
"UPDATEACCOUNT_NOLASTNAME"));
+
data.setMessage(Localization.getBundle(rundata.getRequest()).getString("UPDATEACCOUNT_NOLASTNAME"));
backToEditAccount( data, screenData );
return;
}
@@ -256,7 +256,7 @@
// make sure the email exists
if ( email.length() == 0 )
{
- data.setMessage(Localization.getString(rundata, "UPDATEACCOUNT_NOEMAIL"));
+
data.setMessage(Localization.getBundle(rundata.getRequest()).getString("UPDATEACCOUNT_NOEMAIL"));
backToEditAccount( data, screenData );
return;
}
@@ -273,7 +273,7 @@
ActionLoader.getInstance().exec(data, "SendConfirmationEmail");
// add in the username to the parameters because ConfirmRegistration
needs it
data.getParameters().add("username", data.getUser().getUserName() );
- data.setMessage(Localization.getString(rundata,
"UPDATEACCOUNT_NEWEMAILCONFIRM"));
+
data.setMessage(Localization.getBundle(rundata.getRequest()).getString("UPDATEACCOUNT_NEWEMAILCONFIRM"));
data.setScreenTemplate("ConfirmRegistration");
}
else
@@ -302,7 +302,7 @@
updateUser(data);
JetspeedSecurity.saveUser( data.getJetspeedUser() );
- data.setMessage (Localization.getString(rundata, "UPDATEACCOUNT_DONE"));
+ data.setMessage
(Localization.getBundle(rundata.getRequest()).getString("UPDATEACCOUNT_DONE"));
}
Index: org/apache/jetspeed/modules/actions/controllers/MultiColumnControllerAction.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/MultiColumnControllerAction.java,v
retrieving revision 1.29
diff -u -r1.29 MultiColumnControllerAction.java
--- org/apache/jetspeed/modules/actions/controllers/MultiColumnControllerAction.java
23 Jul 2003 19:50:11 -0000 1.29
+++ org/apache/jetspeed/modules/actions/controllers/MultiColumnControllerAction.java
31 Aug 2003 12:48:29 -0000
@@ -368,12 +368,12 @@
if (identityElement instanceof Reference)
{
- titles.put(identityElement.getId(),
Localization.getString(rundata, "CUSTOMIZER_REF_DEFAULTTITLE"));
+ titles.put(identityElement.getId(),
Localization.getBundle(rundata.getRequest()).getString("CUSTOMIZER_REF_DEFAULTTITLE"));
continue;
}
// Let's make sure their is a title
- titles.put(identityElement.getId(), Localization.getString(rundata,
"CUSTOMIZER_NOTITLESET"));
+ titles.put(identityElement.getId(),
Localization.getBundle(rundata.getRequest()).getString("CUSTOMIZER_NOTITLESET"));
}
}
Index: org/apache/jetspeed/modules/actions/controllers/VelocityControllerAction.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/VelocityControllerAction.java,v
retrieving revision 1.8
diff -u -r1.8 VelocityControllerAction.java
--- org/apache/jetspeed/modules/actions/controllers/VelocityControllerAction.java
5 Aug 2003 18:57:16 -0000 1.8
+++ org/apache/jetspeed/modules/actions/controllers/VelocityControllerAction.java
31 Aug 2003 12:48:30 -0000
@@ -192,11 +192,11 @@
String saveLabel = null;
if (((String)
customizationState.getAttribute("customize-paneName")).equalsIgnoreCase("*"))
{
- saveLabel = Localization.getString(rundata, "CUSTOMIZER_SAVEAPPLY");
+ saveLabel =
Localization.getBundle(rundata.getRequest()).getString("CUSTOMIZER_SAVEAPPLY");
}
else
{
- saveLabel = Localization.getString(rundata, "CUSTOMIZER_APPLY");
+ saveLabel =
Localization.getBundle(rundata.getRequest()).getString("CUSTOMIZER_APPLY");
}
context.put("saveLabel", saveLabel);
Index: org/apache/jetspeed/modules/actions/portlets/CustomizeSetAction.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeSetAction.java,v
retrieving revision 1.46
diff -u -r1.46 CustomizeSetAction.java
--- org/apache/jetspeed/modules/actions/portlets/CustomizeSetAction.java 23 Jul
2003 19:50:12 -0000 1.46
+++ org/apache/jetspeed/modules/actions/portlets/CustomizeSetAction.java 31 Aug
2003 12:48:34 -0000
@@ -743,7 +743,7 @@
}
else
{
- String tmpl = Localization.getString(rundata,
"CUSTOMIZER_ADD_REF_ERROR");
+ String tmpl =
Localization.getBundle(rundata.getRequest()).getString("CUSTOMIZER_ADD_REF_ERROR");
Object[] args = {
refNames[i]
};
Index: org/apache/jetspeed/modules/parameters/RegistryEntryListBox.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/parameters/RegistryEntryListBox.java,v
retrieving revision 1.7
diff -u -r1.7 RegistryEntryListBox.java
--- org/apache/jetspeed/modules/parameters/RegistryEntryListBox.java 3 Aug 2003
23:31:22 -0000 1.7
+++ org/apache/jetspeed/modules/parameters/RegistryEntryListBox.java 31 Aug 2003
12:48:34 -0000
@@ -177,11 +177,11 @@
String label = null;
if (regName.equals(Registry.PORTLET))
{
- label = Localization.getString(data, "CUSTOMIZER_PORTLET");
+ label =
Localization.getBundle(data.getRequest()).getString("CUSTOMIZER_PORTLET");
}
else if (regName.equals(Registry.SECURITY))
{
- label = Localization.getString(data, "CUSTOMIZER_SECURITY_REF");
+ label =
Localization.getBundle(data.getRequest()).getString("CUSTOMIZER_SECURITY_REF");
// SecurityReference defaultRef = PortalToolkit.getDefaultSecurityRef(
// ((JetspeedRunData) data).getCustomizedProfile());
// if (defaultRef != null)
@@ -191,15 +191,15 @@
}
else if (regName.equals(Registry.MEDIA_TYPE))
{
- label = Localization.getString(data, "CUSTOMIZER_MEDIATYPE");
+ label =
Localization.getBundle(data.getRequest()).getString("CUSTOMIZER_MEDIATYPE");
}
else if (regName.equals(Registry.PORTLET_CONTROLLER))
{
- label = Localization.getString(data, "CUSTOMIZER_LAYOUT");
+ label =
Localization.getBundle(data.getRequest()).getString("CUSTOMIZER_LAYOUT");
}
else if (regName.equals(Registry.PORTLET_CONTROL))
{
- label = Localization.getString(data, "CUSTOMIZER_DECORATION");
+ label =
Localization.getBundle(data.getRequest()).getString("CUSTOMIZER_DECORATION");
}
else if (regName.equals(Registry.CLIENT))
{
Index: org/apache/jetspeed/portal/BasePortletSet.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/BasePortletSet.java,v
retrieving revision 1.33
diff -u -r1.33 BasePortletSet.java
--- org/apache/jetspeed/portal/BasePortletSet.java 23 Jul 2003 19:50:15 -0000
1.33
+++ org/apache/jetspeed/portal/BasePortletSet.java 31 Aug 2003 12:48:38 -0000
@@ -367,7 +367,7 @@
{
this.portlets.clear();
}
- return new StringElement(Localization.getString(rundata,
"SECURITY_NO_ACCESS"));
+ return new
StringElement(Localization.getBundle(rundata.getRequest()).getString("SECURITY_NO_ACCESS"));
}
else
{
Index: org/apache/jetspeed/portal/security/portlets/PortletWrapper.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/security/portlets/PortletWrapper.java,v
retrieving revision 1.22
diff -u -r1.22 PortletWrapper.java
--- org/apache/jetspeed/portal/security/portlets/PortletWrapper.java 23 Jul 2003
19:50:18 -0000 1.22
+++ org/apache/jetspeed/portal/security/portlets/PortletWrapper.java 31 Aug 2003
12:48:40 -0000
@@ -165,7 +165,7 @@
{
PortletStats.logAccess(rundata, this, PortletStats.ACCESS_DENIED);
}
- return new JetspeedClearElement(Localization.getString(rundata,
"SECURITY_NO_ACCESS_TO_PORTLET"));
+ return new
JetspeedClearElement(Localization.getBundle(rundata.getRequest()).getString("SECURITY_NO_ACCESS_TO_PORTLET"));
}
}
Index: org/apache/jetspeed/services/idgenerator/TestIdGenerator.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/idgenerator/TestIdGenerator.java,v
retrieving revision 1.4
diff -u -r1.4 TestIdGenerator.java
--- org/apache/jetspeed/services/idgenerator/TestIdGenerator.java 8 Aug 2003
18:28:03 -0000 1.4
+++ org/apache/jetspeed/services/idgenerator/TestIdGenerator.java 31 Aug 2003
12:48:41 -0000
@@ -95,7 +95,7 @@
{
config = new TurbineConfig( "../webapp",
"/WEB-INF/conf/TurbineResources.properties");
- config.init();
+ config.initialize();
}
catch (Exception e)
{
Index: org/apache/jetspeed/services/portletcache/TestTurbineCache.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/portletcache/TestTurbineCache.java,v
retrieving revision 1.6
diff -u -r1.6 TestTurbineCache.java
--- org/apache/jetspeed/services/portletcache/TestTurbineCache.java 8 Aug 2003
18:28:03 -0000 1.6
+++ org/apache/jetspeed/services/portletcache/TestTurbineCache.java 31 Aug 2003
12:48:43 -0000
@@ -102,7 +102,7 @@
{
config = new TurbineConfig( "../webapp",
"/WEB-INF/conf/TurbineResources.properties");
- config.init();
+ config.initialize();
}
catch (Exception e)
{
Index: org/apache/jetspeed/services/profiler/TestProfilerService.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/TestProfilerService.java,v
retrieving revision 1.5
diff -u -r1.5 TestProfilerService.java
--- org/apache/jetspeed/services/profiler/TestProfilerService.java 8 Aug 2003
18:28:03 -0000 1.5
+++ org/apache/jetspeed/services/profiler/TestProfilerService.java 31 Aug 2003
12:48:44 -0000
@@ -163,7 +163,7 @@
try
{
config = new TurbineConfig( "../webapp",
"/WEB-INF/conf/TurbineResources.properties");
- config.init();
+ config.initialize();
}
catch (Exception e)
{
Index: org/apache/jetspeed/services/psmlmanager/PsmlImporter.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/PsmlImporter.java,v
retrieving revision 1.15
diff -u -r1.15 PsmlImporter.java
--- org/apache/jetspeed/services/psmlmanager/PsmlImporter.java 23 Jul 2003 19:50:22
-0000 1.15
+++ org/apache/jetspeed/services/psmlmanager/PsmlImporter.java 31 Aug 2003 12:48:45
-0000
@@ -119,7 +119,7 @@
properties = args[2];
}
TurbineConfig config = new TurbineConfig( root, properties);
- config.init();
+ config.initialize();
}
catch (Exception e)
{
Index: org/apache/jetspeed/services/psmlmanager/TestDbCriteria.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/TestDbCriteria.java,v
retrieving revision 1.3
diff -u -r1.3 TestDbCriteria.java
--- org/apache/jetspeed/services/psmlmanager/TestDbCriteria.java 8 Aug 2003
18:28:03 -0000 1.3
+++ org/apache/jetspeed/services/psmlmanager/TestDbCriteria.java 31 Aug 2003
12:48:45 -0000
@@ -200,7 +200,7 @@
try
{
config = new TurbineConfig( "../webapp",
"/WEB-INF/conf/TurbineResources.properties");
- config.init();
+ config.initialize();
}
catch (Exception e)
{
Index: org/apache/jetspeed/services/psmlmanager/TestMarshalPsml.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/TestMarshalPsml.java,v
retrieving revision 1.14
diff -u -r1.14 TestMarshalPsml.java
--- org/apache/jetspeed/services/psmlmanager/TestMarshalPsml.java 25 Aug 2003
06:18:41 -0000 1.14
+++ org/apache/jetspeed/services/psmlmanager/TestMarshalPsml.java 31 Aug 2003
12:48:48 -0000
@@ -502,7 +502,7 @@
try
{
config = new TurbineConfig( "../webapp",
"/WEB-INF/conf/TurbineResources.properties");
- config.init();
+ config.initialize();
}
catch (Exception e)
{
Index: org/apache/jetspeed/services/registry/TestMarshallRegistry.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/registry/TestMarshallRegistry.java,v
retrieving revision 1.8
diff -u -r1.8 TestMarshallRegistry.java
--- org/apache/jetspeed/services/registry/TestMarshallRegistry.java 8 Aug 2003
18:28:03 -0000 1.8
+++ org/apache/jetspeed/services/registry/TestMarshallRegistry.java 31 Aug 2003
12:48:49 -0000
@@ -530,7 +530,7 @@
try
{
config = new TurbineConfig("../webapp",
"/WEB-INF/conf/TurbineResources.properties");
- config.init();
+ config.initialize();
}
catch (Exception e)
{
Index: org/apache/jetspeed/services/registry/TestRegistryCategories.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/registry/TestRegistryCategories.java,v
retrieving revision 1.10
diff -u -r1.10 TestRegistryCategories.java
--- org/apache/jetspeed/services/registry/TestRegistryCategories.java 8 Aug 2003
18:28:03 -0000 1.10
+++ org/apache/jetspeed/services/registry/TestRegistryCategories.java 31 Aug 2003
12:48:50 -0000
@@ -301,7 +301,7 @@
try
{
config = new TurbineConfig( "../webapp",
"/WEB-INF/conf/TurbineResources.properties");
- config.init();
+ config.initialize();
}
catch (Exception e)
{
Index: org/apache/jetspeed/services/registry/TestRegistryPersistence.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/registry/TestRegistryPersistence.java,v
retrieving revision 1.5
diff -u -r1.5 TestRegistryPersistence.java
--- org/apache/jetspeed/services/registry/TestRegistryPersistence.java 8 Aug 2003
18:28:03 -0000 1.5
+++ org/apache/jetspeed/services/registry/TestRegistryPersistence.java 31 Aug 2003
12:48:51 -0000
@@ -203,7 +203,7 @@
try
{
config = new TurbineConfig( "../webapp",
"/WEB-INF/conf/TurbineResources.properties");
- config.init();
+ config.initialize();
}
catch (Exception e)
{
Index: org/apache/jetspeed/services/search/PopulateSampleIndices.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/search/PopulateSampleIndices.java,v
retrieving revision 1.1
diff -u -r1.1 PopulateSampleIndices.java
--- org/apache/jetspeed/services/search/PopulateSampleIndices.java 12 Jun 2003
22:11:33 -0000 1.1
+++ org/apache/jetspeed/services/search/PopulateSampleIndices.java 31 Aug 2003
12:48:51 -0000
@@ -76,7 +76,7 @@
TurbineConfig config = null;
config = new TurbineConfig( "./webapp",
"/WEB-INF/conf/TurbineResources.properties");
- config.init();
+ config.initialize();
FileReader reader = new FileReader(SAMPLE_URLS);
BufferedReader breader = new BufferedReader(reader);
Index: org/apache/jetspeed/services/security/TestGroupManagement.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/TestGroupManagement.java,v
retrieving revision 1.5
diff -u -r1.5 TestGroupManagement.java
--- org/apache/jetspeed/services/security/TestGroupManagement.java 8 Aug 2003
18:28:03 -0000 1.5
+++ org/apache/jetspeed/services/security/TestGroupManagement.java 31 Aug 2003
12:48:52 -0000
@@ -417,7 +417,7 @@
try
{
config = new TurbineConfig( "../webapp",
"/WEB-INF/conf/TurbineResources.properties");
- config.init();
+ config.initialize();
}
catch (Exception e)
{
Index: org/apache/jetspeed/services/security/TestPermissionManagement.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/TestPermissionManagement.java,v
retrieving revision 1.6
diff -u -r1.6 TestPermissionManagement.java
--- org/apache/jetspeed/services/security/TestPermissionManagement.java 8 Aug 2003
18:28:03 -0000 1.6
+++ org/apache/jetspeed/services/security/TestPermissionManagement.java 31 Aug 2003
12:48:53 -0000
@@ -438,7 +438,7 @@
try
{
config = new TurbineConfig( "../webapp",
"/WEB-INF/conf/TurbineResources.properties");
- config.init();
+ config.initialize();
}
catch (Exception e)
{
Index: org/apache/jetspeed/services/security/TestPortalAuthentication.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/TestPortalAuthentication.java,v
retrieving revision 1.5
diff -u -r1.5 TestPortalAuthentication.java
--- org/apache/jetspeed/services/security/TestPortalAuthentication.java 8 Aug 2003
18:28:03 -0000 1.5
+++ org/apache/jetspeed/services/security/TestPortalAuthentication.java 31 Aug 2003
12:48:53 -0000
@@ -202,7 +202,7 @@
try
{
config = new TurbineConfig( "../webapp",
"/WEB-INF/conf/TurbineResources.properties");
- config.init();
+ config.initialize();
}
catch (Exception e)
{
Index: org/apache/jetspeed/services/security/TestRoleManagement.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/TestRoleManagement.java,v
retrieving revision 1.6
diff -u -r1.6 TestRoleManagement.java
--- org/apache/jetspeed/services/security/TestRoleManagement.java 8 Aug 2003
18:28:03 -0000 1.6
+++ org/apache/jetspeed/services/security/TestRoleManagement.java 31 Aug 2003
12:48:54 -0000
@@ -425,7 +425,7 @@
try
{
config = new TurbineConfig( "../webapp",
"/WEB-INF/conf/TurbineResources.properties");
- config.init();
+ config.initialize();
}
catch (Exception e)
{
Index: org/apache/jetspeed/services/security/TestSecurityCache.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/TestSecurityCache.java,v
retrieving revision 1.6
diff -u -r1.6 TestSecurityCache.java
--- org/apache/jetspeed/services/security/TestSecurityCache.java 8 Aug 2003
18:28:03 -0000 1.6
+++ org/apache/jetspeed/services/security/TestSecurityCache.java 31 Aug 2003
12:48:54 -0000
@@ -241,7 +241,7 @@
try
{
config = new TurbineConfig( "../webapp",
"/WEB-INF/conf/TurbineResources.properties");
- config.init();
+ config.initialize();
}
catch (Exception e)
{
Index: org/apache/jetspeed/services/security/TestUserManagement.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/TestUserManagement.java,v
retrieving revision 1.7
diff -u -r1.7 TestUserManagement.java
--- org/apache/jetspeed/services/security/TestUserManagement.java 8 Aug 2003
18:28:03 -0000 1.7
+++ org/apache/jetspeed/services/security/TestUserManagement.java 31 Aug 2003
12:48:55 -0000
@@ -408,7 +408,7 @@
try
{
config = new TurbineConfig( "../webapp",
"/WEB-INF/conf/TurbineResources.properties");
- config.init();
+ config.initialize();
}
catch (Exception e)
{
Index: org/apache/jetspeed/services/security/registry/TestAccessController.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/registry/TestAccessController.java,v
retrieving revision 1.5
diff -u -r1.5 TestAccessController.java
--- org/apache/jetspeed/services/security/registry/TestAccessController.java 8 Aug
2003 18:28:03 -0000 1.5
+++ org/apache/jetspeed/services/security/registry/TestAccessController.java 31 Aug
2003 12:48:57 -0000
@@ -267,7 +267,7 @@
try
{
config = new TurbineConfig( "../webapp",
"/WEB-INF/conf/TurbineResources.properties");
- config.init();
+ config.initialize();
}
catch (Exception e)
{
Index: org/apache/jetspeed/services/security/turbine/TestAccessController.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/TestAccessController.java,v
retrieving revision 1.5
diff -u -r1.5 TestAccessController.java
--- org/apache/jetspeed/services/security/turbine/TestAccessController.java 8 Aug
2003 18:28:03 -0000 1.5
+++ org/apache/jetspeed/services/security/turbine/TestAccessController.java 31 Aug
2003 12:48:58 -0000
@@ -256,7 +256,7 @@
try
{
config = new TurbineConfig( "../webapp",
"/WEB-INF/conf/TurbineResources.properties");
- config.init();
+ config.initialize();
}
catch (Exception e)
{
Index: org/apache/jetspeed/test/HeadlessBaseTest.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/test/HeadlessBaseTest.java,v
retrieving revision 1.4
diff -u -r1.4 HeadlessBaseTest.java
--- org/apache/jetspeed/test/HeadlessBaseTest.java 8 Aug 2003 18:28:03 -0000
1.4
+++ org/apache/jetspeed/test/HeadlessBaseTest.java 31 Aug 2003 12:48:59 -0000
@@ -180,7 +180,7 @@
System.out.println(webappUrl);
//System.out.println("webapp found "+webappUrl.exists());
config = new TurbineConfig(webappUrl.getPath(),
testConfig.getString(TR_PROPS_PATH));
- config.init();
+ config.initialize();
}
}
catch (Throwable e)
Index: org/apache/jetspeed/util/template/JetspeedTool.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/JetspeedTool.java,v
retrieving revision 1.36
diff -u -r1.36 JetspeedTool.java
--- org/apache/jetspeed/util/template/JetspeedTool.java 23 Jul 2003 19:50:27 -0000
1.36
+++ org/apache/jetspeed/util/template/JetspeedTool.java 31 Aug 2003 12:49:02 -0000
@@ -66,7 +66,6 @@
import org.apache.jetspeed.portal.PortletControl;
import org.apache.jetspeed.services.PortalToolkit;
import org.apache.jetspeed.services.PortletFactory;
-import org.apache.jetspeed.services.PsmlManager;
import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
import org.apache.jetspeed.services.logging.JetspeedLogger;
import org.apache.jetspeed.services.resources.JetspeedResources;
@@ -639,7 +638,7 @@
}
else
{
- result = new JetspeedClearElement(Localization.getString(data,
"SECURITY_NO_ACCESS_TO_PORTLET"));
+ result = new
JetspeedClearElement(Localization.getBundle(rundata.getRequest()).getString("SECURITY_NO_ACCESS_TO_PORTLET"));
}
}
catch (Exception e)
Index: org/apache/jetspeed/util/template/TestJetspeedLinkFactory.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/TestJetspeedLinkFactory.java,v
retrieving revision 1.4
diff -u -r1.4 TestJetspeedLinkFactory.java
--- org/apache/jetspeed/util/template/TestJetspeedLinkFactory.java 8 Aug 2003
18:28:03 -0000 1.4
+++ org/apache/jetspeed/util/template/TestJetspeedLinkFactory.java 31 Aug 2003
12:49:03 -0000
@@ -98,7 +98,7 @@
{
config = new TurbineConfig( "../webapp",
"/WEB-INF/conf/TurbineResources.properties");
- config.init();
+ config.initialize();
}
catch (Exception e)
{--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
