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 [28/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/JSRuleCriterion.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSRuleCriterion.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/JSRuleCriterion.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSRuleCriterion.java Fri Dec 12 04:06:29 2008
@@ -1,191 +1,191 @@
-/*
- * 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 org.apache.jetspeed.profiler.rules.RuleCriterion;
-
-public class JSRuleCriterion
-{
-	// private int refID;
-
-	private String name;
-
-
-	private String type;
-
-	private String value;
-
-	private int fallBackOrder;
-
-	private int fallBackType;
-
-	public JSRuleCriterion()
-	{
-		// refID = id;
-	}
-
-	public JSRuleCriterion(RuleCriterion c)
-	{
-		this.name = c.getName();
-		this.type = c.getType();
-		this.value = c.getValue();
-		this.fallBackOrder = c.getFallbackOrder();
-		this.fallBackType = c.getFallbackType();
-	}
-
-	/***************************************************************************
-	 * SERIALIZER
-	 */
-	private static final XMLFormat XML = new XMLFormat(JSRuleCriterion.class)
-	{
-		public void write(Object o, OutputElement xml)
-				throws XMLStreamException
-		{
-
-			try
-			{
-				JSRuleCriterion g = (JSRuleCriterion) o;
-				xml.setAttribute("name", g.name);
-				xml.add( g.type, "type",String.class);
-				xml.add(g.value,"value", String.class);
-				xml.add(new Integer(g.fallBackOrder), "fallBackOrder", Integer.class);
-				xml.add(new Integer(g.fallBackType), "fallBackType", Integer.class);
-
-				// xml.add(g.groupString);
-
-			} catch (Exception e)
-			{
-				e.printStackTrace();
-			}
-		}
-
-		public void read(InputElement xml, Object o)
-		{
-			try
-			{
-				JSRuleCriterion g = (JSRuleCriterion) o;
-				g.name = StringEscapeUtils.unescapeHtml(xml.getAttribute("name","unknown_name"));
-                Object o1 = xml.get("type",String.class);
-                if (o1 instanceof String) g.type = StringEscapeUtils.unescapeHtml((String) o1);
-                o1 = xml.get("value",String.class);
-                if (o1 instanceof String) g.value = StringEscapeUtils.unescapeHtml((String) o1);
-
-	              o1 = xml.get("fallBackOrder",String.class);
-	                if (o1 instanceof String)
-	                    g.fallBackOrder = Integer.parseInt(((String) o1));
-	                o1 = xml.get("fallBackType",String.class);
-	                if (o1 instanceof String)
-	                    g.fallBackType = Integer.parseInt(((String) o1));
-
-	                while (xml.hasNext())
-	                {
-	                }
-	  			} catch (Exception e)
-			{
-				e.printStackTrace();
-			}
-		}
-	};
-
-
-	/**
-	 * @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 fallBackOrder.
-	 */
-	public int getFallBackOrder()
-	{
-		return fallBackOrder;
-	}
-
-	/**
-	 * @param fallBackOrder The fallBackOrder to set.
-	 */
-	public void setFallBackOrder(int fallBackOrder)
-	{
-		this.fallBackOrder = fallBackOrder;
-	}
-	/**
-	 * @return Returns the fallBackType.
-	 */
-	public int getFallBackType()
-	{
-		return fallBackType;
-	}
-
-	/**
-	 * @param fallBackTye The fallBackType to set.
-	 */
-	public void setFallBackType(int fallBackType)
-	{
-		this.fallBackType = fallBackType;
-	}
-
-
-
-	/**
-	 * @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 value.
-	 */
-	public String getValue()
-	{
-		return value;
-	}
-
-	/**
-	 * @param value The value to set.
-	 */
-	public void setValue(String value)
-	{
-		this.value = value;
-	}
-
-
-}
+/*
+ * 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 org.apache.jetspeed.profiler.rules.RuleCriterion;
+
+public class JSRuleCriterion
+{
+	// private int refID;
+
+	private String name;
+
+
+	private String type;
+
+	private String value;
+
+	private int fallBackOrder;
+
+	private int fallBackType;
+
+	public JSRuleCriterion()
+	{
+		// refID = id;
+	}
+
+	public JSRuleCriterion(RuleCriterion c)
+	{
+		this.name = c.getName();
+		this.type = c.getType();
+		this.value = c.getValue();
+		this.fallBackOrder = c.getFallbackOrder();
+		this.fallBackType = c.getFallbackType();
+	}
+
+	/***************************************************************************
+	 * SERIALIZER
+	 */
+	private static final XMLFormat XML = new XMLFormat(JSRuleCriterion.class)
+	{
+		public void write(Object o, OutputElement xml)
+				throws XMLStreamException
+		{
+
+			try
+			{
+				JSRuleCriterion g = (JSRuleCriterion) o;
+				xml.setAttribute("name", g.name);
+				xml.add( g.type, "type",String.class);
+				xml.add(g.value,"value", String.class);
+				xml.add(new Integer(g.fallBackOrder), "fallBackOrder", Integer.class);
+				xml.add(new Integer(g.fallBackType), "fallBackType", Integer.class);
+
+				// xml.add(g.groupString);
+
+			} catch (Exception e)
+			{
+				e.printStackTrace();
+			}
+		}
+
+		public void read(InputElement xml, Object o)
+		{
+			try
+			{
+				JSRuleCriterion g = (JSRuleCriterion) o;
+				g.name = StringEscapeUtils.unescapeHtml(xml.getAttribute("name","unknown_name"));
+                Object o1 = xml.get("type",String.class);
+                if (o1 instanceof String) g.type = StringEscapeUtils.unescapeHtml((String) o1);
+                o1 = xml.get("value",String.class);
+                if (o1 instanceof String) g.value = StringEscapeUtils.unescapeHtml((String) o1);
+
+	              o1 = xml.get("fallBackOrder",String.class);
+	                if (o1 instanceof String)
+	                    g.fallBackOrder = Integer.parseInt(((String) o1));
+	                o1 = xml.get("fallBackType",String.class);
+	                if (o1 instanceof String)
+	                    g.fallBackType = Integer.parseInt(((String) o1));
+
+	                while (xml.hasNext())
+	                {
+	                }
+	  			} catch (Exception e)
+			{
+				e.printStackTrace();
+			}
+		}
+	};
+
+
+	/**
+	 * @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 fallBackOrder.
+	 */
+	public int getFallBackOrder()
+	{
+		return fallBackOrder;
+	}
+
+	/**
+	 * @param fallBackOrder The fallBackOrder to set.
+	 */
+	public void setFallBackOrder(int fallBackOrder)
+	{
+		this.fallBackOrder = fallBackOrder;
+	}
+	/**
+	 * @return Returns the fallBackType.
+	 */
+	public int getFallBackType()
+	{
+		return fallBackType;
+	}
+
+	/**
+	 * @param fallBackTye The fallBackType to set.
+	 */
+	public void setFallBackType(int fallBackType)
+	{
+		this.fallBackType = fallBackType;
+	}
+
+
+
+	/**
+	 * @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 value.
+	 */
+	public String getValue()
+	{
+		return value;
+	}
+
+	/**
+	 * @param value The value to set.
+	 */
+	public void setValue(String value)
+	{
+		this.value = value;
+	}
+
+
+}

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

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSRuleCriterions.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSRuleCriterions.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/JSRuleCriterions.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSRuleCriterions.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 Rule Criterion Wrapper
-* <p>
-* Wrapper to process XML representation of a set of criteria - used only for binding
-* 
-* @author <a href="mailto:hajo@bluesunrise.com">Hajo Birthelmer</a>
-* @version $Id: $
-*/
-public class JSRuleCriterions extends ArrayList
-{
-}
+/*
+ * 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 Rule Criterion Wrapper
+* <p>
+* Wrapper to process XML representation of a set of criteria - used only for binding
+* 
+* @author <a href="mailto:hajo@bluesunrise.com">Hajo Birthelmer</a>
+* @version $Id: $
+*/
+public class JSRuleCriterions extends ArrayList
+{
+}

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

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

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

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

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

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

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSUserGroups.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSUserGroups.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/JSUserGroups.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSUserGroups.java Fri Dec 12 04:06:29 2008
@@ -1,43 +1,43 @@
-/*
- * 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;
-
-
-
-/**
-* Jetspeed Serializer - Simple User Groups Wrapper
-* <p>
-* Wrapper to process XML representation of a set of user groups - used only for binding
-* 
-* @author <a href="mailto:hajo@bluesunrise.com">Hajo Birthelmer</a>
-* @version $Id: $
-*/public class JSUserGroups extends JSUserRoles
-{
-
-    public JSUserGroups()
-    {
-        super();
-    }
-	/**
-	 * 
-	 */
-	public JSUserGroups(String s)
-	{
-		super(s);
-	}
-
-}
+/*
+ * 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;
+
+
+
+/**
+* Jetspeed Serializer - Simple User Groups Wrapper
+* <p>
+* Wrapper to process XML representation of a set of user groups - used only for binding
+* 
+* @author <a href="mailto:hajo@bluesunrise.com">Hajo Birthelmer</a>
+* @version $Id: $
+*/public class JSUserGroups extends JSUserRoles
+{
+
+    public JSUserGroups()
+    {
+        super();
+    }
+	/**
+	 * 
+	 */
+	public JSUserGroups(String s)
+	{
+		super(s);
+	}
+
+}

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

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSUserRoles.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSUserRoles.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/JSUserRoles.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSUserRoles.java Fri Dec 12 04:06:29 2008
@@ -1,65 +1,65 @@
-/*
- * 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 org.apache.commons.lang.StringEscapeUtils;
-
-import javolution.xml.XMLFormat;
-import javolution.xml.stream.XMLStreamException;
-
-
-/**
-* Jetspeed Serializer - Simple User Roles Wrapper
-* <p>
-* Wrapper to process XML representation of a set of user roles - used only for binding
-* 
-* @author <a href="mailto:hajo@bluesunrise.com">Hajo Birthelmer</a>
-* @version $Id: $
-*/
-public class JSUserRoles
-{
-	String roles;
-	
-	
-    public JSUserRoles()
-    {
-    }
-    public JSUserRoles(String s)
-	{
-		roles = s;
-	}
-	public String toString()
-	{
-		return roles;
-	}
-
-    
-    
-    private static final XMLFormat XML = new XMLFormat(JSUserRoles.class)
-	{
-		public void write(Object oo, OutputElement xml)
-		throws XMLStreamException
-		{
-	        xml.addText(((JSUserRoles)oo).roles); 
-	    }
-		public void read(InputElement xml, Object oo)
-		throws XMLStreamException
-		{
-	        ((JSUserRoles)oo).roles = StringEscapeUtils.unescapeHtml(xml.getText().toString());
-	    }
-	};
-}
+/*
+ * 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 org.apache.commons.lang.StringEscapeUtils;
+
+import javolution.xml.XMLFormat;
+import javolution.xml.stream.XMLStreamException;
+
+
+/**
+* Jetspeed Serializer - Simple User Roles Wrapper
+* <p>
+* Wrapper to process XML representation of a set of user roles - used only for binding
+* 
+* @author <a href="mailto:hajo@bluesunrise.com">Hajo Birthelmer</a>
+* @version $Id: $
+*/
+public class JSUserRoles
+{
+	String roles;
+	
+	
+    public JSUserRoles()
+    {
+    }
+    public JSUserRoles(String s)
+	{
+		roles = s;
+	}
+	public String toString()
+	{
+		return roles;
+	}
+
+    
+    
+    private static final XMLFormat XML = new XMLFormat(JSUserRoles.class)
+	{
+		public void write(Object oo, OutputElement xml)
+		throws XMLStreamException
+		{
+	        xml.addText(((JSUserRoles)oo).roles); 
+	    }
+		public void read(InputElement xml, Object oo)
+		throws XMLStreamException
+		{
+	        ((JSUserRoles)oo).roles = StringEscapeUtils.unescapeHtml(xml.getText().toString());
+	    }
+	};
+}

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

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSUserUsers.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSUserUsers.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/JSUserUsers.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSUserUsers.java Fri Dec 12 04:06:29 2008
@@ -1,47 +1,47 @@
-/*
- * 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;
-
-
-
-/**
-* Jetspeed Serializer - Simple User Wrapper to allow cross reference of users in a list
-* <p>
-* Wrapper to process XML representation of a set of users - used only for binding
-* 
-* @author <a href="mailto:hajo@bluesunrise.com">Hajo Birthelmer</a>
-* @version $Id: $
-*/
-public class JSUserUsers extends JSUserRoles
-{
-
-	/**
-	 * 
-	 */
-	public JSUserUsers(String s)
-	{
-		super(s);
-	}
-	/**
-	 * 
-	 */
-	public JSUserUsers()
-	{
-		super();
-	}
-
-}
+/*
+ * 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;
+
+
+
+/**
+* Jetspeed Serializer - Simple User Wrapper to allow cross reference of users in a list
+* <p>
+* Wrapper to process XML representation of a set of users - used only for binding
+* 
+* @author <a href="mailto:hajo@bluesunrise.com">Hajo Birthelmer</a>
+* @version $Id: $
+*/
+public class JSUserUsers extends JSUserRoles
+{
+
+	/**
+	 * 
+	 */
+	public JSUserUsers(String s)
+	{
+		super(s);
+	}
+	/**
+	 * 
+	 */
+	public JSUserUsers()
+	{
+		super();
+	}
+
+}

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

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSUsers.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSUsers.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/JSUsers.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSUsers.java Fri Dec 12 04:06:29 2008
@@ -1,30 +1,30 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jetspeed.serializer.objects;
-
-import java.util.ArrayList;
-
-
-/**
- * Simple wrapper class for XML serialization
- * @author hajo
- *
- */
-public class JSUsers extends ArrayList<JSUser>
-{
-    private static final long serialVersionUID = -5698435742048612881L;
-}
+/*
+ * 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;
+
+
+/**
+ * Simple wrapper class for XML serialization
+ * @author hajo
+ *
+ */
+public class JSUsers extends ArrayList<JSUser>
+{
+    private static final long serialVersionUID = -5698435742048612881L;
+}

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

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/resources/dataModel-new.xsd
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/resources/dataModel-new.xsd?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/resources/dataModel-new.xsd (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/resources/dataModel-new.xsd Fri Dec 12 04:06:29 2008
@@ -1,369 +1,369 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema 	xmlns="http://www.w3.org/2001/XMLSchema" 
-			targetNamespace="http://portals.apache.org" 
-			xmlns:pa="http://portals.apache.org" 
-			elementFormDefault="qualified" 
-			version="1.0">
-	<annotation>
-		<documentation xml:lang="en">Schema for data serialization of JetSpeed 2 DataModel
+<?xml version="1.0" encoding="UTF-8"?>
+<schema 	xmlns="http://www.w3.org/2001/XMLSchema" 
+			targetNamespace="http://portals.apache.org" 
+			xmlns:pa="http://portals.apache.org" 
+			elementFormDefault="qualified" 
+			version="1.0">
+	<annotation>
+		<documentation xml:lang="en">Schema for data serialization of JetSpeed 2 DataModel
       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.
-	  </documentation>
-	</annotation>
-	
-	<element name="DataModel">
-		<annotation>
-			<documentation xml:lang="en">The DataModel consists of a list of 
-		domain objects that are valid for this version. Each domain object holds the data of a given component. 
-		</documentation>
-		</annotation>
-
-		<complexType>
-			<sequence>
-				<element name="schemaVersion" type="string" minOccurs="1" maxOccurs="1">
-				<annotation>
-						<documentation xml:lang="en">The schemaVersion denotes the backward compatibility 
-						of this schema. The optional version attribute of the schema above denotes the version of this schema and
-						the schemaVersion element here declares the latest schema version with which the instance is compatible
-						With this approach, an application could compare the schema version (captured in the 
-						schema file) with the version to which the instance reports that it is compatible.
-						</documentation>
-				</annotation>
-				</element>
-				<element name="Domain" minOccurs="1" maxOccurs="1">
-					<annotation>
-						<documentation xml:lang="en">The Domain is the collection of 
-						all relevant data objects for this portal. 
-						</documentation>
-					</annotation>
-					<complexType>
-						<sequence>
-							<element name="PortalName" type="string" minOccurs="1" maxOccurs="1">
-								<annotation>
-									<documentation xml:lang="en">
-									The PortalName allows to identify the source of the data.
-									</documentation>
-								</annotation>
-								</element>
-							<element name="DateCreated" type="date" minOccurs="1" maxOccurs="1">
-								<annotation>
-									<documentation xml:lang="en">
-									Always helpful to recognize when it was created.
-									</documentation>
-								</annotation>
-								</element>
-							<element name="Roles" minOccurs="0" maxOccurs="1">
-								<annotation>
-									<documentation xml:lang="en">
-									Roles
-									</documentation>
-								</annotation>
-								<complexType>
-					            	<sequence>
-                						<element ref="pa:Role" minOccurs="1" maxOccurs="unbounded"/>
-									</sequence>
-								</complexType>
-
-								</element>
-							<element name="Groups" minOccurs="0" maxOccurs="1">
-								<annotation>
-									<documentation xml:lang="en">
-									Groups
-									</documentation>
-								</annotation>
-								<complexType>
-					            	<sequence>
-                						<element ref="pa:Group" minOccurs="1" maxOccurs="unbounded"/>
-									</sequence>
-								</complexType>
-								</element>
-							<element name="Permissions" minOccurs="0" maxOccurs="1" >
-								<annotation>
-									<documentation xml:lang="en">
-									Permissions
-									</documentation>
-								</annotation>
-								<complexType>
-					            	<sequence>
-                						<element ref="pa:Permission" minOccurs="1" maxOccurs="unbounded"/>
-									</sequence>
-								</complexType>
-								</element>
-							<element name="Capabilities" minOccurs="0" maxOccurs="1" >
-								<annotation>
-									<documentation xml:lang="en">
-									Capabilities
-									</documentation>
-								</annotation>
-								<complexType>
-					            	<sequence>
-                						<element ref="pa:Capability" minOccurs="1" maxOccurs="unbounded"/>
-									</sequence>
-								</complexType>
-
-								</element>
-							<element name="MimeTypes" minOccurs="0" maxOccurs="1" >
-								<annotation>
-									<documentation xml:lang="en">
-									Mime Types
-									</documentation>
-								</annotation>
-								<complexType>
-					            	<sequence>
-                						<element ref="pa:MimeType" minOccurs="1" maxOccurs="unbounded"/>
-									</sequence>
-								</complexType>
-								</element>
-							<element name="Clients" minOccurs="0" maxOccurs="1" >
-								<annotation>
-									<documentation xml:lang="en">
-									Clients
-									</documentation>
-								</annotation>
-								<complexType>
-					            	<sequence>
-                						<element ref="pa:Client" minOccurs="1" maxOccurs="unbounded"/>
-									</sequence>
-								</complexType>
-								</element>
-							<element name="MediaTypes" minOccurs="0" maxOccurs="1">
-								<annotation>
-									<documentation xml:lang="en">
-									Media Types
-									</documentation>
-								</annotation>
-								<complexType>
-					            	<sequence>
-                						<element ref="pa:MediaType" minOccurs="1" maxOccurs="unbounded"/>
-									</sequence>
-								</complexType>
-								</element>
-
-	<!--  Associations -->
-
-
-							<element name="ClientToCapabilities" minOccurs="0" maxOccurs="1" >
-								<annotation>
-									<documentation xml:lang="en">
-									Client to Capabilities
-									</documentation>
-								</annotation>
-								<complexType>
-					            	<sequence>
-                						<element ref="pa:ClientCapability" minOccurs="1" maxOccurs="unbounded"/>
-									</sequence>
-								</complexType>
-
-								</element>
-							<element name="ClientToMimeTypes" minOccurs="0" maxOccurs="1" >
-								<annotation>
-									<documentation xml:lang="en">
-									Client To MimeTypes
-									</documentation>
-								</annotation>
-								<complexType>
-					            	<sequence>
-                						<element ref="pa:ClientMimeTypes" minOccurs="1" maxOccurs="unbounded"/>
-									</sequence>
-								</complexType>
-								</element>
-							<element name="MediaToMimeTypes" minOccurs="0" maxOccurs="1" >
-								<annotation>
-									<documentation xml:lang="en">
-									Media To MimeTypes
-									</documentation>
-								</annotation>
-								<complexType>
-					            	<sequence>
-                						<element ref="pa:MediaMimeTypes" minOccurs="1" maxOccurs="unbounded"/>
-									</sequence>
-								</complexType>
-							</element>
-						<element name="ProfilingRules" minOccurs="0" maxOccurs="1" >
-								<annotation>
-									<documentation xml:lang="en">
-									Profiling Rule
-									</documentation>
-								</annotation>
-								<complexType>
-					            	<sequence>
-                						<element ref="pa:ProfilingRule" minOccurs="1" maxOccurs="unbounded"/>
-									</sequence>
-								</complexType>
-						</element>
-						</sequence>
-		
-					</complexType>
-				</element>
-			</sequence>
-		</complexType>
-		<key name="UniqueDomain">
-			<selector xpath="Domain"/>
-			<field xpath="@PortalName"/>
-		</key>
-	</element>
-	<element name="Role">
-	<complexType >
-		<annotation>
-			<documentation xml:lang="en">Role ....
-						</documentation>
-		</annotation>
-		<sequence>
-			<element name="name" type="string" minOccurs="1" maxOccurs="1"/>
-		</sequence>
-	</complexType>
-</element>
-
-
-	<element name="Group">
-	<complexType>
-		<annotation>
-			<documentation xml:lang="en">Group ....
-						</documentation>
-		</annotation>
-		<sequence>
-			<element name="name" type="string" minOccurs="1" maxOccurs="1"/>
-		</sequence>
-	</complexType>
-	</element>
-
-	<element name="Permission">
-		<complexType>
-		<annotation>
-			<documentation xml:lang="en">Permission ....
-						</documentation>
-		</annotation>
-		<sequence>
-			<element name="name" type="string" minOccurs="1" maxOccurs="1"/>
-		</sequence>
-	</complexType>
-</element>
-
-	<element name="Capability">
-	<complexType>
-		<annotation>
-			<documentation xml:lang="en">Capability ....
-						</documentation>
-		</annotation>
-		<sequence>
-			<element name="capability_id" type="integer" minOccurs="1" maxOccurs="1"/>
-			<element name="capability" type="string" minOccurs="1" maxOccurs="1"/>
-		</sequence>
-	</complexType>
-</element>
-
-	<element name="MimeType">
-	<complexType>
-		<annotation>
-			<documentation xml:lang="en">Mimetype ....
-						</documentation>
-		</annotation>
-		<sequence>
-			<element name="mimetype_id" type="integer" minOccurs="1" maxOccurs="1"/>
-			<element name="name" type="string" minOccurs="1" maxOccurs="1"/>
-		</sequence>
-	</complexType>
-</element>
-
-	<element name="Client">
-	<complexType>
-		<annotation>
-			<documentation xml:lang="en">Client ....
-						</documentation>
-		</annotation>
-		<sequence>
-			<element name="client_id" type="integer" minOccurs="1" maxOccurs="1"/>
-			<element name="eval_order" type="integer" minOccurs="1" maxOccurs="1"/>
-			<element name="name" type="string" minOccurs="1" maxOccurs="1"/>
-			<element name="user_agent_pattern" type="string" minOccurs="0" maxOccurs="1"/>
-				<element name="manufacturer" type="string" minOccurs="0" maxOccurs="1"/>
-			<element name="model" type="string" minOccurs="0" maxOccurs="1"/>
-			<element name="version" type="string" minOccurs="0" maxOccurs="1"/>
-			<element name="preferred_mimetype_id" type="integer" minOccurs="1" maxOccurs="1"/>
-		</sequence>
-	</complexType>
-</element>
-
-	<element name="MediaType">
-	<complexType>
-		<annotation>
-			<documentation xml:lang="en">MediaType ....
-						</documentation>
-		</annotation>
-		<sequence>
-			<element name="mediatype_id" type="integer" minOccurs="1" maxOccurs="1"/>
-			<element name="name" type="string" minOccurs="1" maxOccurs="1"/>
-			<element name="character_set" type="string" minOccurs="0" maxOccurs="1"/>
-			<element name="title" type="string" minOccurs="0" maxOccurs="1"/>
-			<element name="description" type="string" minOccurs="0" maxOccurs="1"/>
-		</sequence>
-	</complexType>
-</element>
-
-	<element name="ClientCapability">
-	<complexType>
-		<annotation>
-			<documentation xml:lang="en">
-			Associate clients with capabilities
-			 </documentation>
-		</annotation>
-		<sequence>
-			<element name="clientID" type="integer" minOccurs="1" maxOccurs="1"/>
-			<element name="capabilityID" type="integer" minOccurs="1" maxOccurs="1"/>
-		</sequence>
-	</complexType>
-</element>
-
-	<element name="ClientMimeTypes">
-	<complexType>
-		<annotation>
-			<documentation xml:lang="en">
-			Associate clients with mime types
-			 </documentation>
-		</annotation>
-		<sequence>
-			<element name="clientID" type="integer" minOccurs="1" maxOccurs="1"/>
-			<element name="mimetypeID" type="integer" minOccurs="1" maxOccurs="1"/>
-		</sequence>
-	</complexType>
-</element>
-
-	<element name="MediaMimeTypes">
-	<complexType>
-		<annotation>
-			<documentation xml:lang="en">
-			Associate media types with mime types 
-			 </documentation>
-		</annotation>
-		<sequence>
-			<element name="mediatypeID" type="integer" minOccurs="1" maxOccurs="1"/>
-			<element name="mimetypeID" type="integer" minOccurs="1" maxOccurs="1"/>
-		</sequence>
-	</complexType>
-	</element>
-
-	<element name="ProfilingRule">
-	<complexType>
-
-		<annotation>
-			<documentation xml:lang="en">
-			Profiling Rule
-			 </documentation>
-		</annotation>
-		<sequence>
-			<element name="tbd" type="string" minOccurs="1" maxOccurs="1"/>
-		</sequence>
-	</complexType>
-</element>
-
-</schema>
+      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.
+	  </documentation>
+	</annotation>
+	
+	<element name="DataModel">
+		<annotation>
+			<documentation xml:lang="en">The DataModel consists of a list of 
+		domain objects that are valid for this version. Each domain object holds the data of a given component. 
+		</documentation>
+		</annotation>
+
+		<complexType>
+			<sequence>
+				<element name="schemaVersion" type="string" minOccurs="1" maxOccurs="1">
+				<annotation>
+						<documentation xml:lang="en">The schemaVersion denotes the backward compatibility 
+						of this schema. The optional version attribute of the schema above denotes the version of this schema and
+						the schemaVersion element here declares the latest schema version with which the instance is compatible
+						With this approach, an application could compare the schema version (captured in the 
+						schema file) with the version to which the instance reports that it is compatible.
+						</documentation>
+				</annotation>
+				</element>
+				<element name="Domain" minOccurs="1" maxOccurs="1">
+					<annotation>
+						<documentation xml:lang="en">The Domain is the collection of 
+						all relevant data objects for this portal. 
+						</documentation>
+					</annotation>
+					<complexType>
+						<sequence>
+							<element name="PortalName" type="string" minOccurs="1" maxOccurs="1">
+								<annotation>
+									<documentation xml:lang="en">
+									The PortalName allows to identify the source of the data.
+									</documentation>
+								</annotation>
+								</element>
+							<element name="DateCreated" type="date" minOccurs="1" maxOccurs="1">
+								<annotation>
+									<documentation xml:lang="en">
+									Always helpful to recognize when it was created.
+									</documentation>
+								</annotation>
+								</element>
+							<element name="Roles" minOccurs="0" maxOccurs="1">
+								<annotation>
+									<documentation xml:lang="en">
+									Roles
+									</documentation>
+								</annotation>
+								<complexType>
+					            	<sequence>
+                						<element ref="pa:Role" minOccurs="1" maxOccurs="unbounded"/>
+									</sequence>
+								</complexType>
+
+								</element>
+							<element name="Groups" minOccurs="0" maxOccurs="1">
+								<annotation>
+									<documentation xml:lang="en">
+									Groups
+									</documentation>
+								</annotation>
+								<complexType>
+					            	<sequence>
+                						<element ref="pa:Group" minOccurs="1" maxOccurs="unbounded"/>
+									</sequence>
+								</complexType>
+								</element>
+							<element name="Permissions" minOccurs="0" maxOccurs="1" >
+								<annotation>
+									<documentation xml:lang="en">
+									Permissions
+									</documentation>
+								</annotation>
+								<complexType>
+					            	<sequence>
+                						<element ref="pa:Permission" minOccurs="1" maxOccurs="unbounded"/>
+									</sequence>
+								</complexType>
+								</element>
+							<element name="Capabilities" minOccurs="0" maxOccurs="1" >
+								<annotation>
+									<documentation xml:lang="en">
+									Capabilities
+									</documentation>
+								</annotation>
+								<complexType>
+					            	<sequence>
+                						<element ref="pa:Capability" minOccurs="1" maxOccurs="unbounded"/>
+									</sequence>
+								</complexType>
+
+								</element>
+							<element name="MimeTypes" minOccurs="0" maxOccurs="1" >
+								<annotation>
+									<documentation xml:lang="en">
+									Mime Types
+									</documentation>
+								</annotation>
+								<complexType>
+					            	<sequence>
+                						<element ref="pa:MimeType" minOccurs="1" maxOccurs="unbounded"/>
+									</sequence>
+								</complexType>
+								</element>
+							<element name="Clients" minOccurs="0" maxOccurs="1" >
+								<annotation>
+									<documentation xml:lang="en">
+									Clients
+									</documentation>
+								</annotation>
+								<complexType>
+					            	<sequence>
+                						<element ref="pa:Client" minOccurs="1" maxOccurs="unbounded"/>
+									</sequence>
+								</complexType>
+								</element>
+							<element name="MediaTypes" minOccurs="0" maxOccurs="1">
+								<annotation>
+									<documentation xml:lang="en">
+									Media Types
+									</documentation>
+								</annotation>
+								<complexType>
+					            	<sequence>
+                						<element ref="pa:MediaType" minOccurs="1" maxOccurs="unbounded"/>
+									</sequence>
+								</complexType>
+								</element>
+
+	<!--  Associations -->
+
+
+							<element name="ClientToCapabilities" minOccurs="0" maxOccurs="1" >
+								<annotation>
+									<documentation xml:lang="en">
+									Client to Capabilities
+									</documentation>
+								</annotation>
+								<complexType>
+					            	<sequence>
+                						<element ref="pa:ClientCapability" minOccurs="1" maxOccurs="unbounded"/>
+									</sequence>
+								</complexType>
+
+								</element>
+							<element name="ClientToMimeTypes" minOccurs="0" maxOccurs="1" >
+								<annotation>
+									<documentation xml:lang="en">
+									Client To MimeTypes
+									</documentation>
+								</annotation>
+								<complexType>
+					            	<sequence>
+                						<element ref="pa:ClientMimeTypes" minOccurs="1" maxOccurs="unbounded"/>
+									</sequence>
+								</complexType>
+								</element>
+							<element name="MediaToMimeTypes" minOccurs="0" maxOccurs="1" >
+								<annotation>
+									<documentation xml:lang="en">
+									Media To MimeTypes
+									</documentation>
+								</annotation>
+								<complexType>
+					            	<sequence>
+                						<element ref="pa:MediaMimeTypes" minOccurs="1" maxOccurs="unbounded"/>
+									</sequence>
+								</complexType>
+							</element>
+						<element name="ProfilingRules" minOccurs="0" maxOccurs="1" >
+								<annotation>
+									<documentation xml:lang="en">
+									Profiling Rule
+									</documentation>
+								</annotation>
+								<complexType>
+					            	<sequence>
+                						<element ref="pa:ProfilingRule" minOccurs="1" maxOccurs="unbounded"/>
+									</sequence>
+								</complexType>
+						</element>
+						</sequence>
+		
+					</complexType>
+				</element>
+			</sequence>
+		</complexType>
+		<key name="UniqueDomain">
+			<selector xpath="Domain"/>
+			<field xpath="@PortalName"/>
+		</key>
+	</element>
+	<element name="Role">
+	<complexType >
+		<annotation>
+			<documentation xml:lang="en">Role ....
+						</documentation>
+		</annotation>
+		<sequence>
+			<element name="name" type="string" minOccurs="1" maxOccurs="1"/>
+		</sequence>
+	</complexType>
+</element>
+
+
+	<element name="Group">
+	<complexType>
+		<annotation>
+			<documentation xml:lang="en">Group ....
+						</documentation>
+		</annotation>
+		<sequence>
+			<element name="name" type="string" minOccurs="1" maxOccurs="1"/>
+		</sequence>
+	</complexType>
+	</element>
+
+	<element name="Permission">
+		<complexType>
+		<annotation>
+			<documentation xml:lang="en">Permission ....
+						</documentation>
+		</annotation>
+		<sequence>
+			<element name="name" type="string" minOccurs="1" maxOccurs="1"/>
+		</sequence>
+	</complexType>
+</element>
+
+	<element name="Capability">
+	<complexType>
+		<annotation>
+			<documentation xml:lang="en">Capability ....
+						</documentation>
+		</annotation>
+		<sequence>
+			<element name="capability_id" type="integer" minOccurs="1" maxOccurs="1"/>
+			<element name="capability" type="string" minOccurs="1" maxOccurs="1"/>
+		</sequence>
+	</complexType>
+</element>
+
+	<element name="MimeType">
+	<complexType>
+		<annotation>
+			<documentation xml:lang="en">Mimetype ....
+						</documentation>
+		</annotation>
+		<sequence>
+			<element name="mimetype_id" type="integer" minOccurs="1" maxOccurs="1"/>
+			<element name="name" type="string" minOccurs="1" maxOccurs="1"/>
+		</sequence>
+	</complexType>
+</element>
+
+	<element name="Client">
+	<complexType>
+		<annotation>
+			<documentation xml:lang="en">Client ....
+						</documentation>
+		</annotation>
+		<sequence>
+			<element name="client_id" type="integer" minOccurs="1" maxOccurs="1"/>
+			<element name="eval_order" type="integer" minOccurs="1" maxOccurs="1"/>
+			<element name="name" type="string" minOccurs="1" maxOccurs="1"/>
+			<element name="user_agent_pattern" type="string" minOccurs="0" maxOccurs="1"/>
+				<element name="manufacturer" type="string" minOccurs="0" maxOccurs="1"/>
+			<element name="model" type="string" minOccurs="0" maxOccurs="1"/>
+			<element name="version" type="string" minOccurs="0" maxOccurs="1"/>
+			<element name="preferred_mimetype_id" type="integer" minOccurs="1" maxOccurs="1"/>
+		</sequence>
+	</complexType>
+</element>
+
+	<element name="MediaType">
+	<complexType>
+		<annotation>
+			<documentation xml:lang="en">MediaType ....
+						</documentation>
+		</annotation>
+		<sequence>
+			<element name="mediatype_id" type="integer" minOccurs="1" maxOccurs="1"/>
+			<element name="name" type="string" minOccurs="1" maxOccurs="1"/>
+			<element name="character_set" type="string" minOccurs="0" maxOccurs="1"/>
+			<element name="title" type="string" minOccurs="0" maxOccurs="1"/>
+			<element name="description" type="string" minOccurs="0" maxOccurs="1"/>
+		</sequence>
+	</complexType>
+</element>
+
+	<element name="ClientCapability">
+	<complexType>
+		<annotation>
+			<documentation xml:lang="en">
+			Associate clients with capabilities
+			 </documentation>
+		</annotation>
+		<sequence>
+			<element name="clientID" type="integer" minOccurs="1" maxOccurs="1"/>
+			<element name="capabilityID" type="integer" minOccurs="1" maxOccurs="1"/>
+		</sequence>
+	</complexType>
+</element>
+
+	<element name="ClientMimeTypes">
+	<complexType>
+		<annotation>
+			<documentation xml:lang="en">
+			Associate clients with mime types
+			 </documentation>
+		</annotation>
+		<sequence>
+			<element name="clientID" type="integer" minOccurs="1" maxOccurs="1"/>
+			<element name="mimetypeID" type="integer" minOccurs="1" maxOccurs="1"/>
+		</sequence>
+	</complexType>
+</element>
+
+	<element name="MediaMimeTypes">
+	<complexType>
+		<annotation>
+			<documentation xml:lang="en">
+			Associate media types with mime types 
+			 </documentation>
+		</annotation>
+		<sequence>
+			<element name="mediatypeID" type="integer" minOccurs="1" maxOccurs="1"/>
+			<element name="mimetypeID" type="integer" minOccurs="1" maxOccurs="1"/>
+		</sequence>
+	</complexType>
+	</element>
+
+	<element name="ProfilingRule">
+	<complexType>
+
+		<annotation>
+			<documentation xml:lang="en">
+			Profiling Rule
+			 </documentation>
+		</annotation>
+		<sequence>
+			<element name="tbd" type="string" minOccurs="1" maxOccurs="1"/>
+		</sequence>
+	</complexType>
+</element>
+
+</schema>

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/resources/dataModel-new.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/resources/dataModel.xsd
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/resources/dataModel.xsd?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/resources/dataModel.xsd (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/resources/dataModel.xsd Fri Dec 12 04:06:29 2008
@@ -1,293 +1,293 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema 	xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-			targetNamespace="http://portals.apache.org" 
-			xmlns="http://portals.apache.org" 
-			elementFormDefault="qualified" 
-			version="1.0">
-	<xs:annotation>
-		<xs:documentation xml:lang="en">Schema for data serialization of JetSpeed 2 DataModel
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema 	xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+			targetNamespace="http://portals.apache.org" 
+			xmlns="http://portals.apache.org" 
+			elementFormDefault="qualified" 
+			version="1.0">
+	<xs:annotation>
+		<xs:documentation xml:lang="en">Schema for data serialization of JetSpeed 2 DataModel
       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.
-	  </xs:documentation>
-	</xs:annotation>
-	
-	<xs:element name="DataModel">
-		<xs:annotation>
-			<xs:documentation xml:lang="en">The DataModel consists of a list of 
-		domain objects that are valid for this version. Each domain object holds the data of a given component. 
-		</xs:documentation>
-		</xs:annotation>
-
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="schemaVersion" type="xs:string" minOccurs="1" maxOccurs="1">
-				<xs:annotation>
-						<xs:documentation xml:lang="en">The schemaVersion denotes the backward compatibility 
-						of this schema. The optional version attribute of the schema above denotes the version of this schema and
-						the schemaVersion element here declares the latest schema version with which the instance is compatible
-						With this approach, an application could compare the schema version (captured in the 
-						schema file) with the version to which the instance reports that it is compatible.
-						</xs:documentation>
-				</xs:annotation>
-				</xs:element>
-				<xs:element name="Domain" maxOccurs="unbounded">
-					<xs:annotation>
-						<xs:documentation xml:lang="en">The Domain is the collection of 
-						all relevant data objects for this portal. 
-						</xs:documentation>
-					</xs:annotation>
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="PortalName" type="xs:string" minOccurs="0" maxOccurs="1">
-								<xs:annotation>
-									<xs:documentation xml:lang="en">
-									The PortalName allows to identify the source of the data.
-									</xs:documentation>
-								</xs:annotation>
-								</xs:element>
-							<xs:element name="DateCreated" type="xs:date" minOccurs="0" maxOccurs="1">
-								<xs:annotation>
-									<xs:documentation xml:lang="en">
-									Always helpful to recognize when it was created.
-									</xs:documentation>
-								</xs:annotation>
-								</xs:element>
-							<xs:element name="Roles" minOccurs="0" maxOccurs="1">
-								<xs:annotation>
-									<xs:documentation xml:lang="en">
-									Roles
-									</xs:documentation>
-								</xs:annotation>
-								<xs:complexType>
-					            <xs:sequence>
-                					<xs:element ref="Role" minOccurs="0" maxOccurs="unbounded"/>
-</xs:sequence>
-</xs:complexType>
-
-								</xs:element>
-							<xs:element name="Groups" maxOccurs="unbounded" type="Group">
-								<xs:annotation>
-									<xs:documentation xml:lang="en">
-									Groups
-									</xs:documentation>
-								</xs:annotation>
-								</xs:element>
-							<xs:element name="Permissions" maxOccurs="unbounded" type="Permission">
-								<xs:annotation>
-									<xs:documentation xml:lang="en">
-									Permissions
-									</xs:documentation>
-								</xs:annotation>
-								</xs:element>
-							<xs:element name="Capabilities" maxOccurs="unbounded" type="Capability">
-								<xs:annotation>
-									<xs:documentation xml:lang="en">
-									Capabilities
-									</xs:documentation>
-								</xs:annotation>
-								</xs:element>
-							<xs:element name="MimeTypes" maxOccurs="unbounded" type="MimeType">
-								<xs:annotation>
-									<xs:documentation xml:lang="en">
-									Mime Types
-									</xs:documentation>
-								</xs:annotation>
-								</xs:element>
-							<xs:element name="Clients" maxOccurs="unbounded" type="Client">
-								<xs:annotation>
-									<xs:documentation xml:lang="en">
-									Clients
-									</xs:documentation>
-								</xs:annotation>
-								</xs:element>
-							<xs:element name="MediaTypes" maxOccurs="unbounded" type="MediaType">
-								<xs:annotation>
-									<xs:documentation xml:lang="en">
-									Media Types
-									</xs:documentation>
-								</xs:annotation>
-								</xs:element>
-
-	<!--  Associations -->
-
-
-							<xs:element name="ClientToCapabilities" maxOccurs="unbounded" type="ClientCapability">
-								<xs:annotation>
-									<xs:documentation xml:lang="en">
-									Client to Capabilities
-									</xs:documentation>
-								</xs:annotation>
-								</xs:element>
-							<xs:element name="ClientToMimeTypes" maxOccurs="unbounded" type="ClientMimeTypes">
-								<xs:annotation>
-									<xs:documentation xml:lang="en">
-									Client To MimeTypes
-									</xs:documentation>
-								</xs:annotation>
-								</xs:element>
-							<xs:element name="MediaToMimeTypes" maxOccurs="unbounded" type="MediaMimeTypes">
-								<xs:annotation>
-									<xs:documentation xml:lang="en">
-									Media To MimeTypes
-									</xs:documentation>
-								</xs:annotation>
-	</xs:element>
-						<xs:element name="ProfilingRules" maxOccurs="unbounded" type="ProfilingRule">
-								<xs:annotation>
-									<xs:documentation xml:lang="en">
-									Profiling Rule
-									</xs:documentation>
-								</xs:annotation>
-		</xs:element>
-						</xs:sequence>
-		
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-		</xs:complexType>
-		<xs:key name="UniqueDomain">
-			<xs:selector xpath="Domain"/>
-			<xs:field xpath="@PortalName"/>
-		</xs:key>
-	</xs:element>
-	
-	<xs:complexType name="Role">
-		<xs:annotation>
-			<xs:documentation xml:lang="en">Role ....
-						</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"/>
-		</xs:sequence>
-	</xs:complexType>
-
-
-	<xs:complexType name="Group">
-		<xs:annotation>
-			<xs:documentation xml:lang="en">Group ....
-						</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Permission">
-		<xs:annotation>
-			<xs:documentation xml:lang="en">Permission ....
-						</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"/>
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="Capability">
-		<xs:annotation>
-			<xs:documentation xml:lang="en">Capability ....
-						</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="capability_id" type="xs:integer" minOccurs="1" maxOccurs="1"/>
-			<xs:element name="capability" type="xs:string" minOccurs="1" maxOccurs="1"/>
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="MimeType">
-		<xs:annotation>
-			<xs:documentation xml:lang="en">Mimetype ....
-						</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="mimetype_id" type="xs:integer" minOccurs="1" maxOccurs="1"/>
-			<xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"/>
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="Client">
-		<xs:annotation>
-			<xs:documentation xml:lang="en">Client ....
-						</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="client_id" type="xs:integer" minOccurs="1" maxOccurs="1"/>
-			<xs:element name="eval_order" type="xs:integer" minOccurs="1" maxOccurs="1"/>
-			<xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"/>
-			<xs:element name="user_agent_pattern" type="xs:string" minOccurs="0" maxOccurs="1"/>
-				<xs:element name="manufacturer" type="xs:string" minOccurs="0" maxOccurs="1"/>
-			<xs:element name="model" type="xs:string" minOccurs="0" maxOccurs="1"/>
-			<xs:element name="version" type="xs:string" minOccurs="0" maxOccurs="1"/>
-			<xs:element name="preferred_mimetype_id" type="xs:integer" minOccurs="1" maxOccurs="1"/>
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="MediaType">
-		<xs:annotation>
-			<xs:documentation xml:lang="en">MediaType ....
-						</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="mediatype_id" type="xs:integer" minOccurs="1" maxOccurs="1"/>
-			<xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"/>
-			<xs:element name="character_set" type="xs:string" minOccurs="0" maxOccurs="1"/>
-			<xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1"/>
-			<xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1"/>
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="ClientCapability">
-		<xs:annotation>
-			<xs:documentation xml:lang="en">
-			Associate clients with capabilities
-			 </xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="clientID" type="xs:integer" minOccurs="1" maxOccurs="1"/>
-			<xs:element name="capabilityID" type="xs:integer" minOccurs="1" maxOccurs="1"/>
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="ClientMimeTypes">
-		<xs:annotation>
-			<xs:documentation xml:lang="en">
-			Associate clients with mime types
-			 </xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="clientID" type="xs:integer" minOccurs="1" maxOccurs="1"/>
-			<xs:element name="mimetypeID" type="xs:integer" minOccurs="1" maxOccurs="1"/>
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="MediaMimeTypes">
-		<xs:annotation>
-			<xs:documentation xml:lang="en">
-			Associate media types with mime types 
-			 </xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="mediatypeID" type="xs:integer" minOccurs="1" maxOccurs="1"/>
-			<xs:element name="mimetypeID" type="xs:integer" minOccurs="1" maxOccurs="1"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="ProfilingRule">
-		<xs:annotation>
-			<xs:documentation xml:lang="en">
-			Profiling Rule
-			 </xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="tbd" type="xs:string" minOccurs="1" maxOccurs="1"/>
-		</xs:sequence>
-	</xs:complexType>
-
-</xs:schema>
+      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.
+	  </xs:documentation>
+	</xs:annotation>
+	
+	<xs:element name="DataModel">
+		<xs:annotation>
+			<xs:documentation xml:lang="en">The DataModel consists of a list of 
+		domain objects that are valid for this version. Each domain object holds the data of a given component. 
+		</xs:documentation>
+		</xs:annotation>
+
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="schemaVersion" type="xs:string" minOccurs="1" maxOccurs="1">
+				<xs:annotation>
+						<xs:documentation xml:lang="en">The schemaVersion denotes the backward compatibility 
+						of this schema. The optional version attribute of the schema above denotes the version of this schema and
+						the schemaVersion element here declares the latest schema version with which the instance is compatible
+						With this approach, an application could compare the schema version (captured in the 
+						schema file) with the version to which the instance reports that it is compatible.
+						</xs:documentation>
+				</xs:annotation>
+				</xs:element>
+				<xs:element name="Domain" maxOccurs="unbounded">
+					<xs:annotation>
+						<xs:documentation xml:lang="en">The Domain is the collection of 
+						all relevant data objects for this portal. 
+						</xs:documentation>
+					</xs:annotation>
+					<xs:complexType>
+						<xs:sequence>
+							<xs:element name="PortalName" type="xs:string" minOccurs="0" maxOccurs="1">
+								<xs:annotation>
+									<xs:documentation xml:lang="en">
+									The PortalName allows to identify the source of the data.
+									</xs:documentation>
+								</xs:annotation>
+								</xs:element>
+							<xs:element name="DateCreated" type="xs:date" minOccurs="0" maxOccurs="1">
+								<xs:annotation>
+									<xs:documentation xml:lang="en">
+									Always helpful to recognize when it was created.
+									</xs:documentation>
+								</xs:annotation>
+								</xs:element>
+							<xs:element name="Roles" minOccurs="0" maxOccurs="1">
+								<xs:annotation>
+									<xs:documentation xml:lang="en">
+									Roles
+									</xs:documentation>
+								</xs:annotation>
+								<xs:complexType>
+					            <xs:sequence>
+                					<xs:element ref="Role" minOccurs="0" maxOccurs="unbounded"/>
+</xs:sequence>
+</xs:complexType>
+
+								</xs:element>
+							<xs:element name="Groups" maxOccurs="unbounded" type="Group">
+								<xs:annotation>
+									<xs:documentation xml:lang="en">
+									Groups
+									</xs:documentation>
+								</xs:annotation>
+								</xs:element>
+							<xs:element name="Permissions" maxOccurs="unbounded" type="Permission">
+								<xs:annotation>
+									<xs:documentation xml:lang="en">
+									Permissions
+									</xs:documentation>
+								</xs:annotation>
+								</xs:element>
+							<xs:element name="Capabilities" maxOccurs="unbounded" type="Capability">
+								<xs:annotation>
+									<xs:documentation xml:lang="en">
+									Capabilities
+									</xs:documentation>
+								</xs:annotation>
+								</xs:element>
+							<xs:element name="MimeTypes" maxOccurs="unbounded" type="MimeType">
+								<xs:annotation>
+									<xs:documentation xml:lang="en">
+									Mime Types
+									</xs:documentation>
+								</xs:annotation>
+								</xs:element>
+							<xs:element name="Clients" maxOccurs="unbounded" type="Client">
+								<xs:annotation>
+									<xs:documentation xml:lang="en">
+									Clients
+									</xs:documentation>
+								</xs:annotation>
+								</xs:element>
+							<xs:element name="MediaTypes" maxOccurs="unbounded" type="MediaType">
+								<xs:annotation>
+									<xs:documentation xml:lang="en">
+									Media Types
+									</xs:documentation>
+								</xs:annotation>
+								</xs:element>
+
+	<!--  Associations -->
+
+
+							<xs:element name="ClientToCapabilities" maxOccurs="unbounded" type="ClientCapability">
+								<xs:annotation>
+									<xs:documentation xml:lang="en">
+									Client to Capabilities
+									</xs:documentation>
+								</xs:annotation>
+								</xs:element>
+							<xs:element name="ClientToMimeTypes" maxOccurs="unbounded" type="ClientMimeTypes">
+								<xs:annotation>
+									<xs:documentation xml:lang="en">
+									Client To MimeTypes
+									</xs:documentation>
+								</xs:annotation>
+								</xs:element>
+							<xs:element name="MediaToMimeTypes" maxOccurs="unbounded" type="MediaMimeTypes">
+								<xs:annotation>
+									<xs:documentation xml:lang="en">
+									Media To MimeTypes
+									</xs:documentation>
+								</xs:annotation>
+	</xs:element>
+						<xs:element name="ProfilingRules" maxOccurs="unbounded" type="ProfilingRule">
+								<xs:annotation>
+									<xs:documentation xml:lang="en">
+									Profiling Rule
+									</xs:documentation>
+								</xs:annotation>
+		</xs:element>
+						</xs:sequence>
+		
+					</xs:complexType>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+		<xs:key name="UniqueDomain">
+			<xs:selector xpath="Domain"/>
+			<xs:field xpath="@PortalName"/>
+		</xs:key>
+	</xs:element>
+	
+	<xs:complexType name="Role">
+		<xs:annotation>
+			<xs:documentation xml:lang="en">Role ....
+						</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"/>
+		</xs:sequence>
+	</xs:complexType>
+
+
+	<xs:complexType name="Group">
+		<xs:annotation>
+			<xs:documentation xml:lang="en">Group ....
+						</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="Permission">
+		<xs:annotation>
+			<xs:documentation xml:lang="en">Permission ....
+						</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"/>
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="Capability">
+		<xs:annotation>
+			<xs:documentation xml:lang="en">Capability ....
+						</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="capability_id" type="xs:integer" minOccurs="1" maxOccurs="1"/>
+			<xs:element name="capability" type="xs:string" minOccurs="1" maxOccurs="1"/>
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="MimeType">
+		<xs:annotation>
+			<xs:documentation xml:lang="en">Mimetype ....
+						</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="mimetype_id" type="xs:integer" minOccurs="1" maxOccurs="1"/>
+			<xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"/>
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="Client">
+		<xs:annotation>
+			<xs:documentation xml:lang="en">Client ....
+						</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="client_id" type="xs:integer" minOccurs="1" maxOccurs="1"/>
+			<xs:element name="eval_order" type="xs:integer" minOccurs="1" maxOccurs="1"/>
+			<xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"/>
+			<xs:element name="user_agent_pattern" type="xs:string" minOccurs="0" maxOccurs="1"/>
+				<xs:element name="manufacturer" type="xs:string" minOccurs="0" maxOccurs="1"/>
+			<xs:element name="model" type="xs:string" minOccurs="0" maxOccurs="1"/>
+			<xs:element name="version" type="xs:string" minOccurs="0" maxOccurs="1"/>
+			<xs:element name="preferred_mimetype_id" type="xs:integer" minOccurs="1" maxOccurs="1"/>
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="MediaType">
+		<xs:annotation>
+			<xs:documentation xml:lang="en">MediaType ....
+						</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="mediatype_id" type="xs:integer" minOccurs="1" maxOccurs="1"/>
+			<xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"/>
+			<xs:element name="character_set" type="xs:string" minOccurs="0" maxOccurs="1"/>
+			<xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1"/>
+			<xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1"/>
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="ClientCapability">
+		<xs:annotation>
+			<xs:documentation xml:lang="en">
+			Associate clients with capabilities
+			 </xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="clientID" type="xs:integer" minOccurs="1" maxOccurs="1"/>
+			<xs:element name="capabilityID" type="xs:integer" minOccurs="1" maxOccurs="1"/>
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="ClientMimeTypes">
+		<xs:annotation>
+			<xs:documentation xml:lang="en">
+			Associate clients with mime types
+			 </xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="clientID" type="xs:integer" minOccurs="1" maxOccurs="1"/>
+			<xs:element name="mimetypeID" type="xs:integer" minOccurs="1" maxOccurs="1"/>
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="MediaMimeTypes">
+		<xs:annotation>
+			<xs:documentation xml:lang="en">
+			Associate media types with mime types 
+			 </xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="mediatypeID" type="xs:integer" minOccurs="1" maxOccurs="1"/>
+			<xs:element name="mimetypeID" type="xs:integer" minOccurs="1" maxOccurs="1"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="ProfilingRule">
+		<xs:annotation>
+			<xs:documentation xml:lang="en">
+			Profiling Rule
+			 </xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="tbd" type="xs:string" minOccurs="1" maxOccurs="1"/>
+		</xs:sequence>
+	</xs:complexType>
+
+</xs:schema>

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/resources/dataModel.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

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

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

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

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

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

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/audit/impl/AuditActivityImpl.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