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 [24/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
Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletpreferences/DatabasePreference.java
------------------------------------------------------------------------------
    svn:eol-style = native

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

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

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

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

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

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

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

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

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

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

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

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

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/CustomPortletModeImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/CustomWindowStateImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PreferenceImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PreferencesImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/CSVtoCollectionFieldConversion.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/CSVtoCollectionFieldConversion.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/CSVtoCollectionFieldConversion.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/CSVtoCollectionFieldConversion.java Fri Dec 12 04:06:29 2008
@@ -1,156 +1,156 @@
-/*
+/*
  * 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.ojb;
-
-import java.io.IOException;
-import java.io.StreamTokenizer;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ojb.broker.accesslayer.conversions.ConversionException;
-import org.apache.ojb.broker.accesslayer.conversions.FieldConversion;
-
-/**
- * <p style="font-weight: bold">
- * ObjectRelationalBridge field conversion.
- * </p>
- * Converts from a comma-delimited field to a <code>java.util.collection</code>
- * 
- * @author <a href="mailto:weaver@apache.org">Scott T. Weaver</a>
- */
-public class CSVtoCollectionFieldConversion implements FieldConversion
-{
-    private static final String DELIM = ",";
-    private static final String QUOTE = "\"";
-    
-    private static final Log log = LogFactory.getLog(CSVtoCollectionFieldConversion.class);
-    
-    /**
-     * @see org.apache.ojb.broker.accesslayer.conversions.FieldConversion#javaToSql(java.lang.Object)
-     * @task Fix JDK 1.3 complient problem described in the FIXME
-     */
-    public Object javaToSql(Object arg0) throws ConversionException
-    {
-        if (arg0 instanceof Collection)
-        {
-            Collection col = ((Collection) arg0);
-            if (col.size() == 0)
-            {
-                return "";
-            }
-
-            Iterator itr = col.iterator();
-            // Estimate that the average word is going to be 5 characters long
-            StringBuffer buffer = new StringBuffer((col.size() * 5));
-            while (itr.hasNext())
-            {
-                buffer.append(QUOTE);
-                String value = getNext(itr);
-
-                // FIXME: The following is not JDK1.3 complient. So I implement a warning 
-                //        message as a workaround until this field conversion is no longer
-                //        need and delete, or the code is made JDK 1.3 complient. (Paul Spencer)
-
-                // buffer.append(value.replaceAll("\"","\\\\\""));
-                if(value != null && value.toString().indexOf("\"") >= 0)
-                {
-                //  FieldConversionLog.LOG.error("The string '" + value + 
-                // "' contains embeded '\"'.  It will not be converted to a CSV correctly.");
-                  log.warn("In CSVtoCollectionFieldConversion() - The string '" + value + 
-                        "' contains embeded '\"'.  It will not be converted to a CSV correctly.");
-                }
-                buffer.append(value);
-                // End of FIXME:
-                buffer.append(QUOTE);
-                
-                if (itr.hasNext())
-                {
-                    buffer.append(DELIM);
-                }
-            }
-
-            return buffer.toString();
-        }
-        return arg0;
-    }
-
-    /**
-     * @see org.apache.ojb.broker.accesslayer.conversions.FieldConversion#sqlToJava(java.lang.Object)
-     */
-    public Object sqlToJava(Object arg0) throws ConversionException
-    {
-
-        if (arg0 instanceof String)
-        {
-            StringReader sr = new StringReader((String) arg0);
-            StreamTokenizer st = new StreamTokenizer(sr);
-            st.resetSyntax();
-            st.whitespaceChars(',', ',');
-            st.quoteChar('"');
-            st.eolIsSignificant(false);
-
-         
-            ArrayList list = new ArrayList();
-            try
-            {
-                while (st.nextToken() != StreamTokenizer.TT_EOF)
-                {
-                    list.add(createObject(st.sval));
-                }
-            }
-            catch (IOException e)
-            {
-                String message = "CSV parsing failed during field conversion.";
-                log.error(message, e);
-                throw new ConversionException("CSV parsing failed during field conversion.", e);
-            } 
-
-            return list;
-        }
-
-        return arg0;
-    }
-
-    /**
-     * Makes creation of objects created via csv fields extensible
-     * By default simply return the string value.
-     * 
-     * @param name The string value
-     * @return The string value
-     */
-    protected Object createObject(String name)
-    {
-        return name;
-    }
-
-    /**
-     * Makes getting objects via csv fields extensible
-     * By default simply return the string value.
-     * 
-     * @param name The string value
-     * @return The string value
-     */
-    protected String getNext(Iterator iterator)
-    {
-        return (String) iterator.next();
-    }
-
-}
+ * 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.ojb;
+
+import java.io.IOException;
+import java.io.StreamTokenizer;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ojb.broker.accesslayer.conversions.ConversionException;
+import org.apache.ojb.broker.accesslayer.conversions.FieldConversion;
+
+/**
+ * <p style="font-weight: bold">
+ * ObjectRelationalBridge field conversion.
+ * </p>
+ * Converts from a comma-delimited field to a <code>java.util.collection</code>
+ * 
+ * @author <a href="mailto:weaver@apache.org">Scott T. Weaver</a>
+ */
+public class CSVtoCollectionFieldConversion implements FieldConversion
+{
+    private static final String DELIM = ",";
+    private static final String QUOTE = "\"";
+    
+    private static final Log log = LogFactory.getLog(CSVtoCollectionFieldConversion.class);
+    
+    /**
+     * @see org.apache.ojb.broker.accesslayer.conversions.FieldConversion#javaToSql(java.lang.Object)
+     * @task Fix JDK 1.3 complient problem described in the FIXME
+     */
+    public Object javaToSql(Object arg0) throws ConversionException
+    {
+        if (arg0 instanceof Collection)
+        {
+            Collection col = ((Collection) arg0);
+            if (col.size() == 0)
+            {
+                return "";
+            }
+
+            Iterator itr = col.iterator();
+            // Estimate that the average word is going to be 5 characters long
+            StringBuffer buffer = new StringBuffer((col.size() * 5));
+            while (itr.hasNext())
+            {
+                buffer.append(QUOTE);
+                String value = getNext(itr);
+
+                // FIXME: The following is not JDK1.3 complient. So I implement a warning 
+                //        message as a workaround until this field conversion is no longer
+                //        need and delete, or the code is made JDK 1.3 complient. (Paul Spencer)
+
+                // buffer.append(value.replaceAll("\"","\\\\\""));
+                if(value != null && value.toString().indexOf("\"") >= 0)
+                {
+                //  FieldConversionLog.LOG.error("The string '" + value + 
+                // "' contains embeded '\"'.  It will not be converted to a CSV correctly.");
+                  log.warn("In CSVtoCollectionFieldConversion() - The string '" + value + 
+                        "' contains embeded '\"'.  It will not be converted to a CSV correctly.");
+                }
+                buffer.append(value);
+                // End of FIXME:
+                buffer.append(QUOTE);
+                
+                if (itr.hasNext())
+                {
+                    buffer.append(DELIM);
+                }
+            }
+
+            return buffer.toString();
+        }
+        return arg0;
+    }
+
+    /**
+     * @see org.apache.ojb.broker.accesslayer.conversions.FieldConversion#sqlToJava(java.lang.Object)
+     */
+    public Object sqlToJava(Object arg0) throws ConversionException
+    {
+
+        if (arg0 instanceof String)
+        {
+            StringReader sr = new StringReader((String) arg0);
+            StreamTokenizer st = new StreamTokenizer(sr);
+            st.resetSyntax();
+            st.whitespaceChars(',', ',');
+            st.quoteChar('"');
+            st.eolIsSignificant(false);
+
+         
+            ArrayList list = new ArrayList();
+            try
+            {
+                while (st.nextToken() != StreamTokenizer.TT_EOF)
+                {
+                    list.add(createObject(st.sval));
+                }
+            }
+            catch (IOException e)
+            {
+                String message = "CSV parsing failed during field conversion.";
+                log.error(message, e);
+                throw new ConversionException("CSV parsing failed during field conversion.", e);
+            } 
+
+            return list;
+        }
+
+        return arg0;
+    }
+
+    /**
+     * Makes creation of objects created via csv fields extensible
+     * By default simply return the string value.
+     * 
+     * @param name The string value
+     * @return The string value
+     */
+    protected Object createObject(String name)
+    {
+        return name;
+    }
+
+    /**
+     * Makes getting objects via csv fields extensible
+     * By default simply return the string value.
+     * 
+     * @param name The string value
+     * @return The string value
+     */
+    protected String getNext(Iterator iterator)
+    {
+        return (String) iterator.next();
+    }
+
+}

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/CSVtoCollectionFieldConversion.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/CSVtoPortletModeFieldConversion.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/CSVtoPortletModeFieldConversion.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/CSVtoPortletModeFieldConversion.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/CSVtoPortletModeFieldConversion.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.util.ojb;
-
-import java.util.Iterator;
-
-import javax.portlet.PortletMode;
-
-import org.apache.ojb.broker.accesslayer.conversions.FieldConversion;
-
-/**
- * CSVtoPortletModeFieldConversion
- *
- * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
- * @version $Id: CSVtoPortletModeFieldConversion.java 185962 2004-03-08 01:03:33Z jford $
- */
-public class CSVtoPortletModeFieldConversion extends CSVtoCollectionFieldConversion implements FieldConversion
-{
-    /* (non-Javadoc)
-     * @see org.apache.jetspeed.util.ojb.CSVtoCollectionFieldConversion#getNext(java.util.Iterator)
-     */
-    protected String getNext(Iterator iterator)
-    {
-        PortletMode mode = (PortletMode)iterator.next();
-        return mode.toString();
-    }
-    
-    /* (non-Javadoc)
-     * @see org.apache.jetspeed.util.ojb.CSVtoCollectionFieldConversion#createObject(java.lang.String)
-     */
-    protected Object createObject(String name)
-    {
-        return new PortletMode(name);
-    }
-    
-    
-}
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.util.ojb;
+
+import java.util.Iterator;
+
+import javax.portlet.PortletMode;
+
+import org.apache.ojb.broker.accesslayer.conversions.FieldConversion;
+
+/**
+ * CSVtoPortletModeFieldConversion
+ *
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+ * @version $Id: CSVtoPortletModeFieldConversion.java 185962 2004-03-08 01:03:33Z jford $
+ */
+public class CSVtoPortletModeFieldConversion extends CSVtoCollectionFieldConversion implements FieldConversion
+{
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.util.ojb.CSVtoCollectionFieldConversion#getNext(java.util.Iterator)
+     */
+    protected String getNext(Iterator iterator)
+    {
+        PortletMode mode = (PortletMode)iterator.next();
+        return mode.toString();
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.util.ojb.CSVtoCollectionFieldConversion#createObject(java.lang.String)
+     */
+    protected Object createObject(String name)
+    {
+        return new PortletMode(name);
+    }
+    
+    
+}

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/CSVtoPortletModeFieldConversion.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/CollectionDebugger.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/CollectionDebugger.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/CollectionDebugger.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/CollectionDebugger.java Fri Dec 12 04:06:29 2008
@@ -14,68 +14,68 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-/**
- * Created on Jan 22, 2004
- *
- * 
- * @author
- */
-package org.apache.jetspeed.util.ojb;
-
-
-import org.apache.ojb.broker.PersistenceBroker;
-import org.apache.ojb.broker.accesslayer.QueryCustomizer;
-import org.apache.ojb.broker.metadata.CollectionDescriptor;
-
-import org.apache.ojb.broker.query.Query;
-import org.apache.ojb.broker.query.QueryByCriteria;
-
-
-/**
- * <p>
- * CollectionDebugger
- * </p>
- * 
- * @author <a href="mailto:weaver@apache.org">Scott T. Weaver</a>
- * @version $Id: CollectionDebugger.java 185773 2004-02-24 00:31:46Z weaver $
- *
- */
-public class CollectionDebugger implements QueryCustomizer
-{
-
-    /**
-     * @see org.apache.ojb.broker.accesslayer.QueryCustomizer#customizeQuery(java.lang.Object, org.apache.ojb.broker.PersistenceBroker, org.apache.ojb.broker.metadata.CollectionDescriptor, org.apache.ojb.broker.query.QueryByCriteria)
-     */
-    public Query customizeQuery(Object arg0, PersistenceBroker pb, CollectionDescriptor arg2, QueryByCriteria arg3)
-    {        
-        return arg3;
-    }
-
-    /**
-     * @see org.apache.ojb.broker.metadata.AttributeContainer#addAttribute(java.lang.String, java.lang.String)
-     */
-    public void addAttribute(String arg0, String arg1)
-    {
-        // TODO Auto-generated method stub
-
-    }
-
-    /**
-     * @see org.apache.ojb.broker.metadata.AttributeContainer#getAttribute(java.lang.String, java.lang.String)
-     */
-    public String getAttribute(String arg0, String arg1)
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * @see org.apache.ojb.broker.metadata.AttributeContainer#getAttribute(java.lang.String)
-     */
-    public String getAttribute(String arg0)
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-}
+/**
+ * Created on Jan 22, 2004
+ *
+ * 
+ * @author
+ */
+package org.apache.jetspeed.util.ojb;
+
+
+import org.apache.ojb.broker.PersistenceBroker;
+import org.apache.ojb.broker.accesslayer.QueryCustomizer;
+import org.apache.ojb.broker.metadata.CollectionDescriptor;
+
+import org.apache.ojb.broker.query.Query;
+import org.apache.ojb.broker.query.QueryByCriteria;
+
+
+/**
+ * <p>
+ * CollectionDebugger
+ * </p>
+ * 
+ * @author <a href="mailto:weaver@apache.org">Scott T. Weaver</a>
+ * @version $Id: CollectionDebugger.java 185773 2004-02-24 00:31:46Z weaver $
+ *
+ */
+public class CollectionDebugger implements QueryCustomizer
+{
+
+    /**
+     * @see org.apache.ojb.broker.accesslayer.QueryCustomizer#customizeQuery(java.lang.Object, org.apache.ojb.broker.PersistenceBroker, org.apache.ojb.broker.metadata.CollectionDescriptor, org.apache.ojb.broker.query.QueryByCriteria)
+     */
+    public Query customizeQuery(Object arg0, PersistenceBroker pb, CollectionDescriptor arg2, QueryByCriteria arg3)
+    {        
+        return arg3;
+    }
+
+    /**
+     * @see org.apache.ojb.broker.metadata.AttributeContainer#addAttribute(java.lang.String, java.lang.String)
+     */
+    public void addAttribute(String arg0, String arg1)
+    {
+        // TODO Auto-generated method stub
+
+    }
+
+    /**
+     * @see org.apache.ojb.broker.metadata.AttributeContainer#getAttribute(java.lang.String, java.lang.String)
+     */
+    public String getAttribute(String arg0, String arg1)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /**
+     * @see org.apache.ojb.broker.metadata.AttributeContainer#getAttribute(java.lang.String)
+     */
+    public String getAttribute(String arg0)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+}

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/CollectionDebugger.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/FieldConversionLog.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/FieldConversionLog.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/FieldConversionLog.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/FieldConversionLog.java Fri Dec 12 04:06:29 2008
@@ -1,37 +1,37 @@
-/*
+/*
  * 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.ojb;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * Utility class that allows convenient access to commons=logging for OJB 
- * FiledConversions without having to define a 
- * <code>org.apache.commons.logging.Log</code> in each of conversion
- * class.
- *
- *@author <a href="mailto:weaver@apache.org">Scott T. Weaver</a>
- */
-public abstract class FieldConversionLog
-{
-    /**
-     * There is only default ("package") access to this Log only as
-     * all OJB FieldConversions should be located here.
-     */
-    static final Log LOG = LogFactory.getLog("org.apache.jetspeed.util.ojb");
-}
+ * 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.ojb;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Utility class that allows convenient access to commons=logging for OJB 
+ * FiledConversions without having to define a 
+ * <code>org.apache.commons.logging.Log</code> in each of conversion
+ * class.
+ *
+ *@author <a href="mailto:weaver@apache.org">Scott T. Weaver</a>
+ */
+public abstract class FieldConversionLog
+{
+    /**
+     * There is only default ("package") access to this Log only as
+     * all OJB FieldConversions should be located here.
+     */
+    static final Log LOG = LogFactory.getLog("org.apache.jetspeed.util.ojb");
+}

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/FieldConversionLog.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/LocaleFieldConversion.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/LocaleFieldConversion.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/LocaleFieldConversion.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/LocaleFieldConversion.java Fri Dec 12 04:06:29 2008
@@ -1,125 +1,125 @@
-/*
+/*
  * 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.ojb;
-
-import java.util.Locale;
-import java.util.StringTokenizer;
-
-import org.apache.jetspeed.util.JetspeedLocale;
-import org.apache.ojb.broker.accesslayer.conversions.ConversionException;
-import org.apache.ojb.broker.accesslayer.conversions.FieldConversion;
-
-/**
- * <p style="font-weight: bold">
- * ObjectRelationalBridge field conversion.
- * </p>
- * Helps transparently map Locale objects into a database table
- * that contains country, langauge and variant field and vice versa.
- * 
- * field should be tokenized with commas
- */
-public class LocaleFieldConversion implements FieldConversion
-{
-    private static final String DELIM = ",";
-
-    /**
-     * @see org.apache.ojb.broker.accesslayer.conversions.FieldConversion#javaToSql(java.lang.Object)
-     */
-    public Object javaToSql(Object arg0) throws ConversionException
-    {
-        if (arg0 instanceof Locale)
-        {
-
-            Locale locale = (Locale) arg0;
-            String country = locale.getCountry();
-            String language = locale.getLanguage();
-            String variant = locale.getVariant();
-            StringBuffer buffer = new StringBuffer(40);
-            if (language != null)
-            {
-                buffer.append(language);
-            }
-            buffer.append(DELIM);
-
-            if (country != null)
-            {
-                buffer.append(country);
-            }
-            buffer.append(DELIM);
-
-            if (variant != null)
-            {
-                buffer.append(variant);
-            }
-
-            return buffer.toString().trim();
-        }
-        else
-        {
-            return arg0;
-        }
-    }
-
-    /**
-     * @see org.apache.ojb.broker.accesslayer.conversions.FieldConversion#sqlToJava(java.lang.Object)
-     */
-    public Object sqlToJava(Object arg0) throws ConversionException
-    {
-        if (arg0 instanceof String)
-        {
-            String localeString = (String) arg0;
-            StringTokenizer tokenizer = new StringTokenizer(localeString, DELIM);
-            if(tokenizer.hasMoreTokens() == false)            
-            {
-                return JetspeedLocale.getDefaultLocale();    
-            }
-            String language = tokenizer.nextToken().trim();
-            String country = null;
-            String variant = null;
-            if(tokenizer.hasMoreTokens())
-            {
-                country = tokenizer.nextToken().trim();
-            }           
-            if(tokenizer.hasMoreTokens())
-            {
-                variant = tokenizer.nextToken().trim();
-            }
-            if (country != null && language != null && variant != null)
-            {
-                return new Locale (language, country, variant);
-            }
-            else if (country != null && language != null)
-            {
-                return new Locale(language, country);
-            }
-            else if (language != null)
-            {
-                return new Locale(language, ""); // JDK 1.3 compatibility
-            }
-            else
-            {
-                return JetspeedLocale.getDefaultLocale();
-            }
-        }
-        else
-        {
-            return arg0;
-        }
-
-    }
-
-}
+ * 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.ojb;
+
+import java.util.Locale;
+import java.util.StringTokenizer;
+
+import org.apache.jetspeed.util.JetspeedLocale;
+import org.apache.ojb.broker.accesslayer.conversions.ConversionException;
+import org.apache.ojb.broker.accesslayer.conversions.FieldConversion;
+
+/**
+ * <p style="font-weight: bold">
+ * ObjectRelationalBridge field conversion.
+ * </p>
+ * Helps transparently map Locale objects into a database table
+ * that contains country, langauge and variant field and vice versa.
+ * 
+ * field should be tokenized with commas
+ */
+public class LocaleFieldConversion implements FieldConversion
+{
+    private static final String DELIM = ",";
+
+    /**
+     * @see org.apache.ojb.broker.accesslayer.conversions.FieldConversion#javaToSql(java.lang.Object)
+     */
+    public Object javaToSql(Object arg0) throws ConversionException
+    {
+        if (arg0 instanceof Locale)
+        {
+
+            Locale locale = (Locale) arg0;
+            String country = locale.getCountry();
+            String language = locale.getLanguage();
+            String variant = locale.getVariant();
+            StringBuffer buffer = new StringBuffer(40);
+            if (language != null)
+            {
+                buffer.append(language);
+            }
+            buffer.append(DELIM);
+
+            if (country != null)
+            {
+                buffer.append(country);
+            }
+            buffer.append(DELIM);
+
+            if (variant != null)
+            {
+                buffer.append(variant);
+            }
+
+            return buffer.toString().trim();
+        }
+        else
+        {
+            return arg0;
+        }
+    }
+
+    /**
+     * @see org.apache.ojb.broker.accesslayer.conversions.FieldConversion#sqlToJava(java.lang.Object)
+     */
+    public Object sqlToJava(Object arg0) throws ConversionException
+    {
+        if (arg0 instanceof String)
+        {
+            String localeString = (String) arg0;
+            StringTokenizer tokenizer = new StringTokenizer(localeString, DELIM);
+            if(tokenizer.hasMoreTokens() == false)            
+            {
+                return JetspeedLocale.getDefaultLocale();    
+            }
+            String language = tokenizer.nextToken().trim();
+            String country = null;
+            String variant = null;
+            if(tokenizer.hasMoreTokens())
+            {
+                country = tokenizer.nextToken().trim();
+            }           
+            if(tokenizer.hasMoreTokens())
+            {
+                variant = tokenizer.nextToken().trim();
+            }
+            if (country != null && language != null && variant != null)
+            {
+                return new Locale (language, country, variant);
+            }
+            else if (country != null && language != null)
+            {
+                return new Locale(language, country);
+            }
+            else if (language != null)
+            {
+                return new Locale(language, ""); // JDK 1.3 compatibility
+            }
+            else
+            {
+                return JetspeedLocale.getDefaultLocale();
+            }
+        }
+        else
+        {
+            return arg0;
+        }
+
+    }
+
+}

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/LocaleFieldConversion.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/ObjectIDtoLongFieldConversion.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/ObjectIDtoLongFieldConversion.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/ObjectIDtoLongFieldConversion.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/ObjectIDtoLongFieldConversion.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.util.ojb;
-
-import org.apache.jetspeed.util.JetspeedLongObjectID;
-import org.apache.ojb.broker.accesslayer.conversions.ConversionException;
-import org.apache.ojb.broker.accesslayer.conversions.FieldConversion;
-
-/**
-  * <p style="font-weight: bold">
- * ObjectRelationalBridge field conversion.
- * </p>
- * 
- * Converts between <code>long</code> and <code>JetspeedLongObjectID</code>
- * 
- * @author <a href="mailto:weaver@apache.org">Scott T. Weaver</a>
- */
-public class ObjectIDtoLongFieldConversion implements FieldConversion
-{
-
-    /**
-     * @see org.apache.ojb.broker.accesslayer.conversions.FieldConversion#javaToSql(java.lang.Object)
-     */
-    public Object javaToSql(Object arg0) throws ConversionException
-    {
-        if (arg0 instanceof JetspeedLongObjectID)
-        {
-            return ((JetspeedLongObjectID)arg0).getLong();
-        }
-        return arg0;
-    }
-
-    /**
-     * @see org.apache.ojb.broker.accesslayer.conversions.FieldConversion#sqlToJava(java.lang.Object)
-     */
-    public Object sqlToJava(Object arg0) throws ConversionException
-    {
-        if (arg0 instanceof Number)
-        {
-            return new JetspeedLongObjectID(((Number)arg0).longValue());
-        }
-        return arg0;
-    }
-}
+ * 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.ojb;
+
+import org.apache.jetspeed.util.JetspeedLongObjectID;
+import org.apache.ojb.broker.accesslayer.conversions.ConversionException;
+import org.apache.ojb.broker.accesslayer.conversions.FieldConversion;
+
+/**
+  * <p style="font-weight: bold">
+ * ObjectRelationalBridge field conversion.
+ * </p>
+ * 
+ * Converts between <code>long</code> and <code>JetspeedLongObjectID</code>
+ * 
+ * @author <a href="mailto:weaver@apache.org">Scott T. Weaver</a>
+ */
+public class ObjectIDtoLongFieldConversion implements FieldConversion
+{
+
+    /**
+     * @see org.apache.ojb.broker.accesslayer.conversions.FieldConversion#javaToSql(java.lang.Object)
+     */
+    public Object javaToSql(Object arg0) throws ConversionException
+    {
+        if (arg0 instanceof JetspeedLongObjectID)
+        {
+            return ((JetspeedLongObjectID)arg0).getLong();
+        }
+        return arg0;
+    }
+
+    /**
+     * @see org.apache.ojb.broker.accesslayer.conversions.FieldConversion#sqlToJava(java.lang.Object)
+     */
+    public Object sqlToJava(Object arg0) throws ConversionException
+    {
+        if (arg0 instanceof Number)
+        {
+            return new JetspeedLongObjectID(((Number)arg0).longValue());
+        }
+        return arg0;
+    }
+}

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/ObjectIDtoLongFieldConversion.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/ObjectIDtoStringFieldConversion.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/ObjectIDtoStringFieldConversion.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/ObjectIDtoStringFieldConversion.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/ObjectIDtoStringFieldConversion.java Fri Dec 12 04:06:29 2008
@@ -1,69 +1,69 @@
-/*
+/*
  * 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.ojb;
-
-import org.apache.jetspeed.util.JetspeedObjectID;
-import org.apache.ojb.broker.accesslayer.conversions.ConversionException;
-import org.apache.ojb.broker.accesslayer.conversions.FieldConversion;
-
-/**
-  * <p style="font-weight: bold">
- * ObjectRelationalBridge field conversion.
- * </p>
- * 
- * Converts between <code>long</code> and <code>ObjectID</code>
- * 
- * @author <a href="mailto:weaver@apache.org">Scott T. Weaver</a>
- */
-public class ObjectIDtoStringFieldConversion implements FieldConversion
-{
-
-    /**
-     * @see org.apache.ojb.broker.accesslayer.conversions.FieldConversion#javaToSql(java.lang.Object)
-     */
-    public Object javaToSql(Object arg0) throws ConversionException
-    {
-        if (arg0 instanceof JetspeedObjectID)
-        {
-            JetspeedObjectID oid = (JetspeedObjectID) arg0;
-
-            return oid.toString();
-        }
-        else
-        {
-            return arg0;
-        }
-
-    }
-
-    /**
-     * @see org.apache.ojb.broker.accesslayer.conversions.FieldConversion#sqlToJava(java.lang.Object)
-     */
-    public Object sqlToJava(Object arg0) throws ConversionException
-    {
-        if (arg0 instanceof String)
-        {            
-            return  JetspeedObjectID.createFromString((String)arg0);
-        }
-        else
-        {
-            return arg0;
-        }
-
-    }
-
-}
+ * 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.ojb;
+
+import org.apache.jetspeed.util.JetspeedObjectID;
+import org.apache.ojb.broker.accesslayer.conversions.ConversionException;
+import org.apache.ojb.broker.accesslayer.conversions.FieldConversion;
+
+/**
+  * <p style="font-weight: bold">
+ * ObjectRelationalBridge field conversion.
+ * </p>
+ * 
+ * Converts between <code>long</code> and <code>ObjectID</code>
+ * 
+ * @author <a href="mailto:weaver@apache.org">Scott T. Weaver</a>
+ */
+public class ObjectIDtoStringFieldConversion implements FieldConversion
+{
+
+    /**
+     * @see org.apache.ojb.broker.accesslayer.conversions.FieldConversion#javaToSql(java.lang.Object)
+     */
+    public Object javaToSql(Object arg0) throws ConversionException
+    {
+        if (arg0 instanceof JetspeedObjectID)
+        {
+            JetspeedObjectID oid = (JetspeedObjectID) arg0;
+
+            return oid.toString();
+        }
+        else
+        {
+            return arg0;
+        }
+
+    }
+
+    /**
+     * @see org.apache.ojb.broker.accesslayer.conversions.FieldConversion#sqlToJava(java.lang.Object)
+     */
+    public Object sqlToJava(Object arg0) throws ConversionException
+    {
+        if (arg0 instanceof String)
+        {            
+            return  JetspeedObjectID.createFromString((String)arg0);
+        }
+        else
+        {
+            return arg0;
+        }
+
+    }
+
+}

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/util/ojb/ObjectIDtoStringFieldConversion.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletentity/ContentFragmentTestImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletentity/ContentFragmentTestImpl.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletentity/ContentFragmentTestImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletentity/ContentFragmentTestImpl.java Fri Dec 12 04:06:29 2008
@@ -1,537 +1,537 @@
-/*
- * 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.components.portletentity;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.jetspeed.aggregator.PortletContent;
-import org.apache.jetspeed.decoration.Decoration;
-import org.apache.jetspeed.om.common.SecurityConstraint;
-import org.apache.jetspeed.om.common.SecurityConstraints;
-import org.apache.jetspeed.om.page.ContentFragment;
-import org.apache.jetspeed.om.page.Fragment;
-
-/**
- * <p>
- * ContentFramgentTestImpl
- * </p>
- * 
- * Dummy ContentFragment wrapper around Fragment as using the real ContentFragmentImpl would introduce a circular
- * dependency between the registry and page-manager components. Probably should be replaced by a Mock but I don't
- * know how to setup that quickly and the whole ContentFragment construction is bound to be replaced soon anyway...
- *
- * @author <a href="mailto:rwatler@apache.org">Randy Watler</a>
- * @version $Id$
- */
-class ContentFragmentTestImpl implements Fragment, ContentFragment
-{
-    private Fragment f;
-    private boolean instantlyRendered;
-
-    /**
-     * @param f
-     * @param list
-     */
-    public ContentFragmentTestImpl(Fragment f, HashMap list)
-    {
-        this(f, list, false);
-    }
-    
-    public ContentFragmentTestImpl(Fragment f, HashMap list, boolean instantlyRendered)
-    {
-        this.f = f;
-        this.instantlyRendered = instantlyRendered;
-    }
-
-    public PortletContent getPortletContent()
-    {
-        return null;        
-    }
-    
-    /**
-     * @param actions
-     * @throws SecurityException
-     */
-    public void checkAccess(String actions) throws SecurityException
-    {
-        f.checkAccess(actions);
-    }
-
-    /**
-     * @param actions
-     * @throws SecurityException
-     */
-    public void checkConstraints(String actions) throws SecurityException
-    {
-        f.checkConstraints(actions);
-    }
-
-    /**
-     * @param mask
-     * @throws SecurityException
-     */
-    public void checkPermissions(int mask) throws SecurityException
-    {
-        f.checkPermissions(mask);
-    }
-        
-    public SecurityConstraint newSecurityConstraint()
-    {
-        return f.newSecurityConstraint();
-    }
-
-    public SecurityConstraints newSecurityConstraints()
-    {
-        return f.newSecurityConstraints();
-    }
-
-    /** 
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    public boolean equals(Object obj)
-    {
-        return f.equals(obj);
-    }
-
-    /**
-     * @return contraints enabled
-     */
-    public boolean getConstraintsEnabled()
-    {
-        return f.getConstraintsEnabled();
-    }
-
-    /**
-     * @return decorator name
-     */
-    public String getDecorator()
-    {
-        return f.getDecorator();
-    }
-
-    /**
-     * @return list of fragments
-     */
-    public List getFragments()
-    {
-        return f.getFragments();
-    }
-
-    /**
-     * @return id
-     */
-    public String getId()
-    {
-        return f.getId();
-    }
-
-    /**
-     * @return name
-     */
-    public String getName()
-    {
-        return f.getName();
-    }
-
-    /**
-     * @return permissions enabled
-     */
-    public boolean getPermissionsEnabled()
-    {
-        return f.getPermissionsEnabled();
-    }
-
-
-    /**
-     * @return security constraints
-     */
-    public SecurityConstraints getSecurityConstraints()
-    {
-        return f.getSecurityConstraints();
-    }
-
-    /**
-     * @return  short title
-     */
-    public String getShortTitle()
-    {
-        return f.getShortTitle();
-    }
-
-    /**
-     * @return skin name
-     */
-    public String getSkin()
-    {
-        return f.getSkin();
-    }
-
-    /**
-     * @return state string
-     */
-    public String getState()
-    {
-        return f.getState();
-    }
-
-    /**
-     * @return state string
-     */
-    public String getMode()
-    {
-        return f.getMode();
-    }
-
-    /**
-     * @return title
-     */
-    public String getTitle()
-    {
-        return f.getTitle();
-    }
-
-    /**
-     * @return type string
-     */
-    public String getType()
-    {
-        return f.getType();
-    }
-
-    /** 
-     * @see java.lang.Object#hashCode()
-     */
-    public int hashCode()
-    {
-        return f.hashCode();
-    }
-
-    /**
-     * @return if its a reference
-     */
-    public boolean isReference()
-    {
-        return f.isReference();
-    }
-
-    /**
-     * @param decoratorName
-     */
-    public void setDecorator(String decoratorName)
-    {
-        f.setDecorator(decoratorName);
-    }
-
-    /**
-     * @param name
-     */
-    public void setName(String name)
-    {
-        f.setName(name);
-    }
-
-    /**
-     * @param constraints
-     */
-    public void setSecurityConstraints(SecurityConstraints constraints)
-    {
-        f.setSecurityConstraints(constraints);
-    }
-
-    /**
-     * @param title
-     */
-    public void setShortTitle(String title)
-    {
-        f.setShortTitle(title);
-    }
-
-    /**
-     * @param skinName
-     */
-    public void setSkin(String skinName)
-    {
-        f.setSkin(skinName);
-    }
-
-    /**
-     * @param state
-     */
-    public void setState(String state)
-    {
-        f.setState(state);
-    }
-
-    /**
-     * @param mode
-     */
-    public void setMode(String mode)
-    {
-        f.setMode(mode);
-    }
-
-    /**
-     * @param title
-     */
-    public void setTitle(String title)
-    {
-        f.setTitle(title);
-    }
-
-    /**
-     * @param type
-     */
-    public void setType(String type)
-    {
-        f.setType(type);
-    }
-
-    /** 
-     * @see java.lang.Object#toString()
-     */
-    public String toString()
-    {
-        return f.toString();
-    }
-
-    /** 
-     * @see org.apache.jetspeed.om.page.ContentFragment#getContentFragments()
-     */
-    public List getContentFragments()
-    {
-        return null;
-    }
-
-    /** 
-     * @see org.apache.jetspeed.om.page.ContentFragment#getRenderedContent()
-     */
-    public String getRenderedContent() throws IllegalStateException
-    {
-        return null;
-    }
-
-    /** 
-     * @see org.apache.jetspeed.om.page.ContentFragment#overrideRenderedContent(java.lang.String)
-     */
-    public void overrideRenderedContent(String contnent)
-    {
-    }
-    
-    /* (non-Javadoc)
-     * @see org.apache.jetspeed.om.page.ContentFragment#getOverriddenContent()
-     */
-    public String getOverriddenContent()
-    {
-        return null;
-    }
-
-    /** 
-     * @see org.apache.jetspeed.om.page.ContentFragment#setPortletContent(org.apache.jetspeed.aggregator.PortletContent)
-     */
-    public void setPortletContent(PortletContent portletContent)
-    {
-    }
-
-    /**
-     * @see org.apache.jetspeed.om.page.Fragment#getLayoutRow()
-     */
-    public int getLayoutRow()
-    {
-        return -1;
-    }
-
-    /**
-     * @see org.apache.jetspeed.om.page.Fragment#getLayoutColumn()
-     */
-    public int getLayoutColumn()
-    {
-        return -1;
-    }
-
-    /**
-     * @see org.apache.jetspeed.om.page.Fragment#getLayoutSizes()
-     */
-    public String getLayoutSizes()
-    {
-        return null;
-    }
-
-    /**
-     * @see org.apache.jetspeed.om.page.Fragment#getLayoutX()
-     */
-    public float getLayoutX()
-    {
-        return -1.0F;
-    }
-
-    /**
-     * @see org.apache.jetspeed.om.page.Fragment#getLayoutY()
-     */
-    public float getLayoutY()
-    {
-        return -1.0F;
-    }
-
-    /**
-     * @see org.apache.jetspeed.om.page.Fragment#getLayoutZ()
-     */
-    public float getLayoutZ()
-    {
-        return -1.0F;
-    }
-
-    /**
-     * @see org.apache.jetspeed.om.page.Fragment#getLayoutWidth()
-     */
-    public float getLayoutWidth()
-    {
-        return -1.0F;
-    }
-
-    /**
-     * @see org.apache.jetspeed.om.page.Fragment#getLayoutHeight()
-     */
-    public float getLayoutHeight()
-    {
-        return -1.0F;
-    }
-
-    /**
-     * @see org.apache.jetspeed.om.page.Fragment#setLayoutRow(int)
-     */
-    public void setLayoutRow(int row)
-    {            
-    }
-
-    /**
-     * @see org.apache.jetspeed.om.page.Fragment#setLayoutColumn(int)
-     */
-    public void setLayoutColumn(int column)
-    {            
-    }
-
-    /**
-     * @see org.apache.jetspeed.om.page.Fragment#setLayoutSizes(java.lang.String)
-     */
-    public void setLayoutSizes(String sizes)
-    {            
-    }
-
-    /**
-     * @see org.apache.jetspeed.om.page.Fragment#setLayoutX(float)
-     */
-    public void setLayoutX(float x)
-    {            
-    }
-
-    /**
-     * @see org.apache.jetspeed.om.page.Fragment#setLayoutY(float)
-     */
-    public void setLayoutY(float y)
-    {            
-    }
-
-    /**
-     * @see org.apache.jetspeed.om.page.Fragment#setLayoutZ(float)
-     */
-    public void setLayoutZ(float z)
-    {            
-    }
-
-    /**
-     * @see org.apache.jetspeed.om.page.Fragment#setLayoutWidth(float)
-     */
-    public void setLayoutWidth(float width)
-    {            
-    }
-
-    /**
-     * @see org.apache.jetspeed.om.page.Fragment#setLayoutHeight(float)
-     */
-    public void setLayoutHeight(float height)
-    {            
-    }
-
-    /**
-     * @see org.apache.jetspeed.om.page.Fragment#getIntProperty(java.lang.String)
-     */
-    public int getIntProperty(String propName)
-    {
-        return -1;
-    }
-
-    /**
-     * @see org.apache.jetspeed.om.page.Fragment#getFloatProperty(java.lang.String)
-     */
-    public float getFloatProperty(String propName)
-    {
-        return -1.0F;
-    }
-
-    /**
-     * @see org.apache.jetspeed.om.page.Fragment#getPreferences()
-     */
-    public List getPreferences()
-    {
-        return null;
-    }
-
-    /**
-     * @see org.apache.jetspeed.om.page.Fragment#setPreferences(java.util.List)
-     */
-    public void setPreferences(List preferences)
-    {
-    }
-
-    /**
-     * @see org.apache.jetspeed.om.page.Fragment#getProperties()
-     */
-    public Map getProperties()
-    {
-        return null;
-    }
-
-    /**
-     * @see org.apache.jetspeed.om.page.Fragment#getProperty(java.lang.String)
-     */
-    public String getProperty(String propName)
-    {
-        return null;
-    }
-
-    public Decoration getDecoration()
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public void setDecoration(Decoration decoration)
-    {
-        // TODO Auto-generated method stub
-            
-    }        
-
-    /* (non-Javadoc)
-     * @see org.apache.jetspeed.om.page.ContentFragment#isInstantlyRendered()
-     */
-    public boolean isInstantlyRendered()
-    {
-        return this.instantlyRendered;
-    }
-}
+/*
+ * 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.components.portletentity;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.jetspeed.aggregator.PortletContent;
+import org.apache.jetspeed.decoration.Decoration;
+import org.apache.jetspeed.om.common.SecurityConstraint;
+import org.apache.jetspeed.om.common.SecurityConstraints;
+import org.apache.jetspeed.om.page.ContentFragment;
+import org.apache.jetspeed.om.page.Fragment;
+
+/**
+ * <p>
+ * ContentFramgentTestImpl
+ * </p>
+ * 
+ * Dummy ContentFragment wrapper around Fragment as using the real ContentFragmentImpl would introduce a circular
+ * dependency between the registry and page-manager components. Probably should be replaced by a Mock but I don't
+ * know how to setup that quickly and the whole ContentFragment construction is bound to be replaced soon anyway...
+ *
+ * @author <a href="mailto:rwatler@apache.org">Randy Watler</a>
+ * @version $Id$
+ */
+class ContentFragmentTestImpl implements Fragment, ContentFragment
+{
+    private Fragment f;
+    private boolean instantlyRendered;
+
+    /**
+     * @param f
+     * @param list
+     */
+    public ContentFragmentTestImpl(Fragment f, HashMap list)
+    {
+        this(f, list, false);
+    }
+    
+    public ContentFragmentTestImpl(Fragment f, HashMap list, boolean instantlyRendered)
+    {
+        this.f = f;
+        this.instantlyRendered = instantlyRendered;
+    }
+
+    public PortletContent getPortletContent()
+    {
+        return null;        
+    }
+    
+    /**
+     * @param actions
+     * @throws SecurityException
+     */
+    public void checkAccess(String actions) throws SecurityException
+    {
+        f.checkAccess(actions);
+    }
+
+    /**
+     * @param actions
+     * @throws SecurityException
+     */
+    public void checkConstraints(String actions) throws SecurityException
+    {
+        f.checkConstraints(actions);
+    }
+
+    /**
+     * @param mask
+     * @throws SecurityException
+     */
+    public void checkPermissions(int mask) throws SecurityException
+    {
+        f.checkPermissions(mask);
+    }
+        
+    public SecurityConstraint newSecurityConstraint()
+    {
+        return f.newSecurityConstraint();
+    }
+
+    public SecurityConstraints newSecurityConstraints()
+    {
+        return f.newSecurityConstraints();
+    }
+
+    /** 
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    public boolean equals(Object obj)
+    {
+        return f.equals(obj);
+    }
+
+    /**
+     * @return contraints enabled
+     */
+    public boolean getConstraintsEnabled()
+    {
+        return f.getConstraintsEnabled();
+    }
+
+    /**
+     * @return decorator name
+     */
+    public String getDecorator()
+    {
+        return f.getDecorator();
+    }
+
+    /**
+     * @return list of fragments
+     */
+    public List getFragments()
+    {
+        return f.getFragments();
+    }
+
+    /**
+     * @return id
+     */
+    public String getId()
+    {
+        return f.getId();
+    }
+
+    /**
+     * @return name
+     */
+    public String getName()
+    {
+        return f.getName();
+    }
+
+    /**
+     * @return permissions enabled
+     */
+    public boolean getPermissionsEnabled()
+    {
+        return f.getPermissionsEnabled();
+    }
+
+
+    /**
+     * @return security constraints
+     */
+    public SecurityConstraints getSecurityConstraints()
+    {
+        return f.getSecurityConstraints();
+    }
+
+    /**
+     * @return  short title
+     */
+    public String getShortTitle()
+    {
+        return f.getShortTitle();
+    }
+
+    /**
+     * @return skin name
+     */
+    public String getSkin()
+    {
+        return f.getSkin();
+    }
+
+    /**
+     * @return state string
+     */
+    public String getState()
+    {
+        return f.getState();
+    }
+
+    /**
+     * @return state string
+     */
+    public String getMode()
+    {
+        return f.getMode();
+    }
+
+    /**
+     * @return title
+     */
+    public String getTitle()
+    {
+        return f.getTitle();
+    }
+
+    /**
+     * @return type string
+     */
+    public String getType()
+    {
+        return f.getType();
+    }
+
+    /** 
+     * @see java.lang.Object#hashCode()
+     */
+    public int hashCode()
+    {
+        return f.hashCode();
+    }
+
+    /**
+     * @return if its a reference
+     */
+    public boolean isReference()
+    {
+        return f.isReference();
+    }
+
+    /**
+     * @param decoratorName
+     */
+    public void setDecorator(String decoratorName)
+    {
+        f.setDecorator(decoratorName);
+    }
+
+    /**
+     * @param name
+     */
+    public void setName(String name)
+    {
+        f.setName(name);
+    }
+
+    /**
+     * @param constraints
+     */
+    public void setSecurityConstraints(SecurityConstraints constraints)
+    {
+        f.setSecurityConstraints(constraints);
+    }
+
+    /**
+     * @param title
+     */
+    public void setShortTitle(String title)
+    {
+        f.setShortTitle(title);
+    }
+
+    /**
+     * @param skinName
+     */
+    public void setSkin(String skinName)
+    {
+        f.setSkin(skinName);
+    }
+
+    /**
+     * @param state
+     */
+    public void setState(String state)
+    {
+        f.setState(state);
+    }
+
+    /**
+     * @param mode
+     */
+    public void setMode(String mode)
+    {
+        f.setMode(mode);
+    }
+
+    /**
+     * @param title
+     */
+    public void setTitle(String title)
+    {
+        f.setTitle(title);
+    }
+
+    /**
+     * @param type
+     */
+    public void setType(String type)
+    {
+        f.setType(type);
+    }
+
+    /** 
+     * @see java.lang.Object#toString()
+     */
+    public String toString()
+    {
+        return f.toString();
+    }
+
+    /** 
+     * @see org.apache.jetspeed.om.page.ContentFragment#getContentFragments()
+     */
+    public List getContentFragments()
+    {
+        return null;
+    }
+
+    /** 
+     * @see org.apache.jetspeed.om.page.ContentFragment#getRenderedContent()
+     */
+    public String getRenderedContent() throws IllegalStateException
+    {
+        return null;
+    }
+
+    /** 
+     * @see org.apache.jetspeed.om.page.ContentFragment#overrideRenderedContent(java.lang.String)
+     */
+    public void overrideRenderedContent(String contnent)
+    {
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.ContentFragment#getOverriddenContent()
+     */
+    public String getOverriddenContent()
+    {
+        return null;
+    }
+
+    /** 
+     * @see org.apache.jetspeed.om.page.ContentFragment#setPortletContent(org.apache.jetspeed.aggregator.PortletContent)
+     */
+    public void setPortletContent(PortletContent portletContent)
+    {
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutRow()
+     */
+    public int getLayoutRow()
+    {
+        return -1;
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutColumn()
+     */
+    public int getLayoutColumn()
+    {
+        return -1;
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutSizes()
+     */
+    public String getLayoutSizes()
+    {
+        return null;
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutX()
+     */
+    public float getLayoutX()
+    {
+        return -1.0F;
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutY()
+     */
+    public float getLayoutY()
+    {
+        return -1.0F;
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutZ()
+     */
+    public float getLayoutZ()
+    {
+        return -1.0F;
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutWidth()
+     */
+    public float getLayoutWidth()
+    {
+        return -1.0F;
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutHeight()
+     */
+    public float getLayoutHeight()
+    {
+        return -1.0F;
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutRow(int)
+     */
+    public void setLayoutRow(int row)
+    {            
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutColumn(int)
+     */
+    public void setLayoutColumn(int column)
+    {            
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutSizes(java.lang.String)
+     */
+    public void setLayoutSizes(String sizes)
+    {            
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutX(float)
+     */
+    public void setLayoutX(float x)
+    {            
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutY(float)
+     */
+    public void setLayoutY(float y)
+    {            
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutZ(float)
+     */
+    public void setLayoutZ(float z)
+    {            
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutWidth(float)
+     */
+    public void setLayoutWidth(float width)
+    {            
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutHeight(float)
+     */
+    public void setLayoutHeight(float height)
+    {            
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#getIntProperty(java.lang.String)
+     */
+    public int getIntProperty(String propName)
+    {
+        return -1;
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#getFloatProperty(java.lang.String)
+     */
+    public float getFloatProperty(String propName)
+    {
+        return -1.0F;
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#getPreferences()
+     */
+    public List getPreferences()
+    {
+        return null;
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#setPreferences(java.util.List)
+     */
+    public void setPreferences(List preferences)
+    {
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#getProperties()
+     */
+    public Map getProperties()
+    {
+        return null;
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#getProperty(java.lang.String)
+     */
+    public String getProperty(String propName)
+    {
+        return null;
+    }
+
+    public Decoration getDecoration()
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public void setDecoration(Decoration decoration)
+    {
+        // TODO Auto-generated method stub
+            
+    }        
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.ContentFragment#isInstantlyRendered()
+     */
+    public boolean isInstantlyRendered()
+    {
+        return this.instantlyRendered;
+    }
+}

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletentity/ContentFragmentTestImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletentity/TestPortletEntityDAO.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletpreferences/TestPortletPreferencesProvider.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestRegistryCache.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/resources/registry-test.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-rewriter/src/main/java/org/apache/jetspeed/rewriter/JetspeedClasspathRewriterController.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-rewriter/src/main/java/org/apache/jetspeed/rewriter/JetspeedClasspathRewriterController.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-rewriter/src/main/java/org/apache/jetspeed/rewriter/JetspeedClasspathRewriterController.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-rewriter/src/main/java/org/apache/jetspeed/rewriter/JetspeedClasspathRewriterController.java Fri Dec 12 04:06:29 2008
@@ -1,70 +1,70 @@
-/*
+/*
  * 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.rewriter;
-
-
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * RewriterServiceImpl
- * 
- * @author <a href="mailto:taylor@apache.org">David Sean Taylor </a>
- * @version $Id: JetspeedRewriterController.java,v 1.2 2004/03/08 00:44:40 jford
- *          Exp $
- */
-public class JetspeedClasspathRewriterController
-       extends JetspeedRewriterController
-       implements RewriterController
-{
-    protected final static Log log = LogFactory.getLog(JetspeedClasspathRewriterController.class);
-
-    public JetspeedClasspathRewriterController( String mappingFile ) throws RewriterException
-    {
-        super(mappingFile);
-    }
-
-    public JetspeedClasspathRewriterController( String mappingFile, List rewriterClasses, List adaptorClasses )
-            throws RewriterException
-    {
-        super(mappingFile, rewriterClasses, adaptorClasses);
-    }
-    
-    public JetspeedClasspathRewriterController( String mappingFile, 
-            String basicRewriterClassName, String rulesetRewriterClassName, 
-            String adaptorHtmlClassName, String adaptorXmlClassName )
-    throws RewriterException
-    {
-        super(mappingFile, toClassList(basicRewriterClassName,rulesetRewriterClassName), 
-              toClassList(adaptorHtmlClassName,adaptorXmlClassName));
-    }
-    
-    protected Reader getReader(String resource)
-    throws RewriterException
-    {
-        InputStream stream = this.getClass().getClassLoader().getResourceAsStream(resource);
-        if (stream != null)
-            return new InputStreamReader(stream);
-
-        throw new RewriterException("could not access rewriter classpath resource " + resource);        
-    }
-}
+ * 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.rewriter;
+
+
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * RewriterServiceImpl
+ * 
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor </a>
+ * @version $Id: JetspeedRewriterController.java,v 1.2 2004/03/08 00:44:40 jford
+ *          Exp $
+ */
+public class JetspeedClasspathRewriterController
+       extends JetspeedRewriterController
+       implements RewriterController
+{
+    protected final static Log log = LogFactory.getLog(JetspeedClasspathRewriterController.class);
+
+    public JetspeedClasspathRewriterController( String mappingFile ) throws RewriterException
+    {
+        super(mappingFile);
+    }
+
+    public JetspeedClasspathRewriterController( String mappingFile, List rewriterClasses, List adaptorClasses )
+            throws RewriterException
+    {
+        super(mappingFile, rewriterClasses, adaptorClasses);
+    }
+    
+    public JetspeedClasspathRewriterController( String mappingFile, 
+            String basicRewriterClassName, String rulesetRewriterClassName, 
+            String adaptorHtmlClassName, String adaptorXmlClassName )
+    throws RewriterException
+    {
+        super(mappingFile, toClassList(basicRewriterClassName,rulesetRewriterClassName), 
+              toClassList(adaptorHtmlClassName,adaptorXmlClassName));
+    }
+    
+    protected Reader getReader(String resource)
+    throws RewriterException
+    {
+        InputStream stream = this.getClass().getClassLoader().getResourceAsStream(resource);
+        if (stream != null)
+            return new InputStreamReader(stream);
+
+        throw new RewriterException("could not access rewriter classpath resource " + resource);        
+    }
+}

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

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

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-security-schema/src/main/resources/log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/PolicyWrapper.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/PolicyWrapper.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/PolicyWrapper.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/PolicyWrapper.java Fri Dec 12 04:06:29 2008
@@ -14,91 +14,91 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.jetspeed.security;
-
-import java.io.Serializable;
-import java.security.Policy;
-
-/**
- * <p>
- * Simple wrapper for security policy providing the ability to add attribute on Policy and how they
- * should be used by the application.
- * </p>
- * 
- * @author <a href="mailto:LeStrat_David@emc.com">David Le Strat</a>
- */
-public class PolicyWrapper implements Serializable
-{
-    /** The serial version uid.  */
-    private static final long serialVersionUID = 3386468724328997598L;
-
-    /** The policy. */
-    private transient Policy policy;
-
-    /** Whether to use as a policy. */
-    private boolean useAsPolicy = false;
-
-    /** Whether to use as a default policy. */
-    private boolean defaultPolicy = false;
-
-    /**
-     * @param policy
-     * @param useAsPolicy
-     * @param defaultPolicy
-     */
-    public PolicyWrapper(Policy policy, boolean useAsPolicy, boolean defaultPolicy)
-    {
-        this.policy = policy;
-        this.useAsPolicy = useAsPolicy;
-        this.defaultPolicy = defaultPolicy;
-    }
-
-    /**
-     * @return Returns the policy.
-     */
-    public Policy getPolicy()
-    {
-        return this.policy;
-    }
-
-    /**
-     * @param policy The policy to set.
-     */
-    public void setPolicy(Policy policy)
-    {
-        this.policy = policy;
-    }
-
-    /**
-     * @return Returns the defaultPolicy.
-     */
-    public boolean isDefaultPolicy()
-    {
-        return defaultPolicy;
-    }
-
-    /**
-     * @param defaultPolicy The defaultPolicy to set.
-     */
-    public void setDefaultPolicy(boolean defaultPolicy)
-    {
-        this.defaultPolicy = defaultPolicy;
-    }
-
-    /**
-     * @return Returns the useAsPolicy.
-     */
-    public boolean isUseAsPolicy()
-    {
-        return useAsPolicy;
-    }
-
-    /**
-     * @param useAsPolicy The useAsPolicy to set.
-     */
-    public void setUseAsPolicy(boolean useAsPolicy)
-    {
-        this.useAsPolicy = useAsPolicy;
-    }
-
-}
+package org.apache.jetspeed.security;
+
+import java.io.Serializable;
+import java.security.Policy;
+
+/**
+ * <p>
+ * Simple wrapper for security policy providing the ability to add attribute on Policy and how they
+ * should be used by the application.
+ * </p>
+ * 
+ * @author <a href="mailto:LeStrat_David@emc.com">David Le Strat</a>
+ */
+public class PolicyWrapper implements Serializable
+{
+    /** The serial version uid.  */
+    private static final long serialVersionUID = 3386468724328997598L;
+
+    /** The policy. */
+    private transient Policy policy;
+
+    /** Whether to use as a policy. */
+    private boolean useAsPolicy = false;
+
+    /** Whether to use as a default policy. */
+    private boolean defaultPolicy = false;
+
+    /**
+     * @param policy
+     * @param useAsPolicy
+     * @param defaultPolicy
+     */
+    public PolicyWrapper(Policy policy, boolean useAsPolicy, boolean defaultPolicy)
+    {
+        this.policy = policy;
+        this.useAsPolicy = useAsPolicy;
+        this.defaultPolicy = defaultPolicy;
+    }
+
+    /**
+     * @return Returns the policy.
+     */
+    public Policy getPolicy()
+    {
+        return this.policy;
+    }
+
+    /**
+     * @param policy The policy to set.
+     */
+    public void setPolicy(Policy policy)
+    {
+        this.policy = policy;
+    }
+
+    /**
+     * @return Returns the defaultPolicy.
+     */
+    public boolean isDefaultPolicy()
+    {
+        return defaultPolicy;
+    }
+
+    /**
+     * @param defaultPolicy The defaultPolicy to set.
+     */
+    public void setDefaultPolicy(boolean defaultPolicy)
+    {
+        this.defaultPolicy = defaultPolicy;
+    }
+
+    /**
+     * @return Returns the useAsPolicy.
+     */
+    public boolean isUseAsPolicy()
+    {
+        return useAsPolicy;
+    }
+
+    /**
+     * @param useAsPolicy The useAsPolicy to set.
+     */
+    public void setUseAsPolicy(boolean useAsPolicy)
+    {
+        this.useAsPolicy = useAsPolicy;
+    }
+
+}

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



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


Mime
View raw message