portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r725977 [38/48] - in /portals/jetspeed-2/portal/trunk: ./ app-servers/security/jboss/src/java/META-INF/jboss-secsvc/ app-servers/security/jboss/src/java/org/apache/jetspeed/appservers/security/jboss/ applications/jetspeed/src/main/javascrip...
Date Fri, 12 Dec 2008 12:07:04 GMT
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh_TW.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh_TW.properties?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh_TW.properties (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh_TW.properties Fri Dec 12 04:06:29 2008
@@ -1,111 +1,111 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_DOES_NOT_EXIST = \u4f7f\u7528\u8005 {0} \u4e0d\u5b58\u5728. 
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_ALREADY_EXISTS = The principal {0} already exists.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_IS_READ_ONLY = The principal {0} is read-only.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_UPDATE_FAILURE = Failed to update principal {0}.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_NOT_REMOVABLE = The principal {0} cannot be removed.
-org.apache.jetspeed.security.SecurityException.DEPENDENT_PRINCIPAL_EXISTS = The principal {0} has one or more required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has a {1} association with {2}.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_REQUIRED = A {0} {1} association is required.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A {0} {1} association is not allowed.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from principal {1} to another {2}.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_DOMINANT = Only one {0} association is allowed to principal {1} from another {2}.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_SINGULAR_MIXED = Only one {0} association is allowed from principal {1} to a {2}.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_DOMINANT_MIXED = Only one {0} association is allowed to principal {1} from a {2}.
-org.apache.jetspeed.security.SecurityException.ATTRIBUTE_IS_READ_ONLY = The principal attribute {0} is read only.
-org.apache.jetspeed.security.SecurityException.ATTRIBUTE_IS_REQUIRED = The principal attribute {0} is required.
-org.apache.jetspeed.security.SecurityException.ATTRIBUTES_ARE_READ_ONLY = The principal attributes are read only.
-org.apache.jetspeed.security.SecurityException.ATTRIBUTE_NOT_EXTENDABLE = Adding new principal attributes is not supported.
-
-org.apache.jetspeed.security.SecurityException.PERMISSION_DOES_NOT_EXIST = \u8a31\u53ef\u6b0a {0} \u4e0d\u5b58\u5728. 
-org.apache.jetspeed.security.SecurityException.PERMISSION_ALREADY_EXISTS = The permission {0} already exists.
-org.apache.jetspeed.security.SecurityException.EMPTY_PARAMETER = \u4e0d\u5408\u6cd5\u7684null\u6216\u7a7a\u53c3\u6578 {0}. 
-org.apache.jetspeed.security.SecurityException.INVALID_PASSWORD = \u5bc6\u78bc\u4e0d\u53ef\u7528.
-org.apache.jetspeed.security.SecurityException.INVALID_NEW_PASSWORD = \u65b0\u5bc6\u78bc\u4e0d\u53ef\u7528. 
-org.apache.jetspeed.security.SecurityException.INCORRECT_PASSWORD = \u4e0d\u6b63\u78ba\u5bc6\u78bc. 
-org.apache.jetspeed.security.SecurityException.PASSWORD_REQUIRED = \u9700\u8981\u8f38\u5165\u5bc6\u78bc. 
-org.apache.jetspeed.security.SecurityException.INVALID_AUTHENTICATION_PROVIDER = \u9a57\u8b49\u63d0\u4f9b\u5668 {0} \u4e0d\u53ef\u7528. 
-org.apache.jetspeed.security.SecurityException.PASSWORD_ALREADY_USED = \u5bc6\u78bc\u5df2\u4f7f\u7528. 
-org.apache.jetspeed.security.SecurityException.ANONYMOUS_USER_PROTECTED = \u4f7f\u7528\u8005 {0} \u53d7\u4fdd\u8b77. 
-org.apache.jetspeed.security.SecurityException.UNEXPECTED = \u610f\u5916\u7684\u5b89\u5168\u932f\u8aa4 {0} \u5728 {1}: {2} 
-org.apache.jetspeed.security.SecurityException.INVALID_UID = uid\u4e0d\u80fd\u70ba\u7a7a\u5b57\u4e32, null\u6216\u5305\u542b\u4efb\u4f55\u5e38\u898f\u8868\u793a\u5f0f\u8b8a\u5316\u7528\u5b57\u5143. 
-org.apache.jetspeed.security.SecurityException.INVALID_DN = dn\u4e0d\u80fd\u70ba\u7a7a\u5b57\u4e32\u6216\u662fnull. 
-
-#### deprecated resource strings: see SecurityException #####
-org.apache.jetspeed.security.SecurityException.USER_ALREADY_EXISTS = \u4f7f\u7528\u8005 {0} \u5df2\u5b58\u5728. 
-org.apache.jetspeed.security.SecurityException.USER_DOES_NOT_EXIST = \u4f7f\u7528\u8005 {0} \u4e0d\u5b58\u5728. 
-org.apache.jetspeed.security.SecurityException.ROLE_ALREADY_EXISTS = \u89d2\u8272 {0} \u5df2\u5b58\u5728. 
-org.apache.jetspeed.security.SecurityException.ROLE_DOES_NOT_EXIST = \u89d2\u8272 {0} \u4e0d\u5b58\u5728. 
-org.apache.jetspeed.security.SecurityException.GROUP_ALREADY_EXISTS = \u7fa4\u7d44 {0} \u5df2\u5b58\u5728. 
-org.apache.jetspeed.security.SecurityException.GROUP_DOES_NOT_EXIST = \u7fa4\u7d44 {0} \u4e0d\u5b58\u5728. 
-
-# resource strings for specific principal, user
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_DOES_NOT_EXIST = The user {0} does not exist.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ALREADY_EXISTS = The user {0} already exists.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_IS_READ_ONLY = The user {0} is read-only.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_UPDATE_FAILURE = Failed to update user {0}.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_NOT_REMOVABLE = The user {0} cannot be removed.
-org.apache.jetspeed.security.SecurityException.user.DEPENDENT_PRINCIPAL_EXISTS = The user {0} has one or more required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The user {0} already has a {1} association with {2}.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_REQUIRED = A user {0} {1} association is required.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A user {0} {1} association is not supported.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from user {1} to another user.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_DOMINANT = Only one {0} association is allowed to user {1} from another user.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_SINGULAR_MIXED = Only one {0} association is allowed from principal {1} to a {2}.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_DOMINANT_MIXED = Only one {0} association is allowed to principal {1} from a {2}.
-org.apache.jetspeed.security.SecurityException.user.ATTRIBUTE_IS_READ_ONLY = The user attribute {0} is read only.
-org.apache.jetspeed.security.SecurityException.user.ATTRIBUTE_IS_REQUIRED = The user attribute {0} is required.
-org.apache.jetspeed.security.SecurityException.user.ATTRIBUTES_ARE_READ_ONLY = The user attributes are read only.
-org.apache.jetspeed.security.SecurityException.user.ATTRIBUTE_NOT_EXTENDABLE = Adding new user attributes is not supported.
-
-# resource strings for specific principal, role
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_DOES_NOT_EXIST = The role {0} does not exist.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ALREADY_EXISTS = The role {0} already exists.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_IS_READ_ONLY = The role {0} is read-only.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_UPDATE_FAILURE = Failed to update role {0}.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_NOT_REMOVABLE = The role {0} cannot be removed.
-org.apache.jetspeed.security.SecurityException.role.DEPENDENT_PRINCIPAL_EXISTS = The role {0} has one or more required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The role {0} already has a {1} association with {2}.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_REQUIRED = A role {0} {1} association is required.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A role {0} {1} association is not supported.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from role {1} to another role.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_DOMINANT = Only one {0} association is allowed to role {1} from another role.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_SINGULAR_MIXED = Only one {0} association is allowed from principal {1} to a {2}.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_DOMINANT_MIXED = Only one {0} association is allowed to principal {1} from a {2}.
-org.apache.jetspeed.security.SecurityException.role.ATTRIBUTE_IS_READ_ONLY = The role attribute {0} is read only.
-org.apache.jetspeed.security.SecurityException.role.ATTRIBUTE_IS_REQUIRED = The role attribute {0} is required.
-org.apache.jetspeed.security.SecurityException.role.ATTRIBUTES_ARE_READ_ONLY = The role attributes are read only.
-org.apache.jetspeed.security.SecurityException.role.ATTRIBUTE_NOT_EXTENDABLE = Adding new role attributes is not supported.
-
-# resource strings for specific principal, group
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_DOES_NOT_EXIST = The group {0} does not exist.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ALREADY_EXISTS = The group {0} already exists.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_IS_READ_ONLY = The group {0} is read-only.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_UPDATE_FAILURE = Failed to update group {0}.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_NOT_REMOVABLE = The group {0} cannot be removed.
-org.apache.jetspeed.security.SecurityException.group.DEPENDENT_PRINCIPAL_EXISTS = The group {0} has one or more required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The group {0} already has a {1} association with {2}.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_REQUIRED = A group {0} {1} association is required.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A group {0} {1} association is not supported.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from principal {1} to another group.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_DOMINANT = Only one {0} association is allowed to principal {1} from another group.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_SINGULAR_MIXED = Only one {0} association is allowed from principal {1} to a {2}.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_DOMINANT_MIXED = Only one {0} association is allowed to principal {1} from a {2}.
-org.apache.jetspeed.security.SecurityException.group.ATTRIBUTE_IS_READ_ONLY = The group attribute {0} is read only.
-org.apache.jetspeed.security.SecurityException.group.ATTRIBUTE_IS_REQUIRED = The group attribute {0} is required.
-org.apache.jetspeed.security.SecurityException.group.ATTRIBUTES_ARE_READ_ONLY = The group attributes are read only.
-org.apache.jetspeed.security.SecurityException.group.ATTRIBUTE_NOT_EXTENDABLE = Adding new group attributes is not supported.
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_DOES_NOT_EXIST = \u4f7f\u7528\u8005 {0} \u4e0d\u5b58\u5728. 
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ALREADY_EXISTS = The principal {0} already exists.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_IS_READ_ONLY = The principal {0} is read-only.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_UPDATE_FAILURE = Failed to update principal {0}.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_NOT_REMOVABLE = The principal {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.DEPENDENT_PRINCIPAL_EXISTS = The principal {0} has one or more required {1} {2} associations.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has a {1} association with {2}.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_REQUIRED = A {0} {1} association is required.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A {0} {1} association is not allowed.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from principal {1} to another {2}.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_DOMINANT = Only one {0} association is allowed to principal {1} from another {2}.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_SINGULAR_MIXED = Only one {0} association is allowed from principal {1} to a {2}.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_DOMINANT_MIXED = Only one {0} association is allowed to principal {1} from a {2}.
+org.apache.jetspeed.security.SecurityException.ATTRIBUTE_IS_READ_ONLY = The principal attribute {0} is read only.
+org.apache.jetspeed.security.SecurityException.ATTRIBUTE_IS_REQUIRED = The principal attribute {0} is required.
+org.apache.jetspeed.security.SecurityException.ATTRIBUTES_ARE_READ_ONLY = The principal attributes are read only.
+org.apache.jetspeed.security.SecurityException.ATTRIBUTE_NOT_EXTENDABLE = Adding new principal attributes is not supported.
+
+org.apache.jetspeed.security.SecurityException.PERMISSION_DOES_NOT_EXIST = \u8a31\u53ef\u6b0a {0} \u4e0d\u5b58\u5728. 
+org.apache.jetspeed.security.SecurityException.PERMISSION_ALREADY_EXISTS = The permission {0} already exists.
+org.apache.jetspeed.security.SecurityException.EMPTY_PARAMETER = \u4e0d\u5408\u6cd5\u7684null\u6216\u7a7a\u53c3\u6578 {0}. 
+org.apache.jetspeed.security.SecurityException.INVALID_PASSWORD = \u5bc6\u78bc\u4e0d\u53ef\u7528.
+org.apache.jetspeed.security.SecurityException.INVALID_NEW_PASSWORD = \u65b0\u5bc6\u78bc\u4e0d\u53ef\u7528. 
+org.apache.jetspeed.security.SecurityException.INCORRECT_PASSWORD = \u4e0d\u6b63\u78ba\u5bc6\u78bc. 
+org.apache.jetspeed.security.SecurityException.PASSWORD_REQUIRED = \u9700\u8981\u8f38\u5165\u5bc6\u78bc. 
+org.apache.jetspeed.security.SecurityException.INVALID_AUTHENTICATION_PROVIDER = \u9a57\u8b49\u63d0\u4f9b\u5668 {0} \u4e0d\u53ef\u7528. 
+org.apache.jetspeed.security.SecurityException.PASSWORD_ALREADY_USED = \u5bc6\u78bc\u5df2\u4f7f\u7528. 
+org.apache.jetspeed.security.SecurityException.ANONYMOUS_USER_PROTECTED = \u4f7f\u7528\u8005 {0} \u53d7\u4fdd\u8b77. 
+org.apache.jetspeed.security.SecurityException.UNEXPECTED = \u610f\u5916\u7684\u5b89\u5168\u932f\u8aa4 {0} \u5728 {1}: {2} 
+org.apache.jetspeed.security.SecurityException.INVALID_UID = uid\u4e0d\u80fd\u70ba\u7a7a\u5b57\u4e32, null\u6216\u5305\u542b\u4efb\u4f55\u5e38\u898f\u8868\u793a\u5f0f\u8b8a\u5316\u7528\u5b57\u5143. 
+org.apache.jetspeed.security.SecurityException.INVALID_DN = dn\u4e0d\u80fd\u70ba\u7a7a\u5b57\u4e32\u6216\u662fnull. 
+
+#### deprecated resource strings: see SecurityException #####
+org.apache.jetspeed.security.SecurityException.USER_ALREADY_EXISTS = \u4f7f\u7528\u8005 {0} \u5df2\u5b58\u5728. 
+org.apache.jetspeed.security.SecurityException.USER_DOES_NOT_EXIST = \u4f7f\u7528\u8005 {0} \u4e0d\u5b58\u5728. 
+org.apache.jetspeed.security.SecurityException.ROLE_ALREADY_EXISTS = \u89d2\u8272 {0} \u5df2\u5b58\u5728. 
+org.apache.jetspeed.security.SecurityException.ROLE_DOES_NOT_EXIST = \u89d2\u8272 {0} \u4e0d\u5b58\u5728. 
+org.apache.jetspeed.security.SecurityException.GROUP_ALREADY_EXISTS = \u7fa4\u7d44 {0} \u5df2\u5b58\u5728. 
+org.apache.jetspeed.security.SecurityException.GROUP_DOES_NOT_EXIST = \u7fa4\u7d44 {0} \u4e0d\u5b58\u5728. 
+
+# resource strings for specific principal, user
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_DOES_NOT_EXIST = The user {0} does not exist.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ALREADY_EXISTS = The user {0} already exists.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_IS_READ_ONLY = The user {0} is read-only.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_UPDATE_FAILURE = Failed to update user {0}.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_NOT_REMOVABLE = The user {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.user.DEPENDENT_PRINCIPAL_EXISTS = The user {0} has one or more required {1} {2} associations.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The user {0} already has a {1} association with {2}.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_REQUIRED = A user {0} {1} association is required.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A user {0} {1} association is not supported.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from user {1} to another user.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_DOMINANT = Only one {0} association is allowed to user {1} from another user.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_SINGULAR_MIXED = Only one {0} association is allowed from principal {1} to a {2}.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_DOMINANT_MIXED = Only one {0} association is allowed to principal {1} from a {2}.
+org.apache.jetspeed.security.SecurityException.user.ATTRIBUTE_IS_READ_ONLY = The user attribute {0} is read only.
+org.apache.jetspeed.security.SecurityException.user.ATTRIBUTE_IS_REQUIRED = The user attribute {0} is required.
+org.apache.jetspeed.security.SecurityException.user.ATTRIBUTES_ARE_READ_ONLY = The user attributes are read only.
+org.apache.jetspeed.security.SecurityException.user.ATTRIBUTE_NOT_EXTENDABLE = Adding new user attributes is not supported.
+
+# resource strings for specific principal, role
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_DOES_NOT_EXIST = The role {0} does not exist.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ALREADY_EXISTS = The role {0} already exists.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_IS_READ_ONLY = The role {0} is read-only.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_UPDATE_FAILURE = Failed to update role {0}.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_NOT_REMOVABLE = The role {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.role.DEPENDENT_PRINCIPAL_EXISTS = The role {0} has one or more required {1} {2} associations.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The role {0} already has a {1} association with {2}.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_REQUIRED = A role {0} {1} association is required.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A role {0} {1} association is not supported.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from role {1} to another role.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_DOMINANT = Only one {0} association is allowed to role {1} from another role.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_SINGULAR_MIXED = Only one {0} association is allowed from principal {1} to a {2}.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_DOMINANT_MIXED = Only one {0} association is allowed to principal {1} from a {2}.
+org.apache.jetspeed.security.SecurityException.role.ATTRIBUTE_IS_READ_ONLY = The role attribute {0} is read only.
+org.apache.jetspeed.security.SecurityException.role.ATTRIBUTE_IS_REQUIRED = The role attribute {0} is required.
+org.apache.jetspeed.security.SecurityException.role.ATTRIBUTES_ARE_READ_ONLY = The role attributes are read only.
+org.apache.jetspeed.security.SecurityException.role.ATTRIBUTE_NOT_EXTENDABLE = Adding new role attributes is not supported.
+
+# resource strings for specific principal, group
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_DOES_NOT_EXIST = The group {0} does not exist.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ALREADY_EXISTS = The group {0} already exists.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_IS_READ_ONLY = The group {0} is read-only.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_UPDATE_FAILURE = Failed to update group {0}.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_NOT_REMOVABLE = The group {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.group.DEPENDENT_PRINCIPAL_EXISTS = The group {0} has one or more required {1} {2} associations.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The group {0} already has a {1} association with {2}.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_REQUIRED = A group {0} {1} association is required.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A group {0} {1} association is not supported.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from principal {1} to another group.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_DOMINANT = Only one {0} association is allowed to principal {1} from another group.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_SINGULAR_MIXED = Only one {0} association is allowed from principal {1} to a {2}.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_DOMINANT_MIXED = Only one {0} association is allowed to principal {1} from a {2}.
+org.apache.jetspeed.security.SecurityException.group.ATTRIBUTE_IS_READ_ONLY = The group attribute {0} is read only.
+org.apache.jetspeed.security.SecurityException.group.ATTRIBUTE_IS_REQUIRED = The group attribute {0} is required.
+org.apache.jetspeed.security.SecurityException.group.ATTRIBUTES_ARE_READ_ONLY = The group attributes are read only.
+org.apache.jetspeed.security.SecurityException.group.ATTRIBUTE_NOT_EXTENDABLE = Adding new group attributes is not supported.

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh_TW.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/headerresource/HeaderResourceLib.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/Coordinate.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/Coordinate.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/Coordinate.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/Coordinate.java Fri Dec 12 04:06:29 2008
@@ -1,32 +1,32 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jetspeed.layout;
-
-/**
- * Abstracts coordinate parameters for portlet placement 
- *
- * @author <a>David Gurney</a>
- * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
- * @version $Id: $
- */
-public interface Coordinate 
-{
-	public int getOldCol();
-	public int getOldRow();
-	public int getNewCol();
-	public int getNewRow();
-}
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.layout;
+
+/**
+ * Abstracts coordinate parameters for portlet placement 
+ *
+ * @author <a>David Gurney</a>
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+ * @version $Id: $
+ */
+public interface Coordinate 
+{
+	public int getOldCol();
+	public int getOldRow();
+	public int getNewCol();
+	public int getNewRow();
+}

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/Coordinate.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/JetspeedPowerTool.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/JetspeedPowerToolFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/PortletActionSecurityBehavior.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/PortletActionSecurityBehavior.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/PortletActionSecurityBehavior.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/PortletActionSecurityBehavior.java Fri Dec 12 04:06:29 2008
@@ -1,33 +1,33 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jetspeed.layout;
-
-import org.apache.jetspeed.request.RequestContext;
-
-/**
- * Abstracted behavior of security checks for portlet actions 
- *
- * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
- * @version $Id: $
- */
-public interface PortletActionSecurityBehavior 
-{
-    public boolean checkAccess(RequestContext context, String action);
-    public boolean isCreateNewPageOnEditEnabled();
-    public boolean isPageQualifiedForCreateNewPageOnEdit(RequestContext context);
-    public boolean createNewPageOnEdit(RequestContext context);
-}
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.layout;
+
+import org.apache.jetspeed.request.RequestContext;
+
+/**
+ * Abstracted behavior of security checks for portlet actions 
+ *
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+ * @version $Id: $
+ */
+public interface PortletActionSecurityBehavior 
+{
+    public boolean checkAccess(RequestContext context, String action);
+    public boolean isCreateNewPageOnEditEnabled();
+    public boolean isPageQualifiedForCreateNewPageOnEdit(RequestContext context);
+    public boolean createNewPageOnEdit(RequestContext context);
+}

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/PortletActionSecurityBehavior.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/PortletPlacementContext.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/PortletPlacementContext.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/PortletPlacementContext.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/PortletPlacementContext.java Fri Dec 12 04:06:29 2008
@@ -1,160 +1,160 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jetspeed.layout;
-
-import org.apache.jetspeed.om.page.Fragment;
-import org.apache.jetspeed.om.page.Page;
-
-/**
- * Handles portlet placement for client such as AJAX client side
- * on a per request basis. The context is associated with a request context,
- * thus it is only valid for the span of a request.  
- *
- * @author <a>David Gurney</a>
- * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
- * @version $Id: $
- */
-public interface PortletPlacementContext 
-{
-	/**
-     * Move a portlet fragment to a new absolute position as specified in the Coordinate parameter.
-     * 
-	 * @param fragment The fragment to be moved.
-	 * @param coordinate The specification of the new absolute coordinate
-	 * @return new coordinate location of the portlet
-	 * @throws PortletPlacementException
-	 */
-	public Coordinate moveAbsolute(Fragment fragment, Coordinate coordinate ) throws PortletPlacementException;
-
-	/**
-     * Move a portlet fragment to a new absolute position as specified in the Coordinate parameter.
-     * 
-	 * @param fragment The fragment to be moved.
-	 * @param coordinate The specification of the new absolute coordinate
-	 * @param addFragment When true, the fragment is being added (i.e. it is not being moved within the column)
-	 * @return new coordinate location of the portlet
-	 * @throws PortletPlacementException
-	 */
-	public Coordinate moveAbsolute(Fragment fragment, Coordinate coordinate, boolean addFragment) throws PortletPlacementException;
-	
-	/**
-     * Move a portlet relative to its current position UP one row.
-     * 
-     * @param fragment The fragment to be moved.
-     * @return new coordinate location of the portlet
-	 * @throws PortletPlacementException
-	 */
-	public Coordinate moveUp(Fragment fragment) throws PortletPlacementException;
-
-    /**
-     * Move a portlet relative to its current position DOWN one row.
-     * 
-     * @param fragment The fragment to be moved.
-     * @return new coordinate location of the portlet
-     * @throws PortletPlacementException
-     */    
-	public Coordinate moveDown(Fragment fragment) throws PortletPlacementException;
-    
-    /**
-     * Move a portlet relative to its current position LEFT one column.
-     * 
-     * @param fragment The fragment to be moved.
-     * @return new coordinate location of the portlet
-     * @throws PortletPlacementException
-     */        
-	public Coordinate moveLeft(Fragment fragment) throws PortletPlacementException;
-    
-    /**
-     * Move a portlet relative to its current position RIGHT one column.
-     * 
-     * @param fragment The fragment to be moved.
-     * @return new coordinate location of the portlet
-     * @throws PortletPlacementException
-     */            
-	public Coordinate moveRight(Fragment fragment) throws PortletPlacementException;
-    
-	/**
-     * Add a portlet to its managed page.
-     * 
-	 * @param fragment The Fragment to add
-	 * @param coordinate The coordinate where to place the new portlet
-	 * @return
-	 * @throws PortletPlacementException
-	 */
-	public Coordinate add(Fragment fragment, Coordinate coordinate) throws PortletPlacementException;
-    
-	/**
-     * Remove the specified fragment.
-	 * @param fragment
-	 * @return
-	 * @throws PortletPlacementException
-	 */
-	public Coordinate remove(Fragment fragment) throws PortletPlacementException;
-    
-    /**
-     * retrieve the number of columns for the managed layout.
-     * 
-     * @return the number of columns in the manged layout
-     * @throws PortletPlacementException
-     */
-	public int getNumberColumns() throws PortletPlacementException;
-    
-    /**
-     * retrieve the number of rows for the managed layout at the given column.
-     * 
-     * @param column the column to retrieve the number of rows for
-     * @return the number of rows for the given column
-     * @throws PortletPlacementException
-     */    
-	public int getNumberRows(int column) throws PortletPlacementException;
-    
-	/**
-     * Retrieve a portlet fragment for the given coordinate.
-     *  
-	 * @param coordinate the coordinate associated to a fragment.
-	 * @return the fragment associated to the given coordinate
-	 * @throws PortletPlacementException
-	 */
-	public Fragment getFragmentAtNewCoordinate(Coordinate coordinate) throws PortletPlacementException;
-    
-	/**
-     * Retrieve the old portlet fragment for the given coordinate (prior to placement).
-     * 
-	 * @param coordinate the coordinate associated to a fragment.
-	 * @return the fragment associated to the given coordinate
-	 * @throws PortletPlacementException
-	 */
-	public Fragment getFragmentAtOldCoordinate(Coordinate coordinate) throws PortletPlacementException;
-    
-	/**
-     * Retrieve a fragment by fragment id.
-     * 
-	 * @param fragmentId a string key for a fragment managed on this layout.
-	 * @return The fragment associated with the given fragment id.
-	 * @throws PortletPlacementException
-	 */
-	public Fragment getFragmentById(String fragmentId) throws PortletPlacementException;
-    
-    /**
-     * Takes the internal portlet placement state and writes it back
-     * out to the root fragment for the managed page layout.
-     * 
-     * @return the managed page layout with updated fragment state.
-     */
-    public Page syncPageFragments();
-        
-}
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.layout;
+
+import org.apache.jetspeed.om.page.Fragment;
+import org.apache.jetspeed.om.page.Page;
+
+/**
+ * Handles portlet placement for client such as AJAX client side
+ * on a per request basis. The context is associated with a request context,
+ * thus it is only valid for the span of a request.  
+ *
+ * @author <a>David Gurney</a>
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+ * @version $Id: $
+ */
+public interface PortletPlacementContext 
+{
+	/**
+     * Move a portlet fragment to a new absolute position as specified in the Coordinate parameter.
+     * 
+	 * @param fragment The fragment to be moved.
+	 * @param coordinate The specification of the new absolute coordinate
+	 * @return new coordinate location of the portlet
+	 * @throws PortletPlacementException
+	 */
+	public Coordinate moveAbsolute(Fragment fragment, Coordinate coordinate ) throws PortletPlacementException;
+
+	/**
+     * Move a portlet fragment to a new absolute position as specified in the Coordinate parameter.
+     * 
+	 * @param fragment The fragment to be moved.
+	 * @param coordinate The specification of the new absolute coordinate
+	 * @param addFragment When true, the fragment is being added (i.e. it is not being moved within the column)
+	 * @return new coordinate location of the portlet
+	 * @throws PortletPlacementException
+	 */
+	public Coordinate moveAbsolute(Fragment fragment, Coordinate coordinate, boolean addFragment) throws PortletPlacementException;
+	
+	/**
+     * Move a portlet relative to its current position UP one row.
+     * 
+     * @param fragment The fragment to be moved.
+     * @return new coordinate location of the portlet
+	 * @throws PortletPlacementException
+	 */
+	public Coordinate moveUp(Fragment fragment) throws PortletPlacementException;
+
+    /**
+     * Move a portlet relative to its current position DOWN one row.
+     * 
+     * @param fragment The fragment to be moved.
+     * @return new coordinate location of the portlet
+     * @throws PortletPlacementException
+     */    
+	public Coordinate moveDown(Fragment fragment) throws PortletPlacementException;
+    
+    /**
+     * Move a portlet relative to its current position LEFT one column.
+     * 
+     * @param fragment The fragment to be moved.
+     * @return new coordinate location of the portlet
+     * @throws PortletPlacementException
+     */        
+	public Coordinate moveLeft(Fragment fragment) throws PortletPlacementException;
+    
+    /**
+     * Move a portlet relative to its current position RIGHT one column.
+     * 
+     * @param fragment The fragment to be moved.
+     * @return new coordinate location of the portlet
+     * @throws PortletPlacementException
+     */            
+	public Coordinate moveRight(Fragment fragment) throws PortletPlacementException;
+    
+	/**
+     * Add a portlet to its managed page.
+     * 
+	 * @param fragment The Fragment to add
+	 * @param coordinate The coordinate where to place the new portlet
+	 * @return
+	 * @throws PortletPlacementException
+	 */
+	public Coordinate add(Fragment fragment, Coordinate coordinate) throws PortletPlacementException;
+    
+	/**
+     * Remove the specified fragment.
+	 * @param fragment
+	 * @return
+	 * @throws PortletPlacementException
+	 */
+	public Coordinate remove(Fragment fragment) throws PortletPlacementException;
+    
+    /**
+     * retrieve the number of columns for the managed layout.
+     * 
+     * @return the number of columns in the manged layout
+     * @throws PortletPlacementException
+     */
+	public int getNumberColumns() throws PortletPlacementException;
+    
+    /**
+     * retrieve the number of rows for the managed layout at the given column.
+     * 
+     * @param column the column to retrieve the number of rows for
+     * @return the number of rows for the given column
+     * @throws PortletPlacementException
+     */    
+	public int getNumberRows(int column) throws PortletPlacementException;
+    
+	/**
+     * Retrieve a portlet fragment for the given coordinate.
+     *  
+	 * @param coordinate the coordinate associated to a fragment.
+	 * @return the fragment associated to the given coordinate
+	 * @throws PortletPlacementException
+	 */
+	public Fragment getFragmentAtNewCoordinate(Coordinate coordinate) throws PortletPlacementException;
+    
+	/**
+     * Retrieve the old portlet fragment for the given coordinate (prior to placement).
+     * 
+	 * @param coordinate the coordinate associated to a fragment.
+	 * @return the fragment associated to the given coordinate
+	 * @throws PortletPlacementException
+	 */
+	public Fragment getFragmentAtOldCoordinate(Coordinate coordinate) throws PortletPlacementException;
+    
+	/**
+     * Retrieve a fragment by fragment id.
+     * 
+	 * @param fragmentId a string key for a fragment managed on this layout.
+	 * @return The fragment associated with the given fragment id.
+	 * @throws PortletPlacementException
+	 */
+	public Fragment getFragmentById(String fragmentId) throws PortletPlacementException;
+    
+    /**
+     * Takes the internal portlet placement state and writes it back
+     * out to the root fragment for the managed page layout.
+     * 
+     * @return the managed page layout with updated fragment state.
+     */
+    public Page syncPageFragments();
+        
+}

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/PortletPlacementContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/PortletPlacementException.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/PortletPlacementException.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/PortletPlacementException.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/PortletPlacementException.java Fri Dec 12 04:06:29 2008
@@ -1,32 +1,32 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jetspeed.layout;
-
-/**
- * Handles portlet placement exceptions 
- *
- * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
- * @author <a>David Gurney</a>
- * @version $Id: $
- */
-public class PortletPlacementException extends Exception 
-{
-	public PortletPlacementException(String message) 
-    {
-		super(message);
-	}
-}
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.layout;
+
+/**
+ * Handles portlet placement exceptions 
+ *
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+ * @author <a>David Gurney</a>
+ * @version $Id: $
+ */
+public class PortletPlacementException extends Exception 
+{
+	public PortletPlacementException(String message) 
+    {
+		super(message);
+	}
+}

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/PortletPlacementException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/preference/FragmentPreference.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/valve/Valve.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/valve/Valve.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/valve/Valve.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/valve/Valve.java Fri Dec 12 04:06:29 2008
@@ -1,45 +1,45 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jetspeed.pipeline.valve;
-
-import org.apache.jetspeed.request.RequestContext;
-import org.apache.jetspeed.pipeline.PipelineException;
-
-/**
- * NOTE: This class will be deprecated once we merge with Summit
- *
- * General valve interface.  The actual valve interface(s) should be 
- * extended by the implementing class.
- *
- * @author <a href="mailto:david@bluesunrise.com">David Sean Taylor</a>
- * @version $Id: Valve.java 186726 2004-06-05 05:13:09Z taylor $
- *
- * @see org.apache.jetspeed.pipeline.JetspeedPipeline
- * @see org.apache.jetspeed.pipeline.Pipeline
- */
-public interface Valve
-{
-    public void invoke(RequestContext request, ValveContext context)
-        throws PipelineException;
-
-    /**
-     * Initialize the valve before using in a pipeline.
-     */
-    public void initialize()
-        throws PipelineException;
-
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.pipeline.valve;
+
+import org.apache.jetspeed.request.RequestContext;
+import org.apache.jetspeed.pipeline.PipelineException;
+
+/**
+ * NOTE: This class will be deprecated once we merge with Summit
+ *
+ * General valve interface.  The actual valve interface(s) should be 
+ * extended by the implementing class.
+ *
+ * @author <a href="mailto:david@bluesunrise.com">David Sean Taylor</a>
+ * @version $Id: Valve.java 186726 2004-06-05 05:13:09Z taylor $
+ *
+ * @see org.apache.jetspeed.pipeline.JetspeedPipeline
+ * @see org.apache.jetspeed.pipeline.Pipeline
+ */
+public interface Valve
+{
+    public void invoke(RequestContext request, ValveContext context)
+        throws PipelineException;
+
+    /**
+     * Initialize the valve before using in a pipeline.
+     */
+    public void initialize()
+        throws PipelineException;
+
 }
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/valve/Valve.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/valve/ValveContext.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/valve/ValveContext.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/valve/ValveContext.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/valve/ValveContext.java Fri Dec 12 04:06:29 2008
@@ -1,53 +1,53 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jetspeed.pipeline.valve;
-
-import org.apache.jetspeed.request.RequestContext;
-import org.apache.jetspeed.pipeline.PipelineException;
-
-/**
- * NOTE: This class will be deprecated once we merge with Summit
- *
- *
- * @author <a href="mailto:david@bluesunrise.com">David Sean Taylor</a>
- * @version $Id: ValveContext.java 186726 2004-06-05 05:13:09Z taylor $
- */
-public interface ValveContext
-{
-    /**
-     * <p>Cause the <code>invoke()</code> method of the next Valve
-     * that is part of the Pipeline currently being processed (if any)
-     * to be executed, passing on the specified request and response
-     * objects plus this <code>ValveContext</code> instance.
-     * Exceptions thrown by a subsequently executed Valve will be
-     * passed on to our caller.</p>
-     *
-     * <p>If there are no more Valves to be executed, execution of
-     * this method will result in a no op.</p>
-     *
-     * @param data The run-time information, including the servlet
-     * request and response we are processing.
-     *
-     * @exception IOException Thrown by a subsequent Valve.
-     * @exception SummitException Thrown by a subsequent Valve.
-     * @exception SummitException No further Valves configured in the
-     * Pipeline currently being processed.
-     */
-    public void invokeNext(RequestContext request)
-        throws PipelineException;
-}
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jetspeed.pipeline.valve;
+
+import org.apache.jetspeed.request.RequestContext;
+import org.apache.jetspeed.pipeline.PipelineException;
+
+/**
+ * NOTE: This class will be deprecated once we merge with Summit
+ *
+ *
+ * @author <a href="mailto:david@bluesunrise.com">David Sean Taylor</a>
+ * @version $Id: ValveContext.java 186726 2004-06-05 05:13:09Z taylor $
+ */
+public interface ValveContext
+{
+    /**
+     * <p>Cause the <code>invoke()</code> method of the next Valve
+     * that is part of the Pipeline currently being processed (if any)
+     * to be executed, passing on the specified request and response
+     * objects plus this <code>ValveContext</code> instance.
+     * Exceptions thrown by a subsequently executed Valve will be
+     * passed on to our caller.</p>
+     *
+     * <p>If there are no more Valves to be executed, execution of
+     * this method will result in a no op.</p>
+     *
+     * @param data The run-time information, including the servlet
+     * request and response we are processing.
+     *
+     * @exception IOException Thrown by a subsequent Valve.
+     * @exception SummitException Thrown by a subsequent Valve.
+     * @exception SummitException No further Valves configured in the
+     * Pipeline currently being processed.
+     */
+    public void invokeNext(RequestContext request)
+        throws PipelineException;
+}

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/valve/ValveContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portlet/PortletHeaderRequest.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portlet/PortletHeaderRequest.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portlet/PortletHeaderRequest.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portlet/PortletHeaderRequest.java Fri Dec 12 04:06:29 2008
@@ -1,45 +1,45 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jetspeed.portlet;
-
-import javax.portlet.PortletPreferences;
-
-public interface PortletHeaderRequest
-{    
-    /**
-     * Returns the web context path for the portal  
-     * @return the portal context path, for example "/jetspeed"
-     */
-    String getPortalContextPath();
-    
-    /**
-     * Returns the portlet applicatoin context path 
-     * 
-     * @return
-     */
-    String getPortletApplicationContextPath();
-    
-    /**
-     * Get the portlet preferences
-     */
-    PortletPreferences getPreferences();
-    
-    /**
-     * Get the init parameter by name
-     */
-    String getInitParameter( String name );
-}
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.portlet;
+
+import javax.portlet.PortletPreferences;
+
+public interface PortletHeaderRequest
+{    
+    /**
+     * Returns the web context path for the portal  
+     * @return the portal context path, for example "/jetspeed"
+     */
+    String getPortalContextPath();
+    
+    /**
+     * Returns the portlet applicatoin context path 
+     * 
+     * @return
+     */
+    String getPortletApplicationContextPath();
+    
+    /**
+     * Get the portlet preferences
+     */
+    PortletPreferences getPreferences();
+    
+    /**
+     * Get the init parameter by name
+     */
+    String getInitParameter( String name );
+}

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portlet/PortletHeaderRequest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portlet/PortletHeaderResponse.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portlet/PortletHeaderResponse.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portlet/PortletHeaderResponse.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portlet/PortletHeaderResponse.java Fri Dec 12 04:06:29 2008
@@ -1,76 +1,76 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jetspeed.portlet;
-
-import java.util.Map;
-
-import javax.portlet.PortletException;
-
-import org.apache.jetspeed.headerresource.HeaderResource;
-
-
-public interface PortletHeaderResponse
-{    
-    /**
-     * Retrieves the header resource for this request
-     * 
-     * @return a per request HeaderResource
-     */
-    HeaderResource getHeaderResource();
-    
-    /**
-     * Is request for /desktop rather than /portal
-     * 
-     * @return true if request is for /desktop, false if request is for /portal
-     */
-    boolean isDesktop();
-    
-    
-    /**
-     * Configuration data for use by HeaderResource
-     * 
-     * @return an immutable Map
-     */
-    Map getHeaderConfiguration();
-    
-    /**
-     * Map containing overrides of content for header statements
-     * 
-     * @return an immutable Map
-     */
-    Map getHeaderResourceRegistry();
-    
-    /**
-     * Temporary solution: get the content after calling include
-     * this will be deprecated
-     * 
-     */
-    String getContent();
-
-    
-    /**
-     * Dispatch to a servlet or resource to generate and include the header content
-     * 
-     * @param request
-     * @param response
-     * @param headerResource
-     * @return
-     * @throws PortletException
-     */
-    void include(PortletHeaderRequest request, PortletHeaderResponse response, String headerResource) 
-        throws PortletException;
-}
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.portlet;
+
+import java.util.Map;
+
+import javax.portlet.PortletException;
+
+import org.apache.jetspeed.headerresource.HeaderResource;
+
+
+public interface PortletHeaderResponse
+{    
+    /**
+     * Retrieves the header resource for this request
+     * 
+     * @return a per request HeaderResource
+     */
+    HeaderResource getHeaderResource();
+    
+    /**
+     * Is request for /desktop rather than /portal
+     * 
+     * @return true if request is for /desktop, false if request is for /portal
+     */
+    boolean isDesktop();
+    
+    
+    /**
+     * Configuration data for use by HeaderResource
+     * 
+     * @return an immutable Map
+     */
+    Map getHeaderConfiguration();
+    
+    /**
+     * Map containing overrides of content for header statements
+     * 
+     * @return an immutable Map
+     */
+    Map getHeaderResourceRegistry();
+    
+    /**
+     * Temporary solution: get the content after calling include
+     * this will be deprecated
+     * 
+     */
+    String getContent();
+
+    
+    /**
+     * Dispatch to a servlet or resource to generate and include the header content
+     * 
+     * @param request
+     * @param response
+     * @param headerResource
+     * @return
+     * @throws PortletException
+     */
+    void include(PortletHeaderRequest request, PortletHeaderResponse response, String headerResource) 
+        throws PortletException;
+}

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portlet/PortletHeaderResponse.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portlet/SupportsHeaderPhase.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portlet/SupportsHeaderPhase.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portlet/SupportsHeaderPhase.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portlet/SupportsHeaderPhase.java Fri Dec 12 04:06:29 2008
@@ -1,29 +1,29 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jetspeed.portlet;
-
-import javax.portlet.PortletException;
-
-/**
- * Indicates that a portlet supports the pre-286 header phase  
- *
- * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
- */
-public interface SupportsHeaderPhase
-{
-    void doHeader(PortletHeaderRequest request, PortletHeaderResponse response) throws PortletException;    
-}
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.portlet;
+
+import javax.portlet.PortletException;
+
+/**
+ * Indicates that a portlet supports the pre-286 header phase  
+ *
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+ */
+public interface SupportsHeaderPhase
+{
+    void doHeader(PortletHeaderRequest request, PortletHeaderResponse response) throws PortletException;    
+}

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portlet/SupportsHeaderPhase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/profiler/rules/ProfileResolvers.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/profiler/rules/ProfileResolvers.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/profiler/rules/ProfileResolvers.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/profiler/rules/ProfileResolvers.java Fri Dec 12 04:06:29 2008
@@ -1,34 +1,34 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jetspeed.profiler.rules;
-
-import java.util.Map;
-
-/**
- * Spring component to hold criterion resolvers for building profiling rules.
- *
- * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
- * @version $Id: PrincipalRule.java 188415 2005-03-23 22:15:25Z ate $
- */
-public interface ProfileResolvers 
-{
-    RuleCriterionResolver get(String resolverName);
-    /**
-     * return the map of resolver
-     */
-    Map getResolvers();
-}
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.profiler.rules;
+
+import java.util.Map;
+
+/**
+ * Spring component to hold criterion resolvers for building profiling rules.
+ *
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+ * @version $Id: PrincipalRule.java 188415 2005-03-23 22:15:25Z ate $
+ */
+public interface ProfileResolvers 
+{
+    RuleCriterionResolver get(String resolverName);
+    /**
+     * return the map of resolver
+     */
+    Map getResolvers();
+}

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/profiler/rules/ProfileResolvers.java
------------------------------------------------------------------------------
    svn:eol-style = native



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message