From 813611daa2f55b8d0bd0abc562ce7fddbb2d9322 Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Mon, 9 Apr 2012 17:36:50 -0500 Subject: Removed deprecated resources. Some exceptions used deprecated resource class names as the bundle name, they have been replaced with string constants. The deprecated resource classes are no longer used, so they have been removed. Ticket #3 --- .../com/netscape/certsrv/acls/ACLsResources.java | 45 --------------------- .../com/netscape/certsrv/acls/EACLsException.java | 2 +- .../certsrv/authentication/AuthResources.java | 44 --------------------- .../certsrv/authentication/EAuthException.java | 2 +- .../certsrv/authorization/AuthzResources.java | 44 --------------------- .../certsrv/authorization/EAuthzException.java | 2 +- .../netscape/certsrv/policy/EPolicyException.java | 2 +- .../netscape/certsrv/policy/PolicyResources.java | 45 --------------------- .../netscape/certsrv/usrgrp/EUsrGrpException.java | 2 +- .../netscape/certsrv/usrgrp/UsrGrpResources.java | 46 ---------------------- 10 files changed, 5 insertions(+), 229 deletions(-) delete mode 100644 base/common/src/com/netscape/certsrv/acls/ACLsResources.java delete mode 100644 base/common/src/com/netscape/certsrv/authentication/AuthResources.java delete mode 100644 base/common/src/com/netscape/certsrv/authorization/AuthzResources.java delete mode 100644 base/common/src/com/netscape/certsrv/policy/PolicyResources.java delete mode 100644 base/common/src/com/netscape/certsrv/usrgrp/UsrGrpResources.java (limited to 'base/common/src/com') diff --git a/base/common/src/com/netscape/certsrv/acls/ACLsResources.java b/base/common/src/com/netscape/certsrv/acls/ACLsResources.java deleted file mode 100644 index d886eb383..000000000 --- a/base/common/src/com/netscape/certsrv/acls/ACLsResources.java +++ /dev/null @@ -1,45 +0,0 @@ -// --- BEGIN COPYRIGHT BLOCK --- -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; version 2 of the License. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with this program; if not, write to the Free Software Foundation, Inc., -// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -// -// (C) 2007 Red Hat, Inc. -// All rights reserved. -// --- END COPYRIGHT BLOCK --- -package com.netscape.certsrv.acls; - -import java.util.ListResourceBundle; - -/** - * A class represents a resource bundle for the entire ACL component. - * system. - *

- * - * @deprecated - * @version $Revision$, $Date$ - */ -public class ACLsResources extends ListResourceBundle { - - /** - * Returns the content of this resource. - * - * @return the content of this resource. - */ - public Object[][] getContents() { - return contents; - } - - /** - * A set of constants for localized error messages. - */ - static final Object[][] contents = {}; -} diff --git a/base/common/src/com/netscape/certsrv/acls/EACLsException.java b/base/common/src/com/netscape/certsrv/acls/EACLsException.java index b72796ec5..25e09c47c 100644 --- a/base/common/src/com/netscape/certsrv/acls/EACLsException.java +++ b/base/common/src/com/netscape/certsrv/acls/EACLsException.java @@ -41,7 +41,7 @@ public class EACLsException extends EBaseException { /** * resource class name */ - private static final String ACL_RESOURCES = ACLsResources.class.getName(); + private static final String ACL_RESOURCES = "com.netscape.certsrv.acls.ACLsResources"; /** * Constructs an acls exception. diff --git a/base/common/src/com/netscape/certsrv/authentication/AuthResources.java b/base/common/src/com/netscape/certsrv/authentication/AuthResources.java deleted file mode 100644 index 30a7a5d67..000000000 --- a/base/common/src/com/netscape/certsrv/authentication/AuthResources.java +++ /dev/null @@ -1,44 +0,0 @@ -// --- BEGIN COPYRIGHT BLOCK --- -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; version 2 of the License. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with this program; if not, write to the Free Software Foundation, Inc., -// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -// -// (C) 2007 Red Hat, Inc. -// All rights reserved. -// --- END COPYRIGHT BLOCK --- -package com.netscape.certsrv.authentication; - -import java.util.ListResourceBundle; - -/** - * A class represents a resource bundle for the authentication component. - *

- * - * @deprecated - * @version $Revision$, $Date$ - */ -public class AuthResources extends ListResourceBundle { - - /** - * Returns the content of this resource. - * - * @return the contents of this resource - */ - public Object[][] getContents() { - return contents; - } - - /** - * A set of constants for localized error messages. - */ - static final Object[][] contents = {}; -} diff --git a/base/common/src/com/netscape/certsrv/authentication/EAuthException.java b/base/common/src/com/netscape/certsrv/authentication/EAuthException.java index 07a87ab96..94240fdcc 100644 --- a/base/common/src/com/netscape/certsrv/authentication/EAuthException.java +++ b/base/common/src/com/netscape/certsrv/authentication/EAuthException.java @@ -34,7 +34,7 @@ public class EAuthException extends EBaseException { /** * Resource class name */ - private static final String AUTH_RESOURCES = AuthResources.class.getName(); + private static final String AUTH_RESOURCES = "com.netscape.certsrv.authentication.AuthResources"; /** * Constructs an authentication exception diff --git a/base/common/src/com/netscape/certsrv/authorization/AuthzResources.java b/base/common/src/com/netscape/certsrv/authorization/AuthzResources.java deleted file mode 100644 index 5f736aa02..000000000 --- a/base/common/src/com/netscape/certsrv/authorization/AuthzResources.java +++ /dev/null @@ -1,44 +0,0 @@ -// --- BEGIN COPYRIGHT BLOCK --- -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; version 2 of the License. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with this program; if not, write to the Free Software Foundation, Inc., -// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -// -// (C) 2007 Red Hat, Inc. -// All rights reserved. -// --- END COPYRIGHT BLOCK --- -package com.netscape.certsrv.authorization; - -import java.util.ListResourceBundle; - -/** - * A class represents a resource bundle for the authorization subsystem - *

- * - * @deprecated - * @version $Revision$, $Date$ - */ -public class AuthzResources extends ListResourceBundle { - - /** - * Returns the content of this resource. - * - * @return the content of this resource - */ - public Object[][] getContents() { - return contents; - } - - /** - * A set of constants for localized error messages. - */ - static final Object[][] contents = {}; -} diff --git a/base/common/src/com/netscape/certsrv/authorization/EAuthzException.java b/base/common/src/com/netscape/certsrv/authorization/EAuthzException.java index 873ada1af..ccb81f244 100644 --- a/base/common/src/com/netscape/certsrv/authorization/EAuthzException.java +++ b/base/common/src/com/netscape/certsrv/authorization/EAuthzException.java @@ -34,7 +34,7 @@ public class EAuthzException extends EBaseException { /** * Resource class name. */ - private static final String AUTHZ_RESOURCES = AuthzResources.class.getName(); + private static final String AUTHZ_RESOURCES = "com.netscape.certsrv.authorization.AuthzResources"; /** * Constructs a authz exception diff --git a/base/common/src/com/netscape/certsrv/policy/EPolicyException.java b/base/common/src/com/netscape/certsrv/policy/EPolicyException.java index c4de0e726..b5a46736e 100644 --- a/base/common/src/com/netscape/certsrv/policy/EPolicyException.java +++ b/base/common/src/com/netscape/certsrv/policy/EPolicyException.java @@ -48,7 +48,7 @@ public class EPolicyException extends EBaseException { /** * Resource class name. */ - private static final String POLICY_RESOURCES = PolicyResources.class.getName(); + private static final String POLICY_RESOURCES = "com.netscape.certsrv.policy.PolicyResources"; /** * Constructs a base exception. diff --git a/base/common/src/com/netscape/certsrv/policy/PolicyResources.java b/base/common/src/com/netscape/certsrv/policy/PolicyResources.java deleted file mode 100644 index acaf6d92b..000000000 --- a/base/common/src/com/netscape/certsrv/policy/PolicyResources.java +++ /dev/null @@ -1,45 +0,0 @@ -// --- BEGIN COPYRIGHT BLOCK --- -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; version 2 of the License. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with this program; if not, write to the Free Software Foundation, Inc., -// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -// -// (C) 2007 Red Hat, Inc. -// All rights reserved. -// --- END COPYRIGHT BLOCK --- -package com.netscape.certsrv.policy; - -import java.util.ListResourceBundle; - -/** - * Error messages for Policies. - *

- * - * 

- * NOTE:  The Policy Framework has been replaced by the Profile Framework.
- *
- *

- * - * @deprecated - * @version $Revision$, $Date$ - * @see java.util.ListResourceBundle - */ -public class PolicyResources extends ListResourceBundle { - - /** - * Returns the content of this resource. - */ - public Object[][] getContents() { - return contents; - } - - static final Object[][] contents = {}; -} diff --git a/base/common/src/com/netscape/certsrv/usrgrp/EUsrGrpException.java b/base/common/src/com/netscape/certsrv/usrgrp/EUsrGrpException.java index bae8ba085..cce9f3f3d 100644 --- a/base/common/src/com/netscape/certsrv/usrgrp/EUsrGrpException.java +++ b/base/common/src/com/netscape/certsrv/usrgrp/EUsrGrpException.java @@ -34,7 +34,7 @@ public class EUsrGrpException extends EBaseException { /** * Identity resource class name. */ - private static final String USRGRP_RESOURCES = UsrGrpResources.class.getName(); + private static final String USRGRP_RESOURCES = "com.netscape.certsrv.usrgrp.UsrGrpResources"; /** * Constructs a usr/grp management exception diff --git a/base/common/src/com/netscape/certsrv/usrgrp/UsrGrpResources.java b/base/common/src/com/netscape/certsrv/usrgrp/UsrGrpResources.java deleted file mode 100644 index f85f7116c..000000000 --- a/base/common/src/com/netscape/certsrv/usrgrp/UsrGrpResources.java +++ /dev/null @@ -1,46 +0,0 @@ -// --- BEGIN COPYRIGHT BLOCK --- -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; version 2 of the License. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with this program; if not, write to the Free Software Foundation, Inc., -// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -// -// (C) 2007 Red Hat, Inc. -// All rights reserved. -// --- END COPYRIGHT BLOCK --- -package com.netscape.certsrv.usrgrp; - -import java.util.ListResourceBundle; - -/** - * A class represents a resource bundle for the - * user/group manager - * - * @deprecated - * @version $Revision$, $Date$ - */ -public class UsrGrpResources extends ListResourceBundle { - - /** - * Returns the content of this resource. - * - * @return the content of this resource. - */ - public Object[][] getContents() { - return contents; - } - - /** - * Constants. The suffix represents the number of - * possible parameters. - */ - - static final Object[][] contents = {}; -} -- cgit