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 [37/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/container/window/PortletWindowAccessor.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/window/PortletWindowAccessor.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/window/PortletWindowAccessor.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/window/PortletWindowAccessor.java Fri Dec 12 04:06:29 2008
@@ -1,104 +1,104 @@
-/*
+/*
  * 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.container.window;
-
-import java.util.Set;
-
-import org.apache.jetspeed.components.portletentity.PortletEntityNotStoredException;
-import org.apache.jetspeed.om.page.ContentFragment;
-import org.apache.jetspeed.container.PortletEntity;
-import org.apache.jetspeed.container.PortletWindow;
-
-/**
- * Portlet Window Accessor
- *
- * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
- * @version $Id: PortletWindowAccessor.java,v 1.7 2005/04/29 13:59:46 weaver Exp $
- */
-public interface PortletWindowAccessor 
-{
-    /**
-     * Get a portlet window for the given fragment
-     * 
-     * @param fragment
-     * @return
-     * @throws FailedToRetrievePortletWindow
-     * @throws PortletEntityNotStoredException 
-     * @throws InconsistentWindowStateException If the window references a non-existsent PortletEntity
-     */
-    PortletWindow getPortletWindow(ContentFragment fragment) throws FailedToRetrievePortletWindow, PortletEntityNotStoredException;
-    
-    /**
-     * Lookup a portlet window in the cache
-     * If not found, return null
-     * 
-     * @param windowId 
-     * @return the window from the cache or null
-     */
-    PortletWindow getPortletWindow(String windowId);
-
-    /**
-     * Given a portlet entity, create a portlet window for that entity.
-     * 
-     * @param entity
-     * @param windowId
-     * @return new window
-     */
-    PortletWindow createPortletWindow(PortletEntity entity, String windowId);
-
-    /**
-     * Create a temporary portlet window
-     * This window does not have an entity associated with it.
-     * 
-     * @param windowId
-     * @return
-     */
-    PortletWindow createPortletWindow(String windowId);
-    
-    /**
-     * 
-     * <p>
-     * removeWindows
-     * </p>
-     * 
-     * Removes all <code>PortletWindow</code>s associated with this
-     * <code>PortletEntity</code>
-     *
-     * @param portletEntity
-     */
-    void removeWindows(PortletEntity portletEntity);
-    
-    /**
-     * 
-     * <p>
-     * removeWindow
-     * </p>
-     * 
-     * Removes a <code>PortletWindow</code> from the window cache.
-     *
-     * @param window
-     */
-    void removeWindow(PortletWindow window);
-    
-    /**
-     *  Gets a {@link Set} of currently available {@link PortletWindow}s within
-     *  the current engine instance.
-     *  
-     * @return {@link Set} of {@link PortletWindow}s, never returns <code>null</code>
-     */
-    Set getPortletWindows();
-}
+ * 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.container.window;
+
+import java.util.Set;
+
+import org.apache.jetspeed.components.portletentity.PortletEntityNotStoredException;
+import org.apache.jetspeed.om.page.ContentFragment;
+import org.apache.jetspeed.container.PortletEntity;
+import org.apache.jetspeed.container.PortletWindow;
+
+/**
+ * Portlet Window Accessor
+ *
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+ * @version $Id: PortletWindowAccessor.java,v 1.7 2005/04/29 13:59:46 weaver Exp $
+ */
+public interface PortletWindowAccessor 
+{
+    /**
+     * Get a portlet window for the given fragment
+     * 
+     * @param fragment
+     * @return
+     * @throws FailedToRetrievePortletWindow
+     * @throws PortletEntityNotStoredException 
+     * @throws InconsistentWindowStateException If the window references a non-existsent PortletEntity
+     */
+    PortletWindow getPortletWindow(ContentFragment fragment) throws FailedToRetrievePortletWindow, PortletEntityNotStoredException;
+    
+    /**
+     * Lookup a portlet window in the cache
+     * If not found, return null
+     * 
+     * @param windowId 
+     * @return the window from the cache or null
+     */
+    PortletWindow getPortletWindow(String windowId);
+
+    /**
+     * Given a portlet entity, create a portlet window for that entity.
+     * 
+     * @param entity
+     * @param windowId
+     * @return new window
+     */
+    PortletWindow createPortletWindow(PortletEntity entity, String windowId);
+
+    /**
+     * Create a temporary portlet window
+     * This window does not have an entity associated with it.
+     * 
+     * @param windowId
+     * @return
+     */
+    PortletWindow createPortletWindow(String windowId);
+    
+    /**
+     * 
+     * <p>
+     * removeWindows
+     * </p>
+     * 
+     * Removes all <code>PortletWindow</code>s associated with this
+     * <code>PortletEntity</code>
+     *
+     * @param portletEntity
+     */
+    void removeWindows(PortletEntity portletEntity);
+    
+    /**
+     * 
+     * <p>
+     * removeWindow
+     * </p>
+     * 
+     * Removes a <code>PortletWindow</code> from the window cache.
+     *
+     * @param window
+     */
+    void removeWindow(PortletWindow window);
+    
+    /**
+     *  Gets a {@link Set} of currently available {@link PortletWindow}s within
+     *  the current engine instance.
+     *  
+     * @return {@link Set} of {@link PortletWindow}s, never returns <code>null</code>
+     */
+    Set getPortletWindows();
+}

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

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/decoration/LayoutInfo.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/decoration/LayoutInfo.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/decoration/LayoutInfo.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/decoration/LayoutInfo.java Fri Dec 12 04:06:29 2008
@@ -1,26 +1,26 @@
-/*
- * 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.decoration;
-
-public interface LayoutInfo
-{
-    String getName();
-    
-    String getDescription();
-    
-    String getDisplayName();
+/*
+ * 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.decoration;
+
+public interface LayoutInfo
+{
+    String getName();
+    
+    String getDescription();
+    
+    String getDisplayName();
 }
\ No newline at end of file

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

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

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

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

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/desktop/JetspeedDesktop.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/desktop/JetspeedDesktop.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/desktop/JetspeedDesktop.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/desktop/JetspeedDesktop.java Fri Dec 12 04:06:29 2008
@@ -1,131 +1,131 @@
-/*
+/*
  * 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.desktop;
-
-import org.apache.jetspeed.headerresource.HeaderResourceFactory;
-import org.apache.jetspeed.request.RequestContext;
-
-/**
- * Jetspeed Desktop 
- *
- * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
- * @version $Id: $
- */
-public interface JetspeedDesktop 
-{
-    String DESKTOP_ENABLED_REQUEST_ATTRIBUTE = "desktop.enabled";
-    
-    String DESKTOP_ENCODER_REQUEST_PARAMETER = "encoder";
-    String DESKTOP_ENCODER_REQUEST_PARAMETER_VALUE = "desktop";
-    
-    String DESKTOP_AJAX_REQUEST_PARAMETER = "jsdajax";
-    String DESKTOP_REQUEST_NOT_AJAX_PARAMETER = "org.apache.jetspeed.desktop.request.not.ajax";
-    
-    String DEFAULT_DESKTOP_PIPELINE_PATH = "/desktop";
-    String DEFAULT_DESKTOP_ACTION_PIPELINE_PATH = "/action";
-    String DEFAULT_DESKTOP_RENDER_PIPELINE_PATH = "/render";
-    String DEFAULT_DESKTOP_CONFIGURE_PIPELINE_PATH = "/dtconfigure";
-
-    /**
-     * Render a desktop theme.
-     * 
-     * @param request
-     */
-    void render(RequestContext request);
-    
-    /**
-     * Indicates whether /desktop is enabled for the current portal request.
-     * Located here due to range of jetspeed components which need this information and
-     * already have a DecorationFactory reference.
-     * 
-     * @param requestContext current portal request.
-     * 
-     * @return true if /desktop is enabled for the current portal request, otherwise false
-     */
-    boolean isDesktopEnabled( RequestContext requestContext );
-    
-    /**
-     * Retrieve the header resource factory
-     * 
-     * @return header resource factory
-     */
-    HeaderResourceFactory getHeaderResourceFactory();
-    
-    /**
-     * Desktop servlet path ( e.g. /desktop )
-     * 
-     * @return portal base url
-     */
-    public String getDesktopServletPath();
-    
-    /**
-     * Portal base url ( e.g. http://localhost:8080/jetspeed )
-     * 
-     * @return portal base url
-     */
-    public String getPortalBaseUrl( RequestContext requestContext );
-    
-    /**
-     * Portal base url ( e.g. http://localhost:8080/jetspeed )
-     * 
-     * @return portal base url
-     */
-    public String getPortalBaseUrl( RequestContext requestContext, boolean encode );
-    
-    /**
-     * Portal base url with relativePath argument appended ( e.g. http://localhost:8080/jetspeed/javascript/dojo/ )
-     * 
-     * @return portal base url with relativePath argument appended
-     */
-    public String getPortalResourceUrl( RequestContext requestContext, String relativePath );
-    
-    /**
-     * Portal base url with relativePath argument appended ( e.g. http://localhost:8080/jetspeed/javascript/dojo/ )
-     * 
-     * @return portal base url with relativePath argument appended
-     */
-    public String getPortalResourceUrl( RequestContext requestContext, String relativePath, boolean encode );
-    
-    /**
-     * Portal base servlet url ( e.g. http://localhost:8080/jetspeed/desktop/ )
-     * 
-     * @return portal base servlet url
-     */
-    public String getPortalUrl( RequestContext requestContext );
-    
-    /**
-     * Portal base servlet url ( e.g. http://localhost:8080/jetspeed/desktop/ )
-     * 
-     * @return portal base servlet url
-     */
-    public String getPortalUrl( RequestContext requestContext, boolean encode );
-    
-    /**
-     * Portal base servlet url with relativePath argument appended ( e.g. http://localhost:8080/jetspeed/desktop/default-page.psml )
-     * 
-     * @return portal base servlet url with relativePath argument appended
-     */
-    public String getPortalUrl( RequestContext requestContext, String relativePath );
-    
-    /**
-     * Portal base servlet url with relativePath argument appended ( e.g. http://localhost:8080/jetspeed/desktop/default-page.psml )
-     * 
-     * @return portal base servlet url with relativePath argument appended
-     */
-    public String getPortalUrl( RequestContext requestContext, String relativePath, boolean encode );
-            
-}
+ * 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.desktop;
+
+import org.apache.jetspeed.headerresource.HeaderResourceFactory;
+import org.apache.jetspeed.request.RequestContext;
+
+/**
+ * Jetspeed Desktop 
+ *
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+ * @version $Id: $
+ */
+public interface JetspeedDesktop 
+{
+    String DESKTOP_ENABLED_REQUEST_ATTRIBUTE = "desktop.enabled";
+    
+    String DESKTOP_ENCODER_REQUEST_PARAMETER = "encoder";
+    String DESKTOP_ENCODER_REQUEST_PARAMETER_VALUE = "desktop";
+    
+    String DESKTOP_AJAX_REQUEST_PARAMETER = "jsdajax";
+    String DESKTOP_REQUEST_NOT_AJAX_PARAMETER = "org.apache.jetspeed.desktop.request.not.ajax";
+    
+    String DEFAULT_DESKTOP_PIPELINE_PATH = "/desktop";
+    String DEFAULT_DESKTOP_ACTION_PIPELINE_PATH = "/action";
+    String DEFAULT_DESKTOP_RENDER_PIPELINE_PATH = "/render";
+    String DEFAULT_DESKTOP_CONFIGURE_PIPELINE_PATH = "/dtconfigure";
+
+    /**
+     * Render a desktop theme.
+     * 
+     * @param request
+     */
+    void render(RequestContext request);
+    
+    /**
+     * Indicates whether /desktop is enabled for the current portal request.
+     * Located here due to range of jetspeed components which need this information and
+     * already have a DecorationFactory reference.
+     * 
+     * @param requestContext current portal request.
+     * 
+     * @return true if /desktop is enabled for the current portal request, otherwise false
+     */
+    boolean isDesktopEnabled( RequestContext requestContext );
+    
+    /**
+     * Retrieve the header resource factory
+     * 
+     * @return header resource factory
+     */
+    HeaderResourceFactory getHeaderResourceFactory();
+    
+    /**
+     * Desktop servlet path ( e.g. /desktop )
+     * 
+     * @return portal base url
+     */
+    public String getDesktopServletPath();
+    
+    /**
+     * Portal base url ( e.g. http://localhost:8080/jetspeed )
+     * 
+     * @return portal base url
+     */
+    public String getPortalBaseUrl( RequestContext requestContext );
+    
+    /**
+     * Portal base url ( e.g. http://localhost:8080/jetspeed )
+     * 
+     * @return portal base url
+     */
+    public String getPortalBaseUrl( RequestContext requestContext, boolean encode );
+    
+    /**
+     * Portal base url with relativePath argument appended ( e.g. http://localhost:8080/jetspeed/javascript/dojo/ )
+     * 
+     * @return portal base url with relativePath argument appended
+     */
+    public String getPortalResourceUrl( RequestContext requestContext, String relativePath );
+    
+    /**
+     * Portal base url with relativePath argument appended ( e.g. http://localhost:8080/jetspeed/javascript/dojo/ )
+     * 
+     * @return portal base url with relativePath argument appended
+     */
+    public String getPortalResourceUrl( RequestContext requestContext, String relativePath, boolean encode );
+    
+    /**
+     * Portal base servlet url ( e.g. http://localhost:8080/jetspeed/desktop/ )
+     * 
+     * @return portal base servlet url
+     */
+    public String getPortalUrl( RequestContext requestContext );
+    
+    /**
+     * Portal base servlet url ( e.g. http://localhost:8080/jetspeed/desktop/ )
+     * 
+     * @return portal base servlet url
+     */
+    public String getPortalUrl( RequestContext requestContext, boolean encode );
+    
+    /**
+     * Portal base servlet url with relativePath argument appended ( e.g. http://localhost:8080/jetspeed/desktop/default-page.psml )
+     * 
+     * @return portal base servlet url with relativePath argument appended
+     */
+    public String getPortalUrl( RequestContext requestContext, String relativePath );
+    
+    /**
+     * Portal base servlet url with relativePath argument appended ( e.g. http://localhost:8080/jetspeed/desktop/default-page.psml )
+     * 
+     * @return portal base servlet url with relativePath argument appended
+     */
+    public String getPortalUrl( RequestContext requestContext, String relativePath, boolean encode );
+            
+}

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

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/desktop/JetspeedDesktopContext.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/desktop/JetspeedDesktopContext.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/desktop/JetspeedDesktopContext.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/desktop/JetspeedDesktopContext.java Fri Dec 12 04:06:29 2008
@@ -1,180 +1,180 @@
-/*
+/*
  * 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.desktop;
-
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-import org.apache.jetspeed.headerresource.HeaderResource;
-
-/**
- * Jetspeed Desktop 
- *
- * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
- * @author <a href="mailto:smilek@apache.org">Steve Milek</a>
- * @version $Id: JetspeedDesktopContext.java $
- */
-public interface JetspeedDesktopContext
-{
-    String DESKTOP_CONTEXT_ATTRIBUTE = "jetspeedDesktop";
-    String DESKTOP_REQUEST_CONTEXT_ATTRIBUTE = "JS2RequestContext";
-    String DESKTOP_COMPONENT_MANAGER_ATTRIBUTE = "JS2ComponentManager";
-    
-    String LAYOUT_TEMPLATE_EXTENSION_PROP = "template.extension";
-    String LAYOUT_DESKTOP_TEMPLATE_EXTENSION_PROP = "desktop.template.extension";
-    
-    String LAYOUT_TEMPLATE_ID_PROP = "template.id";
-    String LAYOUT_PRINT_TEMPLATE_ID_PROP = "template.print.id";
-    String LAYOUT_PORTALUSER_TEMPLATE_ID_PROP = "template.portaluser.id";
-    
-    String LAYOUT_TEMPLATE_ID_DEFAULT = "desktop";
-
-    
-    /**
-     * Portal base url ( e.g. http://localhost:8080/jetspeed )
-     * 
-     * @return portal base url
-     */
-    public String getPortalBaseUrl();
-    
-    /**
-     * Portal base url ( e.g. http://localhost:8080/jetspeed )
-     * 
-     * @return portal base url
-     */
-    public String getPortalBaseUrl( boolean encode );
-    
-    /**
-     * Portal base url with relativePath argument appended ( e.g. http://localhost:8080/jetspeed/javascript/dojo/ )
-     * 
-     * @return portal base url with relativePath argument appended
-     */
-    public String getPortalResourceUrl( String relativePath );
-    
-    /**
-     * Portal base url with relativePath argument appended ( e.g. http://localhost:8080/jetspeed/javascript/dojo/ )
-     * 
-     * @return portal base url with relativePath argument appended
-     */
-    public String getPortalResourceUrl( String relativePath, boolean encode );
-    
-    /**
-     * Portal base servlet url ( e.g. http://localhost:8080/jetspeed/desktop/ )
-     * 
-     * @return portal base servlet url
-     */
-    public String getPortalUrl();
-    
-    /**
-     * Portal base servlet url ( e.g. http://localhost:8080/jetspeed/desktop/ )
-     * 
-     * @return portal base servlet url
-     */
-    public String getPortalUrl( boolean encode );
-    
-    /**
-     * Portal base servlet url with relativePath argument appended ( e.g. http://localhost:8080/jetspeed/desktop/default-page.psml )
-     * 
-     * @return portal base servlet url with relativePath argument appended
-     */
-    public String getPortalUrl( String relativePath );
-    
-    /**
-     * Portal base servlet url with relativePath argument appended ( e.g. http://localhost:8080/jetspeed/desktop/default-page.psml )
-     * 
-     * @return portal base servlet url with relativePath argument appended
-     */
-    public String getPortalUrl( String relativePath, boolean encode );
-
-    /**
-     * Gets the layout decoration name
-     * 
-     * @return
-     */
-    public String getLayoutDecorationName();
-    
-    /**
-     * <p>
-     * Get the path to the layout decoration desktop template file.
-     * </p>
-     * 
-     * @return the desktop template file path.
-     */
-    public String getLayoutTemplatePath();
-
-    /**
-     * <p>
-     * Get the path to the layout decoration desktop template file.
-     * The property name parameter is provided to allow for an alternate
-     * property value to be used as the filename (without extension)
-     * of the desktop template file.
-     * </p>
-     * 
-     * @return the desktop template file path.
-     */
-    public String getLayoutTemplatePath( String layoutTemplateIdPropertyName );
-    
-    /**
-     * <p>
-     * Returns the base path for the layout decoration.
-     * </p>
-     * 
-     * @return the base path for the layout decoration.
-     */
-    public String getLayoutBasePath();
-    
-    /**
-     * <p>
-     * Returns the base path for the layout decoration
-     * with the relativePath argument added.
-     * </p>
-     * 
-     * @param relativePath
-     * @return the base path for the layout decoration with the relativePath argument added.
-     */
-    public String getLayoutBasePath( String relativePath );
-    
-    /**
-     * <p>
-     * Returns the base url for the layout decoration.
-     * </p>
-     * 
-     * @return the base url for the layout decoration.
-     */
-    public String getLayoutBaseUrl();
-    
-    /**
-     * <p>
-     * Returns the base url for the layout decoration
-     * with the relativePath argument added.
-     * </p>
-     * 
-     * @param relativePath
-     * @return the base url for the layout decoration with the relativePath argument added.
-     */
-    public String getLayoutBaseUrl( String relativePath );
-    
-    /**
-     * @return the layout decoration resource bundle for the given Locale.
-     */
-    public ResourceBundle getLayoutResourceBundle( Locale locale );
-    
-    /**
-     * @return the HeaderResource component.
-     */
-    public HeaderResource getHeaderResource();
-}
+ * 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.desktop;
+
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+import org.apache.jetspeed.headerresource.HeaderResource;
+
+/**
+ * Jetspeed Desktop 
+ *
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+ * @author <a href="mailto:smilek@apache.org">Steve Milek</a>
+ * @version $Id: JetspeedDesktopContext.java $
+ */
+public interface JetspeedDesktopContext
+{
+    String DESKTOP_CONTEXT_ATTRIBUTE = "jetspeedDesktop";
+    String DESKTOP_REQUEST_CONTEXT_ATTRIBUTE = "JS2RequestContext";
+    String DESKTOP_COMPONENT_MANAGER_ATTRIBUTE = "JS2ComponentManager";
+    
+    String LAYOUT_TEMPLATE_EXTENSION_PROP = "template.extension";
+    String LAYOUT_DESKTOP_TEMPLATE_EXTENSION_PROP = "desktop.template.extension";
+    
+    String LAYOUT_TEMPLATE_ID_PROP = "template.id";
+    String LAYOUT_PRINT_TEMPLATE_ID_PROP = "template.print.id";
+    String LAYOUT_PORTALUSER_TEMPLATE_ID_PROP = "template.portaluser.id";
+    
+    String LAYOUT_TEMPLATE_ID_DEFAULT = "desktop";
+
+    
+    /**
+     * Portal base url ( e.g. http://localhost:8080/jetspeed )
+     * 
+     * @return portal base url
+     */
+    public String getPortalBaseUrl();
+    
+    /**
+     * Portal base url ( e.g. http://localhost:8080/jetspeed )
+     * 
+     * @return portal base url
+     */
+    public String getPortalBaseUrl( boolean encode );
+    
+    /**
+     * Portal base url with relativePath argument appended ( e.g. http://localhost:8080/jetspeed/javascript/dojo/ )
+     * 
+     * @return portal base url with relativePath argument appended
+     */
+    public String getPortalResourceUrl( String relativePath );
+    
+    /**
+     * Portal base url with relativePath argument appended ( e.g. http://localhost:8080/jetspeed/javascript/dojo/ )
+     * 
+     * @return portal base url with relativePath argument appended
+     */
+    public String getPortalResourceUrl( String relativePath, boolean encode );
+    
+    /**
+     * Portal base servlet url ( e.g. http://localhost:8080/jetspeed/desktop/ )
+     * 
+     * @return portal base servlet url
+     */
+    public String getPortalUrl();
+    
+    /**
+     * Portal base servlet url ( e.g. http://localhost:8080/jetspeed/desktop/ )
+     * 
+     * @return portal base servlet url
+     */
+    public String getPortalUrl( boolean encode );
+    
+    /**
+     * Portal base servlet url with relativePath argument appended ( e.g. http://localhost:8080/jetspeed/desktop/default-page.psml )
+     * 
+     * @return portal base servlet url with relativePath argument appended
+     */
+    public String getPortalUrl( String relativePath );
+    
+    /**
+     * Portal base servlet url with relativePath argument appended ( e.g. http://localhost:8080/jetspeed/desktop/default-page.psml )
+     * 
+     * @return portal base servlet url with relativePath argument appended
+     */
+    public String getPortalUrl( String relativePath, boolean encode );
+
+    /**
+     * Gets the layout decoration name
+     * 
+     * @return
+     */
+    public String getLayoutDecorationName();
+    
+    /**
+     * <p>
+     * Get the path to the layout decoration desktop template file.
+     * </p>
+     * 
+     * @return the desktop template file path.
+     */
+    public String getLayoutTemplatePath();
+
+    /**
+     * <p>
+     * Get the path to the layout decoration desktop template file.
+     * The property name parameter is provided to allow for an alternate
+     * property value to be used as the filename (without extension)
+     * of the desktop template file.
+     * </p>
+     * 
+     * @return the desktop template file path.
+     */
+    public String getLayoutTemplatePath( String layoutTemplateIdPropertyName );
+    
+    /**
+     * <p>
+     * Returns the base path for the layout decoration.
+     * </p>
+     * 
+     * @return the base path for the layout decoration.
+     */
+    public String getLayoutBasePath();
+    
+    /**
+     * <p>
+     * Returns the base path for the layout decoration
+     * with the relativePath argument added.
+     * </p>
+     * 
+     * @param relativePath
+     * @return the base path for the layout decoration with the relativePath argument added.
+     */
+    public String getLayoutBasePath( String relativePath );
+    
+    /**
+     * <p>
+     * Returns the base url for the layout decoration.
+     * </p>
+     * 
+     * @return the base url for the layout decoration.
+     */
+    public String getLayoutBaseUrl();
+    
+    /**
+     * <p>
+     * Returns the base url for the layout decoration
+     * with the relativePath argument added.
+     * </p>
+     * 
+     * @param relativePath
+     * @return the base url for the layout decoration with the relativePath argument added.
+     */
+    public String getLayoutBaseUrl( String relativePath );
+    
+    /**
+     * @return the layout decoration resource bundle for the given Locale.
+     */
+    public ResourceBundle getLayoutResourceBundle( Locale locale );
+    
+    /**
+     * @return the HeaderResource component.
+     */
+    public HeaderResource getHeaderResource();
+}

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

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

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ko.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ko.properties?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ko.properties (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ko.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 = principal {0} \uc774 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
-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 = permission {0} \uc774 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
-org.apache.jetspeed.security.SecurityException.PERMISSION_ALREADY_EXISTS = The permission {0} already exists.
-org.apache.jetspeed.security.SecurityException.EMPTY_PARAMETER = \uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \ub110 \uac12 \ub610\ub294 \ube48 \ud30c\ub77c\ubbf8\ud130\uc785\ub2c8\ub2e4: {0}.
-org.apache.jetspeed.security.SecurityException.INVALID_PASSWORD = \uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \ube44\ubc00\ubc88\ud638.
-org.apache.jetspeed.security.SecurityException.INVALID_NEW_PASSWORD = \uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \uc0c8 \ube44\ubc00\ubc88\ud638.
-org.apache.jetspeed.security.SecurityException.INCORRECT_PASSWORD = \ubd80\uc815\ud655\ud55c \ube44\ubc00\ubc88\ud638.
-org.apache.jetspeed.security.SecurityException.PASSWORD_REQUIRED = \ube44\ubc00\ubc88\ud638\uac00 \ud544\uc218\uc801\uc73c\ub85c \uc81c\uacf5\ub418\uc5b4\uc57c \ud569\ub2c8\ub2e4.
-org.apache.jetspeed.security.SecurityException.INVALID_AUTHENTICATION_PROVIDER = \uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \uc778\uc99d \uc81c\uacf5\uc790\uc785\ub2c8\ub2e4:  {0}.
-org.apache.jetspeed.security.SecurityException.PASSWORD_ALREADY_USED = \uc774\ubbf8 \uc0ac\uc6a9\ub418\uc5c8\ub358 \ube44\ubc00\ubc88\ud638\uc785\ub2c8\ub2e4.
-org.apache.jetspeed.security.SecurityException.ANONYMOUS_USER_PROTECTED = \uc0ac\uc6a9\uc790, {0} \uc740 \ubcf4\ud638 \ubaa8\ub4dc\uc5d0 \uc788\uc2b5\ub2c8\ub2e4.
-org.apache.jetspeed.security.SecurityException.UNEXPECTED = \uc608\uae30\uce58 \uc54a\uc740 \ubcf4\uc548 \uc624\ub958\uc785\ub2c8\ub2e4: at {0} from {1}: {2}
-org.apache.jetspeed.security.SecurityException.INVALID_UID = UID\ub294 \uc815\uaddc\uc2dd \ud45c\ud604\uc774\ub098 \uba54\ud0c0 \ubb38\uc790\uac00 \ud3ec\ud568\ub420 \uc218 \uc5c6\uc73c\uba70, \ub110 \uac12\uc774\uac70\ub098 \ube48 \uac12\uc774\uba74 \uc548\ub429\ub2c8\ub2e4.
-org.apache.jetspeed.security.SecurityException.INVALID_DN = DN\uc740 \ub110 \uac12\uc774\uac70\ub098 \ube48 \uac12\uc77c \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
-
-#### deprecated resource strings: see SecurityException #####
-org.apache.jetspeed.security.SecurityException.USER_ALREADY_EXISTS = \uc0ac\uc6a9\uc790, {0} \uc740 \uc774\ubbf8 \uc874\uc7ac\ud569\ub2c8\ub2e4.
-org.apache.jetspeed.security.SecurityException.USER_DOES_NOT_EXIST = \uc0ac\uc6a9\uc790, {0} \uc740 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
-org.apache.jetspeed.security.SecurityException.ROLE_ALREADY_EXISTS = \uc5ed\ud560, {0} \uc740 \uc774\ubbf8 \uc874\uc7ac\ud569\ub2c8\ub2e4.
-org.apache.jetspeed.security.SecurityException.ROLE_DOES_NOT_EXIST = \uc5ed\ud560, {0} \uc740 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
-org.apache.jetspeed.security.SecurityException.GROUP_ALREADY_EXISTS = \uadf8\ub8f9, {0} \uc740 \uc774\ubbf8 \uc874\uc7ac\ud569\ub2c8\ub2e4.
-org.apache.jetspeed.security.SecurityException.GROUP_DOES_NOT_EXIST = \uadf8\ub8f9, {0} \uc740 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
-
-# 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 = principal {0} \uc774 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
+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 = permission {0} \uc774 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
+org.apache.jetspeed.security.SecurityException.PERMISSION_ALREADY_EXISTS = The permission {0} already exists.
+org.apache.jetspeed.security.SecurityException.EMPTY_PARAMETER = \uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \ub110 \uac12 \ub610\ub294 \ube48 \ud30c\ub77c\ubbf8\ud130\uc785\ub2c8\ub2e4: {0}.
+org.apache.jetspeed.security.SecurityException.INVALID_PASSWORD = \uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \ube44\ubc00\ubc88\ud638.
+org.apache.jetspeed.security.SecurityException.INVALID_NEW_PASSWORD = \uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \uc0c8 \ube44\ubc00\ubc88\ud638.
+org.apache.jetspeed.security.SecurityException.INCORRECT_PASSWORD = \ubd80\uc815\ud655\ud55c \ube44\ubc00\ubc88\ud638.
+org.apache.jetspeed.security.SecurityException.PASSWORD_REQUIRED = \ube44\ubc00\ubc88\ud638\uac00 \ud544\uc218\uc801\uc73c\ub85c \uc81c\uacf5\ub418\uc5b4\uc57c \ud569\ub2c8\ub2e4.
+org.apache.jetspeed.security.SecurityException.INVALID_AUTHENTICATION_PROVIDER = \uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \uc778\uc99d \uc81c\uacf5\uc790\uc785\ub2c8\ub2e4:  {0}.
+org.apache.jetspeed.security.SecurityException.PASSWORD_ALREADY_USED = \uc774\ubbf8 \uc0ac\uc6a9\ub418\uc5c8\ub358 \ube44\ubc00\ubc88\ud638\uc785\ub2c8\ub2e4.
+org.apache.jetspeed.security.SecurityException.ANONYMOUS_USER_PROTECTED = \uc0ac\uc6a9\uc790, {0} \uc740 \ubcf4\ud638 \ubaa8\ub4dc\uc5d0 \uc788\uc2b5\ub2c8\ub2e4.
+org.apache.jetspeed.security.SecurityException.UNEXPECTED = \uc608\uae30\uce58 \uc54a\uc740 \ubcf4\uc548 \uc624\ub958\uc785\ub2c8\ub2e4: at {0} from {1}: {2}
+org.apache.jetspeed.security.SecurityException.INVALID_UID = UID\ub294 \uc815\uaddc\uc2dd \ud45c\ud604\uc774\ub098 \uba54\ud0c0 \ubb38\uc790\uac00 \ud3ec\ud568\ub420 \uc218 \uc5c6\uc73c\uba70, \ub110 \uac12\uc774\uac70\ub098 \ube48 \uac12\uc774\uba74 \uc548\ub429\ub2c8\ub2e4.
+org.apache.jetspeed.security.SecurityException.INVALID_DN = DN\uc740 \ub110 \uac12\uc774\uac70\ub098 \ube48 \uac12\uc77c \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
+
+#### deprecated resource strings: see SecurityException #####
+org.apache.jetspeed.security.SecurityException.USER_ALREADY_EXISTS = \uc0ac\uc6a9\uc790, {0} \uc740 \uc774\ubbf8 \uc874\uc7ac\ud569\ub2c8\ub2e4.
+org.apache.jetspeed.security.SecurityException.USER_DOES_NOT_EXIST = \uc0ac\uc6a9\uc790, {0} \uc740 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
+org.apache.jetspeed.security.SecurityException.ROLE_ALREADY_EXISTS = \uc5ed\ud560, {0} \uc740 \uc774\ubbf8 \uc874\uc7ac\ud569\ub2c8\ub2e4.
+org.apache.jetspeed.security.SecurityException.ROLE_DOES_NOT_EXIST = \uc5ed\ud560, {0} \uc740 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
+org.apache.jetspeed.security.SecurityException.GROUP_ALREADY_EXISTS = \uadf8\ub8f9, {0} \uc740 \uc774\ubbf8 \uc874\uc7ac\ud569\ub2c8\ub2e4.
+org.apache.jetspeed.security.SecurityException.GROUP_DOES_NOT_EXIST = \uadf8\ub8f9, {0} \uc740 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
+
+# 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_ko.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ua.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ua.properties?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ua.properties (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ua.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 = \u041f\u0440\u0438\u043d\u0446\u0438\u043f\u0430\u043b\u0430 {0} \u043d\u0435 \u0456\u0441\u043d\u0443\u0454.
-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 = \u0414\u043e\u0437\u0432\u043e\u043b\u0443 {0} \u043d\u0435 \u0456\u0441\u043d\u0443\u0454.
-org.apache.jetspeed.security.SecurityException.PERMISSION_ALREADY_EXISTS = The permission {0} already exists.
-org.apache.jetspeed.security.SecurityException.EMPTY_PARAMETER = \u041d\u0435\u0432\u0456\u0440\u043d\u0438\u0439 null \u0430\u0431\u043e \u043f\u043e\u0440\u043e\u0436\u043d\u0456\u0439 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440 {0}.
-org.apache.jetspeed.security.SecurityException.INVALID_PASSWORD = \u041d\u0435\u0432\u0456\u0440\u043d\u0438\u0439 \u043f\u0430\u0440\u043e\u043b\u044c.
-org.apache.jetspeed.security.SecurityException.INVALID_NEW_PASSWORD = \u041d\u0435\u0432\u0456\u0440\u043d\u0438\u0439 \u043d\u043e\u0432\u0438\u0439 \u043f\u0430\u0440\u043e\u043b\u044c.
-org.apache.jetspeed.security.SecurityException.INCORRECT_PASSWORD = \u041d\u0435\u0432\u0456\u0440\u043d\u0438\u0439 \u043f\u0430\u0440\u043e\u043b\u044c.
-org.apache.jetspeed.security.SecurityException.PASSWORD_REQUIRED = \u041d\u0435\u043e\u0431\u0445\u0456\u0434\u043d\u043e \u0432\u0432\u0435\u0441\u0442\u0438 \u043f\u0430\u0440\u043e\u043b\u044c.
-org.apache.jetspeed.security.SecurityException.INVALID_AUTHENTICATION_PROVIDER = \u041d\u0435\u0432\u0456\u0440\u043d\u0438\u0439 \u043f\u0440\u043e\u0432\u0430\u0439\u0434\u0435\u0440 \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0456\u043a\u0430\u0446\u0456\u0457 {0}.
-org.apache.jetspeed.security.SecurityException.PASSWORD_ALREADY_USED = \u041f\u0430\u0440\u043e\u043b\u044c \u0432\u0436\u0435 \u0432\u0438\u043a\u043e\u0440\u0438\u0441\u0442\u043e\u0432\u0443\u0454\u0442\u044c\u0441\u044f.
-org.apache.jetspeed.security.SecurityException.ANONYMOUS_USER_PROTECTED = \u041a\u043e\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447 {0} \u0437\u0430\u0445\u0438\u0449\u0435\u043d\u0438\u0439.
-org.apache.jetspeed.security.SecurityException.UNEXPECTED = \u041d\u0435\u043e\u0447\u0456\u043a\u0443\u0432\u0430\u043d\u0430 \u043f\u043e\u043c\u0438\u043b\u043a\u0430 \u0431\u0435\u0437\u043f\u0435\u043a\u0438 \u043d\u0430 {0} \u0437 {1}: {2}
-org.apache.jetspeed.security.SecurityException.INVALID_UID = uid \u043d\u0435 \u043c\u043e\u0436\u0435 \u043c\u0456\u0441\u0442\u0438\u0442\u0438 \u043c\u0435\u0442\u0430\u0441\u0438\u043c\u0432\u043e\u043b\u0438 \u0441\u0442\u0430\u043b\u043e\u0433\u043e \u0432\u0438\u0440\u0430\u0437\u0443, \u0430 \u0442\u0430\u043a\u043e\u0436 \u0431\u0443\u0442\u0438 null \u0430\u0431\u043e \u043f\u043e\u0440\u043e\u0436\u043d\u0456\u043c.
-org.apache.jetspeed.security.SecurityException.INVALID_DN = dn \u043d\u0435 \u043c\u043e\u0436\u0435 \u0431\u0443\u0442\u0438 null \u0430\u0431\u043e \u043f\u043e\u0440\u043e\u0436\u043d\u0456\u043c.
-
-#### deprecated resource strings: see SecurityException #####
-org.apache.jetspeed.security.SecurityException.USER_ALREADY_EXISTS = \u041a\u043e\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447 {0} \u0432\u0436\u0435 \u0456\u0441\u043d\u0443\u0454 \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0456.
-org.apache.jetspeed.security.SecurityException.USER_DOES_NOT_EXIST = \u041a\u043e\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447\u0430 {0} \u043d\u0435 \u0456\u0441\u043d\u0443\u0454 \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0456.
-org.apache.jetspeed.security.SecurityException.ROLE_ALREADY_EXISTS = \u0420\u043e\u043b\u044c {0} \u0432\u0436\u0435 \u0456\u0441\u043d\u0443\u0454 \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0456.
-org.apache.jetspeed.security.SecurityException.ROLE_DOES_NOT_EXIST = \u0420\u043e\u043b\u0456 {0} \u043d\u0435 \u0456\u0441\u043d\u0443\u0454 \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0456.
-org.apache.jetspeed.security.SecurityException.GROUP_ALREADY_EXISTS = \u0413\u0440\u0443\u043f\u0430 {0} \u0432\u0436\u0435 \u0456\u0441\u043d\u0443\u0454 \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0456.
-org.apache.jetspeed.security.SecurityException.GROUP_DOES_NOT_EXIST = \u0413\u0440\u0443\u043f\u0438 {0} \u043d\u0435 \u0456\u0441\u043d\u0443\u0454 \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0456.
-
-# 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 = \u041f\u0440\u0438\u043d\u0446\u0438\u043f\u0430\u043b\u0430 {0} \u043d\u0435 \u0456\u0441\u043d\u0443\u0454.
+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 = \u0414\u043e\u0437\u0432\u043e\u043b\u0443 {0} \u043d\u0435 \u0456\u0441\u043d\u0443\u0454.
+org.apache.jetspeed.security.SecurityException.PERMISSION_ALREADY_EXISTS = The permission {0} already exists.
+org.apache.jetspeed.security.SecurityException.EMPTY_PARAMETER = \u041d\u0435\u0432\u0456\u0440\u043d\u0438\u0439 null \u0430\u0431\u043e \u043f\u043e\u0440\u043e\u0436\u043d\u0456\u0439 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440 {0}.
+org.apache.jetspeed.security.SecurityException.INVALID_PASSWORD = \u041d\u0435\u0432\u0456\u0440\u043d\u0438\u0439 \u043f\u0430\u0440\u043e\u043b\u044c.
+org.apache.jetspeed.security.SecurityException.INVALID_NEW_PASSWORD = \u041d\u0435\u0432\u0456\u0440\u043d\u0438\u0439 \u043d\u043e\u0432\u0438\u0439 \u043f\u0430\u0440\u043e\u043b\u044c.
+org.apache.jetspeed.security.SecurityException.INCORRECT_PASSWORD = \u041d\u0435\u0432\u0456\u0440\u043d\u0438\u0439 \u043f\u0430\u0440\u043e\u043b\u044c.
+org.apache.jetspeed.security.SecurityException.PASSWORD_REQUIRED = \u041d\u0435\u043e\u0431\u0445\u0456\u0434\u043d\u043e \u0432\u0432\u0435\u0441\u0442\u0438 \u043f\u0430\u0440\u043e\u043b\u044c.
+org.apache.jetspeed.security.SecurityException.INVALID_AUTHENTICATION_PROVIDER = \u041d\u0435\u0432\u0456\u0440\u043d\u0438\u0439 \u043f\u0440\u043e\u0432\u0430\u0439\u0434\u0435\u0440 \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0456\u043a\u0430\u0446\u0456\u0457 {0}.
+org.apache.jetspeed.security.SecurityException.PASSWORD_ALREADY_USED = \u041f\u0430\u0440\u043e\u043b\u044c \u0432\u0436\u0435 \u0432\u0438\u043a\u043e\u0440\u0438\u0441\u0442\u043e\u0432\u0443\u0454\u0442\u044c\u0441\u044f.
+org.apache.jetspeed.security.SecurityException.ANONYMOUS_USER_PROTECTED = \u041a\u043e\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447 {0} \u0437\u0430\u0445\u0438\u0449\u0435\u043d\u0438\u0439.
+org.apache.jetspeed.security.SecurityException.UNEXPECTED = \u041d\u0435\u043e\u0447\u0456\u043a\u0443\u0432\u0430\u043d\u0430 \u043f\u043e\u043c\u0438\u043b\u043a\u0430 \u0431\u0435\u0437\u043f\u0435\u043a\u0438 \u043d\u0430 {0} \u0437 {1}: {2}
+org.apache.jetspeed.security.SecurityException.INVALID_UID = uid \u043d\u0435 \u043c\u043e\u0436\u0435 \u043c\u0456\u0441\u0442\u0438\u0442\u0438 \u043c\u0435\u0442\u0430\u0441\u0438\u043c\u0432\u043e\u043b\u0438 \u0441\u0442\u0430\u043b\u043e\u0433\u043e \u0432\u0438\u0440\u0430\u0437\u0443, \u0430 \u0442\u0430\u043a\u043e\u0436 \u0431\u0443\u0442\u0438 null \u0430\u0431\u043e \u043f\u043e\u0440\u043e\u0436\u043d\u0456\u043c.
+org.apache.jetspeed.security.SecurityException.INVALID_DN = dn \u043d\u0435 \u043c\u043e\u0436\u0435 \u0431\u0443\u0442\u0438 null \u0430\u0431\u043e \u043f\u043e\u0440\u043e\u0436\u043d\u0456\u043c.
+
+#### deprecated resource strings: see SecurityException #####
+org.apache.jetspeed.security.SecurityException.USER_ALREADY_EXISTS = \u041a\u043e\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447 {0} \u0432\u0436\u0435 \u0456\u0441\u043d\u0443\u0454 \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0456.
+org.apache.jetspeed.security.SecurityException.USER_DOES_NOT_EXIST = \u041a\u043e\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447\u0430 {0} \u043d\u0435 \u0456\u0441\u043d\u0443\u0454 \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0456.
+org.apache.jetspeed.security.SecurityException.ROLE_ALREADY_EXISTS = \u0420\u043e\u043b\u044c {0} \u0432\u0436\u0435 \u0456\u0441\u043d\u0443\u0454 \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0456.
+org.apache.jetspeed.security.SecurityException.ROLE_DOES_NOT_EXIST = \u0420\u043e\u043b\u0456 {0} \u043d\u0435 \u0456\u0441\u043d\u0443\u0454 \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0456.
+org.apache.jetspeed.security.SecurityException.GROUP_ALREADY_EXISTS = \u0413\u0440\u0443\u043f\u0430 {0} \u0432\u0436\u0435 \u0456\u0441\u043d\u0443\u0454 \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0456.
+org.apache.jetspeed.security.SecurityException.GROUP_DOES_NOT_EXIST = \u0413\u0440\u0443\u043f\u0438 {0} \u043d\u0435 \u0456\u0441\u043d\u0443\u0454 \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0456.
+
+# 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_ua.properties
------------------------------------------------------------------------------
    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