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 [27/48] - in /portals/jetspeed-2/portal/trunk: ./ app-servers/security/jboss/src/java/META-INF/jboss-secsvc/ app-servers/security/jboss/src/java/org/apache/jetspeed/appservers/security/jboss/ applications/jetspeed/src/main/javascrip...
Date Fri, 12 Dec 2008 12:07:04 GMT
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSMediaType.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSMediaType.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSMediaType.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSMediaType.java Fri Dec 12 04:06:29 2008
@@ -1,301 +1,301 @@
-/*
- * 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.serializer.objects;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javolution.xml.XMLFormat;
-import javolution.xml.stream.XMLStreamException;
-
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.jetspeed.capabilities.MediaType;
-
-public class JSMediaType
-{
-	// private int refID;
-
-	private String name;
-
-	private int id;
-
-	private String characterSet;
-
-	private String title;
-
-	private String description;
-
-    private ArrayList capabilities;
-
-    private ArrayList mimeTypes;
-
-    private JSClientCapabilities capabilitiesString;
-
-    private JSClientMimeTypes mimeTypesString;
-
-
-	public JSMediaType()
-	{
-		// refID = id;
-	}
-
-	public JSMediaType(MediaType c)
-	{
-		this.id = c.getMediatypeId();
-		this.name = c.getName();
-
-		this.characterSet = c.getCharacterSet();
-		this.title = c.getTitle();
-		this.description = c.getDescription();
-        capabilities = new ArrayList();
-        mimeTypes = new ArrayList();
-        
-	}
-
-	/***************************************************************************
-	 * SERIALIZER
-	 */
-	private static final XMLFormat XML = new XMLFormat(JSMediaType.class)
-	{
-		public void write(Object o, OutputElement xml)
-				throws XMLStreamException
-		{
-
-			try
-			{
-				JSMediaType g = (JSMediaType) o;
-                /** attributes here */
-
-				xml.setAttribute("name", g.name);
-
-                /** named fields HERE */
-
-                xml.add( g.characterSet, "charcterSet",String.class);
-				xml.add(g.title,"title", String.class);
-				xml.add(g.description, "description", String.class);
-
-                /** implicitly named (through binding) fields here */
-
-                g.capabilitiesString = new JSClientCapabilities(g.putTokens(g.capabilities));
-                g.mimeTypesString = new JSClientMimeTypes(g.putTokens(g.mimeTypes));
-                xml.add(g.capabilitiesString);
-                xml.add(g.mimeTypesString);
-
-				// xml.add(g.groupString);
-
-			} catch (Exception e)
-			{
-				e.printStackTrace();
-			}
-		}
-
-		public void read(InputElement xml, Object o)
-		{
-			try
-			{
-				JSMediaType g = (JSMediaType) o;
-               g.name = StringEscapeUtils.unescapeHtml(xml.getAttribute("name",""));
-
-                /** named fields HERE */
-                Object o1 = xml.get("charcterSet",String.class); //characterSet
-                if ((o1 != null) && (o1 instanceof String))
-                	g.characterSet = StringEscapeUtils.unescapeHtml((String)o1);
-                g.title = StringEscapeUtils.unescapeHtml((String)xml.get("title", String.class)); //title;
-                g.description  = StringEscapeUtils.unescapeHtml((String)xml.get("description", String.class)); //description;
-
-                while (xml.hasNext())
-                {
-                    o1 = xml.getNext(); // mime
-
-                    if (o1 instanceof JSClientCapabilities)
-                        g.capabilitiesString = (JSClientCapabilities) o1; //capabilitiesString;
-                    else
-                        if (o1 instanceof JSClientMimeTypes)
-                            g.mimeTypesString  = (JSClientMimeTypes)o1; //mimeTypesString;
-                }
-			} catch (Exception e)
-			{
-				e.printStackTrace();
-			}
-		}
-	};
-
-
-	/**
-	 * @return Returns the characterSet.
-	 */
-	public String getCharacterSet()
-	{
-		return characterSet;
-	}
-
-	/**
-	 * @param characterSet The characterSet to set.
-	 */
-	public void setCharacterSet(String characterSet)
-	{
-		this.characterSet = characterSet;
-	}
-
-	/**
-	 * @return Returns the description.
-	 */
-	public String getDescription()
-	{
-		return description;
-	}
-
-	/**
-	 * @param description The description to set.
-	 */
-	public void setDescription(String description)
-	{
-		this.description = description;
-	}
-
-	/**
-	 * @return Returns the id.
-	 */
-	public int getId()
-	{
-		return id;
-	}
-
-	/**
-	 * @param id The id to set.
-	 */
-	public void setId(int id)
-	{
-		this.id = id;
-	}
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * @param name The name to set.
-	 */
-	public void setName(String name)
-	{
-		this.name = name;
-	}
-
-	/**
-	 * @return Returns the title.
-	 */
-	public String getTitle()
-	{
-		return title;
-	}
-
-	/**
-	 * @param title The title to set.
-	 */
-	public void setTitle(String titel)
-	{
-		this.title = titel;
-	}
-    private String append(JSCapability capability)
-    {
-        return capability.getName();
-    }
-
-    private String append(JSMimeType mime)
-    {
-        return mime.getName();
-    }
-
-    private String append(Object s)
-    {
-        if (s instanceof JSCapability)
-            return append((JSCapability) s);
-        if (s instanceof JSMimeType)
-            return append((JSMimeType) s);
-
-        return s.toString();
-    }
-
-    private String putTokens(ArrayList _list)
-    {
-        if ((_list == null) || (_list.size() == 0))
-            return "";
-        boolean _start = true;
-        Iterator _it = _list.iterator();
-        StringBuffer _sb = new StringBuffer();
-        while (_it.hasNext())
-        {
-            if (!_start)
-                _sb.append(',');
-            else
-                _start = false;
-
-            _sb.append(append(_it.next()));
-        }
-        return _sb.toString();
-    }
-
-    /**
-     * @return Returns the capabilities.
-     */
-    public List getCapabilities()
-    {
-        return capabilities;
-    }
-
-    /**
-     * @param capabilities
-     *            The capabilities to set.
-     */
-    public void setCapabilities(ArrayList capabilities)
-    {
-        this.capabilities = capabilities;
-    }
-
-    /**
-     * @return Returns the mimeTypes.
-     */
-    public List getMimeTypes()
-    {
-        return mimeTypes;
-    }
-
-    /**
-     * @param mimeTypes
-     *            The mimeTypes to set.
-     */
-    public void setMimeTypes(ArrayList mimeTypes)
-    {
-        this.mimeTypes = mimeTypes;
-    }
-
-	public JSClientCapabilities getCapabilitiesString()
-	{
-		return capabilitiesString;
-	}
-
-	public JSClientMimeTypes getMimeTypesString()
-	{
-		return mimeTypesString;
-	}
-
-}
+/*
+ * 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.serializer.objects;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javolution.xml.XMLFormat;
+import javolution.xml.stream.XMLStreamException;
+
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.jetspeed.capabilities.MediaType;
+
+public class JSMediaType
+{
+	// private int refID;
+
+	private String name;
+
+	private int id;
+
+	private String characterSet;
+
+	private String title;
+
+	private String description;
+
+    private ArrayList capabilities;
+
+    private ArrayList mimeTypes;
+
+    private JSClientCapabilities capabilitiesString;
+
+    private JSClientMimeTypes mimeTypesString;
+
+
+	public JSMediaType()
+	{
+		// refID = id;
+	}
+
+	public JSMediaType(MediaType c)
+	{
+		this.id = c.getMediatypeId();
+		this.name = c.getName();
+
+		this.characterSet = c.getCharacterSet();
+		this.title = c.getTitle();
+		this.description = c.getDescription();
+        capabilities = new ArrayList();
+        mimeTypes = new ArrayList();
+        
+	}
+
+	/***************************************************************************
+	 * SERIALIZER
+	 */
+	private static final XMLFormat XML = new XMLFormat(JSMediaType.class)
+	{
+		public void write(Object o, OutputElement xml)
+				throws XMLStreamException
+		{
+
+			try
+			{
+				JSMediaType g = (JSMediaType) o;
+                /** attributes here */
+
+				xml.setAttribute("name", g.name);
+
+                /** named fields HERE */
+
+                xml.add( g.characterSet, "charcterSet",String.class);
+				xml.add(g.title,"title", String.class);
+				xml.add(g.description, "description", String.class);
+
+                /** implicitly named (through binding) fields here */
+
+                g.capabilitiesString = new JSClientCapabilities(g.putTokens(g.capabilities));
+                g.mimeTypesString = new JSClientMimeTypes(g.putTokens(g.mimeTypes));
+                xml.add(g.capabilitiesString);
+                xml.add(g.mimeTypesString);
+
+				// xml.add(g.groupString);
+
+			} catch (Exception e)
+			{
+				e.printStackTrace();
+			}
+		}
+
+		public void read(InputElement xml, Object o)
+		{
+			try
+			{
+				JSMediaType g = (JSMediaType) o;
+               g.name = StringEscapeUtils.unescapeHtml(xml.getAttribute("name",""));
+
+                /** named fields HERE */
+                Object o1 = xml.get("charcterSet",String.class); //characterSet
+                if ((o1 != null) && (o1 instanceof String))
+                	g.characterSet = StringEscapeUtils.unescapeHtml((String)o1);
+                g.title = StringEscapeUtils.unescapeHtml((String)xml.get("title", String.class)); //title;
+                g.description  = StringEscapeUtils.unescapeHtml((String)xml.get("description", String.class)); //description;
+
+                while (xml.hasNext())
+                {
+                    o1 = xml.getNext(); // mime
+
+                    if (o1 instanceof JSClientCapabilities)
+                        g.capabilitiesString = (JSClientCapabilities) o1; //capabilitiesString;
+                    else
+                        if (o1 instanceof JSClientMimeTypes)
+                            g.mimeTypesString  = (JSClientMimeTypes)o1; //mimeTypesString;
+                }
+			} catch (Exception e)
+			{
+				e.printStackTrace();
+			}
+		}
+	};
+
+
+	/**
+	 * @return Returns the characterSet.
+	 */
+	public String getCharacterSet()
+	{
+		return characterSet;
+	}
+
+	/**
+	 * @param characterSet The characterSet to set.
+	 */
+	public void setCharacterSet(String characterSet)
+	{
+		this.characterSet = characterSet;
+	}
+
+	/**
+	 * @return Returns the description.
+	 */
+	public String getDescription()
+	{
+		return description;
+	}
+
+	/**
+	 * @param description The description to set.
+	 */
+	public void setDescription(String description)
+	{
+		this.description = description;
+	}
+
+	/**
+	 * @return Returns the id.
+	 */
+	public int getId()
+	{
+		return id;
+	}
+
+	/**
+	 * @param id The id to set.
+	 */
+	public void setId(int id)
+	{
+		this.id = id;
+	}
+
+	/**
+	 * @return Returns the name.
+	 */
+	public String getName()
+	{
+		return name;
+	}
+
+	/**
+	 * @param name The name to set.
+	 */
+	public void setName(String name)
+	{
+		this.name = name;
+	}
+
+	/**
+	 * @return Returns the title.
+	 */
+	public String getTitle()
+	{
+		return title;
+	}
+
+	/**
+	 * @param title The title to set.
+	 */
+	public void setTitle(String titel)
+	{
+		this.title = titel;
+	}
+    private String append(JSCapability capability)
+    {
+        return capability.getName();
+    }
+
+    private String append(JSMimeType mime)
+    {
+        return mime.getName();
+    }
+
+    private String append(Object s)
+    {
+        if (s instanceof JSCapability)
+            return append((JSCapability) s);
+        if (s instanceof JSMimeType)
+            return append((JSMimeType) s);
+
+        return s.toString();
+    }
+
+    private String putTokens(ArrayList _list)
+    {
+        if ((_list == null) || (_list.size() == 0))
+            return "";
+        boolean _start = true;
+        Iterator _it = _list.iterator();
+        StringBuffer _sb = new StringBuffer();
+        while (_it.hasNext())
+        {
+            if (!_start)
+                _sb.append(',');
+            else
+                _start = false;
+
+            _sb.append(append(_it.next()));
+        }
+        return _sb.toString();
+    }
+
+    /**
+     * @return Returns the capabilities.
+     */
+    public List getCapabilities()
+    {
+        return capabilities;
+    }
+
+    /**
+     * @param capabilities
+     *            The capabilities to set.
+     */
+    public void setCapabilities(ArrayList capabilities)
+    {
+        this.capabilities = capabilities;
+    }
+
+    /**
+     * @return Returns the mimeTypes.
+     */
+    public List getMimeTypes()
+    {
+        return mimeTypes;
+    }
+
+    /**
+     * @param mimeTypes
+     *            The mimeTypes to set.
+     */
+    public void setMimeTypes(ArrayList mimeTypes)
+    {
+        this.mimeTypes = mimeTypes;
+    }
+
+	public JSClientCapabilities getCapabilitiesString()
+	{
+		return capabilitiesString;
+	}
+
+	public JSClientMimeTypes getMimeTypesString()
+	{
+		return mimeTypesString;
+	}
+
+}

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

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSMediaTypes.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSMediaTypes.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSMediaTypes.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSMediaTypes.java Fri Dec 12 04:06:29 2008
@@ -1,33 +1,33 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jetspeed.serializer.objects;
-
-import java.util.ArrayList;
-
-
-/**
-* Jetspeed Serializer - Simple media types Wrapper
-* <p>
-* Wrapper to process XML representation of a set of media types - used only for binding
-* 
-* @author <a href="mailto:hajo@bluesunrise.com">Hajo Birthelmer</a>
-* @version $Id: $
-*/
-public class JSMediaTypes extends ArrayList<JSMediaType>
-{
-    private static final long serialVersionUID = 1980446521894054025L;
-}
+/*
+ * 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.serializer.objects;
+
+import java.util.ArrayList;
+
+
+/**
+* Jetspeed Serializer - Simple media types Wrapper
+* <p>
+* Wrapper to process XML representation of a set of media types - used only for binding
+* 
+* @author <a href="mailto:hajo@bluesunrise.com">Hajo Birthelmer</a>
+* @version $Id: $
+*/
+public class JSMediaTypes extends ArrayList<JSMediaType>
+{
+    private static final long serialVersionUID = 1980446521894054025L;
+}

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

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSMimeType.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSMimeType.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSMimeType.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSMimeType.java Fri Dec 12 04:06:29 2008
@@ -1,21 +1,21 @@
-/*
- * 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.serializer.objects;
-
-public class JSMimeType extends JSGroup
-{
-}
+/*
+ * 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.serializer.objects;
+
+public class JSMimeType extends JSGroup
+{
+}

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

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSMimeTypes.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSMimeTypes.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSMimeTypes.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSMimeTypes.java Fri Dec 12 04:06:29 2008
@@ -1,33 +1,33 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jetspeed.serializer.objects;
-
-import java.util.ArrayList;
-
-
-/**
-* Jetspeed Serializer - Simple mime types Wrapper
-* <p>
-* Wrapper to process XML representation of a set of mime types - used only for binding
-* 
-* @author <a href="mailto:hajo@bluesunrise.com">Hajo Birthelmer</a>
-* @version $Id: $
-*/
-public class JSMimeTypes extends ArrayList<JSMimeType>
-{
-    private static final long serialVersionUID = -3255090433022941285L;
-}
+/*
+ * 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.serializer.objects;
+
+import java.util.ArrayList;
+
+
+/**
+* Jetspeed Serializer - Simple mime types Wrapper
+* <p>
+* Wrapper to process XML representation of a set of mime types - used only for binding
+* 
+* @author <a href="mailto:hajo@bluesunrise.com">Hajo Birthelmer</a>
+* @version $Id: $
+*/
+public class JSMimeTypes extends ArrayList<JSMimeType>
+{
+    private static final long serialVersionUID = -3255090433022941285L;
+}

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

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

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

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

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSPWAttributes.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSPWAttributes.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSPWAttributes.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSPWAttributes.java Fri Dec 12 04:06:29 2008
@@ -1,28 +1,28 @@
-/*
+/*
  * 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.serializer.objects;
-
-public class JSPWAttributes extends JSNameValuePairs
-{
-
-
-    public JSPWAttributes()
-    {
-        super();
-    }
-}
+ * 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.serializer.objects;
+
+public class JSPWAttributes extends JSNameValuePairs
+{
+
+
+    public JSPWAttributes()
+    {
+        super();
+    }
+}

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

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSPermission.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSPermission.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSPermission.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSPermission.java Fri Dec 12 04:06:29 2008
@@ -1,316 +1,316 @@
-/*
- * 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.serializer.objects;
-
-import java.util.List;
-import java.util.ArrayList;
-
-import javolution.xml.XMLFormat;
-import javolution.xml.stream.XMLStreamException;
-
-import org.apache.commons.lang.StringEscapeUtils;
-
-/**
- * Serialized Permission <permission type='folder' resource='/' actions='view,
- * edit'> <roles>admin, user</roles> <groups>dev</groups> <users>joe</users>
- * </permission>
- * 
- * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
- * @version $Id: $
- */
-public class JSPermission
-{
-
-	private String type;
-
-	private String resource;
-
-	private String actions;
-
-	private long id;
-
-	private List<JSPrincipal> roles = null;
-
-	private List<JSPrincipal> groups = null;
-
-	private List<JSPrincipal> users = null;
-
-	private JSUserRoles roleString;
-
-	private JSUserGroups groupString;
-
-	private JSUserUsers userString;
-
-	public static final String TYPE_FOLDER = "folder".intern();
-
-	public static final String TYPE_FRAGMENT = "fragment".intern();
-
-	public static final String TYPE_PAGE = "page".intern();
-
-	public static final String TYPE_PORTALRESOURCE = "portalResource".intern();
-
-	public static final String TYPE_PORTALRESOURCECOLLECTION = "portalResource"
-			.intern();
-
-	public static final String TYPE_PORTAL = "portal".intern();
-
-	public static final String TYPE_UNKNOWN = "unknown".intern();
-
-	public JSPermission()
-	{
-	}
-
-	private String putTokens(List<JSPrincipal> _list)
-	{
-		if ((_list == null) || (_list.size() == 0))
-			return "";
-		
-		boolean _start = true;
-		StringBuffer _sb = new StringBuffer();
-		
-		for (JSPrincipal jsPrincipal : _list)
-		{
-			if (!_start)
-				_sb.append(',');
-			else
-				_start = false;
-
-			_sb.append(jsPrincipal.getName());
-		}
-		
-		return _sb.toString();
-	}
-
-	/**
-	 * @return Returns the actions.
-	 */
-	public String getActions()
-	{
-		return actions;
-	}
-
-	/**
-	 * @param actions
-	 *            The actions to set.
-	 */
-	public void setActions(String actions)
-	{
-		this.actions = actions;
-	}
-
-	/**
-	 * @return Returns the groups.
-	 */
-	public List<JSPrincipal> getGroups()
-	{
-		return groups;
-	}
-
-	/**
-	 * @param groups
-	 *            The groups to set.
-	 */
-	public void setGroups(List<JSPrincipal> groups)
-	{
-		this.groups = groups;
-	}
-
-	/**
-	 * @return Returns the resource.
-	 */
-	public String getResource()
-	{
-		return resource;
-	}
-
-	/**
-	 * @param resource
-	 *            The resource to set.
-	 */
-	public void setResource(String resource)
-	{
-		this.resource = resource;
-	}
-
-	/**
-	 * @return Returns the roles.
-	 */
-	public List<JSPrincipal> getRoles()
-	{
-		return roles;
-	}
-
-	/**
-	 * @param roles
-	 *            The roles to set.
-	 */
-	public void setRoles(List<JSPrincipal> roles)
-	{
-		this.roles = roles;
-	}
-
-	/**
-	 * @return Returns the type.
-	 */
-	public String getType()
-	{
-		return type;
-	}
-
-	/**
-	 * @param type
-	 *            The type to set.
-	 */
-	public void setType(String type)
-	{
-		this.type = type;
-	}
-
-	/**
-	 * @return Returns the users.
-	 */
-	public List<JSPrincipal> getUsers()
-	{
-		return users;
-	}
-
-	/**
-	 * @param users
-	 *            The users to set.
-	 */
-	public void setUsers(List<JSPrincipal> users)
-	{
-		this.users = users;
-	}
-
-
-	/**
-	 * @return Returns the id.
-	 */
-	public long getId()
-	{
-		return id;
-	}
-
-	/**
-	 * @param id
-	 *            The id to set.
-	 */
-	public void setId(long id)
-	{
-		this.id = id;
-	}
-
-	public void addGroup(JSPrincipal group)
-	{
-		if (groups == null)
-			groups = new ArrayList<JSPrincipal>();
-		
-		groups.add(group);
-	}
-
-	public void addRole(JSPrincipal role)
-	{
-		if (roles == null)
-			roles = new ArrayList<JSPrincipal>();
-		
-		roles.add(role);
-	}
-
-
-	public void addUser(JSPrincipal user)
-	{
-		if (users == null)
-			users = new ArrayList<JSPrincipal>();
-		
-		users.add(user);
-	}
-
-
-	/***************************************************************************
-	 * SERIALIZER
-	 */
-	private static final XMLFormat XML = new XMLFormat(JSPermission.class)
-	{
-		public void write(Object o, OutputElement xml)
-				throws XMLStreamException
-		{
-			try
-			{
-				JSPermission g = (JSPermission) o;
-				xml.setAttribute("type", g.getType());
-				xml.setAttribute("resource",g.getResource());
-				xml.setAttribute("actions",g.getActions());
-				g.groupString = new JSUserGroups(g.putTokens(g.getGroups()));
-				g.roleString = new JSUserRoles(g.putTokens(g.getRoles())); 
-				g.userString = new JSUserUsers(g.putTokens(g.getUsers())); 
-				xml.add(g.roleString);
-				xml.add(g.groupString);
-				xml.add(g.userString);
-
-			} catch (Exception e)
-			{
-				e.printStackTrace();
-			}
-		}
-
-		public void read(InputElement xml, Object o)
-		{
-			try
-			{
-				JSPermission g = (JSPermission) o;
-				g.type = StringEscapeUtils.unescapeHtml(xml.getAttribute("type", "type_unknown"));
-				g.resource = StringEscapeUtils.unescapeHtml(xml.getAttribute("resource", "resource_unknown"));
-				g.actions = StringEscapeUtils.unescapeHtml(xml.getAttribute("actions", "unknown_actions"));
-				
-	               while (xml.hasNext())
-	                {
-	                    Object o1 = xml.getNext(); // mime
-
-	                    if (o1 instanceof JSUserGroups)
-	                        g.groupString = (JSUserGroups) o1;
-	                    else if (o1 instanceof JSUserUsers)
-	                        g.userString = (JSUserUsers) o1;
-	                    else if (o1 instanceof JSUserRoles)
-	                        g.roleString = (JSUserRoles) o1;
-	                }
-			} catch (Exception e)
-			{
-				e.printStackTrace();
-			}
-		}
-
-	};
-
-	public JSUserGroups getGroupString()
-	{
-		return groupString;
-	}
-
-	public JSUserRoles getRoleString()
-	{
-		return roleString;
-	}
-
-	public JSUserUsers getUserString()
-	{
-		return userString;
-	}
-
-
-	
-}
+/*
+ * 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.serializer.objects;
+
+import java.util.List;
+import java.util.ArrayList;
+
+import javolution.xml.XMLFormat;
+import javolution.xml.stream.XMLStreamException;
+
+import org.apache.commons.lang.StringEscapeUtils;
+
+/**
+ * Serialized Permission <permission type='folder' resource='/' actions='view,
+ * edit'> <roles>admin, user</roles> <groups>dev</groups> <users>joe</users>
+ * </permission>
+ * 
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+ * @version $Id: $
+ */
+public class JSPermission
+{
+
+	private String type;
+
+	private String resource;
+
+	private String actions;
+
+	private long id;
+
+	private List<JSPrincipal> roles = null;
+
+	private List<JSPrincipal> groups = null;
+
+	private List<JSPrincipal> users = null;
+
+	private JSUserRoles roleString;
+
+	private JSUserGroups groupString;
+
+	private JSUserUsers userString;
+
+	public static final String TYPE_FOLDER = "folder".intern();
+
+	public static final String TYPE_FRAGMENT = "fragment".intern();
+
+	public static final String TYPE_PAGE = "page".intern();
+
+	public static final String TYPE_PORTALRESOURCE = "portalResource".intern();
+
+	public static final String TYPE_PORTALRESOURCECOLLECTION = "portalResource"
+			.intern();
+
+	public static final String TYPE_PORTAL = "portal".intern();
+
+	public static final String TYPE_UNKNOWN = "unknown".intern();
+
+	public JSPermission()
+	{
+	}
+
+	private String putTokens(List<JSPrincipal> _list)
+	{
+		if ((_list == null) || (_list.size() == 0))
+			return "";
+		
+		boolean _start = true;
+		StringBuffer _sb = new StringBuffer();
+		
+		for (JSPrincipal jsPrincipal : _list)
+		{
+			if (!_start)
+				_sb.append(',');
+			else
+				_start = false;
+
+			_sb.append(jsPrincipal.getName());
+		}
+		
+		return _sb.toString();
+	}
+
+	/**
+	 * @return Returns the actions.
+	 */
+	public String getActions()
+	{
+		return actions;
+	}
+
+	/**
+	 * @param actions
+	 *            The actions to set.
+	 */
+	public void setActions(String actions)
+	{
+		this.actions = actions;
+	}
+
+	/**
+	 * @return Returns the groups.
+	 */
+	public List<JSPrincipal> getGroups()
+	{
+		return groups;
+	}
+
+	/**
+	 * @param groups
+	 *            The groups to set.
+	 */
+	public void setGroups(List<JSPrincipal> groups)
+	{
+		this.groups = groups;
+	}
+
+	/**
+	 * @return Returns the resource.
+	 */
+	public String getResource()
+	{
+		return resource;
+	}
+
+	/**
+	 * @param resource
+	 *            The resource to set.
+	 */
+	public void setResource(String resource)
+	{
+		this.resource = resource;
+	}
+
+	/**
+	 * @return Returns the roles.
+	 */
+	public List<JSPrincipal> getRoles()
+	{
+		return roles;
+	}
+
+	/**
+	 * @param roles
+	 *            The roles to set.
+	 */
+	public void setRoles(List<JSPrincipal> roles)
+	{
+		this.roles = roles;
+	}
+
+	/**
+	 * @return Returns the type.
+	 */
+	public String getType()
+	{
+		return type;
+	}
+
+	/**
+	 * @param type
+	 *            The type to set.
+	 */
+	public void setType(String type)
+	{
+		this.type = type;
+	}
+
+	/**
+	 * @return Returns the users.
+	 */
+	public List<JSPrincipal> getUsers()
+	{
+		return users;
+	}
+
+	/**
+	 * @param users
+	 *            The users to set.
+	 */
+	public void setUsers(List<JSPrincipal> users)
+	{
+		this.users = users;
+	}
+
+
+	/**
+	 * @return Returns the id.
+	 */
+	public long getId()
+	{
+		return id;
+	}
+
+	/**
+	 * @param id
+	 *            The id to set.
+	 */
+	public void setId(long id)
+	{
+		this.id = id;
+	}
+
+	public void addGroup(JSPrincipal group)
+	{
+		if (groups == null)
+			groups = new ArrayList<JSPrincipal>();
+		
+		groups.add(group);
+	}
+
+	public void addRole(JSPrincipal role)
+	{
+		if (roles == null)
+			roles = new ArrayList<JSPrincipal>();
+		
+		roles.add(role);
+	}
+
+
+	public void addUser(JSPrincipal user)
+	{
+		if (users == null)
+			users = new ArrayList<JSPrincipal>();
+		
+		users.add(user);
+	}
+
+
+	/***************************************************************************
+	 * SERIALIZER
+	 */
+	private static final XMLFormat XML = new XMLFormat(JSPermission.class)
+	{
+		public void write(Object o, OutputElement xml)
+				throws XMLStreamException
+		{
+			try
+			{
+				JSPermission g = (JSPermission) o;
+				xml.setAttribute("type", g.getType());
+				xml.setAttribute("resource",g.getResource());
+				xml.setAttribute("actions",g.getActions());
+				g.groupString = new JSUserGroups(g.putTokens(g.getGroups()));
+				g.roleString = new JSUserRoles(g.putTokens(g.getRoles())); 
+				g.userString = new JSUserUsers(g.putTokens(g.getUsers())); 
+				xml.add(g.roleString);
+				xml.add(g.groupString);
+				xml.add(g.userString);
+
+			} catch (Exception e)
+			{
+				e.printStackTrace();
+			}
+		}
+
+		public void read(InputElement xml, Object o)
+		{
+			try
+			{
+				JSPermission g = (JSPermission) o;
+				g.type = StringEscapeUtils.unescapeHtml(xml.getAttribute("type", "type_unknown"));
+				g.resource = StringEscapeUtils.unescapeHtml(xml.getAttribute("resource", "resource_unknown"));
+				g.actions = StringEscapeUtils.unescapeHtml(xml.getAttribute("actions", "unknown_actions"));
+				
+	               while (xml.hasNext())
+	                {
+	                    Object o1 = xml.getNext(); // mime
+
+	                    if (o1 instanceof JSUserGroups)
+	                        g.groupString = (JSUserGroups) o1;
+	                    else if (o1 instanceof JSUserUsers)
+	                        g.userString = (JSUserUsers) o1;
+	                    else if (o1 instanceof JSUserRoles)
+	                        g.roleString = (JSUserRoles) o1;
+	                }
+			} catch (Exception e)
+			{
+				e.printStackTrace();
+			}
+		}
+
+	};
+
+	public JSUserGroups getGroupString()
+	{
+		return groupString;
+	}
+
+	public JSUserRoles getRoleString()
+	{
+		return roleString;
+	}
+
+	public JSUserUsers getUserString()
+	{
+		return userString;
+	}
+
+
+	
+}

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

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSPermissions.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSPermissions.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSPermissions.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSPermissions.java Fri Dec 12 04:06:29 2008
@@ -1,33 +1,33 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jetspeed.serializer.objects;
-
-import java.util.ArrayList;
-
-
-/**
-* Jetspeed Serializer - Simple Permissions Wrapper
-* <p>
-* Wrapper to process XML representation of a set of permissions - used only for binding
-* 
-* @author <a href="mailto:hajo@bluesunrise.com">Hajo Birthelmer</a>
-* @version $Id: $
-*/
-public class JSPermissions extends ArrayList<JSPermission>
-{
-    private static final long serialVersionUID = -5989542652543681219L;
-}
+/*
+ * 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.serializer.objects;
+
+import java.util.ArrayList;
+
+
+/**
+* Jetspeed Serializer - Simple Permissions Wrapper
+* <p>
+* Wrapper to process XML representation of a set of permissions - used only for binding
+* 
+* @author <a href="mailto:hajo@bluesunrise.com">Hajo Birthelmer</a>
+* @version $Id: $
+*/
+public class JSPermissions extends ArrayList<JSPermission>
+{
+    private static final long serialVersionUID = -5989542652543681219L;
+}

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

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

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

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSPrincipalRule.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSPrincipalRule.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSPrincipalRule.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSPrincipalRule.java Fri Dec 12 04:06:29 2008
@@ -1,111 +1,111 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jetspeed.serializer.objects;
-import javolution.xml.XMLFormat;
-import javolution.xml.stream.XMLStreamException;
-
-import org.apache.commons.lang.StringEscapeUtils;
-
-public class JSPrincipalRule
-{
-// int refID;
-
-	private String locator;
-
-	private String rule;
-
-    public JSPrincipalRule()
-    {
-    }
-	public JSPrincipalRule(String locator, String rule)
-	{
-//		refID = id;
-		this.locator = locator;
-		this.rule = rule;
-	}
-
-	/***************************************************************************
-	 * SERIALIZER
-	 */
-	private static final XMLFormat XML = new XMLFormat(JSPrincipalRule.class)
-	{
-		public void write(Object o, OutputElement xml)
-				throws XMLStreamException
-		{
-			try
-			{
-				JSPrincipalRule g = (JSPrincipalRule) o;
-				xml.setAttribute("locator", g.locator);
-				xml.setAttribute("rule", g.rule);
-			} catch (Exception e)
-			{
-				e.printStackTrace();
-			}
-		}
-
-		public void read(InputElement xml, Object o)
-		{
-			try
-			{
-				JSPrincipalRule g = (JSPrincipalRule) o;
-				g.setLocator(StringEscapeUtils.unescapeHtml(xml.getAttribute("locator","unknown")));
-				g.setRule(StringEscapeUtils.unescapeHtml(xml.getAttribute("rule","unknown")));
-				
-				
-			} catch (Exception e)
-			{
-				e.printStackTrace();
-			}
-		}
-
-	};
-
-
-
-
-	/**
-	 * @return Returns the locator.
-	 */
-	public String getLocator()
-	{
-		return locator;
-	}
-
-	/**
-	 * @param locator The locator to set.
-	 */
-	public void setLocator(String locator)
-	{
-		this.locator = locator;
-	}
-
-	/**
-	 * @return Returns the rule.
-	 */
-	public String getRule()
-	{
-		return rule;
-	}
-
-	/**
-	 * @param rule The rule to set.
-	 */
-	public void setRule(String rule)
-	{
-		this.rule = rule;
-	}
-}
+/*
+ * 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.serializer.objects;
+import javolution.xml.XMLFormat;
+import javolution.xml.stream.XMLStreamException;
+
+import org.apache.commons.lang.StringEscapeUtils;
+
+public class JSPrincipalRule
+{
+// int refID;
+
+	private String locator;
+
+	private String rule;
+
+    public JSPrincipalRule()
+    {
+    }
+	public JSPrincipalRule(String locator, String rule)
+	{
+//		refID = id;
+		this.locator = locator;
+		this.rule = rule;
+	}
+
+	/***************************************************************************
+	 * SERIALIZER
+	 */
+	private static final XMLFormat XML = new XMLFormat(JSPrincipalRule.class)
+	{
+		public void write(Object o, OutputElement xml)
+				throws XMLStreamException
+		{
+			try
+			{
+				JSPrincipalRule g = (JSPrincipalRule) o;
+				xml.setAttribute("locator", g.locator);
+				xml.setAttribute("rule", g.rule);
+			} catch (Exception e)
+			{
+				e.printStackTrace();
+			}
+		}
+
+		public void read(InputElement xml, Object o)
+		{
+			try
+			{
+				JSPrincipalRule g = (JSPrincipalRule) o;
+				g.setLocator(StringEscapeUtils.unescapeHtml(xml.getAttribute("locator","unknown")));
+				g.setRule(StringEscapeUtils.unescapeHtml(xml.getAttribute("rule","unknown")));
+				
+				
+			} catch (Exception e)
+			{
+				e.printStackTrace();
+			}
+		}
+
+	};
+
+
+
+
+	/**
+	 * @return Returns the locator.
+	 */
+	public String getLocator()
+	{
+		return locator;
+	}
+
+	/**
+	 * @param locator The locator to set.
+	 */
+	public void setLocator(String locator)
+	{
+		this.locator = locator;
+	}
+
+	/**
+	 * @return Returns the rule.
+	 */
+	public String getRule()
+	{
+		return rule;
+	}
+
+	/**
+	 * @param rule The rule to set.
+	 */
+	public void setRule(String rule)
+	{
+		this.rule = rule;
+	}
+}

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

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSPrincipalRules.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSPrincipalRules.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSPrincipalRules.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSPrincipalRules.java Fri Dec 12 04:06:29 2008
@@ -1,32 +1,32 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jetspeed.serializer.objects;
-
-import java.util.ArrayList;
-
-
-/**
-* Jetspeed Serializer - Simple Prinicpal Rules Wrapper
-* <p>
-* Wrapper to process XML representation of a set of principal rules - used only for binding
-* 
-* @author <a href="mailto:hajo@bluesunrise.com">Hajo Birthelmer</a>
-* @version $Id: $
-*/
-public class JSPrincipalRules extends ArrayList<JSPrincipalRule>
-{
-}
+/*
+ * 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.serializer.objects;
+
+import java.util.ArrayList;
+
+
+/**
+* Jetspeed Serializer - Simple Prinicpal Rules Wrapper
+* <p>
+* Wrapper to process XML representation of a set of principal rules - used only for binding
+* 
+* @author <a href="mailto:hajo@bluesunrise.com">Hajo Birthelmer</a>
+* @version $Id: $
+*/
+public class JSPrincipalRules extends ArrayList<JSPrincipalRule>
+{
+}

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

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSProcessOrder.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSProcessOrder.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSProcessOrder.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSProcessOrder.java Fri Dec 12 04:06:29 2008
@@ -1,90 +1,90 @@
-/*
- * 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.serializer.objects;
-
-import javolution.xml.XMLFormat;
-import javolution.xml.stream.XMLStreamException;
-
-public class JSProcessOrder
-{
-    private JSMimeTypes ordererList;
-
-    public JSProcessOrder()
-    {
-    }
-
- 
-    /***************************************************************************
-     * SERIALIZER
-     */
-    private static final XMLFormat XML = new XMLFormat(JSProcessOrder.class)
-    {
-
-        public void write(Object o, OutputElement xml)
-                throws XMLStreamException
-        {
-        	
-            try
-            {
-            	JSProcessOrder g = (JSProcessOrder) o;
-                xml.add(g.getMimeTypes());
-
-            } catch (Exception e)
-            {
-                e.printStackTrace();
-            }
-        }
-
-        public void read(InputElement xml, Object o)
-        {
-            try
-            {
-            	JSProcessOrder g = (JSProcessOrder) o;
-                while (xml.hasNext())
-                {
-                    Object o1 = xml.getNext(); // mime
-
-                    if (o1 instanceof JSMimeTypes)
-                        g.ordererList = (JSMimeTypes) o1;
-                }
-            } catch (Exception e)
-            {
-                e.printStackTrace();
-            }
-        }
-    };
-
-
-    /**
-     * @return Returns the mimeTypes.
-     */
-    public JSMimeTypes getMimeTypes()
-    {
-        return ordererList;
-    }
-
-    /**
-     * @param mimeTypes
-     *            The mimeTypes to set.
-     */
-    public void setMimeTypes(JSMimeTypes ordererList)
-    {
-        this.ordererList = ordererList;
-    }
-
-}
+/*
+ * 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.serializer.objects;
+
+import javolution.xml.XMLFormat;
+import javolution.xml.stream.XMLStreamException;
+
+public class JSProcessOrder
+{
+    private JSMimeTypes ordererList;
+
+    public JSProcessOrder()
+    {
+    }
+
+ 
+    /***************************************************************************
+     * SERIALIZER
+     */
+    private static final XMLFormat XML = new XMLFormat(JSProcessOrder.class)
+    {
+
+        public void write(Object o, OutputElement xml)
+                throws XMLStreamException
+        {
+        	
+            try
+            {
+            	JSProcessOrder g = (JSProcessOrder) o;
+                xml.add(g.getMimeTypes());
+
+            } catch (Exception e)
+            {
+                e.printStackTrace();
+            }
+        }
+
+        public void read(InputElement xml, Object o)
+        {
+            try
+            {
+            	JSProcessOrder g = (JSProcessOrder) o;
+                while (xml.hasNext())
+                {
+                    Object o1 = xml.getNext(); // mime
+
+                    if (o1 instanceof JSMimeTypes)
+                        g.ordererList = (JSMimeTypes) o1;
+                }
+            } catch (Exception e)
+            {
+                e.printStackTrace();
+            }
+        }
+    };
+
+
+    /**
+     * @return Returns the mimeTypes.
+     */
+    public JSMimeTypes getMimeTypes()
+    {
+        return ordererList;
+    }
+
+    /**
+     * @param mimeTypes
+     *            The mimeTypes to set.
+     */
+    public void setMimeTypes(JSMimeTypes ordererList)
+    {
+        this.ordererList = ordererList;
+    }
+
+}

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

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSProfilingRule.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSProfilingRule.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSProfilingRule.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSProfilingRule.java Fri Dec 12 04:06:29 2008
@@ -1,154 +1,154 @@
-/*
+/*
  * 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.serializer.objects;
-
-import javolution.xml.XMLFormat;
-import javolution.xml.stream.XMLStreamException;
-
-import org.apache.commons.lang.StringEscapeUtils;
-
-/**
- * Import ProfilingRule
- * 
- *   <profilingRule name = j2>
- *       <description>whatever</description>
- *       <className>org.apache.jetspeed.profile.RuleImpl</className>
- *       <criteria>
- *          ...
- *       </criteria>
- *   </profilingRule>
- *   
- * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
- * @version $Id: $
- */
-public class JSProfilingRule
-{
-    private String id;
-    private boolean standardRule;
-    private String description;
-    JSRuleCriterions criterions = new JSRuleCriterions();
-    
-    
-    public JSProfilingRule()
-    {        
-    }
-
-    
-    public boolean isStandardRule()
-    {
-        return standardRule;
-    }
-
-    
-    public void setStandardRule(boolean standard)
-    {
-        this.standardRule = standard;
-    }
-
-    
-    public String getDescription()
-    {
-        return description;
-    }
-
-    
-    public void setDescription(String description)
-    {
-        this.description = description;
-    }
-
-    
-    public String getId()
-    {
-        return id;
-    }
-
-    
-    public void setId(String id)
-    {
-        this.id = id;
-    }
-
-    
- 
-	/***************************************************************************
-	 * SERIALIZER
-	 */
-	private static final XMLFormat XML = new XMLFormat(JSProfilingRule.class)
-	{
-		public void write(Object o, OutputElement xml)
-				throws XMLStreamException
-		{
-
-			try
-			{
-				JSProfilingRule g = (JSProfilingRule) o;
-				xml.setAttribute("id", g.id);
-				xml.setAttribute("standardRule", g.standardRule);
-				xml.add( g.description, "description",String.class);
-				xml.add(g.criterions);
-
-			} catch (Exception e)
-			{
-				e.printStackTrace();
-			}
-		}
-
-		public void read(InputElement xml, Object o)
-		{
-			try
-			{
-				JSProfilingRule g = (JSProfilingRule) o;
-				g.id = StringEscapeUtils.unescapeHtml(xml.getAttribute("id","unkwown_id"));
-				g.standardRule = xml.getAttribute("standardRule",false);
-	               Object o1 = xml.get("description",String.class);
-	                if (o1 instanceof String)
-	                    g.description = (String) o1;
-	                while (xml.hasNext())
-	                {
-	                    o1 = xml.getNext(); // mime
-
-	                    if (o1 instanceof JSRuleCriterions)
-	                        g.criterions = (JSRuleCriterions) o1;
-	                }
-	        			} catch (Exception e)
-			{
-				e.printStackTrace();
-			}
-		}
-	};
-
-
-	/**
-	 * @return Returns the criterions.
-	 */
-	public JSRuleCriterions getCriterions()
-	{
-		return criterions;
-	}
-
-
-	/**
-	 * @param criterions The criterions to set.
-	 */
-	public void setCriterions(JSRuleCriterions criterions)
-	{
-		this.criterions = criterions;
-	}
-
-    
+ * 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.serializer.objects;
+
+import javolution.xml.XMLFormat;
+import javolution.xml.stream.XMLStreamException;
+
+import org.apache.commons.lang.StringEscapeUtils;
+
+/**
+ * Import ProfilingRule
+ * 
+ *   <profilingRule name = j2>
+ *       <description>whatever</description>
+ *       <className>org.apache.jetspeed.profile.RuleImpl</className>
+ *       <criteria>
+ *          ...
+ *       </criteria>
+ *   </profilingRule>
+ *   
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+ * @version $Id: $
+ */
+public class JSProfilingRule
+{
+    private String id;
+    private boolean standardRule;
+    private String description;
+    JSRuleCriterions criterions = new JSRuleCriterions();
+    
+    
+    public JSProfilingRule()
+    {        
+    }
+
+    
+    public boolean isStandardRule()
+    {
+        return standardRule;
+    }
+
+    
+    public void setStandardRule(boolean standard)
+    {
+        this.standardRule = standard;
+    }
+
+    
+    public String getDescription()
+    {
+        return description;
+    }
+
+    
+    public void setDescription(String description)
+    {
+        this.description = description;
+    }
+
+    
+    public String getId()
+    {
+        return id;
+    }
+
+    
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    
+ 
+	/***************************************************************************
+	 * SERIALIZER
+	 */
+	private static final XMLFormat XML = new XMLFormat(JSProfilingRule.class)
+	{
+		public void write(Object o, OutputElement xml)
+				throws XMLStreamException
+		{
+
+			try
+			{
+				JSProfilingRule g = (JSProfilingRule) o;
+				xml.setAttribute("id", g.id);
+				xml.setAttribute("standardRule", g.standardRule);
+				xml.add( g.description, "description",String.class);
+				xml.add(g.criterions);
+
+			} catch (Exception e)
+			{
+				e.printStackTrace();
+			}
+		}
+
+		public void read(InputElement xml, Object o)
+		{
+			try
+			{
+				JSProfilingRule g = (JSProfilingRule) o;
+				g.id = StringEscapeUtils.unescapeHtml(xml.getAttribute("id","unkwown_id"));
+				g.standardRule = xml.getAttribute("standardRule",false);
+	               Object o1 = xml.get("description",String.class);
+	                if (o1 instanceof String)
+	                    g.description = (String) o1;
+	                while (xml.hasNext())
+	                {
+	                    o1 = xml.getNext(); // mime
+
+	                    if (o1 instanceof JSRuleCriterions)
+	                        g.criterions = (JSRuleCriterions) o1;
+	                }
+	        			} catch (Exception e)
+			{
+				e.printStackTrace();
+			}
+		}
+	};
+
+
+	/**
+	 * @return Returns the criterions.
+	 */
+	public JSRuleCriterions getCriterions()
+	{
+		return criterions;
+	}
+
+
+	/**
+	 * @param criterions The criterions to set.
+	 */
+	public void setCriterions(JSRuleCriterions criterions)
+	{
+		this.criterions = criterions;
+	}
+
+    
 }
\ No newline at end of file

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

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSProfilingRules.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSProfilingRules.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSProfilingRules.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSProfilingRules.java Fri Dec 12 04:06:29 2008
@@ -1,33 +1,33 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jetspeed.serializer.objects;
-
-import java.util.ArrayList;
-
-
-/**
-* Jetspeed Serializer - Simple Profiling Rules Wrapper
-* <p>
-* Wrapper to process XML representation of a set of profiling rules - used only for binding
-* 
-* @author <a href="mailto:hajo@bluesunrise.com">Hajo Birthelmer</a>
-* @version $Id: $
-*/
-public class JSProfilingRules extends ArrayList<JSProfilingRule>
-{
-    private static final long serialVersionUID = -3452575197134401194L;
-}
+/*
+ * 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.serializer.objects;
+
+import java.util.ArrayList;
+
+
+/**
+* Jetspeed Serializer - Simple Profiling Rules Wrapper
+* <p>
+* Wrapper to process XML representation of a set of profiling rules - used only for binding
+* 
+* @author <a href="mailto:hajo@bluesunrise.com">Hajo Birthelmer</a>
+* @version $Id: $
+*/
+public class JSProfilingRules extends ArrayList<JSProfilingRule>
+{
+    private static final long serialVersionUID = -3452575197134401194L;
+}

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

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSRole.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSRole.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSRole.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSRole.java Fri Dec 12 04:06:29 2008
@@ -1,21 +1,21 @@
-/*
- * 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.serializer.objects;
-
-public class JSRole extends JSGroup
-{
-}
+/*
+ * 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.serializer.objects;
+
+public class JSRole extends JSGroup
+{
+}

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

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSRoles.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSRoles.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSRoles.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSRoles.java Fri Dec 12 04:06:29 2008
@@ -1,33 +1,33 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jetspeed.serializer.objects;
-
-import java.util.ArrayList;
-
-
-/**
-* Jetspeed Serializer - Simple Rules Wrapper
-* <p>
-* Wrapper to process XML representation of a set of rules - used only for binding
-* 
-* @author <a href="mailto:hajo@bluesunrise.com">Hajo Birthelmer</a>
-* @version $Id: $
-*/
-public class JSRoles extends ArrayList<JSRole>
-{
-    private static final long serialVersionUID = 6682626744785492346L;
-}
+/*
+ * 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.serializer.objects;
+
+import java.util.ArrayList;
+
+
+/**
+* Jetspeed Serializer - Simple Rules Wrapper
+* <p>
+* Wrapper to process XML representation of a set of rules - used only for binding
+* 
+* @author <a href="mailto:hajo@bluesunrise.com">Hajo Birthelmer</a>
+* @version $Id: $
+*/
+public class JSRoles extends ArrayList<JSRole>
+{
+    private static final long serialVersionUID = 6682626744785492346L;
+}

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSRoles.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