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 [16/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/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/LayoutInfoImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/LayoutInfoImpl.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/LayoutInfoImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/LayoutInfoImpl.java Fri Dec 12 04:06:29 2008
@@ -1,51 +1,51 @@
-/*
- * 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;
-
-/**
- * 
- * @author <href a="mailto:weaver@apache.org">Scott T. Weaver</a>
- *
- */
-public class LayoutInfoImpl implements LayoutInfo
-{
-    private String name;
-    private String displayName;
-    private String description;
-    
-    public LayoutInfoImpl(String name, String displayName, String description)
-    {
-        this.name = name;
-        this.displayName = displayName;
-        this.description = description;
-    }
-    
-    public String getName()
-    {
-        return this.name;
-    }
-    
-    public String getDescription()
-    {
-        return this.description;
-    }
-    
-    public String getDisplayName()
-    {
-        return this.displayName;
-    }        
-}
+/*
+ * 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;
+
+/**
+ * 
+ * @author <href a="mailto:weaver@apache.org">Scott T. Weaver</a>
+ *
+ */
+public class LayoutInfoImpl implements LayoutInfo
+{
+    private String name;
+    private String displayName;
+    private String description;
+    
+    public LayoutInfoImpl(String name, String displayName, String description)
+    {
+        this.name = name;
+        this.displayName = displayName;
+        this.description = description;
+    }
+    
+    public String getName()
+    {
+        return this.name;
+    }
+    
+    public String getDescription()
+    {
+        return this.description;
+    }
+    
+    public String getDisplayName()
+    {
+        return this.displayName;
+    }        
+}

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

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

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/resources/DecoratorActions.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/resources/DecoratorActions_ko.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/resources/DecoratorActions_ko.properties?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/resources/DecoratorActions_ko.properties (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/resources/DecoratorActions_ko.properties Fri Dec 12 04:06:29 2008
@@ -1,30 +1,30 @@
-# 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.
-
-## standard actions
-view=\ubcf4\uae30
-edit=\ud3b8\uc9d1
-help=\ub3c4\uc6c0\ub9d0
-normal=\ud654\uba74 \ubcf5\uc6d0
-minimized=\ucd5c\uc18c\ud654
-maximized=\ucd5c\ub300\ud654
-
-## extended actions
-about=\uc815\ubcf4
-config=\uc124\uc815
-edit_defaults=\uae30\ubcf8\uac12 \ud3b8\uc9d1
-preview=\ubbf8\ub9ac\ubcf4\uae30
-print=\uc778\uc1c4
-solo=\ud31d\uc5c5
+# 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.
+
+## standard actions
+view=\ubcf4\uae30
+edit=\ud3b8\uc9d1
+help=\ub3c4\uc6c0\ub9d0
+normal=\ud654\uba74 \ubcf5\uc6d0
+minimized=\ucd5c\uc18c\ud654
+maximized=\ucd5c\ub300\ud654
+
+## extended actions
+about=\uc815\ubcf4
+config=\uc124\uc815
+edit_defaults=\uae30\ubcf8\uac12 \ud3b8\uc9d1
+preview=\ubbf8\ub9ac\ubcf4\uae30
+print=\uc778\uc1c4
+solo=\ud31d\uc5c5

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/resources/DecoratorActions_ko.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/resources/DecoratorActions_nl.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/resources/DecoratorActions_ua.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/desktop/impl/DesktopEncoderRedirectValveImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/desktop/impl/DesktopEncoderRedirectValveImpl.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/desktop/impl/DesktopEncoderRedirectValveImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/desktop/impl/DesktopEncoderRedirectValveImpl.java Fri Dec 12 04:06:29 2008
@@ -1,112 +1,112 @@
-/*
+/*
  * 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.impl;
-
-import java.io.IOException;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.jetspeed.desktop.JetspeedDesktop;
-import org.apache.jetspeed.pipeline.PipelineException;
-import org.apache.jetspeed.pipeline.valve.AbstractValve;
-import org.apache.jetspeed.pipeline.valve.ValveContext;
-import org.apache.jetspeed.request.RequestContext;
-
-/**
- * DesktopEncoderRedirect Valve
- * 
- * if request parameter encoder=desktop is NOT defined,
- *    redirect to same url with /desktop pipeline,
- * otherwise,
- *    just invoke next valve
- * 
- * Used by the /render pipeline (desktop-render-pipeline) to allow
- * render requests that are not initiated via desktop javascript code to result
- * in a page level navigation to the /desktop pipeline with the correct portlet rendering
- * indicated in the original url. The encoder=desktop request parameter
- * is used by desktop javascript code to indicate that the request is an "official"
- * desktop ajax request. 
- *
- * @author <a href="mailto:smilek@apache.org">Steve Milek</a>
- * @version $Id: $
- */
-public class DesktopEncoderRedirectValveImpl extends AbstractValve
-{
-    protected Log log = LogFactory.getLog(DesktopEncoderRedirectValveImpl.class);
-    
-    private String desktopPipelinePath = null;
-    private String desktopRenderPipelinePath = null;
-    
-    public DesktopEncoderRedirectValveImpl( String desktopPipelinePath, String desktopRenderPipelinePath )
-    {
-        if ( desktopPipelinePath == null || desktopPipelinePath.length() == 0 )
-            desktopPipelinePath = JetspeedDesktop.DEFAULT_DESKTOP_PIPELINE_PATH;
-        if ( desktopPipelinePath.charAt( 0 ) != '/' )
-            desktopPipelinePath = "/" + desktopPipelinePath;
-        if ( desktopPipelinePath.charAt( desktopPipelinePath.length() -1 ) != '/' )
-            desktopPipelinePath = desktopPipelinePath + "/";
-
-        if ( desktopRenderPipelinePath == null || desktopRenderPipelinePath.length() == 0 )
-            desktopRenderPipelinePath = JetspeedDesktop.DEFAULT_DESKTOP_RENDER_PIPELINE_PATH;
-        if ( desktopRenderPipelinePath.charAt( 0 ) != '/' )
-            desktopRenderPipelinePath = "/" + desktopRenderPipelinePath;
-        if ( desktopRenderPipelinePath.charAt( desktopRenderPipelinePath.length() -1 ) != '/' )
-            desktopRenderPipelinePath = desktopRenderPipelinePath + "/";
-        
-        this.desktopPipelinePath = desktopPipelinePath;
-        this.desktopRenderPipelinePath = desktopRenderPipelinePath;
-    }
-        
-    public void invoke( RequestContext request, ValveContext context )
-        throws PipelineException
-    {
-        try
-        {  
-            if ( request.getPortalURL() == null )
-            {
-                String encoding = request.getRequestParameter(JetspeedDesktop.DESKTOP_ENCODER_REQUEST_PARAMETER);
-                if (encoding == null || ! encoding.equals(JetspeedDesktop.DESKTOP_ENCODER_REQUEST_PARAMETER_VALUE))
-                {
-                    // redirect to page url with render encoding
-                    try 
-                    {
-                        String queryString = request.getRequest().getQueryString();
-                        String location = request.getRequest().getRequestURI();
-                        if ( queryString != null && queryString.length() > 0 )
-                            location += "?" + queryString;
-                        location = location.replaceAll( this.desktopRenderPipelinePath, this.desktopPipelinePath );
-                        //log.info( "DesktopEncoderRedirectValveImpl redirecting request-uri=" + request.getRequest().getRequestURI() + " location=" + location );
-                        request.getResponse().sendRedirect( location );
-                    }
-                    catch (IOException ioe){}
-                    return;
-                }                
-            }
-        }
-        catch (Exception e)
-        {
-            throw new PipelineException(e);
-        }
-        // Pass control to the next Valve in the Pipeline
-        context.invokeNext( request );
-    }
-
-    public String toString()
-    {
-        return "DesktopValve";
-    }
-}
+ * 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.impl;
+
+import java.io.IOException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.jetspeed.desktop.JetspeedDesktop;
+import org.apache.jetspeed.pipeline.PipelineException;
+import org.apache.jetspeed.pipeline.valve.AbstractValve;
+import org.apache.jetspeed.pipeline.valve.ValveContext;
+import org.apache.jetspeed.request.RequestContext;
+
+/**
+ * DesktopEncoderRedirect Valve
+ * 
+ * if request parameter encoder=desktop is NOT defined,
+ *    redirect to same url with /desktop pipeline,
+ * otherwise,
+ *    just invoke next valve
+ * 
+ * Used by the /render pipeline (desktop-render-pipeline) to allow
+ * render requests that are not initiated via desktop javascript code to result
+ * in a page level navigation to the /desktop pipeline with the correct portlet rendering
+ * indicated in the original url. The encoder=desktop request parameter
+ * is used by desktop javascript code to indicate that the request is an "official"
+ * desktop ajax request. 
+ *
+ * @author <a href="mailto:smilek@apache.org">Steve Milek</a>
+ * @version $Id: $
+ */
+public class DesktopEncoderRedirectValveImpl extends AbstractValve
+{
+    protected Log log = LogFactory.getLog(DesktopEncoderRedirectValveImpl.class);
+    
+    private String desktopPipelinePath = null;
+    private String desktopRenderPipelinePath = null;
+    
+    public DesktopEncoderRedirectValveImpl( String desktopPipelinePath, String desktopRenderPipelinePath )
+    {
+        if ( desktopPipelinePath == null || desktopPipelinePath.length() == 0 )
+            desktopPipelinePath = JetspeedDesktop.DEFAULT_DESKTOP_PIPELINE_PATH;
+        if ( desktopPipelinePath.charAt( 0 ) != '/' )
+            desktopPipelinePath = "/" + desktopPipelinePath;
+        if ( desktopPipelinePath.charAt( desktopPipelinePath.length() -1 ) != '/' )
+            desktopPipelinePath = desktopPipelinePath + "/";
+
+        if ( desktopRenderPipelinePath == null || desktopRenderPipelinePath.length() == 0 )
+            desktopRenderPipelinePath = JetspeedDesktop.DEFAULT_DESKTOP_RENDER_PIPELINE_PATH;
+        if ( desktopRenderPipelinePath.charAt( 0 ) != '/' )
+            desktopRenderPipelinePath = "/" + desktopRenderPipelinePath;
+        if ( desktopRenderPipelinePath.charAt( desktopRenderPipelinePath.length() -1 ) != '/' )
+            desktopRenderPipelinePath = desktopRenderPipelinePath + "/";
+        
+        this.desktopPipelinePath = desktopPipelinePath;
+        this.desktopRenderPipelinePath = desktopRenderPipelinePath;
+    }
+        
+    public void invoke( RequestContext request, ValveContext context )
+        throws PipelineException
+    {
+        try
+        {  
+            if ( request.getPortalURL() == null )
+            {
+                String encoding = request.getRequestParameter(JetspeedDesktop.DESKTOP_ENCODER_REQUEST_PARAMETER);
+                if (encoding == null || ! encoding.equals(JetspeedDesktop.DESKTOP_ENCODER_REQUEST_PARAMETER_VALUE))
+                {
+                    // redirect to page url with render encoding
+                    try 
+                    {
+                        String queryString = request.getRequest().getQueryString();
+                        String location = request.getRequest().getRequestURI();
+                        if ( queryString != null && queryString.length() > 0 )
+                            location += "?" + queryString;
+                        location = location.replaceAll( this.desktopRenderPipelinePath, this.desktopPipelinePath );
+                        //log.info( "DesktopEncoderRedirectValveImpl redirecting request-uri=" + request.getRequest().getRequestURI() + " location=" + location );
+                        request.getResponse().sendRedirect( location );
+                    }
+                    catch (IOException ioe){}
+                    return;
+                }                
+            }
+        }
+        catch (Exception e)
+        {
+            throw new PipelineException(e);
+        }
+        // Pass control to the next Valve in the Pipeline
+        context.invokeNext( request );
+    }
+
+    public String toString()
+    {
+        return "DesktopValve";
+    }
+}

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

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/desktop/impl/DesktopValveImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/desktop/impl/DesktopValveImpl.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/desktop/impl/DesktopValveImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/desktop/impl/DesktopValveImpl.java Fri Dec 12 04:06:29 2008
@@ -1,58 +1,58 @@
-/*
+/*
  * 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.impl;
-
-import org.apache.jetspeed.desktop.JetspeedDesktop;
-import org.apache.jetspeed.pipeline.PipelineException;
-import org.apache.jetspeed.pipeline.valve.AbstractValve;
-import org.apache.jetspeed.pipeline.valve.ValveContext;
-import org.apache.jetspeed.request.RequestContext;
-
-/**
- * Desktop Valve
- *
- * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
- * @version $Id: $
- */
-public class DesktopValveImpl extends AbstractValve
-{
-    private JetspeedDesktop desktop;
-    
-    public DesktopValveImpl(JetspeedDesktop desktop)
-    {
-        this.desktop = desktop;
-    }
-        
-    public void invoke( RequestContext request, ValveContext context )
-        throws PipelineException
-    {
-        try
-        {
-            desktop.render(request);
-        }
-        catch (Exception e)
-        {
-            throw new PipelineException(e);
-        }
-        context.invokeNext( request );
-    }
-
-    public String toString()
-    {
-        return "DesktopValve";
-    }
-}
+ * 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.impl;
+
+import org.apache.jetspeed.desktop.JetspeedDesktop;
+import org.apache.jetspeed.pipeline.PipelineException;
+import org.apache.jetspeed.pipeline.valve.AbstractValve;
+import org.apache.jetspeed.pipeline.valve.ValveContext;
+import org.apache.jetspeed.request.RequestContext;
+
+/**
+ * Desktop Valve
+ *
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+ * @version $Id: $
+ */
+public class DesktopValveImpl extends AbstractValve
+{
+    private JetspeedDesktop desktop;
+    
+    public DesktopValveImpl(JetspeedDesktop desktop)
+    {
+        this.desktop = desktop;
+    }
+        
+    public void invoke( RequestContext request, ValveContext context )
+        throws PipelineException
+    {
+        try
+        {
+            desktop.render(request);
+        }
+        catch (Exception e)
+        {
+            throw new PipelineException(e);
+        }
+        context.invokeNext( request );
+    }
+
+    public String toString()
+    {
+        return "DesktopValve";
+    }
+}

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

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopContextImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopContextImpl.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopContextImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopContextImpl.java Fri Dec 12 04:06:29 2008
@@ -1,230 +1,230 @@
-/*
+/*
  * 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.impl;
-
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-import org.apache.jetspeed.container.url.BasePortalURL;
-import org.apache.jetspeed.decoration.LayoutDecoration;
-import org.apache.jetspeed.decoration.Theme;
-import org.apache.jetspeed.desktop.JetspeedDesktopContext;
-import org.apache.jetspeed.headerresource.HeaderResource;
-import org.apache.jetspeed.headerresource.HeaderResourceLib;
-import org.apache.jetspeed.request.RequestContext;
-
-/**
- * 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: JetspeedDesktopContextImpl.java $
- */
-public class JetspeedDesktopContextImpl implements JetspeedDesktopContext
-{
-    // Jetspeed Request Context
-    RequestContext context;
-    
-    // base portal url to override default url server info from servlet
-    private BasePortalURL baseUrlAccess = null;
-    
-    private LayoutDecoration layoutDecoration;
-    
-    // default extension for layout templates
-    private String defaultLayoutTemplateExtension;
-    
-    
-    // ... save generated portal urls to avoid duplicate effort
-    private String portalBaseUrl;
-    private String portalUrl;
-    
-    private HeaderResource headerResource;
-    
-    public JetspeedDesktopContextImpl( RequestContext context, BasePortalURL baseUrlAccess, Theme theme, HeaderResource headerResource, String defaultLayoutTemplateExtension )
-    {
-        // String layoutDecorator, String layoutDecoratorRootPath, String resourceName
-        this.context = context;
-        this.baseUrlAccess = baseUrlAccess;
-        this.layoutDecoration = theme.getPageLayoutDecoration();
-        this.headerResource = headerResource;
-        this.defaultLayoutTemplateExtension = defaultLayoutTemplateExtension;
-    }
-    
-    
-    // get portal urls - each of these methods is copied from HeaderResourceImpl.java
-    
-    /**
-     * Portal base url ( e.g. http://localhost:8080/jetspeed )
-     * 
-     * @return portal base url
-     */
-    public String getPortalBaseUrl()
-    {
-        if ( this.portalBaseUrl == null )
-        {
-            this.portalBaseUrl = HeaderResourceLib.getPortalBaseUrl( context, this.baseUrlAccess );
-        }
-        return this.portalBaseUrl;
-    }
-    
-    /**
-     * Portal base url ( e.g. http://localhost:8080/jetspeed )
-     * 
-     * @return portal base url
-     */
-    public String getPortalBaseUrl( boolean encode )
-    {
-        String baseurl = getPortalBaseUrl();
-        if ( ! encode )
-        {
-            return baseurl;
-        }
-        else
-        {
-            return context.getResponse().encodeURL( baseurl );
-        }
-    }
-        
-    /**
-     * 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 )
-    {
-        return getPortalResourceUrl( relativePath, false );
-    }
-    
-    /**
-     * 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 )
-    {
-        return HeaderResourceLib.getPortalResourceUrl( relativePath, getPortalBaseUrl(), encode, context );
-    }
-    
-    /**
-     * Portal base servlet url ( e.g. http://localhost:8080/jetspeed/desktop/ )
-     * 
-     * @return portal base servlet url
-     */
-    public String getPortalUrl()
-    {
-        if ( this.portalUrl == null )
-        {
-            this.portalUrl = HeaderResourceLib.getPortalUrl( getPortalBaseUrl(), context );
-        }
-        return this.portalUrl;
-    }
-    
-    /**
-     * Portal base servlet url ( e.g. http://localhost:8080/jetspeed/desktop/ )
-     * 
-     * @return portal base servlet url
-     */
-    public String getPortalUrl( boolean encode )
-    {
-        return getPortalUrl( null, 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 )
-    {
-        return getPortalUrl( relativePath, false );
-    }
-    
-    /**
-     * 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 )
-    {
-        return HeaderResourceLib.getPortalResourceUrl( relativePath, getPortalUrl(), encode, context );
-    }
-    
-    public String getLayoutDecorationName()
-    {
-        return layoutDecoration.getName();
-    }
-    
-    public String getLayoutTemplatePath()
-    {
-        return getLayoutTemplatePath( null );
-    }
-    public String getLayoutTemplatePath( String layoutTemplateIdPropertyName )
-    {
-        String id = null;
-        if ( layoutTemplateIdPropertyName != null )
-        {
-            id = layoutDecoration.getProperty( layoutTemplateIdPropertyName );
-        }
-        
-        if ( id == null || id.length() == 0 )
-        {
-            id = layoutDecoration.getProperty( LAYOUT_TEMPLATE_ID_PROP );
-        }
-        
-        if ( id == null || id.length() == 0 )
-        {
-            id = LAYOUT_TEMPLATE_ID_DEFAULT;
-        }
-        
-        String ext = layoutDecoration.getProperty( LAYOUT_DESKTOP_TEMPLATE_EXTENSION_PROP );
-        if ( ext == null )
-            ext = layoutDecoration.getProperty( LAYOUT_TEMPLATE_EXTENSION_PROP );
-        if ( ext == null )
-        {
-            ext = this.defaultLayoutTemplateExtension;
-        }
-        return layoutDecoration.getBasePath( id + ext );
-    }
-    
-    public String getLayoutBasePath()
-    {
-        return layoutDecoration.getBasePath();
-    }
-    public String getLayoutBasePath( String relativePath )
-    {
-        return layoutDecoration.getBasePath( relativePath );
-    }
-    
-    public String getLayoutBaseUrl()
-    {
-        return getPortalResourceUrl( getLayoutBasePath(), false );
-    }
-    public String getLayoutBaseUrl( String relativePath )
-    {
-        return getPortalResourceUrl( getLayoutBasePath( relativePath ), false );
-    }
-    
-    public ResourceBundle getLayoutResourceBundle( Locale locale )
-    {
-        return layoutDecoration.getResourceBundle( locale, this.context );
-    }
-    
-    public HeaderResource getHeaderResource()
-    {
-        return this.headerResource;
-    }
-}
+ * 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.impl;
+
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+import org.apache.jetspeed.container.url.BasePortalURL;
+import org.apache.jetspeed.decoration.LayoutDecoration;
+import org.apache.jetspeed.decoration.Theme;
+import org.apache.jetspeed.desktop.JetspeedDesktopContext;
+import org.apache.jetspeed.headerresource.HeaderResource;
+import org.apache.jetspeed.headerresource.HeaderResourceLib;
+import org.apache.jetspeed.request.RequestContext;
+
+/**
+ * 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: JetspeedDesktopContextImpl.java $
+ */
+public class JetspeedDesktopContextImpl implements JetspeedDesktopContext
+{
+    // Jetspeed Request Context
+    RequestContext context;
+    
+    // base portal url to override default url server info from servlet
+    private BasePortalURL baseUrlAccess = null;
+    
+    private LayoutDecoration layoutDecoration;
+    
+    // default extension for layout templates
+    private String defaultLayoutTemplateExtension;
+    
+    
+    // ... save generated portal urls to avoid duplicate effort
+    private String portalBaseUrl;
+    private String portalUrl;
+    
+    private HeaderResource headerResource;
+    
+    public JetspeedDesktopContextImpl( RequestContext context, BasePortalURL baseUrlAccess, Theme theme, HeaderResource headerResource, String defaultLayoutTemplateExtension )
+    {
+        // String layoutDecorator, String layoutDecoratorRootPath, String resourceName
+        this.context = context;
+        this.baseUrlAccess = baseUrlAccess;
+        this.layoutDecoration = theme.getPageLayoutDecoration();
+        this.headerResource = headerResource;
+        this.defaultLayoutTemplateExtension = defaultLayoutTemplateExtension;
+    }
+    
+    
+    // get portal urls - each of these methods is copied from HeaderResourceImpl.java
+    
+    /**
+     * Portal base url ( e.g. http://localhost:8080/jetspeed )
+     * 
+     * @return portal base url
+     */
+    public String getPortalBaseUrl()
+    {
+        if ( this.portalBaseUrl == null )
+        {
+            this.portalBaseUrl = HeaderResourceLib.getPortalBaseUrl( context, this.baseUrlAccess );
+        }
+        return this.portalBaseUrl;
+    }
+    
+    /**
+     * Portal base url ( e.g. http://localhost:8080/jetspeed )
+     * 
+     * @return portal base url
+     */
+    public String getPortalBaseUrl( boolean encode )
+    {
+        String baseurl = getPortalBaseUrl();
+        if ( ! encode )
+        {
+            return baseurl;
+        }
+        else
+        {
+            return context.getResponse().encodeURL( baseurl );
+        }
+    }
+        
+    /**
+     * 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 )
+    {
+        return getPortalResourceUrl( relativePath, false );
+    }
+    
+    /**
+     * 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 )
+    {
+        return HeaderResourceLib.getPortalResourceUrl( relativePath, getPortalBaseUrl(), encode, context );
+    }
+    
+    /**
+     * Portal base servlet url ( e.g. http://localhost:8080/jetspeed/desktop/ )
+     * 
+     * @return portal base servlet url
+     */
+    public String getPortalUrl()
+    {
+        if ( this.portalUrl == null )
+        {
+            this.portalUrl = HeaderResourceLib.getPortalUrl( getPortalBaseUrl(), context );
+        }
+        return this.portalUrl;
+    }
+    
+    /**
+     * Portal base servlet url ( e.g. http://localhost:8080/jetspeed/desktop/ )
+     * 
+     * @return portal base servlet url
+     */
+    public String getPortalUrl( boolean encode )
+    {
+        return getPortalUrl( null, 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 )
+    {
+        return getPortalUrl( relativePath, false );
+    }
+    
+    /**
+     * 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 )
+    {
+        return HeaderResourceLib.getPortalResourceUrl( relativePath, getPortalUrl(), encode, context );
+    }
+    
+    public String getLayoutDecorationName()
+    {
+        return layoutDecoration.getName();
+    }
+    
+    public String getLayoutTemplatePath()
+    {
+        return getLayoutTemplatePath( null );
+    }
+    public String getLayoutTemplatePath( String layoutTemplateIdPropertyName )
+    {
+        String id = null;
+        if ( layoutTemplateIdPropertyName != null )
+        {
+            id = layoutDecoration.getProperty( layoutTemplateIdPropertyName );
+        }
+        
+        if ( id == null || id.length() == 0 )
+        {
+            id = layoutDecoration.getProperty( LAYOUT_TEMPLATE_ID_PROP );
+        }
+        
+        if ( id == null || id.length() == 0 )
+        {
+            id = LAYOUT_TEMPLATE_ID_DEFAULT;
+        }
+        
+        String ext = layoutDecoration.getProperty( LAYOUT_DESKTOP_TEMPLATE_EXTENSION_PROP );
+        if ( ext == null )
+            ext = layoutDecoration.getProperty( LAYOUT_TEMPLATE_EXTENSION_PROP );
+        if ( ext == null )
+        {
+            ext = this.defaultLayoutTemplateExtension;
+        }
+        return layoutDecoration.getBasePath( id + ext );
+    }
+    
+    public String getLayoutBasePath()
+    {
+        return layoutDecoration.getBasePath();
+    }
+    public String getLayoutBasePath( String relativePath )
+    {
+        return layoutDecoration.getBasePath( relativePath );
+    }
+    
+    public String getLayoutBaseUrl()
+    {
+        return getPortalResourceUrl( getLayoutBasePath(), false );
+    }
+    public String getLayoutBaseUrl( String relativePath )
+    {
+        return getPortalResourceUrl( getLayoutBasePath( relativePath ), false );
+    }
+    
+    public ResourceBundle getLayoutResourceBundle( Locale locale )
+    {
+        return layoutDecoration.getResourceBundle( locale, this.context );
+    }
+    
+    public HeaderResource getHeaderResource()
+    {
+        return this.headerResource;
+    }
+}

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

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

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/StaticResourceCachingFilter.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/StaticResourceCachingFilter.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/StaticResourceCachingFilter.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/StaticResourceCachingFilter.java Fri Dec 12 04:06:29 2008
@@ -1,102 +1,102 @@
-/*
+/*
  * 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.engine.servlet;
-
-import java.util.TimeZone;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class StaticResourceCachingFilter implements Filter
-{
-    // constants
-
-    private static final String HTTP_HEADER_EXPIRES = "Expires" ;
-    private static final String HTTP_HEADER_CACHE_CONTROL = "Cache-Control" ;
-    private static final String HTTP_HEADER_CACHE_MAX_AGE = "max-age" ;
-    private static final String HTTP_HEADER_CACHE_MAX_AGE_EQ = "max-age=" ;
-
-    private static String PARAM_EXPIRES_HOURS = "ExpireHours";
-
-    private static final TimeZone GMT_TIME_ZONE = TimeZone.getTimeZone( "GMT" );
-
-
-    // members
-    
-    private double expires_in_hours = 0.0;
-    private int max_age = 0;
-
-    // constructor
-
-    public StaticResourceCachingFilter()
-    {
-        super() ;
-    }
-
-
-    // protocol
-
-    public void init( FilterConfig config )
-    {
-        try
-        {
-            expires_in_hours = Double.parseDouble( config.getInitParameter( PARAM_EXPIRES_HOURS ) );
-        }
-        catch ( NumberFormatException ex )
-        {
-            expires_in_hours = 0;
-        }
-        max_age = (int)(expires_in_hours * 60);
-    }
-    
-    public void doFilter( ServletRequest aRequest, ServletResponse aResponse, FilterChain chain )
-        throws java.io.IOException, ServletException
-    {
-        HttpServletRequest request = (HttpServletRequest)aRequest;
-        HttpServletResponse response = (HttpServletResponse)aResponse;
-        if ( max_age > 0 )
-        {
-            String cacheControlVal = HTTP_HEADER_CACHE_MAX_AGE_EQ + max_age;
-            response.setHeader( HTTP_HEADER_CACHE_CONTROL, cacheControlVal );
-        }
-        chain.doFilter( request, response );
-    }
-
-    public void destroy()
-    {
-    }
-
-
-    /* unused (we're only doing Cache-Control max-age), but works for generating Expires header
-    private String createExpiresHeader( int expiresInHours )
-    {
-        SimpleDateFormat sdf = new SimpleDateFormat( "EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US );
-        sdf.setTimeZone( GMT_TIME_ZONE );
-        Calendar cal = Calendar.getInstance();
-        cal.add( Calendar.HOUR, expiresInHours );
-        long millis = cal.getTimeInMillis();
-        Date d = new Date( millis );
-        return sdf.format( d );
-    }
-     */
-}
+ * 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.engine.servlet;
+
+import java.util.TimeZone;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class StaticResourceCachingFilter implements Filter
+{
+    // constants
+
+    private static final String HTTP_HEADER_EXPIRES = "Expires" ;
+    private static final String HTTP_HEADER_CACHE_CONTROL = "Cache-Control" ;
+    private static final String HTTP_HEADER_CACHE_MAX_AGE = "max-age" ;
+    private static final String HTTP_HEADER_CACHE_MAX_AGE_EQ = "max-age=" ;
+
+    private static String PARAM_EXPIRES_HOURS = "ExpireHours";
+
+    private static final TimeZone GMT_TIME_ZONE = TimeZone.getTimeZone( "GMT" );
+
+
+    // members
+    
+    private double expires_in_hours = 0.0;
+    private int max_age = 0;
+
+    // constructor
+
+    public StaticResourceCachingFilter()
+    {
+        super() ;
+    }
+
+
+    // protocol
+
+    public void init( FilterConfig config )
+    {
+        try
+        {
+            expires_in_hours = Double.parseDouble( config.getInitParameter( PARAM_EXPIRES_HOURS ) );
+        }
+        catch ( NumberFormatException ex )
+        {
+            expires_in_hours = 0;
+        }
+        max_age = (int)(expires_in_hours * 60);
+    }
+    
+    public void doFilter( ServletRequest aRequest, ServletResponse aResponse, FilterChain chain )
+        throws java.io.IOException, ServletException
+    {
+        HttpServletRequest request = (HttpServletRequest)aRequest;
+        HttpServletResponse response = (HttpServletResponse)aResponse;
+        if ( max_age > 0 )
+        {
+            String cacheControlVal = HTTP_HEADER_CACHE_MAX_AGE_EQ + max_age;
+            response.setHeader( HTTP_HEADER_CACHE_CONTROL, cacheControlVal );
+        }
+        chain.doFilter( request, response );
+    }
+
+    public void destroy()
+    {
+    }
+
+
+    /* unused (we're only doing Cache-Control max-age), but works for generating Expires header
+    private String createExpiresHeader( int expiresInHours )
+    {
+        SimpleDateFormat sdf = new SimpleDateFormat( "EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US );
+        sdf.setTimeZone( GMT_TIME_ZONE );
+        Calendar cal = Calendar.getInstance();
+        cal.add( Calendar.HOUR, expiresInHours );
+        long millis = cal.getTimeInMillis();
+        Date d = new Date( millis );
+        return sdf.format( d );
+    }
+     */
+}

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

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/add.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/add.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/add.vm (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/add.vm Fri Dec 12 04:06:29 2008
@@ -15,9 +15,9 @@
   limitations under the License.
 *#
 <js>
-    <status>$status</status>
-    <action>$action</action>
-    <id>$id</id> 
-    <entity>$entity</entity>
-    <new_position><col>$newcol</col><row>$newrow</row></new_position>
+    <status>$status</status>
+    <action>$action</action>
+    <id>$id</id> 
+    <entity>$entity</entity>
+    <new_position><col>$newcol</col><row>$newrow</row></new_position>
 </js>
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/add.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/constraints.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/constraints.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/constraints.vm (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/constraints.vm Fri Dec 12 04:06:29 2008
@@ -15,8 +15,8 @@
   limitations under the License.
 *#
 <js>
-    <status>$status</status>
-    <action>$action</action>
-    <method>$method</method>    
-    <count>$count</count>       
+    <status>$status</status>
+    <action>$action</action>
+    <method>$method</method>    
+    <count>$count</count>       
 </js>
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/constraints.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/error.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/error.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/error.vm (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/error.vm Fri Dec 12 04:06:29 2008
@@ -15,8 +15,8 @@
   limitations under the License.
 *#
 <js>
-    <status>$!status</status>
-    <action>$!action</action>
-	    <reason>$!reason</reason>
-    <id>$!id</id>
+    <status>$!status</status>
+    <action>$!action</action>
+	    <reason>$!reason</reason>
+    <id>$!id</id>
 </js>
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/error.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/export.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getactions.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getactions.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getactions.vm (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getactions.vm Fri Dec 12 04:06:29 2008
@@ -15,25 +15,25 @@
   limitations under the License.
 *#
 <js>
-    <status>$status</status>
-    <action>$action</action>
-    
-    #if ( $page )
-    <page>
-#foreach ($action in $page.decoration.actions)
-        <action id="${action.ActionName}" type="${action.ActionType}" name="${action.Name}" url="${action.Action}"/>    
-#end
-    </page>
-    #end
-    <portlets>
-#foreach ($portlet in $portlets)
-    <portlet id="$portlet.getId()">
-#foreach ($action in $portlet.decoration.actions)
-        <action id="${action.ActionName}" type="${action.ActionType}" name="${action.Name}" url="${action.Action}"/>    
-#end
-	<mode>$portlet.decoration.getCurrentModeAction()</mode>
-	<state>$portlet.decoration.getCurrentStateAction()</state>
-    </portlet>
-#end
-    </portlets>
-</js>
+    <status>$status</status>
+    <action>$action</action>
+    
+    #if ( $page )
+    <page>
+#foreach ($action in $page.decoration.actions)
+        <action id="${action.ActionName}" type="${action.ActionType}" name="${action.Name}" url="${action.Action}"/>    
+#end
+    </page>
+    #end
+    <portlets>
+#foreach ($portlet in $portlets)
+    <portlet id="$portlet.getId()">
+#foreach ($action in $portlet.decoration.actions)
+        <action id="${action.ActionName}" type="${action.ActionType}" name="${action.Name}" url="${action.Action}"/>    
+#end
+	<mode>$portlet.decoration.getCurrentModeAction()</mode>
+	<state>$portlet.decoration.getCurrentStateAction()</state>
+    </portlet>
+#end
+    </portlets>
+</js>

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getactions.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getfolder.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getfolder.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getfolder.vm (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getfolder.vm Fri Dec 12 04:06:29 2008
@@ -15,42 +15,42 @@
   limitations under the License.
 *#
 <js>
-    <status>$!status</status>
-    <action>$!action</action>    
-    <folder hidden="$!folder.isHidden()">
-    <defaults
-       layout-decorator='$!folder.getDefaultDecorator("layout")'
-       portlet-decorator='$!folder.getDefaultDecorator("portlet")'
-       theme='$!folder.Skin'
-     />    
-      <name>$!folder.Name</name>
-      <path>$!folder.Path</path>      
-      <url>$!folder.Url</url>
-      <hidden>$!folder.isHidden()</hidden>
-      <reserved>$!folder.isReserved()</reserved>
-		      <title>$!folder.Title</title>
-		      <short-title>$!folder.ShortTitle</short-title>		      		      
-      <default-page>$!folder.DefaultPage</default-page>
-#foreach ($meta in $folder.Metadata.Fields)
-	<metadata name="$meta.Name" xml:lang="$meta.Locale.toString()">$!meta.Value</metadata>
-#end		      
-#if ($securityRefs)
-#foreach ($sec in $securityRefs)
-      	<security-ref>$sec</security-ref>
-#end
-#end
-#if ($securityOwner)
-      <security-owner>$securityOwner</security-owner>
-#end
-#if ($securityDefs)
-#foreach ($sec in $securityDefs)
-      	<security-def id="$velocityCount">
-      	   <permissions>$!sec.Permissions</permissions>
-      	   <roles>$!sec.Roles</roles>
-      	   <groups>$!sec.Groups</groups>
-      	   <users>$!sec.Users</users>      	   
-      	</security-def>
-#end  
-#end
-    </folder>    
-</js>
+    <status>$!status</status>
+    <action>$!action</action>    
+    <folder hidden="$!folder.isHidden()">
+    <defaults
+       layout-decorator='$!folder.getDefaultDecorator("layout")'
+       portlet-decorator='$!folder.getDefaultDecorator("portlet")'
+       theme='$!folder.Skin'
+     />    
+      <name>$!folder.Name</name>
+      <path>$!folder.Path</path>      
+      <url>$!folder.Url</url>
+      <hidden>$!folder.isHidden()</hidden>
+      <reserved>$!folder.isReserved()</reserved>
+		      <title>$!folder.Title</title>
+		      <short-title>$!folder.ShortTitle</short-title>		      		      
+      <default-page>$!folder.DefaultPage</default-page>
+#foreach ($meta in $folder.Metadata.Fields)
+	<metadata name="$meta.Name" xml:lang="$meta.Locale.toString()">$!meta.Value</metadata>
+#end		      
+#if ($securityRefs)
+#foreach ($sec in $securityRefs)
+      	<security-ref>$sec</security-ref>
+#end
+#end
+#if ($securityOwner)
+      <security-owner>$securityOwner</security-owner>
+#end
+#if ($securityDefs)
+#foreach ($sec in $securityDefs)
+      	<security-def id="$velocityCount">
+      	   <permissions>$!sec.Permissions</permissions>
+      	   <roles>$!sec.Roles</roles>
+      	   <groups>$!sec.Groups</groups>
+      	   <users>$!sec.Users</users>      	   
+      	</security-def>
+#end  
+#end
+    </folder>    
+</js>

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getfolder.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getfolderlist.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getfolderlist.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getfolderlist.vm (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getfolderlist.vm Fri Dec 12 04:06:29 2008
@@ -1,4 +1,4 @@
-[
+[
 #*
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,20 +15,20 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 *#
-#set ($fcount = 0)
-#foreach($f in $folders)    
-#if($fcount > 0),#end{isFolder: true, object: "Folder", widgetId: "$f.Path", title: "$f.Name", childIconSrc: "/j2-admin/images/folder.gif"}
-#set ($fcount = $fcount + 1)
-#end        
-#foreach($p in $pages)    
-#if($fcount > 0),#end{isFolder: false, object: "Page", widgetId: "$p.Path", title: "$p.Name", childIconSrc: "/j2-admin/images/page.gif"}
-#set ($fcount = $fcount + 1)
-#end        
-#foreach($l in $links)    
-#if($fcount > 0),#end{isFolder: false, object: "Link", widgetId: "$l.Path", title: "$l.Name", childIconSrc: "/j2-admin/images/link.gif"}
-#set ($fcount = $fcount + 1)
-#end        
-]
-
- 
+#set ($fcount = 0)
+#foreach($f in $folders)    
+#if($fcount > 0),#end{isFolder: true, object: "Folder", widgetId: "$f.Path", title: "$f.Name", childIconSrc: "/j2-admin/images/folder.gif"}
+#set ($fcount = $fcount + 1)
+#end        
+#foreach($p in $pages)    
+#if($fcount > 0),#end{isFolder: false, object: "Page", widgetId: "$p.Path", title: "$p.Name", childIconSrc: "/j2-admin/images/page.gif"}
+#set ($fcount = $fcount + 1)
+#end        
+#foreach($l in $links)    
+#if($fcount > 0),#end{isFolder: false, object: "Link", widgetId: "$l.Path", title: "$l.Name", childIconSrc: "/j2-admin/images/link.gif"}
+#set ($fcount = $fcount + 1)
+#end        
+]
+
+ 
  
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getfolderlist.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getfolders.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getlink.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getlink.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getlink.vm (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getlink.vm Fri Dec 12 04:06:29 2008
@@ -15,36 +15,36 @@
   limitations under the License.
 *#
 <js>
-    <status>$status</status>
-    <action>$action</action>    
-    <link hidden="$!link.isHidden()">
-      <name>$!link.Name</name>
-      <path>$!link.Path</path>
-		      <title>$!link.Title</title>
-		      <short-title>$!link.ShortTitle</short-title>		      
-		      <url>$!link.Url</url>
-		      <target>$!link.Target</target>
-      <version>$!link.Version</version>
-#foreach ($meta in $link.Metadata.Fields)
-	      <metadata name="$meta.Name" xml:lang="$meta.Locale.toString()">$!meta.Value</metadata>
-#end
-#if ($securityRefs)
-#foreach ($sec in $securityRefs)
-      	<security-ref>$sec</security-ref>
-#end
-#end
-#if ($securityOwner)
-      <security-owner>$securityOwner</security-owner>
-#end
-#if ($securityDefs)
-#foreach ($sec in $securityDefs)
-      	<security-def id="$velocityCount">
-      	   <permissions>$!sec.Permissions</permissions>
-      	   <roles>$!sec.Roles</roles>
-      	   <groups>$!sec.Groups</groups>
-      	   <users>$!sec.Users</users>      	   
-      	</security-def>
-#end  
-#end
-    </link>    
-</js>
+    <status>$status</status>
+    <action>$action</action>    
+    <link hidden="$!link.isHidden()">
+      <name>$!link.Name</name>
+      <path>$!link.Path</path>
+		      <title>$!link.Title</title>
+		      <short-title>$!link.ShortTitle</short-title>		      
+		      <url>$!link.Url</url>
+		      <target>$!link.Target</target>
+      <version>$!link.Version</version>
+#foreach ($meta in $link.Metadata.Fields)
+	      <metadata name="$meta.Name" xml:lang="$meta.Locale.toString()">$!meta.Value</metadata>
+#end
+#if ($securityRefs)
+#foreach ($sec in $securityRefs)
+      	<security-ref>$sec</security-ref>
+#end
+#end
+#if ($securityOwner)
+      <security-owner>$securityOwner</security-owner>
+#end
+#if ($securityDefs)
+#foreach ($sec in $securityDefs)
+      	<security-def id="$velocityCount">
+      	   <permissions>$!sec.Permissions</permissions>
+      	   <roles>$!sec.Roles</roles>
+      	   <groups>$!sec.Groups</groups>
+      	   <users>$!sec.Users</users>      	   
+      	</security-def>
+#end  
+#end
+    </link>    
+</js>

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getlink.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getpages.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getpages.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getpages.vm (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getpages.vm Fri Dec 12 04:06:29 2008
@@ -15,14 +15,14 @@
   limitations under the License.
 *#
 <js>
-    <status>$status</status>
-    <action>$action</action>
-    
-    <pages>
-#foreach ($page in $pages)    
-        <page name="$page.Name" title="$page.Title" path="$page.Path">
-        </page>
-#end        
-    </pages>
-    
-</js>
+    <status>$status</status>
+    <action>$action</action>
+    
+    <pages>
+#foreach ($page in $pages)    
+        <page name="$page.Name" title="$page.Title" path="$page.Path">
+        </page>
+#end        
+    </pages>
+    
+</js>

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getpages.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getportlets.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getportlets.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getportlets.vm (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getportlets.vm Fri Dec 12 04:06:29 2008
@@ -15,13 +15,13 @@
   limitations under the License.
 *#
 <js>
-    <status>$status</status>
-    <action>$action</action>
-    
-    <portlets>
-#foreach ($portlet in $portlets)    
-        <portlet name="$portlet.Name" displayName="$!portlet.DisplayName" description="$!portlet.Description" image="$portlet.Image"/>
-#end        
-    </portlets>
-    
-</js>
+    <status>$status</status>
+    <action>$action</action>
+    
+    <portlets>
+#foreach ($portlet in $portlets)    
+        <portlet name="$portlet.Name" displayName="$!portlet.DisplayName" description="$!portlet.Description" image="$portlet.Image"/>
+#end        
+    </portlets>
+    
+</js>

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getportlets.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getthemes.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getthemes.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getthemes.vm (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getthemes.vm Fri Dec 12 04:06:29 2008
@@ -15,65 +15,65 @@
   limitations under the License.
 *#
 #if ($format == "json")
-#if ($type == "portletDecorations")
-[
-#foreach($p in $portletDecorations)    
-#if($velocityCount > 1),#end["$p", "$p"]
-#end        
-]
-#elseif ($type == "pageDecorations")
-[
-#foreach($p in $pageDecorations)    
-#if($velocityCount > 1),#end["$p", "$p"]
-#end        
-]
-#elseif ($type == "desktopPageDecorations")
-[
-#foreach($dt in $desktopPageDecorations)    
-#if($velocityCount > 1),#end["$dt", "$dt"]
-#end 
-]
-#elseif ($type == "desktopPortletDecorations")
-[
-#foreach($dt in $desktopPortletDecorations)    
-#if($velocityCount > 1),#end["$dt", "$dt"]
-#end 
-]
-#elseif ($type == "layouts")
-[
-#foreach($l in $layouts)    
-#if($velocityCount > 1),#end["$l.DisplayName", "$l.Name"]
-#end        
-]
-#end
-#else    
-<js>
-    <status>$status</status>
-    <action>$action</action>    
-    <layouts>    
-#foreach($l in $layouts)    
-    <layout>$l.DisplayName</layout>    
-#end        
-    </layouts>
-    <page-decorations>
-#foreach($p in $pageDecorations)    
-    <page-decoration>$p</page-decoration>    
-#end    
-    </page-decorations>
-    <portlet-decorations>
-#foreach($p in $portletDecorations)    
-    <portlet-decoration>$p</portlet-decoration>    
-#end    
-    </portlet-decorations>
-    <desktop-page-decorations>
-#foreach($dt in $desktopPageDecorations)    
-    <page-decoration>$dt</page-decoration>    
-#end 
-    </desktop-page-decorations>
-    <desktop-portlet-decorations>
-#foreach($p in $desktopPortletDecorations)    
-    <portlet-decoration>$p</portlet-decoration>    
-#end    
-    </desktop-portlet-decorations>
-</js>
-#end   
+#if ($type == "portletDecorations")
+[
+#foreach($p in $portletDecorations)    
+#if($velocityCount > 1),#end["$p", "$p"]
+#end        
+]
+#elseif ($type == "pageDecorations")
+[
+#foreach($p in $pageDecorations)    
+#if($velocityCount > 1),#end["$p", "$p"]
+#end        
+]
+#elseif ($type == "desktopPageDecorations")
+[
+#foreach($dt in $desktopPageDecorations)    
+#if($velocityCount > 1),#end["$dt", "$dt"]
+#end 
+]
+#elseif ($type == "desktopPortletDecorations")
+[
+#foreach($dt in $desktopPortletDecorations)    
+#if($velocityCount > 1),#end["$dt", "$dt"]
+#end 
+]
+#elseif ($type == "layouts")
+[
+#foreach($l in $layouts)    
+#if($velocityCount > 1),#end["$l.DisplayName", "$l.Name"]
+#end        
+]
+#end
+#else    
+<js>
+    <status>$status</status>
+    <action>$action</action>    
+    <layouts>    
+#foreach($l in $layouts)    
+    <layout>$l.DisplayName</layout>    
+#end        
+    </layouts>
+    <page-decorations>
+#foreach($p in $pageDecorations)    
+    <page-decoration>$p</page-decoration>    
+#end    
+    </page-decorations>
+    <portlet-decorations>
+#foreach($p in $portletDecorations)    
+    <portlet-decoration>$p</portlet-decoration>    
+#end    
+    </portlet-decorations>
+    <desktop-page-decorations>
+#foreach($dt in $desktopPageDecorations)    
+    <page-decoration>$dt</page-decoration>    
+#end 
+    </desktop-page-decorations>
+    <desktop-portlet-decorations>
+#foreach($p in $desktopPortletDecorations)    
+    <portlet-decoration>$p</portlet-decoration>    
+#end    
+    </desktop-portlet-decorations>
+</js>
+#end   

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/getthemes.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/jetspeedSchema.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/move.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/move.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/move.vm (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/move.vm Fri Dec 12 04:06:29 2008
@@ -15,9 +15,9 @@
   limitations under the License.
 *#
 <js>
-    <status>$status</status>
-    <action>$action</action>
-    <id>$id</id> 
-    <old_position><col>$oldcol</col><row>$oldrow</row></old_position>
-    <new_position><col>$newcol</col><row>$newrow</row></new_position>
+    <status>$status</status>
+    <action>$action</action>
+    <id>$id</id> 
+    <old_position><col>$oldcol</col><row>$oldrow</row></old_position>
+    <new_position><col>$newcol</col><row>$newrow</row></new_position>
 </js>
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/move.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/multiaction.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/multiaction.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/multiaction.vm (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/multiaction.vm Fri Dec 12 04:06:29 2008
@@ -15,14 +15,14 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 *#
-<js>
-    <status>$status</status>
-    <action>$action</action>
-    
-    <results>
-#foreach ($result in $results)    
-        $result
-#end        
-    </results>
-    
-</js>
+<js>
+    <status>$status</status>
+    <action>$action</action>
+    
+    <results>
+#foreach ($result in $results)    
+        $result
+#end        
+    </results>
+    
+</js>

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/multiaction.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/multiactionerror.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/multiactionerror.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/multiactionerror.vm (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/multiactionerror.vm Fri Dec 12 04:06:29 2008
@@ -15,8 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 *#
-<js>
-    <status>$status</status>
-    <action>$action</action>
-    <reason>$reason</reason>
+<js>
+    <status>$status</status>
+    <action>$action</action>
+    <reason>$reason</reason>
 </js>
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/multiactionerror.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/permissions.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/permissions.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/permissions.vm (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/permissions.vm Fri Dec 12 04:06:29 2008
@@ -15,10 +15,10 @@
   limitations under the License.
 *#
 <js>
-    <status>$status</status>
-    <action>$action</action>
-    <resource>$resource</resource> 
-    <type>$type</type> 
-    <actions>$actions</actions>
-    <roles>$roles</roles>    
+    <status>$status</status>
+    <action>$action</action>
+    <resource>$resource</resource> 
+    <type>$type</type> 
+    <actions>$actions</actions>
+    <roles>$roles</roles>    
 </js>
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/permissions.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/psml.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/psml.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/psml.vm (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/psml.vm Fri Dec 12 04:06:29 2008
@@ -1,107 +1,107 @@
-#*
-  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.
-*#
-#macro (traverseFragments $f $singleLayoutId $singlePortletId)
-    <fragment id="$f.Id" type="$f.Type" name="$f.Name" decorator="$!f.Decorator">
-    #set($hasSizesProperty=false)
-    #foreach ($prop in $f.getProperties().entrySet())
-      <property name="$prop.Key" value="$prop.Value" />
-       #if($prop.Key == "sizes")
-          #set($hasSizesProperty=true)
-       #end
-	    #end
-    #if($f.Type == "layout" && ! $hasSizesProperty && $sizes.get($f.Id))
-       <property name="sizes" value="$sizes.get($f.Id)" />
-    #end
-#foreach ($pref in $f.Preferences)
-		<preference name="$pref.Name" readOnly='$pref.isReadOnly()'>		
-		  #foreach ($value in $pref.ValueList)
-		    <value>$value</value>
-		  #end
-		</preference>
-	#end
-#if($f.Type == "layout" && (! $singleLayoutId || $f.Id == $singleLayoutId))
-		#foreach($subf in $f.Fragments)
-		    #if(! $singlePortletId || ($subf.Type == "portlet" && $subf.Id == $singlePortletId))
-                #traverseFragments($subf $singleLayoutId $singlePortletId)
-            #end
-		#end
-	#end
-#if($f.Type == "portlet")
-	#foreach ($action in $f.decoration.actions)
-     <action id="${action.ActionName}" type="${action.ActionType}" name="${action.Name}" url="${action.Action}"/>    
-	#end
-	<mode>$!f.decoration.getCurrentModeAction()</mode>
-	<state>$!f.decoration.getCurrentStateAction()</state>
-	#if($portletIcons.get($f.Id))
-    <icon>$portletIcons.get($f.Id)</icon>
-    #end
-#end
-    </fragment>                                		
-#end
-
-<js>
-    <status>$status</status>
-    <action>$action</action>
-    
-<page hidden='$page.Hidden'>
-  <defaults
-     layout-decorator='$!defaultLayout'
-     portlet-decorator='$!page.getDefaultDecorator("portlet")'
-     theme='$!page.Skin'     
-  />
-  <name>$page.Name</name>
-  <path>$page.Path</path>
-  <profiledPath>$profiledPath</profiledPath>
-  <title>$esc.xml($!page.Title)</title>
-  <short-title>$esc.xml($!page.ShortTitle)</short-title>
-#foreach ($meta in $page.Metadata.Fields)
-	<metadata name="$meta.Name" xml:lang="$meta.Locale.toString()">$!meta.Value</metadata>
-#end
-  <npe>$pageQualifiedForCreateNewPageOnEdit</npe>
-  <uIA>$userIsAnonymous</uIA>
-#foreach ($action in $page.getRootContentFragment().decoration.actions)
-     <action id="${action.ActionName}" type="${action.ActionType}" name="${action.Name}" url="${action.Action}"/>    
-#end
-
-#if ($fragments == "true")
-  #if ($layoutsingle)
-    #traverseFragments($layoutsingle $layoutsingle.Id $portletsingleId)
-  #else
-  	#traverseFragments($page.RootFragment false false)
-  #end
-#end
-#if ($securityRefs)
-#foreach ($sec in $securityRefs)
-      	<security-ref>$sec</security-ref>
-#end
-#end
-#if ($securityOwner)
-      <security-owner>$securityOwner</security-owner>
-#end
-#if ($securityDefs)
-#foreach ($sec in $securityDefs)
-      	<security-def id="$velocityCount">
-      	   <permissions>$!sec.Permissions</permissions>
-      	   <roles>$!sec.Roles</roles>
-      	   <groups>$!sec.Groups</groups>
-      	   <users>$!sec.Users</users>      	   
-      	</security-def>
-#end  
-#end
-</page>    
-
-</js>
+#*
+  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.
+*#
+#macro (traverseFragments $f $singleLayoutId $singlePortletId)
+    <fragment id="$f.Id" type="$f.Type" name="$f.Name" decorator="$!f.Decorator">
+    #set($hasSizesProperty=false)
+    #foreach ($prop in $f.getProperties().entrySet())
+      <property name="$prop.Key" value="$prop.Value" />
+       #if($prop.Key == "sizes")
+          #set($hasSizesProperty=true)
+       #end
+	    #end
+    #if($f.Type == "layout" && ! $hasSizesProperty && $sizes.get($f.Id))
+       <property name="sizes" value="$sizes.get($f.Id)" />
+    #end
+#foreach ($pref in $f.Preferences)
+		<preference name="$pref.Name" readOnly='$pref.isReadOnly()'>		
+		  #foreach ($value in $pref.ValueList)
+		    <value>$value</value>
+		  #end
+		</preference>
+	#end
+#if($f.Type == "layout" && (! $singleLayoutId || $f.Id == $singleLayoutId))
+		#foreach($subf in $f.Fragments)
+		    #if(! $singlePortletId || ($subf.Type == "portlet" && $subf.Id == $singlePortletId))
+                #traverseFragments($subf $singleLayoutId $singlePortletId)
+            #end
+		#end
+	#end
+#if($f.Type == "portlet")
+	#foreach ($action in $f.decoration.actions)
+     <action id="${action.ActionName}" type="${action.ActionType}" name="${action.Name}" url="${action.Action}"/>    
+	#end
+	<mode>$!f.decoration.getCurrentModeAction()</mode>
+	<state>$!f.decoration.getCurrentStateAction()</state>
+	#if($portletIcons.get($f.Id))
+    <icon>$portletIcons.get($f.Id)</icon>
+    #end
+#end
+    </fragment>                                		
+#end
+
+<js>
+    <status>$status</status>
+    <action>$action</action>
+    
+<page hidden='$page.Hidden'>
+  <defaults
+     layout-decorator='$!defaultLayout'
+     portlet-decorator='$!page.getDefaultDecorator("portlet")'
+     theme='$!page.Skin'     
+  />
+  <name>$page.Name</name>
+  <path>$page.Path</path>
+  <profiledPath>$profiledPath</profiledPath>
+  <title>$esc.xml($!page.Title)</title>
+  <short-title>$esc.xml($!page.ShortTitle)</short-title>
+#foreach ($meta in $page.Metadata.Fields)
+	<metadata name="$meta.Name" xml:lang="$meta.Locale.toString()">$!meta.Value</metadata>
+#end
+  <npe>$pageQualifiedForCreateNewPageOnEdit</npe>
+  <uIA>$userIsAnonymous</uIA>
+#foreach ($action in $page.getRootContentFragment().decoration.actions)
+     <action id="${action.ActionName}" type="${action.ActionType}" name="${action.Name}" url="${action.Action}"/>    
+#end
+
+#if ($fragments == "true")
+  #if ($layoutsingle)
+    #traverseFragments($layoutsingle $layoutsingle.Id $portletsingleId)
+  #else
+  	#traverseFragments($page.RootFragment false false)
+  #end
+#end
+#if ($securityRefs)
+#foreach ($sec in $securityRefs)
+      	<security-ref>$sec</security-ref>
+#end
+#end
+#if ($securityOwner)
+      <security-owner>$securityOwner</security-owner>
+#end
+#if ($securityDefs)
+#foreach ($sec in $securityDefs)
+      	<security-def id="$velocityCount">
+      	   <permissions>$!sec.Permissions</permissions>
+      	   <roles>$!sec.Roles</roles>
+      	   <groups>$!sec.Groups</groups>
+      	   <users>$!sec.Users</users>      	   
+      	</security-def>
+#end  
+#end
+</page>    
+
+</js>

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/psml.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/remove.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/remove.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/remove.vm (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/remove.vm Fri Dec 12 04:06:29 2008
@@ -15,10 +15,10 @@
   limitations under the License.
 *#
 <js>
-    <status>$status</status>
-    <action>$action</action>
-    <id>$id</id> 
-    <old_position>
-        <col>$oldcol</col><row>$oldrow</row>
-    </old_position>
+    <status>$status</status>
+    <action>$action</action>
+    <id>$id</id> 
+    <old_position>
+        <col>$oldcol</col><row>$oldrow</row>
+    </old_position>
 </js>
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/remove.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/update.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/update.vm?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/update.vm (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/update.vm Fri Dec 12 04:06:29 2008
@@ -15,9 +15,9 @@
   limitations under the License.
 *#
 <js>
-    <status>$status</status>
-    <action>$action</action>
-    <method>$method</method>    
-    <count>$count</count>       
-    <id>$!id</id> 
+    <status>$status</status>
+    <action>$action</action>
+    <method>$method</method>    
+    <count>$count</count>       
+    <id>$!id</id> 
 </js>
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/update.vm
------------------------------------------------------------------------------
    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