You are viewing a plain text version of this content. The canonical link for it is here.
Posted to bridges-commits@portals.apache.org by at...@apache.org on 2007/03/12 02:45:04 UTC

svn commit: r517068 [9/9] - in /portals/bridges/trunk: ./ applications/ applications/jpetstore/ applications/jpetstore/src/java/ applications/jpetstore/src/java/com/ibatis/jpetstore/domain/ applications/jpetstore/src/java/com/ibatis/jpetstore/persisten...

Modified: portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/LinkTag.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/LinkTag.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/LinkTag.java (original)
+++ portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/LinkTag.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-2004 The Apache Software Foundation.
- * 
- * Licensed 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
+ * 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
  * 

Modified: portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/RewriteTag.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/RewriteTag.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/RewriteTag.java (original)
+++ portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/RewriteTag.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-2004 The Apache Software Foundation.
- * 
- * Licensed 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
+ * 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
  * 

Modified: portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/ScriptTag.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/ScriptTag.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/ScriptTag.java (original)
+++ portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/ScriptTag.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-2004 The Apache Software Foundation.
- * 
- * Licensed 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
+ * 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
  * 

Modified: portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/TagsSupport.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/TagsSupport.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/TagsSupport.java (original)
+++ portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/TagsSupport.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-2004 The Apache Software Foundation.
- * 
- * Licensed 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
+ * 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
  * 

Modified: portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/util/EmptyHttpServletResponseWrapper.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/util/EmptyHttpServletResponseWrapper.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/util/EmptyHttpServletResponseWrapper.java (original)
+++ portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/util/EmptyHttpServletResponseWrapper.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-2004 The Apache Software Foundation.
- * 
- * Licensed 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
+ * 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
  * 

Modified: portals/bridges/trunk/struts/xdocs/features.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/xdocs/features.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/xdocs/features.xml (original)
+++ portals/bridges/trunk/struts/xdocs/features.xml Sun Mar 11 18:44:37 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed 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
+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
 

Modified: portals/bridges/trunk/struts/xdocs/index.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/xdocs/index.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/xdocs/index.xml (original)
+++ portals/bridges/trunk/struts/xdocs/index.xml Sun Mar 11 18:44:37 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed 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
+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
 

Modified: portals/bridges/trunk/struts/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/xdocs/navigation.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/xdocs/navigation.xml (original)
+++ portals/bridges/trunk/struts/xdocs/navigation.xml Sun Mar 11 18:44:37 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed 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
+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
 

Modified: portals/bridges/trunk/velocity/pom.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/velocity/pom.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/velocity/pom.xml (original)
+++ portals/bridges/trunk/velocity/pom.xml Sun Mar 11 18:44:37 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 2006 The Apache Software Foundation
-
-Licensed 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
+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
 
@@ -31,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.bridges</groupId>
         <artifactId>portals-bridges</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.2-RC</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/bridges/trunk/velocity/project.properties
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/velocity/project.properties?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/velocity/project.properties (original)
+++ portals/bridges/trunk/velocity/project.properties Sun Mar 11 18:44:37 2007
@@ -1,8 +1,9 @@
-# Copyright 2004 The Apache Software Foundation
-#
-# Licensed 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
+# 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
 #

Modified: portals/bridges/trunk/velocity/project.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/velocity/project.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/velocity/project.xml (original)
+++ portals/bridges/trunk/velocity/project.xml Sun Mar 11 18:44:37 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2004 The Apache Software Foundation
-    
-    Licensed 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
+    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
     
@@ -62,6 +63,13 @@
            <include>**/*.xml</include>
         </includes>
       </resource>      
+      <resource>
+        <directory>${basedir}/..</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>NOTICE.txt</include>
+        </includes>
+      </resource>
     </resources>
   </build>
 </project>

Modified: portals/bridges/trunk/velocity/src/java/org/apache/portals/bridges/velocity/AbstractVelocityMessagingPortlet.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/velocity/src/java/org/apache/portals/bridges/velocity/AbstractVelocityMessagingPortlet.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/velocity/src/java/org/apache/portals/bridges/velocity/AbstractVelocityMessagingPortlet.java (original)
+++ portals/bridges/trunk/velocity/src/java/org/apache/portals/bridges/velocity/AbstractVelocityMessagingPortlet.java Sun Mar 11 18:44:37 2007
@@ -1,108 +1,109 @@
-/*
- * Copyright 2000-2004 The Apache Software Foundation.
- * 
- * Licensed 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.portals.bridges.velocity;
-
-import javax.portlet.PortletRequest;
-
-import org.apache.portals.bridges.velocity.GenericVelocityPortlet;
-import org.apache.portals.messaging.PortletMessaging;
-
-/**
- * velocity abstract messaging portlet
- * 
- * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
- * @version $Id: AbstractVelocityMessagingPortlet.java,v 1.3 2005/03/23 06:24:38 david Exp $
- */
-public abstract class AbstractVelocityMessagingPortlet extends GenericVelocityPortlet
-{
-    private String topic = null;
-    public static final String STATUS_MESSAGE = "statusMsg";
-    
-    protected boolean isEmpty(String s)
-    {
-        if (s == null)
-            return true;
-        
-        if (s.trim().length() == 0)
-            return true;
-        
-        return false;
-    }
-    
-    protected String getTopic()
-    {
-        return topic;
-    }
-    protected void setTopic(String topic)
-    {
-        this.topic = topic;
-    }
-    
-    protected void cancelRenderMessage(PortletRequest request, String message)
-    {
-        try
-        {
-            if (topic == null)
-                PortletMessaging.cancel(request, message);
-            else
-                PortletMessaging.cancel(request, topic, message);
-        }
-        catch (Exception e)
-        {}
-    }
-    
-    protected Object receiveRenderMessage(PortletRequest request, String message)
-    {
-        try
-        {
-            if (topic == null)
-                return PortletMessaging.receive(request, message);
-            else
-                return PortletMessaging.receive(request, topic, message);
-        }
-        catch (Exception e)
-        {}
-        return null;
-    }
-    
-    protected Object consumeRenderMessage(PortletRequest request, String message)
-    {
-        try
-        {
-            if (topic == null)
-                return PortletMessaging.consume(request, message);            
-            else
-                return PortletMessaging.consume(request, topic, message);            
-        }
-        catch (Exception e)
-        {}        
-        return null;
-    }
-    
-    protected void publishRenderMessage(PortletRequest request, String message, Object value)
-    {
-        try
-        {
-            if (topic == null)
-                PortletMessaging.publish(request, message, value);
-            else
-                PortletMessaging.publish(request, topic, message, value);
-        }
-        catch (Exception e)
-        {}
-    }
-
-}
+/*
+ * 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.portals.bridges.velocity;
+
+import javax.portlet.PortletRequest;
+
+import org.apache.portals.bridges.velocity.GenericVelocityPortlet;
+import org.apache.portals.messaging.PortletMessaging;
+
+/**
+ * velocity abstract messaging portlet
+ * 
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+ * @version $Id: AbstractVelocityMessagingPortlet.java,v 1.3 2005/03/23 06:24:38 david Exp $
+ */
+public abstract class AbstractVelocityMessagingPortlet extends GenericVelocityPortlet
+{
+    private String topic = null;
+    public static final String STATUS_MESSAGE = "statusMsg";
+    
+    protected boolean isEmpty(String s)
+    {
+        if (s == null)
+            return true;
+        
+        if (s.trim().length() == 0)
+            return true;
+        
+        return false;
+    }
+    
+    protected String getTopic()
+    {
+        return topic;
+    }
+    protected void setTopic(String topic)
+    {
+        this.topic = topic;
+    }
+    
+    protected void cancelRenderMessage(PortletRequest request, String message)
+    {
+        try
+        {
+            if (topic == null)
+                PortletMessaging.cancel(request, message);
+            else
+                PortletMessaging.cancel(request, topic, message);
+        }
+        catch (Exception e)
+        {}
+    }
+    
+    protected Object receiveRenderMessage(PortletRequest request, String message)
+    {
+        try
+        {
+            if (topic == null)
+                return PortletMessaging.receive(request, message);
+            else
+                return PortletMessaging.receive(request, topic, message);
+        }
+        catch (Exception e)
+        {}
+        return null;
+    }
+    
+    protected Object consumeRenderMessage(PortletRequest request, String message)
+    {
+        try
+        {
+            if (topic == null)
+                return PortletMessaging.consume(request, message);            
+            else
+                return PortletMessaging.consume(request, topic, message);            
+        }
+        catch (Exception e)
+        {}        
+        return null;
+    }
+    
+    protected void publishRenderMessage(PortletRequest request, String message, Object value)
+    {
+        try
+        {
+            if (topic == null)
+                PortletMessaging.publish(request, message, value);
+            else
+                PortletMessaging.publish(request, topic, message, value);
+        }
+        catch (Exception e)
+        {}
+    }
+
+}

Modified: portals/bridges/trunk/velocity/src/java/org/apache/portals/bridges/velocity/BridgesVelocityViewServlet.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/velocity/src/java/org/apache/portals/bridges/velocity/BridgesVelocityViewServlet.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/velocity/src/java/org/apache/portals/bridges/velocity/BridgesVelocityViewServlet.java (original)
+++ portals/bridges/trunk/velocity/src/java/org/apache/portals/bridges/velocity/BridgesVelocityViewServlet.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-2004 The Apache Software Foundation.
- * 
- * Licensed 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
+ * 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
  * 

Modified: portals/bridges/trunk/velocity/src/java/org/apache/portals/bridges/velocity/GenericVelocityPortlet.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/velocity/src/java/org/apache/portals/bridges/velocity/GenericVelocityPortlet.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/velocity/src/java/org/apache/portals/bridges/velocity/GenericVelocityPortlet.java (original)
+++ portals/bridges/trunk/velocity/src/java/org/apache/portals/bridges/velocity/GenericVelocityPortlet.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-2004 The Apache Software Foundation.
- * 
- * Licensed 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
+ * 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
  * 

Modified: portals/bridges/trunk/velocity/xdocs/index.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/velocity/xdocs/index.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/velocity/xdocs/index.xml (original)
+++ portals/bridges/trunk/velocity/xdocs/index.xml Sun Mar 11 18:44:37 2007
@@ -1,174 +1,175 @@
-<?xml version="1.0"?>
-<!--
-	Copyright 2006 The Apache Software Foundation
-	
-	Licensed 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.
--->
-<document>
-	<properties>
-		<title>Jetspeed Simple Velocity Portlet Guide</title>
-		<subtitle>Documentation for Creating a Simple Velocity Portlet</subtitle>
-		<authors>
-			<person name="David Le Strat" email="dlestrat@apache.org" />
-			<person name="Philip Mark Donaghy" email="philip.donaghy@gmail.com" />
-		</authors>
-	</properties>
-	<body>
-		<section name="Jetspeed Simple Velocity Portlet Guide">
-			<p>
-				This guide provides a tutorial for creating a very
-				simple Velocity portlet with one template in the portlet view mode.
-			</p>
-			<subsection name="1. The Portlet Class">
-				<p>
-				Create the file VelocitySimplest.java in a directory called
-				velocity-simplest/WEB-INF/classes:
-				<source>
-public class VelocitySimplest extends org.apache.portals.bridges.velocity.GenericVelocityPortlet
-{
-
-    public void doView(javax.portlet.RenderRequest request, javax.portlet.RenderResponse response)
-                throws javax.portlet.PortletException, java.io.IOException
-    {
-        super.doView(request, response);
-    }
-}
-				</source>
-				</p>
-				<p>
-				Compile the class in the velocity-simplest/WEB-INF/classes directory using the command,
-				<source>
-javac -cp portlet-api-1.0.jar:portals-bridges-velocity-1.0.jar:portals-bridges-common-1.0.jar VelocitySimplest.java
-				</source>
-				</p>
-			</subsection>
-			<subsection name="2. The portlet.xml">
-			<p>
-			Create the file portlet.xml in the velocity-simplest/WEB-INF directory.
-			<source><![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<portlet-app id="velocitysimplest" version="1.0">
-  <portlet id="VelocitySimplest">
-    <portlet-name>VelocitySimplest</portlet-name>
-    <display-name>Velocity Simplest Display Name</display-name>
-    <portlet-class>VelocitySimplest</portlet-class>
-    <init-param>
-        <name>ViewPage</name>
-        <value>/WEB-INF/view/world.vm</value>
-    </init-param>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>VIEW</portlet-mode>
-    </supports>
-    <supported-locale>en</supported-locale>
-    <portlet-info>
-      <title>Velocity Simplest Title</title>
-      <short-title>Velocity Simplest Short Title</short-title>
-    </portlet-info>
-  </portlet>
-</portlet-app>]]>
-			</source>
-			</p>
-			</subsection>
-			<subsection name="3. The web.xml">
-			<p>
-			Create the file web.xml in the velocity-simplest/WEB-INF directory.
-			<source><![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-                         "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-  <display-name>Velocity Simplest</display-name>
-  <description>The world's simplest Velocity portlet</description>
-
-  <!-- Define Velocity Servlet -->
-  <servlet>
-    <servlet-name>velocity</servlet-name>
-    <servlet-class>org.apache.portals.bridges.velocity.BridgesVelocityViewServlet</servlet-class>
-  </servlet>
-
-  <!-- Map *.vm files to Velocity  -->
-  <servlet-mapping>
-    <servlet-name>velocity</servlet-name>
-    <url-pattern>*.vm</url-pattern>
-  </servlet-mapping>
-
-</web-app>]]>
-			</source>
-			</p>
-			</subsection>
-			<subsection name="4. The View">
-			<p>
-                        Create the world.vm file in the velocity-simplest/WEB-INF/view directory. Put
-                        whatever content
-                        you desire in it. Notice that the template file is defined in the portlet init
-                        parameter <code>
-                        ViewPage</code>. The objects <a href="http://portals.apache.org/pluto/multiproject/portlet-api/apidocs/javax/portlet/PortletConfig.html">PortletConfig</a>, <a href="http://portals.apache.org/pluto/multiproject/portlet-api/apidocs/javax/portlet/RenderRequest.html">RenderRequest</a>, and <a href="http://portals.apache.org/pluto/multiproject/portlet-api/apidocs/javax/portlet/RenderResponse.html">RenderResponse</a>
-                        are automatically
-                        placed in the Velocity context for use in Velocity templates. Here is a sample
-                        template showing a few of these objects methods and properties.
-<source>
-$portletConfig.portletName
-$portletConfig.portletContext.serverInfo
-#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
-$renderRequest.portletMode
-$renderResponse.namespace
-</source>
-			</p>
-			</subsection>
-			<subsection name="5. The Dependency JARs">
-			<p>
-                        Copy the commons-beanutils-1.7.0.jar, commons-collections-3.1.jar,
-                        commons-digester-1.7.jar, portals-bridges-velocity-1.0.jar,
-                        velocity-1.4.jar, and velocity-tools-1.2.jar to the velocity-simplest/WEB-INF/lib
-                        directory. IMPORTANT: 
-                        Do NOT put the portlet-api-1.0.jar in the war file. If you have already built
-                        Jetspeed these
-                        jars should be in your Maven repository. If so executing these commands in the lib
-                        directory will set up the dependencies for you.
-<source>
-ln -s ~/.maven/repository/commons-beanutils/jars/commons-beanutils-1.7.0.jar
-ln -s ~/.maven/repository/commons-collections/jars/commons-collections-3.1.jar
-ln -s ~/.maven/repository/commons-digester/jars/commons-digester-1.7.jar
-ln -s ~/.maven/repository/org.apache.portals.bridges/jars/portals-bridges-velocity-1.0.jar
-ln -s ~/.maven/repository/velocity/jars/velocity-1.4.jar
-ln -s ~/.maven/repository/velocity-tools/jars/velocity-tools-1.2.jar
-</source>
-			</p>
-			</subsection>
-			<subsection name="6. The WAR file">
-			<p>
-			From the directory velocity-simplest combine the files above into a war file using the command,
-			<source>
-jar cvf ../velocitysimplest.war .
-			</source>
-			</p>
-			</subsection>
-			<subsection name="7. Deploy the WAR file">
-			<p>
-			Copy the war file to <code>$CATALINA_HOME/webapps/jetspeed/WEB-INF/deploy</code>.
-                        Jetspeed-2 will deploy the webapp.
-			</p>
-			</subsection>
-			<subsection name="8. The PSML">
-			<p>
-                        Create the PSML page using the Jetspeed portlet chooser. Login and click on the
-                        edit page icon.
-                        Your user must have the permission to edit pages. The user <code>admin</code>
-                        password
-                        <code>admin</code> has permission to edit all pages.
-			</p>
-			</subsection>
-		</section>
-	</body>
-</document>
+<?xml version="1.0"?>
+<!--
+	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.
+-->
+<document>
+	<properties>
+		<title>Jetspeed Simple Velocity Portlet Guide</title>
+		<subtitle>Documentation for Creating a Simple Velocity Portlet</subtitle>
+		<authors>
+			<person name="David Le Strat" email="dlestrat@apache.org" />
+			<person name="Philip Mark Donaghy" email="philip.donaghy@gmail.com" />
+		</authors>
+	</properties>
+	<body>
+		<section name="Jetspeed Simple Velocity Portlet Guide">
+			<p>
+				This guide provides a tutorial for creating a very
+				simple Velocity portlet with one template in the portlet view mode.
+			</p>
+			<subsection name="1. The Portlet Class">
+				<p>
+				Create the file VelocitySimplest.java in a directory called
+				velocity-simplest/WEB-INF/classes:
+				<source>
+public class VelocitySimplest extends org.apache.portals.bridges.velocity.GenericVelocityPortlet
+{
+
+    public void doView(javax.portlet.RenderRequest request, javax.portlet.RenderResponse response)
+                throws javax.portlet.PortletException, java.io.IOException
+    {
+        super.doView(request, response);
+    }
+}
+				</source>
+				</p>
+				<p>
+				Compile the class in the velocity-simplest/WEB-INF/classes directory using the command,
+				<source>
+javac -cp portlet-api-1.0.jar:portals-bridges-velocity-1.0.jar:portals-bridges-common-1.0.jar VelocitySimplest.java
+				</source>
+				</p>
+			</subsection>
+			<subsection name="2. The portlet.xml">
+			<p>
+			Create the file portlet.xml in the velocity-simplest/WEB-INF directory.
+			<source><![CDATA[
+<?xml version="1.0" encoding="UTF-8"?>
+<portlet-app id="velocitysimplest" version="1.0">
+  <portlet id="VelocitySimplest">
+    <portlet-name>VelocitySimplest</portlet-name>
+    <display-name>Velocity Simplest Display Name</display-name>
+    <portlet-class>VelocitySimplest</portlet-class>
+    <init-param>
+        <name>ViewPage</name>
+        <value>/WEB-INF/view/world.vm</value>
+    </init-param>
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>VIEW</portlet-mode>
+    </supports>
+    <supported-locale>en</supported-locale>
+    <portlet-info>
+      <title>Velocity Simplest Title</title>
+      <short-title>Velocity Simplest Short Title</short-title>
+    </portlet-info>
+  </portlet>
+</portlet-app>]]>
+			</source>
+			</p>
+			</subsection>
+			<subsection name="3. The web.xml">
+			<p>
+			Create the file web.xml in the velocity-simplest/WEB-INF directory.
+			<source><![CDATA[
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+                         "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+  <display-name>Velocity Simplest</display-name>
+  <description>The world's simplest Velocity portlet</description>
+
+  <!-- Define Velocity Servlet -->
+  <servlet>
+    <servlet-name>velocity</servlet-name>
+    <servlet-class>org.apache.portals.bridges.velocity.BridgesVelocityViewServlet</servlet-class>
+  </servlet>
+
+  <!-- Map *.vm files to Velocity  -->
+  <servlet-mapping>
+    <servlet-name>velocity</servlet-name>
+    <url-pattern>*.vm</url-pattern>
+  </servlet-mapping>
+
+</web-app>]]>
+			</source>
+			</p>
+			</subsection>
+			<subsection name="4. The View">
+			<p>
+                        Create the world.vm file in the velocity-simplest/WEB-INF/view directory. Put
+                        whatever content
+                        you desire in it. Notice that the template file is defined in the portlet init
+                        parameter <code>
+                        ViewPage</code>. The objects <a href="http://portals.apache.org/pluto/multiproject/portlet-api/apidocs/javax/portlet/PortletConfig.html">PortletConfig</a>, <a href="http://portals.apache.org/pluto/multiproject/portlet-api/apidocs/javax/portlet/RenderRequest.html">RenderRequest</a>, and <a href="http://portals.apache.org/pluto/multiproject/portlet-api/apidocs/javax/portlet/RenderResponse.html">RenderResponse</a>
+                        are automatically
+                        placed in the Velocity context for use in Velocity templates. Here is a sample
+                        template showing a few of these objects methods and properties.
+<source>
+$portletConfig.portletName
+$portletConfig.portletContext.serverInfo
+#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
+$renderRequest.portletMode
+$renderResponse.namespace
+</source>
+			</p>
+			</subsection>
+			<subsection name="5. The Dependency JARs">
+			<p>
+                        Copy the commons-beanutils-1.7.0.jar, commons-collections-3.1.jar,
+                        commons-digester-1.7.jar, portals-bridges-velocity-1.0.jar,
+                        velocity-1.4.jar, and velocity-tools-1.2.jar to the velocity-simplest/WEB-INF/lib
+                        directory. IMPORTANT: 
+                        Do NOT put the portlet-api-1.0.jar in the war file. If you have already built
+                        Jetspeed these
+                        jars should be in your Maven repository. If so executing these commands in the lib
+                        directory will set up the dependencies for you.
+<source>
+ln -s ~/.maven/repository/commons-beanutils/jars/commons-beanutils-1.7.0.jar
+ln -s ~/.maven/repository/commons-collections/jars/commons-collections-3.1.jar
+ln -s ~/.maven/repository/commons-digester/jars/commons-digester-1.7.jar
+ln -s ~/.maven/repository/org.apache.portals.bridges/jars/portals-bridges-velocity-1.0.jar
+ln -s ~/.maven/repository/velocity/jars/velocity-1.4.jar
+ln -s ~/.maven/repository/velocity-tools/jars/velocity-tools-1.2.jar
+</source>
+			</p>
+			</subsection>
+			<subsection name="6. The WAR file">
+			<p>
+			From the directory velocity-simplest combine the files above into a war file using the command,
+			<source>
+jar cvf ../velocitysimplest.war .
+			</source>
+			</p>
+			</subsection>
+			<subsection name="7. Deploy the WAR file">
+			<p>
+			Copy the war file to <code>$CATALINA_HOME/webapps/jetspeed/WEB-INF/deploy</code>.
+                        Jetspeed-2 will deploy the webapp.
+			</p>
+			</subsection>
+			<subsection name="8. The PSML">
+			<p>
+                        Create the PSML page using the Jetspeed portlet chooser. Login and click on the
+                        edit page icon.
+                        Your user must have the permission to edit pages. The user <code>admin</code>
+                        password
+                        <code>admin</code> has permission to edit all pages.
+			</p>
+			</subsection>
+		</section>
+	</body>
+</document>

Modified: portals/bridges/trunk/velocity/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/velocity/xdocs/navigation.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/velocity/xdocs/navigation.xml (original)
+++ portals/bridges/trunk/velocity/xdocs/navigation.xml Sun Mar 11 18:44:37 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed 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
+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
 

Modified: portals/bridges/trunk/xdocs/download.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/xdocs/download.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/xdocs/download.xml (original)
+++ portals/bridges/trunk/xdocs/download.xml Sun Mar 11 18:44:37 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-	Copyright 2004 The Apache Software Foundation
-	
-	Licensed 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
+	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
 	

Modified: portals/bridges/trunk/xdocs/index.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/xdocs/index.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/xdocs/index.xml (original)
+++ portals/bridges/trunk/xdocs/index.xml Sun Mar 11 18:44:37 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed 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
+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
 

Modified: portals/bridges/trunk/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/xdocs/navigation.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/xdocs/navigation.xml (original)
+++ portals/bridges/trunk/xdocs/navigation.xml Sun Mar 11 18:44:37 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed 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
+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
 

Modified: portals/bridges/trunk/xdocs/release-notes.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/xdocs/release-notes.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/xdocs/release-notes.xml (original)
+++ portals/bridges/trunk/xdocs/release-notes.xml Sun Mar 11 18:44:37 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2004 The Apache Software Foundation
-  
-  Licensed 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
+  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
   

Modified: portals/bridges/trunk/xdocs/style/maven-bridges.css
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/xdocs/style/maven-bridges.css?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/xdocs/style/maven-bridges.css (original)
+++ portals/bridges/trunk/xdocs/style/maven-bridges.css Sun Mar 11 18:44:37 2007
@@ -1,212 +1,228 @@
-/*
----------------------- 
-Theme Style
-----------------------
-*/
-body {
-	background-color: #fff;
-	font-family: Verdana, Helvetica, Arial, sans-serif;
-	margin-left: auto;
-	margin-right: auto;
-	background-repeat: repeat-y;
-	font-size: 13px;
-	padding: 0px;
-}
-
-td,select,input,li {
-	font-family: Verdana, Helvetica, Arial, sans-serif;
-	font-size: 12px;
-	color: #333333;
-}
-
-code {
-	font-size: 12px;
-}
-
-a {
-	text-decoration: none;
-}
-
-a:link {
-	color: #47a;
-}
-
-a:visited {
-	color: #666666;
-}
-
-a:active,a:hover {
-	color: #990000;
-}
-
-#legend li.externalLink {
-	background: url(../images/external.png) left top no-repeat;
-	padding-left: 18px;
-}
-
-a.externalLink,a.externalLink:link,a.externalLink:visited,a.externalLink:active,a.externalLink:hover
-	{
-	background: url(../images/external.png) right center no-repeat;
-	padding-right: 18px;
-}
-
-#legend li.newWindow {
-	background: url(../images/newwindow.png) left top no-repeat;
-	padding-left: 18px;
-}
-
-a.newWindow,a.newWindow:link,a.newWindow:visited,a.newWindow:active,a.newWindow:hover
-	{
-	background: url(../images/newwindow.png) right center no-repeat;
-	padding-right: 18px;
-}
-
-h2 {
-	font-size: 17px;
-	color: #333333;
-}
-
-h3 {
-	padding: 4px 4px 4px 24px;
-	color: #666;
-	background-color: #ccc;
-	font-weight: bold;
-	font-size: 14px;
-	background-image: url(../images/h3.jpg);
-	background-repeat: no-repeat;
-	background-position: left bottom;
-}
-
-p {
-	line-height: 1.3em;
-	font-size: 12px;
-	color: #000;
-}
-
-#breadcrumbs {
-	height: 6px;
-	background-image: url(../images/breadcrumbs.jpg);
-	padding: 5px 10px 14px 20px;
-}
-
-* html #breadcrumbs {
-	padding-bottom: 8px;
-}
-
-#leftColumn {
-	margin: 10px 0 10px 0;
-	border-top-color: #ccc;
-	border-top-style: solid;
-	border-top-width: 1px;
-	border-right-color: #ccc;
-	border-right-style: solid;
-	border-right-width: 1px;
-	border-bottom-color: #ccc;
-	border-bottom-style: solid;
-	border-bottom-width: 1px;
-	padding-right: 5px;
-	padding-left: 5px;
-}
-
-#navcolumn h5 {
-	font-size: smaller;
-	border-bottom: 1px solid #aaaaaa;
-	padding-top: 2px;
-	padding-left: 9px;
-	color: #49635a;
-	background-image: url(../images/h5.jpg);
-	background-repeat: no-repeat;
-	background-position: left bottom;
-}
-
-table.bodyTable th {
-	color: white;
-	background-color: #bbb;
-	text-align: left;
-	font-weight: bold;
-}
-
-table.bodyTable th,table.bodyTable td {
-	font-size: 11px;
-}
-
-table.bodyTable tr.a {
-	background-color: #ddd;
-}
-
-table.bodyTable tr.b {
-	background-color: #eee;
-}
-
-.source {
-	border: 1px solid #999;
-	overflow: auto
-}
-
-dt {
-	padding: 4px 4px 4px 24px;
-	color: #333333;
-	background-color: #ccc;
-	font-weight: bold;
-	font-size: 14px;
-	background-image: url(../images/h3.jpg);
-	background-repeat: no-repeat;
-	background-position: left bottom;
-}
-
-.subsectionTitle {
-	font-size: 13px;
-	font-weight: bold;
-	color: #666;
-}
-
-table {
-	font-size: 10px;
-}
-
-.xright a:link,.xright a:visited,.xright a:active {
-	color: #666;
-}
-
-.xright a:hover {
-	color: #003300;
-}
-
-#banner {
-	height: 93px;
-	background: url(../images/banner.jpg);
-}
-
-#navcolumn ul {
-	margin: 5px 0 15px -0em;
-}
-
-#navcolumn ul a {
-	color: #333333;
-}
-
-#navcolumn ul a:hover {
-	color: red;
-}
-
-#intro {
-	border: solid #ccc 1px;
-	margin: 6px 0px 0px 0px;
-	padding: 10px 40px 10px 40px;
-}
-
-.subsection {
-	margin-left: 3px;
-	color: #333333;
-}
-
-.subsection p {
-	font-size: 12px;
-}
-
-#footer {
-	padding: 10px;
-	margin: 20px 0px 20px 0px;
-	border-top: solid #ccc 1px;
-	color: #333333;
+/*
+* 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.
+*/
+/*
+---------------------- 
+Theme Style
+----------------------
+*/
+body {
+	background-color: #fff;
+	font-family: Verdana, Helvetica, Arial, sans-serif;
+	margin-left: auto;
+	margin-right: auto;
+	background-repeat: repeat-y;
+	font-size: 13px;
+	padding: 0px;
+}
+
+td,select,input,li {
+	font-family: Verdana, Helvetica, Arial, sans-serif;
+	font-size: 12px;
+	color: #333333;
+}
+
+code {
+	font-size: 12px;
+}
+
+a {
+	text-decoration: none;
+}
+
+a:link {
+	color: #47a;
+}
+
+a:visited {
+	color: #666666;
+}
+
+a:active,a:hover {
+	color: #990000;
+}
+
+#legend li.externalLink {
+	background: url(../images/external.png) left top no-repeat;
+	padding-left: 18px;
+}
+
+a.externalLink,a.externalLink:link,a.externalLink:visited,a.externalLink:active,a.externalLink:hover
+	{
+	background: url(../images/external.png) right center no-repeat;
+	padding-right: 18px;
+}
+
+#legend li.newWindow {
+	background: url(../images/newwindow.png) left top no-repeat;
+	padding-left: 18px;
+}
+
+a.newWindow,a.newWindow:link,a.newWindow:visited,a.newWindow:active,a.newWindow:hover
+	{
+	background: url(../images/newwindow.png) right center no-repeat;
+	padding-right: 18px;
+}
+
+h2 {
+	font-size: 17px;
+	color: #333333;
+}
+
+h3 {
+	padding: 4px 4px 4px 24px;
+	color: #666;
+	background-color: #ccc;
+	font-weight: bold;
+	font-size: 14px;
+	background-image: url(../images/h3.jpg);
+	background-repeat: no-repeat;
+	background-position: left bottom;
+}
+
+p {
+	line-height: 1.3em;
+	font-size: 12px;
+	color: #000;
+}
+
+#breadcrumbs {
+	height: 6px;
+	background-image: url(../images/breadcrumbs.jpg);
+	padding: 5px 10px 14px 20px;
+}
+
+* html #breadcrumbs {
+	padding-bottom: 8px;
+}
+
+#leftColumn {
+	margin: 10px 0 10px 0;
+	border-top-color: #ccc;
+	border-top-style: solid;
+	border-top-width: 1px;
+	border-right-color: #ccc;
+	border-right-style: solid;
+	border-right-width: 1px;
+	border-bottom-color: #ccc;
+	border-bottom-style: solid;
+	border-bottom-width: 1px;
+	padding-right: 5px;
+	padding-left: 5px;
+}
+
+#navcolumn h5 {
+	font-size: smaller;
+	border-bottom: 1px solid #aaaaaa;
+	padding-top: 2px;
+	padding-left: 9px;
+	color: #49635a;
+	background-image: url(../images/h5.jpg);
+	background-repeat: no-repeat;
+	background-position: left bottom;
+}
+
+table.bodyTable th {
+	color: white;
+	background-color: #bbb;
+	text-align: left;
+	font-weight: bold;
+}
+
+table.bodyTable th,table.bodyTable td {
+	font-size: 11px;
+}
+
+table.bodyTable tr.a {
+	background-color: #ddd;
+}
+
+table.bodyTable tr.b {
+	background-color: #eee;
+}
+
+.source {
+	border: 1px solid #999;
+	overflow: auto
+}
+
+dt {
+	padding: 4px 4px 4px 24px;
+	color: #333333;
+	background-color: #ccc;
+	font-weight: bold;
+	font-size: 14px;
+	background-image: url(../images/h3.jpg);
+	background-repeat: no-repeat;
+	background-position: left bottom;
+}
+
+.subsectionTitle {
+	font-size: 13px;
+	font-weight: bold;
+	color: #666;
+}
+
+table {
+	font-size: 10px;
+}
+
+.xright a:link,.xright a:visited,.xright a:active {
+	color: #666;
+}
+
+.xright a:hover {
+	color: #003300;
+}
+
+#banner {
+	height: 93px;
+	background: url(../images/banner.jpg);
+}
+
+#navcolumn ul {
+	margin: 5px 0 15px -0em;
+}
+
+#navcolumn ul a {
+	color: #333333;
+}
+
+#navcolumn ul a:hover {
+	color: red;
+}
+
+#intro {
+	border: solid #ccc 1px;
+	margin: 6px 0px 0px 0px;
+	padding: 10px 40px 10px 40px;
+}
+
+.subsection {
+	margin-left: 3px;
+	color: #333333;
+}
+
+.subsection p {
+	font-size: 12px;
+}
+
+#footer {
+	padding: 10px;
+	margin: 20px 0px 20px 0px;
+	border-top: solid #ccc 1px;
+	color: #333333;
 }

Modified: portals/bridges/trunk/xdocs/style/project.css
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/xdocs/style/project.css?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/xdocs/style/project.css (original)
+++ portals/bridges/trunk/xdocs/style/project.css Sun Mar 11 18:44:37 2007
@@ -1,44 +1,60 @@
-/*
----------------------- 
-Project Style
-----------------------
-*/
-
-#downloadbox {
-	float: right;
-	margin: 0 10px 20px 20px;
-	padding: 5px;
-	border: 1px solid #999;
-	background-color: #eee;
-}
-
-#downloadbox {
-	float: right;
-	margin: 0 10px 20px 20px;
-	padding: 5px;
-	border: 1px solid #999;
-	background-color: #eee;
-}
-
-#downloadbox h5 {
-	color: #000;
-	margin: 0;
-	border-bottom: 1px solid #aaaaaa;
-	font-size: smaller;
-	padding: 0;
-}
-
-#downloadbox p {
-	margin-top: 1em;
-	margin-bottom: 0;
-}
-
-#downloadbox ul {
-	margin-top: 0;
-	margin-bottom: 1em;
-	list-style-type: disc;
-}
-
-#downloadbox li {
-	font-size: smaller;
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License.  You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+/*
+---------------------- 
+Project Style
+----------------------
+*/
+
+#downloadbox {
+	float: right;
+	margin: 0 10px 20px 20px;
+	padding: 5px;
+	border: 1px solid #999;
+	background-color: #eee;
+}
+
+#downloadbox {
+	float: right;
+	margin: 0 10px 20px 20px;
+	padding: 5px;
+	border: 1px solid #999;
+	background-color: #eee;
+}
+
+#downloadbox h5 {
+	color: #000;
+	margin: 0;
+	border-bottom: 1px solid #aaaaaa;
+	font-size: smaller;
+	padding: 0;
+}
+
+#downloadbox p {
+	margin-top: 1em;
+	margin-bottom: 0;
+}
+
+#downloadbox ul {
+	margin-top: 0;
+	margin-bottom: 1em;
+	list-style-type: disc;
+}
+
+#downloadbox li {
+	font-size: smaller;
 }



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