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 [40/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-commons/src/main/java/org/apache/jetspeed/portlet/PortletObjectProxy.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/portlet/PortletObjectProxy.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/portlet/PortletObjectProxy.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/portlet/PortletObjectProxy.java Fri Dec 12 04:06:29 2008
@@ -1,332 +1,332 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jetspeed.portlet;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.lang.reflect.Modifier;
-import java.util.List;
-
-import java.io.IOException;
-
-import javax.portlet.Portlet;
-import javax.portlet.GenericPortlet;
-import javax.portlet.PortletException;
-import javax.portlet.PortletMode;
-import javax.portlet.WindowState;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import org.apache.jetspeed.JetspeedActions;
-import org.apache.jetspeed.portlet.SupportsHeaderPhase;
-import org.apache.jetspeed.util.BaseObjectProxy;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.portlet.UnavailableException;
-import org.apache.jetspeed.Jetspeed;
-import org.apache.jetspeed.components.portletregistry.PortletRegistry;
-import org.apache.jetspeed.container.InternalPortletConfig;
-import org.apache.jetspeed.om.portlet.PortletApplication;
-import org.apache.jetspeed.om.portlet.PortletDefinition;
-import org.apache.jetspeed.om.portlet.Supports;
-import org.apache.jetspeed.factory.PortletFactory;
-import org.apache.jetspeed.factory.PortletInstance;
-
-/**
- * PortletObjectProxy
- * 
- * @author <a href="mailto:woonsan@apache.org">Woonsan Ko</a>
- * @version $Id: PortletObjectProxy.java 516448 2007-03-09 16:25:47Z ate $
- */
-public class PortletObjectProxy extends BaseObjectProxy
-{
-    
-    private static ThreadLocal tlPortletObjectProxied =
-        new ThreadLocal() {
-            protected synchronized Object initialValue() {
-                return new boolean [] { false };
-            }
-        };
-    
-    public static void setPortletObjectProxied(boolean portletObjectProxied)
-    {
-        ((boolean []) tlPortletObjectProxied.get())[0] = portletObjectProxied;
-    }
-        
-    public static boolean isPortletObjectProxied()
-    {
-        return ((boolean []) tlPortletObjectProxied.get())[0];
-    }
-    
-    private static Method renderMethod;
-    private static Method processActionMethod;
-    
-    static 
-    {
-    	try 
-        {
-            renderMethod = Portlet.class.getMethod("render", new Class [] { RenderRequest.class, RenderResponse.class });
-            processActionMethod = Portlet.class.getMethod("processAction", new Class [] { ActionRequest.class, ActionResponse.class });
-        } 
-        catch (NoSuchMethodException e) 
-        {
-    	    throw new NoSuchMethodError(e.getMessage());
-    	}
-    }
-    
-    private Object portletObject;
-    private PortletInstance customConfigModePortletInstance;
-    private boolean genericPortletInvocable;
-    private Method portletDoEditMethod;
-    private boolean autoSwitchEditDefaultsModeToEditMode;
-    private boolean autoSwitchConfigMode;
-    private String customConfigModePortletUniqueName;
-    private List<Supports> supports;
-    
-    public static Object createProxy(Object proxiedObject, boolean autoSwitchEditDefaultsModeToEditMode, boolean autoSwitchConfigMode, String customConfigModePortletUniqueName)
-    {
-        Class proxiedClass = proxiedObject.getClass();
-        ClassLoader classLoader = proxiedClass.getClassLoader();
-        Class [] proxyInterfaces = null;
-        
-        if (proxiedObject instanceof SupportsHeaderPhase)
-        {
-            proxyInterfaces = new Class [] { Portlet.class, SupportsHeaderPhase.class };
-        }
-        else
-        {
-            proxyInterfaces = new Class [] { Portlet.class };
-        }
-        
-        InvocationHandler handler = new PortletObjectProxy(proxiedObject, autoSwitchEditDefaultsModeToEditMode, autoSwitchConfigMode, customConfigModePortletUniqueName);
-        return Proxy.newProxyInstance(classLoader, proxyInterfaces, handler);
-    }
-
-    private PortletObjectProxy(Object portletObject, boolean autoSwitchEditDefaultsModeToEditMode, boolean autoSwitchConfigMode, String customConfigModePortletUniqueName)
-    {
-        this.portletObject = portletObject;
-        this.autoSwitchEditDefaultsModeToEditMode = autoSwitchEditDefaultsModeToEditMode;
-        this.autoSwitchConfigMode = autoSwitchConfigMode;
-        this.customConfigModePortletUniqueName = customConfigModePortletUniqueName;
-        
-        if (portletObject instanceof GenericPortlet)
-        {
-            try
-            {
-                this.portletDoEditMethod = this.portletObject.getClass().getMethod("doEdit", new Class [] { RenderRequest.class, RenderResponse.class });
-                
-                if (Modifier.isPublic(this.portletDoEditMethod.getModifiers()))
-                {
-                    this.genericPortletInvocable = true;
-                }
-            }
-            catch (NoSuchMethodException e)
-            {
-            }
-        }
-    }
-
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable
-    {
-        Object result = null;
-        boolean handledHere = false;
-        Class declaringClass = method.getDeclaringClass();
-        
-        if (declaringClass == Portlet.class)
-        {
-            if (renderMethod.equals(method))
-            {
-                proxyRender((RenderRequest) args[0], (RenderResponse) args[1]);
-                return null;
-            }
-            else if (processActionMethod.equals(method))
-            {
-                proxyProcessAction((ActionRequest) args[0], (ActionResponse) args[1]);
-            }
-            else
-            {
-                result = method.invoke(this.portletObject, args);
-            }
-        }
-        else if (declaringClass == SupportsHeaderPhase.class)
-        {
-            result = method.invoke(this.portletObject, args);
-        }
-        else
-        {
-            result = super.invoke(proxy, method, args);
-        }
-        
-        return result;
-    }
-
-    protected void proxyRender(RenderRequest request, RenderResponse response) throws PortletException, IOException, Exception
-    {
-        PortletMode mode = request.getPortletMode();
-        
-        boolean autoSwitchConfigMode = false;
-        boolean autoSwitchToEditMode = false;
-        
-        if (this.autoSwitchConfigMode && JetspeedActions.CONFIG_MODE.equals(mode))
-        {
-            autoSwitchConfigMode = true;
-        }
-        
-        if (this.autoSwitchEditDefaultsModeToEditMode && this.genericPortletInvocable)
-        {
-            if (JetspeedActions.EDIT_DEFAULTS_MODE.equals(mode))
-            {
-                if (!isSupportingEditDefaultsMode((GenericPortlet) this.portletObject))
-                {
-                    autoSwitchToEditMode = true;
-                }
-            }
-        }
-        
-        if (autoSwitchConfigMode)
-        {
-            try
-            {
-                if (this.customConfigModePortletInstance == null)
-                {
-                    refreshCustomConfigModePortletInstance();
-                }
-                
-                this.customConfigModePortletInstance.render(request, response);
-            }
-            catch (UnavailableException e)
-            {
-                refreshCustomConfigModePortletInstance();
-                this.customConfigModePortletInstance.render(request, response);
-            }
-        }
-        else if (autoSwitchToEditMode)
-        {
-            GenericPortlet genericPortlet = (GenericPortlet) this.portletObject;
-            
-            // Override GenericPortlet#render....
-            WindowState state = request.getWindowState();
-            
-            if (!WindowState.MINIMIZED.equals(state))
-            {
-                String title = genericPortlet.getPortletConfig().getResourceBundle(request.getLocale()).getString("javax.portlet.title");
-                response.setTitle(title);
-                
-                this.portletDoEditMethod.invoke(genericPortlet, new Object [] { request, response });
-            }
-        }
-        else
-        {
-            ((Portlet) this.portletObject).render(request, response);
-        }
-    }
-
-    protected void proxyProcessAction(ActionRequest request, ActionResponse response) throws PortletException, IOException, Exception
-    {
-        PortletMode mode = request.getPortletMode();
-        
-        boolean autoSwitchConfigMode = false;
-        
-        if (this.autoSwitchConfigMode && JetspeedActions.CONFIG_MODE.equals(mode))
-        {
-            autoSwitchConfigMode = true;
-        }
-        
-        if (autoSwitchConfigMode)
-        {
-            try
-            {
-                if (this.customConfigModePortletInstance == null)
-                {
-                    refreshCustomConfigModePortletInstance();
-                }
-                
-                this.customConfigModePortletInstance.processAction(request, response);
-            }
-            catch (UnavailableException e)
-            {
-                refreshCustomConfigModePortletInstance();
-                this.customConfigModePortletInstance.processAction(request, response);
-            }
-        }
-        else
-        {
-            ((Portlet) this.portletObject).processAction(request, response);
-        }
-    }
-    
-    private boolean isSupportingEditDefaultsMode(GenericPortlet portlet)
-    {
-        if (supports == null)
-        {
-            try
-            {
-                InternalPortletConfig config = (InternalPortletConfig) portlet.getPortletConfig();
-                PortletDefinition portletDef = config.getPortletDefinition();
-                this.supports = portletDef.getSupports();
-            }
-            catch (Exception e)
-            {
-            }
-        }
-        
-        if (supports != null)
-        {
-            String pm = JetspeedActions.EDIT_DEFAULTS_MODE.toString();
-            for (Supports s : supports)
-            {
-                if (s.getPortletModes().contains(pm))
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-        
-        return false;
-    }
-       
-    private void refreshCustomConfigModePortletInstance()
-    {
-        try
-        {
-            PortletRegistry registry = (PortletRegistry) Jetspeed.getComponentManager().getComponent("portletRegistry");
-            PortletFactory portletFactory = (PortletFactory) Jetspeed.getComponentManager().getComponent("portletFactory");
-            ServletContext portalAppContext = ((ServletConfig) Jetspeed.getComponentManager().getComponent("ServletConfig")).getServletContext();
-            
-            PortletDefinition portletDef = (PortletDefinition) registry.getPortletDefinitionByUniqueName(this.customConfigModePortletUniqueName);
-            PortletApplication portletApp = (PortletApplication) portletDef.getApplication();
-            String portletAppName = portletApp.getContextRoot();
-            ServletContext portletAppContext = portalAppContext.getContext(portletAppName);
-            
-            setPortletObjectProxied(true);
-            this.customConfigModePortletInstance = portletFactory.getPortletInstance(portletAppContext, portletDef);
-        }
-        catch (Exception e)
-        {
-        }
-        finally
-        {
-            setPortletObjectProxied(false);
-        }
-    }
-    
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.portlet;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.lang.reflect.Modifier;
+import java.util.List;
+
+import java.io.IOException;
+
+import javax.portlet.Portlet;
+import javax.portlet.GenericPortlet;
+import javax.portlet.PortletException;
+import javax.portlet.PortletMode;
+import javax.portlet.WindowState;
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+
+import org.apache.jetspeed.JetspeedActions;
+import org.apache.jetspeed.portlet.SupportsHeaderPhase;
+import org.apache.jetspeed.util.BaseObjectProxy;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.portlet.UnavailableException;
+import org.apache.jetspeed.Jetspeed;
+import org.apache.jetspeed.components.portletregistry.PortletRegistry;
+import org.apache.jetspeed.container.InternalPortletConfig;
+import org.apache.jetspeed.om.portlet.PortletApplication;
+import org.apache.jetspeed.om.portlet.PortletDefinition;
+import org.apache.jetspeed.om.portlet.Supports;
+import org.apache.jetspeed.factory.PortletFactory;
+import org.apache.jetspeed.factory.PortletInstance;
+
+/**
+ * PortletObjectProxy
+ * 
+ * @author <a href="mailto:woonsan@apache.org">Woonsan Ko</a>
+ * @version $Id: PortletObjectProxy.java 516448 2007-03-09 16:25:47Z ate $
+ */
+public class PortletObjectProxy extends BaseObjectProxy
+{
+    
+    private static ThreadLocal tlPortletObjectProxied =
+        new ThreadLocal() {
+            protected synchronized Object initialValue() {
+                return new boolean [] { false };
+            }
+        };
+    
+    public static void setPortletObjectProxied(boolean portletObjectProxied)
+    {
+        ((boolean []) tlPortletObjectProxied.get())[0] = portletObjectProxied;
+    }
+        
+    public static boolean isPortletObjectProxied()
+    {
+        return ((boolean []) tlPortletObjectProxied.get())[0];
+    }
+    
+    private static Method renderMethod;
+    private static Method processActionMethod;
+    
+    static 
+    {
+    	try 
+        {
+            renderMethod = Portlet.class.getMethod("render", new Class [] { RenderRequest.class, RenderResponse.class });
+            processActionMethod = Portlet.class.getMethod("processAction", new Class [] { ActionRequest.class, ActionResponse.class });
+        } 
+        catch (NoSuchMethodException e) 
+        {
+    	    throw new NoSuchMethodError(e.getMessage());
+    	}
+    }
+    
+    private Object portletObject;
+    private PortletInstance customConfigModePortletInstance;
+    private boolean genericPortletInvocable;
+    private Method portletDoEditMethod;
+    private boolean autoSwitchEditDefaultsModeToEditMode;
+    private boolean autoSwitchConfigMode;
+    private String customConfigModePortletUniqueName;
+    private List<Supports> supports;
+    
+    public static Object createProxy(Object proxiedObject, boolean autoSwitchEditDefaultsModeToEditMode, boolean autoSwitchConfigMode, String customConfigModePortletUniqueName)
+    {
+        Class proxiedClass = proxiedObject.getClass();
+        ClassLoader classLoader = proxiedClass.getClassLoader();
+        Class [] proxyInterfaces = null;
+        
+        if (proxiedObject instanceof SupportsHeaderPhase)
+        {
+            proxyInterfaces = new Class [] { Portlet.class, SupportsHeaderPhase.class };
+        }
+        else
+        {
+            proxyInterfaces = new Class [] { Portlet.class };
+        }
+        
+        InvocationHandler handler = new PortletObjectProxy(proxiedObject, autoSwitchEditDefaultsModeToEditMode, autoSwitchConfigMode, customConfigModePortletUniqueName);
+        return Proxy.newProxyInstance(classLoader, proxyInterfaces, handler);
+    }
+
+    private PortletObjectProxy(Object portletObject, boolean autoSwitchEditDefaultsModeToEditMode, boolean autoSwitchConfigMode, String customConfigModePortletUniqueName)
+    {
+        this.portletObject = portletObject;
+        this.autoSwitchEditDefaultsModeToEditMode = autoSwitchEditDefaultsModeToEditMode;
+        this.autoSwitchConfigMode = autoSwitchConfigMode;
+        this.customConfigModePortletUniqueName = customConfigModePortletUniqueName;
+        
+        if (portletObject instanceof GenericPortlet)
+        {
+            try
+            {
+                this.portletDoEditMethod = this.portletObject.getClass().getMethod("doEdit", new Class [] { RenderRequest.class, RenderResponse.class });
+                
+                if (Modifier.isPublic(this.portletDoEditMethod.getModifiers()))
+                {
+                    this.genericPortletInvocable = true;
+                }
+            }
+            catch (NoSuchMethodException e)
+            {
+            }
+        }
+    }
+
+    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable
+    {
+        Object result = null;
+        boolean handledHere = false;
+        Class declaringClass = method.getDeclaringClass();
+        
+        if (declaringClass == Portlet.class)
+        {
+            if (renderMethod.equals(method))
+            {
+                proxyRender((RenderRequest) args[0], (RenderResponse) args[1]);
+                return null;
+            }
+            else if (processActionMethod.equals(method))
+            {
+                proxyProcessAction((ActionRequest) args[0], (ActionResponse) args[1]);
+            }
+            else
+            {
+                result = method.invoke(this.portletObject, args);
+            }
+        }
+        else if (declaringClass == SupportsHeaderPhase.class)
+        {
+            result = method.invoke(this.portletObject, args);
+        }
+        else
+        {
+            result = super.invoke(proxy, method, args);
+        }
+        
+        return result;
+    }
+
+    protected void proxyRender(RenderRequest request, RenderResponse response) throws PortletException, IOException, Exception
+    {
+        PortletMode mode = request.getPortletMode();
+        
+        boolean autoSwitchConfigMode = false;
+        boolean autoSwitchToEditMode = false;
+        
+        if (this.autoSwitchConfigMode && JetspeedActions.CONFIG_MODE.equals(mode))
+        {
+            autoSwitchConfigMode = true;
+        }
+        
+        if (this.autoSwitchEditDefaultsModeToEditMode && this.genericPortletInvocable)
+        {
+            if (JetspeedActions.EDIT_DEFAULTS_MODE.equals(mode))
+            {
+                if (!isSupportingEditDefaultsMode((GenericPortlet) this.portletObject))
+                {
+                    autoSwitchToEditMode = true;
+                }
+            }
+        }
+        
+        if (autoSwitchConfigMode)
+        {
+            try
+            {
+                if (this.customConfigModePortletInstance == null)
+                {
+                    refreshCustomConfigModePortletInstance();
+                }
+                
+                this.customConfigModePortletInstance.render(request, response);
+            }
+            catch (UnavailableException e)
+            {
+                refreshCustomConfigModePortletInstance();
+                this.customConfigModePortletInstance.render(request, response);
+            }
+        }
+        else if (autoSwitchToEditMode)
+        {
+            GenericPortlet genericPortlet = (GenericPortlet) this.portletObject;
+            
+            // Override GenericPortlet#render....
+            WindowState state = request.getWindowState();
+            
+            if (!WindowState.MINIMIZED.equals(state))
+            {
+                String title = genericPortlet.getPortletConfig().getResourceBundle(request.getLocale()).getString("javax.portlet.title");
+                response.setTitle(title);
+                
+                this.portletDoEditMethod.invoke(genericPortlet, new Object [] { request, response });
+            }
+        }
+        else
+        {
+            ((Portlet) this.portletObject).render(request, response);
+        }
+    }
+
+    protected void proxyProcessAction(ActionRequest request, ActionResponse response) throws PortletException, IOException, Exception
+    {
+        PortletMode mode = request.getPortletMode();
+        
+        boolean autoSwitchConfigMode = false;
+        
+        if (this.autoSwitchConfigMode && JetspeedActions.CONFIG_MODE.equals(mode))
+        {
+            autoSwitchConfigMode = true;
+        }
+        
+        if (autoSwitchConfigMode)
+        {
+            try
+            {
+                if (this.customConfigModePortletInstance == null)
+                {
+                    refreshCustomConfigModePortletInstance();
+                }
+                
+                this.customConfigModePortletInstance.processAction(request, response);
+            }
+            catch (UnavailableException e)
+            {
+                refreshCustomConfigModePortletInstance();
+                this.customConfigModePortletInstance.processAction(request, response);
+            }
+        }
+        else
+        {
+            ((Portlet) this.portletObject).processAction(request, response);
+        }
+    }
+    
+    private boolean isSupportingEditDefaultsMode(GenericPortlet portlet)
+    {
+        if (supports == null)
+        {
+            try
+            {
+                InternalPortletConfig config = (InternalPortletConfig) portlet.getPortletConfig();
+                PortletDefinition portletDef = config.getPortletDefinition();
+                this.supports = portletDef.getSupports();
+            }
+            catch (Exception e)
+            {
+            }
+        }
+        
+        if (supports != null)
+        {
+            String pm = JetspeedActions.EDIT_DEFAULTS_MODE.toString();
+            for (Supports s : supports)
+            {
+                if (s.getPortletModes().contains(pm))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+        
+        return false;
+    }
+       
+    private void refreshCustomConfigModePortletInstance()
+    {
+        try
+        {
+            PortletRegistry registry = (PortletRegistry) Jetspeed.getComponentManager().getComponent("portletRegistry");
+            PortletFactory portletFactory = (PortletFactory) Jetspeed.getComponentManager().getComponent("portletFactory");
+            ServletContext portalAppContext = ((ServletConfig) Jetspeed.getComponentManager().getComponent("ServletConfig")).getServletContext();
+            
+            PortletDefinition portletDef = (PortletDefinition) registry.getPortletDefinitionByUniqueName(this.customConfigModePortletUniqueName);
+            PortletApplication portletApp = (PortletApplication) portletDef.getApplication();
+            String portletAppName = portletApp.getContextRoot();
+            ServletContext portletAppContext = portalAppContext.getContext(portletAppName);
+            
+            setPortletObjectProxied(true);
+            this.customConfigModePortletInstance = portletFactory.getPortletInstance(portletAppContext, portletDef);
+        }
+        catch (Exception e)
+        {
+        }
+        finally
+        {
+            setPortletObjectProxied(false);
+        }
+    }
+    
+}

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

Modified: portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/security/JSSubject.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/security/JSSubject.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/security/JSSubject.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/security/JSSubject.java Fri Dec 12 04:06:29 2008
@@ -4,227 +4,227 @@
  * 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.security;
-
-/**
- * Wrapper for the javax.security.auth.Subject class.
- * Due to a design oversight in JAAS 1.0, the javax.security.auth.Subject.getSubject method does not return the Subject 
- * that is associated with the running thread !inside! a java.security.AccessController.doPrivileged code block.
- * As a result, the current subject cannot be determined correctly.
- * This class uses the ThreadLocal mechanism to carry the thread-specific instance of the subject 
- * @author hajo
- *
- */
-
-import javax.security.auth.*;
-import java.security.AccessControlContext;
-import java.security.PrivilegedActionException;
-
-
-
-public class JSSubject implements java.io.Serializable 
-{
-
-    private static final long serialVersionUID = -8308522755600156057L;
-
-    static ThreadLocal threadLocal = 
-        new ThreadLocal();
-    
-    
-    
-    
-
-    /**
-     * Get the <code>Subject</code> associated with the provided
-     * <code>AccessControlContext</code> fromn the current Thread or from the standard SUBJECT mechansim 
-     * <p>
-     *
-     * @param  acc the <code>AccessControlContext</code> from which to retrieve
-     *		the <code>Subject</code>. Only used if current thread doesn't carry subject
-     *
-     * @return  the <code>Subject</code> associated with the provided
-     *		<code>AccessControlContext</code>, or <code>null</code>
-     *		if no <code>Subject</code> is associated
-     *		with the provided <code>AccessControlContext</code>.
-     *
-     * @exception SecurityException if the caller does not have permission
-     *		to get the <code>Subject</code>. <p>
-     *
-     * @exception NullPointerException if the provided
-     *		<code>AccessControlContext</code> is <code>null</code>.
-     */
-    public static Subject getSubject(final AccessControlContext acc) 
-    {
-    	Subject s = null;
-    		try
-    	{
-    		s=  (Subject)threadLocal.get();
-    	}
-    	catch (Exception e)
-    	{}
-    	if (s == null)
-    		return Subject.getSubject(acc);
-    	else
-    		return s;
-    }
-
-    /**
-     * Perform work as a particular <code>Subject</code> after setting subject reference in current thread 
-     *
-     * @param subject the <code>Subject</code> that the specified
-     *			<code>action</code> will run as.  This parameter
-     *			may be <code>null</code>. <p>
-     *
-     * @param action the code to be run as the specified
-     *			<code>Subject</code>. <p>
-     *
-     * @return the <code>Object</code> returned by the PrivilegedAction's
-     *			<code>run</code> method.
-     *
-     * @exception NullPointerException if the <code>PrivilegedAction</code>
-     *			is <code>null</code>. <p>
-     *
-     * @exception SecurityException if the caller does not have permission
-     *			to invoke this method.
-     */
-    public static Object doAs(final Subject subject1,
-			final java.security.PrivilegedAction action) 
-    {
-    	Subject subject = subject1;
-    	if (subject == null)
-    		subject = JSSubject.getSubject(null);
-    	threadLocal.set(subject);
-    	return Subject.doAs(subject,action);	
-    }
-
-    /**
-     * Perform work as a particular <code>Subject</code> after setting subject reference in current thread.
-     *
-     *
-     * @param subject the <code>Subject</code> that the specified
-     *			<code>action</code> will run as.  This parameter
-     *			may be <code>null</code>. <p>
-     *
-     * @param action the code to be run as the specified
-     *			<code>Subject</code>. <p>
-     *
-     * @return the <code>Object</code> returned by the
-     *			PrivilegedExceptionAction's <code>run</code> method.
-     *
-     * @exception PrivilegedActionException if the
-     *			<code>PrivilegedExceptionAction.run</code>
-     *			method throws a checked exception. <p>
-     *
-     * @exception NullPointerException if the specified
-     *			<code>PrivilegedExceptionAction</code> is
-     *			<code>null</code>. <p>
-     *
-     * @exception SecurityException if the caller does not have permission
-     *			to invoke this method.
-     */
-    public static Object doAs(final Subject subject1,
-			final java.security.PrivilegedExceptionAction action)
-			throws java.security.PrivilegedActionException 
-			{
-    	Subject subject = subject1;
-    	if (subject == null)
-    		subject = JSSubject.getSubject(null);
-    	threadLocal.set(subject);
-    	if (subject != null)
-    		return Subject.doAs(subject,action);
-    	else
-    		return Subject.doAs(subject,action);
-			}
-    /**
-     * Perform privileged work as a particular <code>Subject</code> after setting subject reference in current thread.
-     *
-     *
-     * @param subject the <code>Subject</code> that the specified
-     *			<code>action</code> will run as.  This parameter
-     *			may be <code>null</code>. <p>
-     *
-     * @param action the code to be run as the specified
-     *			<code>Subject</code>. <p>
-     *
-     * @param acc the <code>AccessControlContext</code> to be tied to the
-     *			specified <i>subject</i> and <i>action</i>. <p>
-     *
-     * @return the <code>Object</code> returned by the PrivilegedAction's
-     *			<code>run</code> method.
-     *
-     * @exception NullPointerException if the <code>PrivilegedAction</code>
-     *			is <code>null</code>. <p>
-     *
-     * @exception SecurityException if the caller does not have permission
-     *			to invoke this method.
-     */
-    public static Object doAsPrivileged(final Subject subject1,
-			final java.security.PrivilegedAction action,
-			final java.security.AccessControlContext acc) {
-    	Subject subject = subject1;
-    	if (subject == null)
-    		subject = JSSubject.getSubject(acc);
-    	threadLocal.set(subject);
-    	if (subject != null)
-    		return Subject.doAsPrivileged(subject,action,acc);
-    	else
-    		return Subject.doAsPrivileged(subject,action,acc);
-    		
-	}
-
-
-    /**
-     * Perform privileged work as a particular <code>Subject</code> after setting subject reference in current thread.
-     *
-     *
-     * @param subject the <code>Subject</code> that the specified
-     *			<code>action</code> will run as.  This parameter
-     *			may be <code>null</code>. <p>
-     *
-     * @param action the code to be run as the specified
-     *			<code>Subject</code>. <p>
-     *
-     * @param acc the <code>AccessControlContext</code> to be tied to the
-     *			specified <i>subject</i> and <i>action</i>. <p>
-     *
-     * @return the <code>Object</code> returned by the
-     *			PrivilegedExceptionAction's <code>run</code> method.
-     *
-     * @exception PrivilegedActionException if the
-     *			<code>PrivilegedExceptionAction.run</code>
-     *			method throws a checked exception. <p>
-     *
-     * @exception NullPointerException if the specified
-     *			<code>PrivilegedExceptionAction</code> is
-     *			<code>null</code>. <p>
-     *
-     * @exception SecurityException if the caller does not have permission
-     *			to invoke this method.
-     */
-    public static Object doAsPrivileged(final Subject subject,
-			final java.security.PrivilegedExceptionAction action,
-			final java.security.AccessControlContext acc)
-			throws java.security.PrivilegedActionException {
-    	Subject s = subject;
-    	if (s == null)
-    		s = JSSubject.getSubject(acc);
-    	threadLocal.set(s);
-    	if (s != null)
-    		return Subject.doAsPrivileged(s,action,acc);
-    	else
-    		return Subject.doAsPrivileged(s,action,acc);
-
-	}
-
-
-}
+ * 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.security;
+
+/**
+ * Wrapper for the javax.security.auth.Subject class.
+ * Due to a design oversight in JAAS 1.0, the javax.security.auth.Subject.getSubject method does not return the Subject 
+ * that is associated with the running thread !inside! a java.security.AccessController.doPrivileged code block.
+ * As a result, the current subject cannot be determined correctly.
+ * This class uses the ThreadLocal mechanism to carry the thread-specific instance of the subject 
+ * @author hajo
+ *
+ */
+
+import javax.security.auth.*;
+import java.security.AccessControlContext;
+import java.security.PrivilegedActionException;
+
+
+
+public class JSSubject implements java.io.Serializable 
+{
+
+    private static final long serialVersionUID = -8308522755600156057L;
+
+    static ThreadLocal threadLocal = 
+        new ThreadLocal();
+    
+    
+    
+    
+
+    /**
+     * Get the <code>Subject</code> associated with the provided
+     * <code>AccessControlContext</code> fromn the current Thread or from the standard SUBJECT mechansim 
+     * <p>
+     *
+     * @param  acc the <code>AccessControlContext</code> from which to retrieve
+     *		the <code>Subject</code>. Only used if current thread doesn't carry subject
+     *
+     * @return  the <code>Subject</code> associated with the provided
+     *		<code>AccessControlContext</code>, or <code>null</code>
+     *		if no <code>Subject</code> is associated
+     *		with the provided <code>AccessControlContext</code>.
+     *
+     * @exception SecurityException if the caller does not have permission
+     *		to get the <code>Subject</code>. <p>
+     *
+     * @exception NullPointerException if the provided
+     *		<code>AccessControlContext</code> is <code>null</code>.
+     */
+    public static Subject getSubject(final AccessControlContext acc) 
+    {
+    	Subject s = null;
+    		try
+    	{
+    		s=  (Subject)threadLocal.get();
+    	}
+    	catch (Exception e)
+    	{}
+    	if (s == null)
+    		return Subject.getSubject(acc);
+    	else
+    		return s;
+    }
+
+    /**
+     * Perform work as a particular <code>Subject</code> after setting subject reference in current thread 
+     *
+     * @param subject the <code>Subject</code> that the specified
+     *			<code>action</code> will run as.  This parameter
+     *			may be <code>null</code>. <p>
+     *
+     * @param action the code to be run as the specified
+     *			<code>Subject</code>. <p>
+     *
+     * @return the <code>Object</code> returned by the PrivilegedAction's
+     *			<code>run</code> method.
+     *
+     * @exception NullPointerException if the <code>PrivilegedAction</code>
+     *			is <code>null</code>. <p>
+     *
+     * @exception SecurityException if the caller does not have permission
+     *			to invoke this method.
+     */
+    public static Object doAs(final Subject subject1,
+			final java.security.PrivilegedAction action) 
+    {
+    	Subject subject = subject1;
+    	if (subject == null)
+    		subject = JSSubject.getSubject(null);
+    	threadLocal.set(subject);
+    	return Subject.doAs(subject,action);	
+    }
+
+    /**
+     * Perform work as a particular <code>Subject</code> after setting subject reference in current thread.
+     *
+     *
+     * @param subject the <code>Subject</code> that the specified
+     *			<code>action</code> will run as.  This parameter
+     *			may be <code>null</code>. <p>
+     *
+     * @param action the code to be run as the specified
+     *			<code>Subject</code>. <p>
+     *
+     * @return the <code>Object</code> returned by the
+     *			PrivilegedExceptionAction's <code>run</code> method.
+     *
+     * @exception PrivilegedActionException if the
+     *			<code>PrivilegedExceptionAction.run</code>
+     *			method throws a checked exception. <p>
+     *
+     * @exception NullPointerException if the specified
+     *			<code>PrivilegedExceptionAction</code> is
+     *			<code>null</code>. <p>
+     *
+     * @exception SecurityException if the caller does not have permission
+     *			to invoke this method.
+     */
+    public static Object doAs(final Subject subject1,
+			final java.security.PrivilegedExceptionAction action)
+			throws java.security.PrivilegedActionException 
+			{
+    	Subject subject = subject1;
+    	if (subject == null)
+    		subject = JSSubject.getSubject(null);
+    	threadLocal.set(subject);
+    	if (subject != null)
+    		return Subject.doAs(subject,action);
+    	else
+    		return Subject.doAs(subject,action);
+			}
+    /**
+     * Perform privileged work as a particular <code>Subject</code> after setting subject reference in current thread.
+     *
+     *
+     * @param subject the <code>Subject</code> that the specified
+     *			<code>action</code> will run as.  This parameter
+     *			may be <code>null</code>. <p>
+     *
+     * @param action the code to be run as the specified
+     *			<code>Subject</code>. <p>
+     *
+     * @param acc the <code>AccessControlContext</code> to be tied to the
+     *			specified <i>subject</i> and <i>action</i>. <p>
+     *
+     * @return the <code>Object</code> returned by the PrivilegedAction's
+     *			<code>run</code> method.
+     *
+     * @exception NullPointerException if the <code>PrivilegedAction</code>
+     *			is <code>null</code>. <p>
+     *
+     * @exception SecurityException if the caller does not have permission
+     *			to invoke this method.
+     */
+    public static Object doAsPrivileged(final Subject subject1,
+			final java.security.PrivilegedAction action,
+			final java.security.AccessControlContext acc) {
+    	Subject subject = subject1;
+    	if (subject == null)
+    		subject = JSSubject.getSubject(acc);
+    	threadLocal.set(subject);
+    	if (subject != null)
+    		return Subject.doAsPrivileged(subject,action,acc);
+    	else
+    		return Subject.doAsPrivileged(subject,action,acc);
+    		
+	}
+
+
+    /**
+     * Perform privileged work as a particular <code>Subject</code> after setting subject reference in current thread.
+     *
+     *
+     * @param subject the <code>Subject</code> that the specified
+     *			<code>action</code> will run as.  This parameter
+     *			may be <code>null</code>. <p>
+     *
+     * @param action the code to be run as the specified
+     *			<code>Subject</code>. <p>
+     *
+     * @param acc the <code>AccessControlContext</code> to be tied to the
+     *			specified <i>subject</i> and <i>action</i>. <p>
+     *
+     * @return the <code>Object</code> returned by the
+     *			PrivilegedExceptionAction's <code>run</code> method.
+     *
+     * @exception PrivilegedActionException if the
+     *			<code>PrivilegedExceptionAction.run</code>
+     *			method throws a checked exception. <p>
+     *
+     * @exception NullPointerException if the specified
+     *			<code>PrivilegedExceptionAction</code> is
+     *			<code>null</code>. <p>
+     *
+     * @exception SecurityException if the caller does not have permission
+     *			to invoke this method.
+     */
+    public static Object doAsPrivileged(final Subject subject,
+			final java.security.PrivilegedExceptionAction action,
+			final java.security.AccessControlContext acc)
+			throws java.security.PrivilegedActionException {
+    	Subject s = subject;
+    	if (s == null)
+    		s = JSSubject.getSubject(acc);
+    	threadLocal.set(s);
+    	if (s != null)
+    		return Subject.doAsPrivileged(s,action,acc);
+    	else
+    		return Subject.doAsPrivileged(s,action,acc);
+
+	}
+
+
+}

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/security/JSSubject.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/security/PrincipalsSet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/security/PrincipalsSet.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/security/PrincipalsSet.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/security/PrincipalsSet.java Fri Dec 12 04:06:29 2008
@@ -14,8 +14,8 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.jetspeed.security;
-
+package org.apache.jetspeed.security;
+
 import java.security.Principal;
 import java.util.Collection;
 import java.util.HashSet;
@@ -23,49 +23,49 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
-
-
-/**
- * PrincipalsSet - provides an ordered 'set' of principals required
- * for some profiling rules that are dependent on order of insert.
- * 
- * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
- * @version $Id$
- */
-
-public class PrincipalsSet implements Set<Principal>
-{
-    List<Principal> principals = new LinkedList<Principal>();
-    Set<Principal> set = new HashSet<Principal>();
-
-    public PrincipalsSet()
-    {}
-    
-    /* (non-Javadoc)
-     * @see java.util.Collection#size()
-     */
-    public int size()
-    {
-        return principals.size();
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.Collection#clear()
-     */
-    public void clear()
-    {
-        set.clear();
-        principals.clear();
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.Collection#isEmpty()
-     */
-    public boolean isEmpty()
-    {
-        return principals.isEmpty();
-    }
-
+
+
+/**
+ * PrincipalsSet - provides an ordered 'set' of principals required
+ * for some profiling rules that are dependent on order of insert.
+ * 
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+ * @version $Id$
+ */
+
+public class PrincipalsSet implements Set<Principal>
+{
+    List<Principal> principals = new LinkedList<Principal>();
+    Set<Principal> set = new HashSet<Principal>();
+
+    public PrincipalsSet()
+    {}
+    
+    /* (non-Javadoc)
+     * @see java.util.Collection#size()
+     */
+    public int size()
+    {
+        return principals.size();
+    }
+
+    /* (non-Javadoc)
+     * @see java.util.Collection#clear()
+     */
+    public void clear()
+    {
+        set.clear();
+        principals.clear();
+    }
+
+    /* (non-Javadoc)
+     * @see java.util.Collection#isEmpty()
+     */
+    public boolean isEmpty()
+    {
+        return principals.isEmpty();
+    }
+
     public <T> T[] toArray(T[] a)
     {
         return principals.toArray(a);
@@ -76,68 +76,68 @@
         return principals.toArray();
     }
     
-    /* (non-Javadoc)
-     * @see java.util.Collection#add(java.lang.Object)
-     */
-    public boolean add(Principal o)
-    {
-        if (set.add(o))
-        {
-            principals.add(o);
-            return true;
-        }
-        return false;
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.Collection#contains(java.lang.Object)
-     */
-    public boolean contains(Object o)
-    {
-        return set.contains(o);
-    }
-    
-    /* (non-Javadoc)
-     * @see java.util.Collection#remove(java.lang.Object)
-     */
-    public boolean remove(Object o)
-    {
-        set.remove(o);
-        return principals.remove(o);
-    }
-    
-    /* (non-Javadoc)
-     * @see java.util.Collection#containsAll(java.util.Collection)
-     */
-    public boolean containsAll(Collection<?> c)
-    {
-        return set.containsAll(c);
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.Collection#removeAll(java.util.Collection)
-     */
-    public boolean removeAll(Collection<?> c)
-    {
-        set.removeAll(c);
-        return principals.removeAll(c);
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.Collection#retainAll(java.util.Collection)
-     */
-    public boolean retainAll(Collection<?> c)
-    {
-        set.retainAll(c);
-        return principals.retainAll(c);
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.Collection#iterator()
-     */
-    public Iterator<Principal> iterator()
-    {
-        return principals.iterator();
+    /* (non-Javadoc)
+     * @see java.util.Collection#add(java.lang.Object)
+     */
+    public boolean add(Principal o)
+    {
+        if (set.add(o))
+        {
+            principals.add(o);
+            return true;
+        }
+        return false;
+    }
+
+    /* (non-Javadoc)
+     * @see java.util.Collection#contains(java.lang.Object)
+     */
+    public boolean contains(Object o)
+    {
+        return set.contains(o);
+    }
+    
+    /* (non-Javadoc)
+     * @see java.util.Collection#remove(java.lang.Object)
+     */
+    public boolean remove(Object o)
+    {
+        set.remove(o);
+        return principals.remove(o);
+    }
+    
+    /* (non-Javadoc)
+     * @see java.util.Collection#containsAll(java.util.Collection)
+     */
+    public boolean containsAll(Collection<?> c)
+    {
+        return set.containsAll(c);
+    }
+
+    /* (non-Javadoc)
+     * @see java.util.Collection#removeAll(java.util.Collection)
+     */
+    public boolean removeAll(Collection<?> c)
+    {
+        set.removeAll(c);
+        return principals.removeAll(c);
+    }
+
+    /* (non-Javadoc)
+     * @see java.util.Collection#retainAll(java.util.Collection)
+     */
+    public boolean retainAll(Collection<?> c)
+    {
+        set.retainAll(c);
+        return principals.retainAll(c);
+    }
+
+    /* (non-Javadoc)
+     * @see java.util.Collection#iterator()
+     */
+    public Iterator<Principal> iterator()
+    {
+        return principals.iterator();
     }
 
     public boolean addAll(Collection<? extends Principal> c)
@@ -146,4 +146,4 @@
         return principals.addAll(c);
     }
 
-}
+}

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/security/PrincipalsSet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/util/BaseObjectProxy.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/util/BaseObjectProxy.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/util/BaseObjectProxy.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/util/BaseObjectProxy.java Fri Dec 12 04:06:29 2008
@@ -1,96 +1,96 @@
-/*
- * 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.util;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-
-/**
- * BaseObjectProxy
- * 
- * @author <a href="mailto:woonsan@apache.org">Woonsan Ko</a>
- * @version $Id: BaseObjectProxy.java 516448 2007-03-09 16:25:47Z ate $
- */
-public class BaseObjectProxy implements InvocationHandler 
-{
-
-    protected static Method hashCodeMethod;
-    protected static Method equalsMethod;
-    protected static Method toStringMethod;
-    
-    static 
-    {
-    	try 
-        {
-    	    hashCodeMethod = Object.class.getMethod("hashCode", (Class [])null);
-    	    equalsMethod = Object.class.getMethod("equals", new Class [] { Object.class });
-    	    toStringMethod = Object.class.getMethod("toString", (Class [])null);
-        } 
-        catch (NoSuchMethodException e) 
-        {
-    	    throw new NoSuchMethodError(e.getMessage());
-    	}
-    }
-    
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable
-    {
-        Object result = null;
-    	Class declaringClass = method.getDeclaringClass();
-
-    	if (declaringClass == Object.class) 
-        {
-    	    if (hashCodeMethod.equals(method)) 
-            {
-                result = proxyHashCode(proxy);
-    	    } 
-            else if (equalsMethod.equals(method)) 
-            {
-                result = proxyEquals(proxy, args[0]);
-    	    } 
-            else if (toStringMethod.equals(method)) 
-            {
-                result = proxyToString(proxy);
-    	    } 
-            else 
-            {
-                throw new InternalError("unexpected Object method dispatched: " + method);
-    	    }
-    	}
-        else
-        {
-            throw new InternalError("unexpected Object method dispatched: " + method);
-        }
-        
-        return result;
-    }
-    
-    protected Integer proxyHashCode(Object proxy) 
-    {
-    	return new Integer(System.identityHashCode(proxy));
-    }
-
-    protected Boolean proxyEquals(Object proxy, Object other) 
-    {
-    	return (proxy == other ? Boolean.TRUE : Boolean.FALSE);
-    }
-
-    protected String proxyToString(Object proxy) 
-    {
-    	return proxy.getClass().getName() + '@' + Integer.toHexString(proxy.hashCode());
-    }
-
-}
+/*
+ * 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.util;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+
+/**
+ * BaseObjectProxy
+ * 
+ * @author <a href="mailto:woonsan@apache.org">Woonsan Ko</a>
+ * @version $Id: BaseObjectProxy.java 516448 2007-03-09 16:25:47Z ate $
+ */
+public class BaseObjectProxy implements InvocationHandler 
+{
+
+    protected static Method hashCodeMethod;
+    protected static Method equalsMethod;
+    protected static Method toStringMethod;
+    
+    static 
+    {
+    	try 
+        {
+    	    hashCodeMethod = Object.class.getMethod("hashCode", (Class [])null);
+    	    equalsMethod = Object.class.getMethod("equals", new Class [] { Object.class });
+    	    toStringMethod = Object.class.getMethod("toString", (Class [])null);
+        } 
+        catch (NoSuchMethodException e) 
+        {
+    	    throw new NoSuchMethodError(e.getMessage());
+    	}
+    }
+    
+    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable
+    {
+        Object result = null;
+    	Class declaringClass = method.getDeclaringClass();
+
+    	if (declaringClass == Object.class) 
+        {
+    	    if (hashCodeMethod.equals(method)) 
+            {
+                result = proxyHashCode(proxy);
+    	    } 
+            else if (equalsMethod.equals(method)) 
+            {
+                result = proxyEquals(proxy, args[0]);
+    	    } 
+            else if (toStringMethod.equals(method)) 
+            {
+                result = proxyToString(proxy);
+    	    } 
+            else 
+            {
+                throw new InternalError("unexpected Object method dispatched: " + method);
+    	    }
+    	}
+        else
+        {
+            throw new InternalError("unexpected Object method dispatched: " + method);
+        }
+        
+        return result;
+    }
+    
+    protected Integer proxyHashCode(Object proxy) 
+    {
+    	return new Integer(System.identityHashCode(proxy));
+    }
+
+    protected Boolean proxyEquals(Object proxy, Object other) 
+    {
+    	return (proxy == other ? Boolean.TRUE : Boolean.FALSE);
+    }
+
+    protected String proxyToString(Object proxy) 
+    {
+    	return proxy.getClass().getName() + '@' + Integer.toHexString(proxy.hashCode());
+    }
+
+}

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/util/BaseObjectProxy.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/util/JetspeedLongObjectID.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/build.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/webapps/ROOT/index.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-mvn-settings-sample.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/administration.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/aggregation.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/ajax-layout.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/debug/Log4j.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/debug/Log4j.properties?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/debug/Log4j.properties (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/debug/Log4j.properties Fri Dec 12 04:06:29 2008
@@ -1,179 +1,179 @@
-# 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.
-
-# ------------------------------------------------------------------------
-#
-# Logging Configuration
-#
-# $Id$
-#
-# ------------------------------------------------------------------------
-
-#
-# If we don't know the logging facility, put it into the jetspeed.log
-# 
-#
-log4j.rootLogger = ERROR, console
-
-#
-# org.apache.portals.tutorials goes into Jetspeed Log
-#
-log4j.category.org.apache.portals.tutorials = ERROR, console
-log4j.additivity.org.apache.portals.tutorials = false
-
-log4j.category.com.fmr = DEBUG, console
-log4j.additivity.com.fmr = false
-
-#
-# Jetspeed goes into Jetspeed Log
-#
-log4j.category.org.apache.jetspeed = ERROR, console
-log4j.additivity.org.apache.jetspeed = false
-
-
-log4j.category.org.apache.jetspeed.tools = ERROR, console
-log4j.additivity.org.apache.jetspeed.tools = false
-
-log4j.category.org.apache.commons.digester = ERROR, console
-log4j.additivity.org.apache.commons.digester = false
-
-
-#
-# Velocity Logfile
-#
-log4j.category.velocity = ERROR, console
-log4j.additivity.velocity = false
-
-#
-# OJB Logfile
-#
-log4j.category.org.apache.ojb= ERROR, console
-log4j.additivity.org.apache.ojb= false
-
-#
-# Scheduler Category
-#
-log4j.category.scheduler = ERROR, console
-log4j.additivity.scheduler = false
-
-#
-# Pluto Category
-#
-log4j.category.org.apache.pluto = ERROR, PLUTO, console
-log4j.additivity.org.apache.pluto = false
-
-#
-# Deployment Category
-#
-log4j.category.deployment = ERROR, DEPLOYMENT, console
-log4j.additivity.deployment = false
-
-
-#
-# Console Category
-#
-log4j.category.console = ERROR, console
-log4j.additivity.console = false
-
-
-#
-# Logfile definitions
-#
-
-#
-# jetspeed.log
-#
-log4j.appender.jetspeed = org.apache.log4j.FileAppender
-log4j.appender.jetspeed.file = ${applicationRoot}/logs/jetspeed.log
-log4j.appender.jetspeed.layout = org.apache.log4j.PatternLayout
-log4j.appender.jetspeed.layout.conversionPattern = %d [%t] %-5p %c - %m%n
-log4j.appender.jetspeed.append = false
-
-log4j.appender.digester = org.apache.log4j.FileAppender
-log4j.appender.digester.file = ${applicationRoot}/logs/digester.log
-log4j.appender.digester.layout = org.apache.log4j.PatternLayout
-log4j.appender.digester.layout.conversionPattern = %d [%t] %-5p %c - %m%n
-log4j.appender.digester.append = false
-
-#
-# pluto.log
-#
-log4j.appender.PLUTO = org.apache.log4j.FileAppender
-log4j.appender.PLUTO.file = ${applicationRoot}/logs/pluto.log
-log4j.appender.PLUTO.layout = org.apache.log4j.PatternLayout
-log4j.appender.PLUTO.layout.conversionPattern = %d [%t] %-5p %c - %m%n
-log4j.appender.PLUTO.append = false
-
-#
-# deployment.log
-#
-log4j.appender.DEPLOYMENT = org.apache.log4j.FileAppender
-log4j.appender.DEPLOYMENT.file = ${applicationRoot}/logs/deployment.log
-log4j.appender.DEPLOYMENT.layout = org.apache.log4j.PatternLayout
-log4j.appender.DEPLOYMENT.layout.conversionPattern = %d [%t] %-5p %c - %m%n
-log4j.appender.DEPLOYMENT.append = false
-
-#
-# Scheduler Output
-#
-log4j.appender.scheduler = org.apache.log4j.FileAppender
-log4j.appender.scheduler.file = ${applicationRoot}/logs/scheduler.log
-log4j.appender.scheduler.layout = org.apache.log4j.PatternLayout
-log4j.appender.scheduler.layout.conversionPattern = %d [%t] %-5p %c - %m%n
-log4j.appender.scheduler.append = false
-
-#
-# Velocity gets configured to write its output onto the velocity
-# category.
-#
-log4j.appender.velocity = org.apache.log4j.FileAppender
-log4j.appender.velocity.file = ${applicationRoot}/logs/velocity.log
-log4j.appender.velocity.layout = org.apache.log4j.PatternLayout
-log4j.appender.velocity.layout.conversionPattern = %d [%t] %-5p %c - %m%n
-log4j.appender.velocity.append = false
-
-
-log4j.appender.ojb = org.apache.log4j.FileAppender
-log4j.appender.ojb.file = ${applicationRoot}/logs/ojb.log
-log4j.appender.ojb.layout = org.apache.log4j.PatternLayout
-log4j.appender.ojb.layout.conversionPattern = %d [%t] %-5p %c - %m%n
-log4j.appender.ojb.append = false
-
-#
-# Console
-#
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-
-# Pattern to output the caller's file name and line number.
-log4j.appender.console.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
-
-# David's recommendation for the debug datasource wrapper
-
-log4j.category.org.apache.jetspeed.ds.statistics = DEBUG, dss
-log4j.additivity.org.apache.jetspeed.ds.statistics = false
-log4j.appender.dss = org.apache.log4j.FileAppender
-log4j.appender.dss.file = ${applicationRoot}/logs/ds-statistics.log
-log4j.appender.dss.layout = org.apache.log4j.PatternLayout
-log4j.appender.dss.layout.conversionPattern = %d [%t] %-5p %c - %m%n
-log4j.appender.dss.append = false
-
-log4j.category.org.apache.jetspeed.ds.connections = DEBUG, dsc
-log4j.additivity.org.apache.jetspeed.ds.connections = false
-log4j.appender.dsc = org.apache.log4j.FileAppender
-log4j.appender.dsc.file = ${applicationRoot}/logs/ds-connections.log
-log4j.appender.dsc.layout = org.apache.log4j.PatternLayout
-log4j.appender.dsc.layout.conversionPattern = %d [%t] %-5p %c - %m%n
-log4j.appender.dsc.append = false
+# 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.
+
+# ------------------------------------------------------------------------
+#
+# Logging Configuration
+#
+# $Id$
+#
+# ------------------------------------------------------------------------
+
+#
+# If we don't know the logging facility, put it into the jetspeed.log
+# 
+#
+log4j.rootLogger = ERROR, console
+
+#
+# org.apache.portals.tutorials goes into Jetspeed Log
+#
+log4j.category.org.apache.portals.tutorials = ERROR, console
+log4j.additivity.org.apache.portals.tutorials = false
+
+log4j.category.com.fmr = DEBUG, console
+log4j.additivity.com.fmr = false
+
+#
+# Jetspeed goes into Jetspeed Log
+#
+log4j.category.org.apache.jetspeed = ERROR, console
+log4j.additivity.org.apache.jetspeed = false
+
+
+log4j.category.org.apache.jetspeed.tools = ERROR, console
+log4j.additivity.org.apache.jetspeed.tools = false
+
+log4j.category.org.apache.commons.digester = ERROR, console
+log4j.additivity.org.apache.commons.digester = false
+
+
+#
+# Velocity Logfile
+#
+log4j.category.velocity = ERROR, console
+log4j.additivity.velocity = false
+
+#
+# OJB Logfile
+#
+log4j.category.org.apache.ojb= ERROR, console
+log4j.additivity.org.apache.ojb= false
+
+#
+# Scheduler Category
+#
+log4j.category.scheduler = ERROR, console
+log4j.additivity.scheduler = false
+
+#
+# Pluto Category
+#
+log4j.category.org.apache.pluto = ERROR, PLUTO, console
+log4j.additivity.org.apache.pluto = false
+
+#
+# Deployment Category
+#
+log4j.category.deployment = ERROR, DEPLOYMENT, console
+log4j.additivity.deployment = false
+
+
+#
+# Console Category
+#
+log4j.category.console = ERROR, console
+log4j.additivity.console = false
+
+
+#
+# Logfile definitions
+#
+
+#
+# jetspeed.log
+#
+log4j.appender.jetspeed = org.apache.log4j.FileAppender
+log4j.appender.jetspeed.file = ${applicationRoot}/logs/jetspeed.log
+log4j.appender.jetspeed.layout = org.apache.log4j.PatternLayout
+log4j.appender.jetspeed.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.jetspeed.append = false
+
+log4j.appender.digester = org.apache.log4j.FileAppender
+log4j.appender.digester.file = ${applicationRoot}/logs/digester.log
+log4j.appender.digester.layout = org.apache.log4j.PatternLayout
+log4j.appender.digester.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.digester.append = false
+
+#
+# pluto.log
+#
+log4j.appender.PLUTO = org.apache.log4j.FileAppender
+log4j.appender.PLUTO.file = ${applicationRoot}/logs/pluto.log
+log4j.appender.PLUTO.layout = org.apache.log4j.PatternLayout
+log4j.appender.PLUTO.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.PLUTO.append = false
+
+#
+# deployment.log
+#
+log4j.appender.DEPLOYMENT = org.apache.log4j.FileAppender
+log4j.appender.DEPLOYMENT.file = ${applicationRoot}/logs/deployment.log
+log4j.appender.DEPLOYMENT.layout = org.apache.log4j.PatternLayout
+log4j.appender.DEPLOYMENT.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.DEPLOYMENT.append = false
+
+#
+# Scheduler Output
+#
+log4j.appender.scheduler = org.apache.log4j.FileAppender
+log4j.appender.scheduler.file = ${applicationRoot}/logs/scheduler.log
+log4j.appender.scheduler.layout = org.apache.log4j.PatternLayout
+log4j.appender.scheduler.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.scheduler.append = false
+
+#
+# Velocity gets configured to write its output onto the velocity
+# category.
+#
+log4j.appender.velocity = org.apache.log4j.FileAppender
+log4j.appender.velocity.file = ${applicationRoot}/logs/velocity.log
+log4j.appender.velocity.layout = org.apache.log4j.PatternLayout
+log4j.appender.velocity.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.velocity.append = false
+
+
+log4j.appender.ojb = org.apache.log4j.FileAppender
+log4j.appender.ojb.file = ${applicationRoot}/logs/ojb.log
+log4j.appender.ojb.layout = org.apache.log4j.PatternLayout
+log4j.appender.ojb.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.ojb.append = false
+
+#
+# Console
+#
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+
+# Pattern to output the caller's file name and line number.
+log4j.appender.console.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
+
+# David's recommendation for the debug datasource wrapper
+
+log4j.category.org.apache.jetspeed.ds.statistics = DEBUG, dss
+log4j.additivity.org.apache.jetspeed.ds.statistics = false
+log4j.appender.dss = org.apache.log4j.FileAppender
+log4j.appender.dss.file = ${applicationRoot}/logs/ds-statistics.log
+log4j.appender.dss.layout = org.apache.log4j.PatternLayout
+log4j.appender.dss.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.dss.append = false
+
+log4j.category.org.apache.jetspeed.ds.connections = DEBUG, dsc
+log4j.additivity.org.apache.jetspeed.ds.connections = false
+log4j.appender.dsc = org.apache.log4j.FileAppender
+log4j.appender.dsc.file = ${applicationRoot}/logs/ds-connections.log
+log4j.appender.dsc.layout = org.apache.log4j.PatternLayout
+log4j.appender.dsc.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.dsc.append = false

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/debug/Log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/debug/datasource.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/extended-pipelines.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/request-context.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/shibboleth.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/deployment.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/jetspeed-services.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/cache.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/cluster-node.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/desktop.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/headtag.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/importer-page-manager.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-production.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/multiple-action.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/request-context-objects.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/servlet-api.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/statistics.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/theme-engine.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/wps.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed-production.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed-production.properties?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed-production.properties (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed-production.properties Fri Dec 12 04:06:29 2008
@@ -13,14 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#
-# Properties that can be configured at runtime by system administrator
-# (example values)
-
-# Portal URL Override
-# useful for hard-coding portal URL in proxied host environments
-portal.url.scheme = http
-portal.url.name = 127.0.0.1
-portal.url.port = 8080
-portal.url.secure = false
-
+#
+# Properties that can be configured at runtime by system administrator
+# (example values)
+
+# Portal URL Override
+# useful for hard-coding portal URL in proxied host environments
+portal.url.scheme = http
+portal.url.name = 127.0.0.1
+portal.url.port = 8080
+portal.url.secure = false
+

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed-production.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/db-ojb/distributed-ehcache.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/db-ojb/ehcache.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/seed/j2-seed.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/seed/min/j2-seed.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/META-INF/maven/archetype.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml Fri Dec 12 04:06:29 2008
@@ -1,41 +1,41 @@
-#set($dollar = '$')
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>2.0.9</maven>
-  </prerequisites>
-
-  <artifactId>${artifactId}</artifactId>
-  <name>My Portal</name>
-  <parent>
-    <groupId>${groupId}</groupId>
-    <artifactId>${rootArtifactId}</artifactId>
-    <version>${version}</version>
-  </parent>
-
-  <packaging>war</packaging>
-  <dependencies>
-    <!-- jetspeed compile time dependencies -->
+#set($dollar = '$')
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <prerequisites>
+    <maven>2.0.9</maven>
+  </prerequisites>
+
+  <artifactId>${artifactId}</artifactId>
+  <name>My Portal</name>
+  <parent>
+    <groupId>${groupId}</groupId>
+    <artifactId>${rootArtifactId}</artifactId>
+    <version>${version}</version>
+  </parent>
+
+  <packaging>war</packaging>
+  <dependencies>
+    <!-- jetspeed compile time dependencies -->
     <!--
     <dependency>
       <groupId>org.apache.portals.jetspeed-2</groupId>
@@ -48,69 +48,69 @@
       <artifactId>jetspeed-portal</artifactId>
       <version>${dollar}{org.apache.portals.jetspeed.version}</version>
     </dependency>
-    -->
-    <!-- jetspeed war dependencies -->
-    <dependency>
-      <groupId>org.apache.portals.jetspeed-2</groupId>
-      <artifactId>jetspeed-dependencies</artifactId>
-      <version>${dollar}{org.apache.portals.jetspeed.version}</version>
-      <type>pom</type>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.portals.jetspeed-2</groupId>
-      <artifactId>jetspeed</artifactId>
-      <version>${dollar}{org.apache.portals.jetspeed.version}</version>
-      <type>war</type>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.pluto</groupId>
-      <artifactId>pluto-container-api</artifactId>
-      <version>${dollar}{org.apache.pluto.version}</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
+    -->
+    <!-- jetspeed war dependencies -->
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed-dependencies</artifactId>
+      <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+      <type>pom</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed</artifactId>
+      <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+      <type>war</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.pluto</groupId>
+      <artifactId>pluto-container-api</artifactId>
+      <version>${dollar}{org.apache.pluto.version}</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.portals.jetspeed-2</groupId>
-        <artifactId>jetspeed-deploy-maven-plugin</artifactId>
-        <version>${dollar}{org.apache.portals.jetspeed.version}</version>
-        <executions>
-          <execution>
-            <id>deploy-jetspeed-layouts</id>
-            <goals>
-              <goal>deploy</goal>
-            </goals>
-            <phase>process-resources</phase>
-            <configuration>
-              <targetBaseDir>${dollar}{project.build.directory}/${dollar}{project.build.finalName}</targetBaseDir>
-              <destinations>
-                <local>WEB-INF/deploy/local</local>
-              </destinations>
-              <deployments>
-                <deployment>
-                  <artifact>org.apache.portals.jetspeed-2:jetspeed-layouts:war</artifact>
-                  <destination>local</destination>
-                </deployment>
-              </deployments>
-            </configuration>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.portals.jetspeed-2</groupId>
-            <artifactId>jetspeed-layouts</artifactId>
-            <version>${dollar}{org.apache.portals.jetspeed.version}</version>
-            <type>war</type>
-          </dependency>
-        </dependencies>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-        <configuration>
-          <warName>${dollar}{pom.artifactId}</warName>
+      <plugin>
+        <groupId>org.apache.portals.jetspeed-2</groupId>
+        <artifactId>jetspeed-deploy-maven-plugin</artifactId>
+        <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+        <executions>
+          <execution>
+            <id>deploy-jetspeed-layouts</id>
+            <goals>
+              <goal>deploy</goal>
+            </goals>
+            <phase>process-resources</phase>
+            <configuration>
+              <targetBaseDir>${dollar}{project.build.directory}/${dollar}{project.build.finalName}</targetBaseDir>
+              <destinations>
+                <local>WEB-INF/deploy/local</local>
+              </destinations>
+              <deployments>
+                <deployment>
+                  <artifact>org.apache.portals.jetspeed-2:jetspeed-layouts:war</artifact>
+                  <destination>local</destination>
+                </deployment>
+              </deployments>
+            </configuration>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.portals.jetspeed-2</groupId>
+            <artifactId>jetspeed-layouts</artifactId>
+            <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+            <type>war</type>
+          </dependency>
+        </dependencies>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <warName>${dollar}{pom.artifactId}</warName>
           <!--<overlays>
             <overlay>
               <id>jetspeed1</id>
@@ -136,10 +136,10 @@
                 <exclude>WEB-INF/min-pages/**</exclude>
               </excludes>
             </overlay>
-          </overlays>-->
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
+          </overlays>-->
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

Propchange: portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml
------------------------------------------------------------------------------
    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