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 [45/48] - in /portals/jetspeed-2/portal/trunk: ./ app-servers/security/jboss/src/java/META-INF/jboss-secsvc/ app-servers/security/jboss/src/java/org/apache/jetspeed/appservers/security/jboss/ applications/jetspeed/src/main/javascrip...
Date Fri, 12 Dec 2008 12:07:04 GMT
Propchange: portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-security/ldap.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-security/login-module.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-security/login-module.xml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-security/login-module.xml (original)
+++ portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-security/login-module.xml Fri Dec 12 04:06:29 2008
@@ -1,155 +1,155 @@
-<?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 2 Security - Login Module</title>
-        <authors>
-            <person name="David Le Strat" email="dlestrat@apache.org" />
-        </authors>
-    </properties>
-    <body>
-        <section name="Login Module Overview">
-            <p>
-                For authentication purpose, Jetspeed 2 provide a default login module implementation. Login modules provide a standard way to expose
-                authentication services for java application. More information about login modules can be found in the JDK
-                <a href="http://java.sun.com/j2se/1.4.2/docs/api/javax/security/auth/spi/LoginModule.html">LoginModule interface</a>
-                documentation.
-            </p>
-        </section>
-        <section name="Login Module Configuration">
-            <p>
-                Configuration is central to JAAS authentication. By default, Jetspeed 2 is configured to use its
-                <code>DefaultLoginModule</code>
-                implementation. The configuration file (login.conf) for the login module ship with the
-                <code>jetspeed2-security-{version}.jar</code>
-                component and provide the following configuration:
-                <source>
-                    <![CDATA[
-Jetspeed {
-   org.apache.jetspeed.security.impl.DefaultLoginModule required;
-};]]>
-                </source>
-            </p>
-            <p>
-                In order to override this configuration, you can place your own login.conf file in your web application class path under WEB-INF/classes. The
-                location of the login.conf file is configured in the
-                <code>security-providers.xml</code>
-                as described below. For more information on how to configure the security providers, see
-                <a href="config.html">the configuration section</a>.
-            </p>
-            <p>
-                <source>
-                    <![CDATA[
-<!-- Security: Default Authentication Provider -->
-<bean id="org.apache.jetspeed.security.AuthenticationProvider" 
-  	  class="org.apache.jetspeed.security.impl.AuthenticationProviderImpl"
->  	   
-    <constructor-arg index="0"><value>DefaultAuthenticator</value></constructor-arg>
-  	<constructor-arg index="1"><value>The default authenticator</value></constructor-arg>
-  	<constructor-arg index="2"><value>login.conf</value></constructor-arg>
-  	<constructor-arg index="3">
-  	    <ref bean="org.apache.jetspeed.security.spi.CredentialHandler"/>
-  	</constructor-arg>
-  	<constructor-arg index="4">
-  	    <ref bean="org.apache.jetspeed.security.spi.UserSecurityHandler"/>
-    </constructor-arg>
-</bean>]]>
-                </source>
-            </p>
-            <p>
-                The <code>AuthenticationProvider</code> configures the <code>LoginModule</code> to be used by the
-                application by setting the System property <code>java.security.auth.login.config</code> to the 
-                <code>login.conf</code> specified in the component configuration.
-            </p>
-        </section>
-        <section name="Login Module Implementation">
-            <p>
-                The
-                <code>DefaultLoginModule</code>
-                implementation is illustrated by the class diagram below:
-                <br />
-            </p>
-            <table>
-                <tr>
-                    <td style="background-color:#FFFFFF;" align="center">
-                        <img src="../../images/components/default-login-module-c.gif" border="0" />
-                    </td>
-                </tr>
-            </table>
-            <p>
-                The roles of the classes used to implement the DefaultLoginModule are:
-            </p>
-            <table>
-                <tr>
-                    <th>Class</th>
-                    <th>Description</th>
-                </tr>
-                <tr>
-                    <td><code>org.apache.jetspeed.security.impl.DefaultLoginModule</code></td>
-                    <td>
-                        The
-                        <code>javax.security.auth.spi.LoginModule</code>
-                        implementation. The
-                        <code>DefaultLoginModule</code>
-                        authentication decision is encapsulated behind the
-                        <code>UserManager</code>
-                        interface which leverages the SPI implementation to decide which authenticator should be used in order to authenticate a user against a
-                        specific system of record. For more information on how to implement your own authenticator, see the
-                        <a href="atn-spi.html">authentication SPI documentation</a>.
-                    </td>
-                </tr>
-                <tr>
-                    <td><code>org.apache.jetspeed.security.LoginModuleProxy</code></td>
-                    <td>
-                        A utility component used to expose the
-                        <code>UserManager</code>
-                        to the
-                        <code>DefaultLoginModule</code>.
-                    </td>
-                </tr>
-                <tr>
-                    <td><code>org.apache.jetspeed.security.User</code></td>
-                    <td>
-                        The
-                        <code>User</code>
-                        is an interface that holds the
-                        <code>javax.security.auth.Subject</code>
-                        and his/her
-                        <code>java.util.prefs.Preferences</code>. The
-                        <code>UserManager</code>
-                        upon user authentication populates the user subject with all user
-                        <code>java.security.Principal</code>. Jetspeed 2 implements 3 types of principals:
-                        <ul>
-                            <li>UserPrincipal: The principal holding the user unique identifier for the application.</li>
-                            <li>RolePrincipal: The principal representing a role for the system.</li>
-                            <li>GroupPrincipal: The principal representing a group for the system.</li>
-                        </ul>
-                    </td>
-                </tr>
-                <tr>
-                    <td><code>org.apache.jetspeed.security.UserManager</code></td>
-                    <td>
-                        The interface exposing all user operations. This interfaces fronts the aggregates various SPI to provide developers with the ability to
-                        map users to their specific system of record.
-                    </td>
-                </tr>
-            </table>
-        </section>
-
-    </body>
+<?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 2 Security - Login Module</title>
+        <authors>
+            <person name="David Le Strat" email="dlestrat@apache.org" />
+        </authors>
+    </properties>
+    <body>
+        <section name="Login Module Overview">
+            <p>
+                For authentication purpose, Jetspeed 2 provide a default login module implementation. Login modules provide a standard way to expose
+                authentication services for java application. More information about login modules can be found in the JDK
+                <a href="http://java.sun.com/j2se/1.4.2/docs/api/javax/security/auth/spi/LoginModule.html">LoginModule interface</a>
+                documentation.
+            </p>
+        </section>
+        <section name="Login Module Configuration">
+            <p>
+                Configuration is central to JAAS authentication. By default, Jetspeed 2 is configured to use its
+                <code>DefaultLoginModule</code>
+                implementation. The configuration file (login.conf) for the login module ship with the
+                <code>jetspeed2-security-{version}.jar</code>
+                component and provide the following configuration:
+                <source>
+                    <![CDATA[
+Jetspeed {
+   org.apache.jetspeed.security.impl.DefaultLoginModule required;
+};]]>
+                </source>
+            </p>
+            <p>
+                In order to override this configuration, you can place your own login.conf file in your web application class path under WEB-INF/classes. The
+                location of the login.conf file is configured in the
+                <code>security-providers.xml</code>
+                as described below. For more information on how to configure the security providers, see
+                <a href="config.html">the configuration section</a>.
+            </p>
+            <p>
+                <source>
+                    <![CDATA[
+<!-- Security: Default Authentication Provider -->
+<bean id="org.apache.jetspeed.security.AuthenticationProvider" 
+  	  class="org.apache.jetspeed.security.impl.AuthenticationProviderImpl"
+>  	   
+    <constructor-arg index="0"><value>DefaultAuthenticator</value></constructor-arg>
+  	<constructor-arg index="1"><value>The default authenticator</value></constructor-arg>
+  	<constructor-arg index="2"><value>login.conf</value></constructor-arg>
+  	<constructor-arg index="3">
+  	    <ref bean="org.apache.jetspeed.security.spi.CredentialHandler"/>
+  	</constructor-arg>
+  	<constructor-arg index="4">
+  	    <ref bean="org.apache.jetspeed.security.spi.UserSecurityHandler"/>
+    </constructor-arg>
+</bean>]]>
+                </source>
+            </p>
+            <p>
+                The <code>AuthenticationProvider</code> configures the <code>LoginModule</code> to be used by the
+                application by setting the System property <code>java.security.auth.login.config</code> to the 
+                <code>login.conf</code> specified in the component configuration.
+            </p>
+        </section>
+        <section name="Login Module Implementation">
+            <p>
+                The
+                <code>DefaultLoginModule</code>
+                implementation is illustrated by the class diagram below:
+                <br />
+            </p>
+            <table>
+                <tr>
+                    <td style="background-color:#FFFFFF;" align="center">
+                        <img src="../../images/components/default-login-module-c.gif" border="0" />
+                    </td>
+                </tr>
+            </table>
+            <p>
+                The roles of the classes used to implement the DefaultLoginModule are:
+            </p>
+            <table>
+                <tr>
+                    <th>Class</th>
+                    <th>Description</th>
+                </tr>
+                <tr>
+                    <td><code>org.apache.jetspeed.security.impl.DefaultLoginModule</code></td>
+                    <td>
+                        The
+                        <code>javax.security.auth.spi.LoginModule</code>
+                        implementation. The
+                        <code>DefaultLoginModule</code>
+                        authentication decision is encapsulated behind the
+                        <code>UserManager</code>
+                        interface which leverages the SPI implementation to decide which authenticator should be used in order to authenticate a user against a
+                        specific system of record. For more information on how to implement your own authenticator, see the
+                        <a href="atn-spi.html">authentication SPI documentation</a>.
+                    </td>
+                </tr>
+                <tr>
+                    <td><code>org.apache.jetspeed.security.LoginModuleProxy</code></td>
+                    <td>
+                        A utility component used to expose the
+                        <code>UserManager</code>
+                        to the
+                        <code>DefaultLoginModule</code>.
+                    </td>
+                </tr>
+                <tr>
+                    <td><code>org.apache.jetspeed.security.User</code></td>
+                    <td>
+                        The
+                        <code>User</code>
+                        is an interface that holds the
+                        <code>javax.security.auth.Subject</code>
+                        and his/her
+                        <code>java.util.prefs.Preferences</code>. The
+                        <code>UserManager</code>
+                        upon user authentication populates the user subject with all user
+                        <code>java.security.Principal</code>. Jetspeed 2 implements 3 types of principals:
+                        <ul>
+                            <li>UserPrincipal: The principal holding the user unique identifier for the application.</li>
+                            <li>RolePrincipal: The principal representing a role for the system.</li>
+                            <li>GroupPrincipal: The principal representing a group for the system.</li>
+                        </ul>
+                    </td>
+                </tr>
+                <tr>
+                    <td><code>org.apache.jetspeed.security.UserManager</code></td>
+                    <td>
+                        The interface exposing all user operations. This interfaces fronts the aggregates various SPI to provide developers with the ability to
+                        map users to their specific system of record.
+                    </td>
+                </tr>
+            </table>
+        </section>
+
+    </body>
 </document>
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-security/login-module.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-security/permission.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-security/permission.xml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-security/permission.xml (original)
+++ portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-security/permission.xml Fri Dec 12 04:06:29 2008
@@ -1,81 +1,81 @@
-<?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 2 Security - PermissionManager Overview</title>
-        <authors>
-            <person name="David Le Strat" email="dlestrat@apache.org" />
-        </authors>
-    </properties>
-    <body>
-        <section name="PermissionManager Overview">
-            <p>The <code>PermissionManager</code> is used by the <code>RdbmsPolicy</code> to get the permissions for
-            a given user principals as presented 
-            in the <a href="atz-jaas.html#Jetspeed_JAAS_Policy">Jetspeed JAAS Policy</a> section of the documentation.
-            </p>
-            <p>
-            The <code>PermissionManager</code> manages the association between permissions and principals.  Each permission
-            or  principal maps to a generic object model and reflexion is used to instantiate the proper permission or
-            principal type.  The class diagram below represents the interfaces representing a generic permission 
-            (<code>InternalPermission</code>) and a generic principal (<code>InternalPrincipal</code>) and their relation
-            to the <code>PermissionManager</code>.
-            </p>
-            <p>
-            <img src="../../images/components/permission-mgr-c.gif" border="0" />
-            </p>
-            <p>
-            Each <code>InternalPermission</code> maps to one or more <code>InternalPrincipal</code> and, each 
-            <code>InternalPrincipal</code> can have one or more <code>InternalPermission</code>.
-            </p>
-            <p>
-            <img src="../../images/components/permissions-principals-om-c.gif" border="0" />
-            </p>
-        </section>
-        <section name="Schema and OJB Mapping">
-            <p>
-            The OJB mappings for the security component are described in <code>security_repository.xml</code>:
-            <ul>
-            <li><code>InternalPrincipal</code>: Maps to the <code>SECURITY_PRINCIPAL</code> table.</li>
-            <li><code>InternalPermission</code>: Maps to the <code>SECURITY_PERMISSION</code> table.</li>
-            <li>Associations between <code>InternalPrincipal</code> and <code>InternalPermission</code> are
-            maintained through the indirection table <code>PRINCIPAL_PERMISSION</code>.</li>
-            </ul>
-            <source><![CDATA[
-<class-descriptor
-	    class="org.apache.jetspeed.security.om.impl.InternalPrincipalImpl"
-	    proxy="dynamic"
-	    table="SECURITY_PRINCIPAL"
-	>...</class-descriptor>
-	
-<class-descriptor
-	    class="org.apache.jetspeed.security.om.impl.InternalPermissionImpl"
-	    proxy="dynamic"
-	    table="SECURITY_PERMISSION"
-	>...</class-descriptor>      
-            ]]>
-            </source>
-            </p>
-            <p>
-            The relational schema maintaining principal to permission associations is provided below:
-            </p>
-            <p>
-            <img src="../../images/components/permissions-principals-schema.gif" border="0" />
-            </p>
-        </section>
-    </body>
+<?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 2 Security - PermissionManager Overview</title>
+        <authors>
+            <person name="David Le Strat" email="dlestrat@apache.org" />
+        </authors>
+    </properties>
+    <body>
+        <section name="PermissionManager Overview">
+            <p>The <code>PermissionManager</code> is used by the <code>RdbmsPolicy</code> to get the permissions for
+            a given user principals as presented 
+            in the <a href="atz-jaas.html#Jetspeed_JAAS_Policy">Jetspeed JAAS Policy</a> section of the documentation.
+            </p>
+            <p>
+            The <code>PermissionManager</code> manages the association between permissions and principals.  Each permission
+            or  principal maps to a generic object model and reflexion is used to instantiate the proper permission or
+            principal type.  The class diagram below represents the interfaces representing a generic permission 
+            (<code>InternalPermission</code>) and a generic principal (<code>InternalPrincipal</code>) and their relation
+            to the <code>PermissionManager</code>.
+            </p>
+            <p>
+            <img src="../../images/components/permission-mgr-c.gif" border="0" />
+            </p>
+            <p>
+            Each <code>InternalPermission</code> maps to one or more <code>InternalPrincipal</code> and, each 
+            <code>InternalPrincipal</code> can have one or more <code>InternalPermission</code>.
+            </p>
+            <p>
+            <img src="../../images/components/permissions-principals-om-c.gif" border="0" />
+            </p>
+        </section>
+        <section name="Schema and OJB Mapping">
+            <p>
+            The OJB mappings for the security component are described in <code>security_repository.xml</code>:
+            <ul>
+            <li><code>InternalPrincipal</code>: Maps to the <code>SECURITY_PRINCIPAL</code> table.</li>
+            <li><code>InternalPermission</code>: Maps to the <code>SECURITY_PERMISSION</code> table.</li>
+            <li>Associations between <code>InternalPrincipal</code> and <code>InternalPermission</code> are
+            maintained through the indirection table <code>PRINCIPAL_PERMISSION</code>.</li>
+            </ul>
+            <source><![CDATA[
+<class-descriptor
+	    class="org.apache.jetspeed.security.om.impl.InternalPrincipalImpl"
+	    proxy="dynamic"
+	    table="SECURITY_PRINCIPAL"
+	>...</class-descriptor>
+	
+<class-descriptor
+	    class="org.apache.jetspeed.security.om.impl.InternalPermissionImpl"
+	    proxy="dynamic"
+	    table="SECURITY_PERMISSION"
+	>...</class-descriptor>      
+            ]]>
+            </source>
+            </p>
+            <p>
+            The relational schema maintaining principal to permission associations is provided below:
+            </p>
+            <p>
+            <img src="../../images/components/permissions-principals-schema.gif" border="0" />
+            </p>
+        </section>
+    </body>
 </document>
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-security/permission.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-statistics/aggregation.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-statistics/aggregation.xml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-statistics/aggregation.xml (original)
+++ portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-statistics/aggregation.xml Fri Dec 12 04:06:29 2008
@@ -1,64 +1,64 @@
-<?xml version="1.0" ?>
-<!--
+<?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-2 Statistics</title>
-        <authors>
-            <person name="David Le Strat" email="dlestrat@apache.org" />
-        </authors>
-    </properties>
-    <body>
-        <section name="Data Aggregation Overview">
-            <p>
-            Jetspeed-2 provides a mechanism for aggregating portal statistics for reporting purpose.
-            </p>
-            <subsection name="Retrieving Aggregate Statistics">
-            <p>
-            The <code>PortalStatistics</code> component exposes a <code>queryStatistics</code> method that given
-            a <code>StatisticsQueryCriteria</code> will return <code>AggregateStatistics</code>.
-        	<source>
-    AggregateStatistics queryStatistics(StatisticsQueryCriteria criteria)</source>
-    		The <code>AggregateStatistics</code> can then be used for reporting purpose.
-            <br/>
-        	<img src="../../images/components/aggregatestatistics-c.gif" border="0" />
-			</p>
-			</subsection>
-			<subsection name="Using Aggregate Statistics">
-			<p>
-			As illustrated in <a href="stats.html">viewing statistics</a>, Jetspeed-2 provides a default reporting portlet
-			for view statistics.  To query statistics, a <code>StatisticsQueryCriteria</code> must be set.  According to this
-			criteria the <code>PortalStatistics</code> <code>queryStatistics()</code> method will return an <code>AggregateStatistics</code>.
-			</p>
-			<source>
-        StatisticsQueryCriteria criteria = statistics.createStatisticsQueryCriteria();
-        ...
-        criteria.setUser(user);
-        criteria.setListsize("5");
-        criteria.setSorttype("count");
-        criteria.setSortorder("desc");
-        criteria.setTimePeriod(timeperiod);
-        criteria.setQueryType(queryType);
-        AggregateStatistics stats = statistics.getDefaultEmptyAggregateStatistics();
-        ...
-        statistics.forceFlush();
-        stats = statistics.queryStatistics(criteria);</source>
-			</subsection>
-		</section>
-    </body>
-</document>
-
+    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-2 Statistics</title>
+        <authors>
+            <person name="David Le Strat" email="dlestrat@apache.org" />
+        </authors>
+    </properties>
+    <body>
+        <section name="Data Aggregation Overview">
+            <p>
+            Jetspeed-2 provides a mechanism for aggregating portal statistics for reporting purpose.
+            </p>
+            <subsection name="Retrieving Aggregate Statistics">
+            <p>
+            The <code>PortalStatistics</code> component exposes a <code>queryStatistics</code> method that given
+            a <code>StatisticsQueryCriteria</code> will return <code>AggregateStatistics</code>.
+        	<source>
+    AggregateStatistics queryStatistics(StatisticsQueryCriteria criteria)</source>
+    		The <code>AggregateStatistics</code> can then be used for reporting purpose.
+            <br/>
+        	<img src="../../images/components/aggregatestatistics-c.gif" border="0" />
+			</p>
+			</subsection>
+			<subsection name="Using Aggregate Statistics">
+			<p>
+			As illustrated in <a href="stats.html">viewing statistics</a>, Jetspeed-2 provides a default reporting portlet
+			for view statistics.  To query statistics, a <code>StatisticsQueryCriteria</code> must be set.  According to this
+			criteria the <code>PortalStatistics</code> <code>queryStatistics()</code> method will return an <code>AggregateStatistics</code>.
+			</p>
+			<source>
+        StatisticsQueryCriteria criteria = statistics.createStatisticsQueryCriteria();
+        ...
+        criteria.setUser(user);
+        criteria.setListsize("5");
+        criteria.setSorttype("count");
+        criteria.setSortorder("desc");
+        criteria.setTimePeriod(timeperiod);
+        criteria.setQueryType(queryType);
+        AggregateStatistics stats = statistics.getDefaultEmptyAggregateStatistics();
+        ...
+        statistics.forceFlush();
+        stats = statistics.queryStatistics(criteria);</source>
+			</subsection>
+		</section>
+    </body>
+</document>
+

Propchange: portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-statistics/aggregation.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-statistics/index.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-statistics/index.xml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-statistics/index.xml (original)
+++ portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-statistics/index.xml Fri Dec 12 04:06:29 2008
@@ -1,122 +1,122 @@
-<?xml version="1.0" ?>
-<!--
+<?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-2 Statistics</title>
-        <authors>
-            <person name="David Le Strat" email="dlestrat@apache.org" />
-        </authors>
-    </properties>
-    <body>
-        <section name="Statistics Overview">
-        	<p>
-        	Jetspeed-2 provides components for collecting portal data for various application events.
-        	</p>
-        	<subsection name="Collecting Portal Data">
-        	<p>
-        	<code>PortalStatistics</code> provides APIs for collecting portal application events.  The following event types
-        	are supported out of the box:
-        	<ul>
-        	<li>Portlet rendering statistics.</li>
-        	<li>Page rendering statistics.</li>
-        	<li>User access statistics.</li>
-        	</ul>
-        	The <code>PortalStatistics</code> implementation logs usage data based on the 
-        	<a href="http://httpd.apache.org/docs/logs.html">Apache Common Log Format (CLF)</a>
-        	where each log entry is formatted in the form:
-        	<source>
-    %h %l %u %t \"%r\" %>s %b</source>
-    		where:
-			<ul>
-			<li><b>%h </b>- remote host</li>
-			<li><b>%l </b>- remote log name</li>
-			<li><b>%u </b>- remote user</li>
-			<li><b>%t </b>- time in common log time format</li>
-			<li><b>%r </b>- first line of HTTP request</li>
-			<li><b>%s </b>- HTTP status code</li>
-			<li><b>%b </b>- number of bytes sent (&quot;-&quot; if no bytes sent).</li>
-			</ul>
-        	<br/>
-        	<img src="../../images/components/portalstatistics-c.gif" border="0" />
-        	</p>
-        	<p>
-        	Statistics data is stored in 3 relational tables as illustrated below:
-        	<br/><br/>
-        	<img src="../../images/components/statistics-db.gif" border="0" />
-        	</p>
-        	<p>
-        	Each event type is mapped to a data holder that gets persisted in the statistics tables illustrated above.
-        	<img src="../../images/components/logrecord-c.gif" border="0" />
-        	<br/>
-        	Jetspeed-2 persists the collected data in batches through the <code>BatchedStatistics</code> component.
-        	<br/><br/>
-        	<img src="../../images/components/batchedstatistics-c.gif" border="0" />
-        	</p>
-        	</subsection>
-        	<subsection name="PortalStatistics Configuration">
-        	<p>
-        	The <code>PortalStatistics</code> component is configured in <code>WEB-INF/assembly/statistics.xml</code> and
-        	requires the following configuration parameters:
-        	<ul>
-               <li><b>logToCLF</b>: Whether to log to a Common Log Format file.</li>
-        	<li><b>logToDatabase</b>: Whether to record the statistics in the database.</li>
-               <li><b>maxRecordToFlush_Portlet</b>: The maximum number of portlet events that can be in the portlet statistics FIFO before a flush occurs.</li>
-               <li><b>maxRecordToFlush_User</b>: The maximum number of user events that can be in the user statistics FIFO before a flush occurs.</li>
-               <li><b>maxRecordToFlush_Page</b>: The maximum number of page events that can be in the page statistics FIFO before a flush occurs.</li>
-               <li><b>maxTimeMsToFlush_Portlet</b>: The maximum length of time between FIFO flushes for the portlet statistics FIFO. </li>
-               <li><b>maxTimeMsToFlush_User</b>: The maximum length of time between FIFO flushes for the user statistics FIFO. </li>
-               <li><b>maxTimeMsToFlush_Page</b>: The maximum length of time between FIFO flushes for the page statistics FIFO. </li>
-        	<li><b>jetspeedDSEntry</b>: The reference to the Jetspeed data source.</li>
-        	</ul>
-        	</p>
-        	<p>
-                The FIFO parameters may be adjusted depending on site specific needs.  For example, tuning the events and times down makes the system less likely to loose events in the
-                case of a failure, and also makes the user experience viewing the statistics more responsive to recent events. On the other hand, tuning them higher will reduce the overhead
-                to the database.  Generally newer sites with fewer users should use smaller tuning parameters and larger more mature sites should use larger ones.
-                </p>
-                <p>
-        	A sample configuration is provided below:
-        	<source>
-    &lt;bean id="PortalStatistics" 
-      class="org.apache.jetspeed.statistics.impl.PortalStatisticsImpl"
-      init-method="springInit"
-      destroy-method="springDestroy"&gt;
-      &lt;!-- logToCLF --&gt;
-      &lt;constructor-arg index='0' type="boolean"&gt;&lt;value&gt;false&lt;/value&gt;&lt;/constructor-arg&gt;
-      &lt;!-- logToDatabase --&gt;
-      &lt;constructor-arg index='1' type="boolean"&gt;&lt;value&gt;true&lt;/value&gt;&lt;/constructor-arg&gt;	
-      &lt;!-- maxRecordToFlush_Portal --&gt;
-      &lt;constructor-arg index='2'&gt;&lt;value&gt;300&lt;/value&gt;&lt;/constructor-arg&gt;
-      &lt;!-- maxRecordToFlush_User --&gt;
-      &lt;constructor-arg index='3'&gt;&lt;value&gt;50&lt;/value&gt;&lt;/constructor-arg&gt;	
-      &lt;!-- maxRecordToFlush_Page --&gt;
-      &lt;constructor-arg index='4'&gt;&lt;value&gt;100&lt;/value&gt;&lt;/constructor-arg&gt;	
-      &lt;!-- maxTimeMsToFlush_Portal --&gt;
-      &lt;constructor-arg  index='5'&gt;&lt;value&gt;300000&lt;/value&gt;&lt;/constructor-arg&gt;		
-      &lt;!-- maxTimeMsToFlush_User --&gt;
-      &lt;constructor-arg  index='6'&gt;&lt;value&gt;5000&lt;/value&gt;&lt;/constructor-arg&gt;
-      &lt;!-- maxTimeMsToFlush_Page --&gt;
-      &lt;constructor-arg  index='7&gt;&lt;value&gt;60000&lt;/value&gt;&lt;/constructor-arg&gt;
-      &lt;!-- jetspeedDSEntry --&gt;
-      &lt;constructor-arg  index='8'&gt;&lt;ref bean="JetspeedDS"/&gt;&lt;/constructor-arg&gt;
-    &lt;/bean&gt;</source>
-        	</p>
-        	</subsection>
-		</section>
-    </body>
-</document>
+    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-2 Statistics</title>
+        <authors>
+            <person name="David Le Strat" email="dlestrat@apache.org" />
+        </authors>
+    </properties>
+    <body>
+        <section name="Statistics Overview">
+        	<p>
+        	Jetspeed-2 provides components for collecting portal data for various application events.
+        	</p>
+        	<subsection name="Collecting Portal Data">
+        	<p>
+        	<code>PortalStatistics</code> provides APIs for collecting portal application events.  The following event types
+        	are supported out of the box:
+        	<ul>
+        	<li>Portlet rendering statistics.</li>
+        	<li>Page rendering statistics.</li>
+        	<li>User access statistics.</li>
+        	</ul>
+        	The <code>PortalStatistics</code> implementation logs usage data based on the 
+        	<a href="http://httpd.apache.org/docs/logs.html">Apache Common Log Format (CLF)</a>
+        	where each log entry is formatted in the form:
+        	<source>
+    %h %l %u %t \"%r\" %>s %b</source>
+    		where:
+			<ul>
+			<li><b>%h </b>- remote host</li>
+			<li><b>%l </b>- remote log name</li>
+			<li><b>%u </b>- remote user</li>
+			<li><b>%t </b>- time in common log time format</li>
+			<li><b>%r </b>- first line of HTTP request</li>
+			<li><b>%s </b>- HTTP status code</li>
+			<li><b>%b </b>- number of bytes sent (&quot;-&quot; if no bytes sent).</li>
+			</ul>
+        	<br/>
+        	<img src="../../images/components/portalstatistics-c.gif" border="0" />
+        	</p>
+        	<p>
+        	Statistics data is stored in 3 relational tables as illustrated below:
+        	<br/><br/>
+        	<img src="../../images/components/statistics-db.gif" border="0" />
+        	</p>
+        	<p>
+        	Each event type is mapped to a data holder that gets persisted in the statistics tables illustrated above.
+        	<img src="../../images/components/logrecord-c.gif" border="0" />
+        	<br/>
+        	Jetspeed-2 persists the collected data in batches through the <code>BatchedStatistics</code> component.
+        	<br/><br/>
+        	<img src="../../images/components/batchedstatistics-c.gif" border="0" />
+        	</p>
+        	</subsection>
+        	<subsection name="PortalStatistics Configuration">
+        	<p>
+        	The <code>PortalStatistics</code> component is configured in <code>WEB-INF/assembly/statistics.xml</code> and
+        	requires the following configuration parameters:
+        	<ul>
+               <li><b>logToCLF</b>: Whether to log to a Common Log Format file.</li>
+        	<li><b>logToDatabase</b>: Whether to record the statistics in the database.</li>
+               <li><b>maxRecordToFlush_Portlet</b>: The maximum number of portlet events that can be in the portlet statistics FIFO before a flush occurs.</li>
+               <li><b>maxRecordToFlush_User</b>: The maximum number of user events that can be in the user statistics FIFO before a flush occurs.</li>
+               <li><b>maxRecordToFlush_Page</b>: The maximum number of page events that can be in the page statistics FIFO before a flush occurs.</li>
+               <li><b>maxTimeMsToFlush_Portlet</b>: The maximum length of time between FIFO flushes for the portlet statistics FIFO. </li>
+               <li><b>maxTimeMsToFlush_User</b>: The maximum length of time between FIFO flushes for the user statistics FIFO. </li>
+               <li><b>maxTimeMsToFlush_Page</b>: The maximum length of time between FIFO flushes for the page statistics FIFO. </li>
+        	<li><b>jetspeedDSEntry</b>: The reference to the Jetspeed data source.</li>
+        	</ul>
+        	</p>
+        	<p>
+                The FIFO parameters may be adjusted depending on site specific needs.  For example, tuning the events and times down makes the system less likely to loose events in the
+                case of a failure, and also makes the user experience viewing the statistics more responsive to recent events. On the other hand, tuning them higher will reduce the overhead
+                to the database.  Generally newer sites with fewer users should use smaller tuning parameters and larger more mature sites should use larger ones.
+                </p>
+                <p>
+        	A sample configuration is provided below:
+        	<source>
+    &lt;bean id="PortalStatistics" 
+      class="org.apache.jetspeed.statistics.impl.PortalStatisticsImpl"
+      init-method="springInit"
+      destroy-method="springDestroy"&gt;
+      &lt;!-- logToCLF --&gt;
+      &lt;constructor-arg index='0' type="boolean"&gt;&lt;value&gt;false&lt;/value&gt;&lt;/constructor-arg&gt;
+      &lt;!-- logToDatabase --&gt;
+      &lt;constructor-arg index='1' type="boolean"&gt;&lt;value&gt;true&lt;/value&gt;&lt;/constructor-arg&gt;	
+      &lt;!-- maxRecordToFlush_Portal --&gt;
+      &lt;constructor-arg index='2'&gt;&lt;value&gt;300&lt;/value&gt;&lt;/constructor-arg&gt;
+      &lt;!-- maxRecordToFlush_User --&gt;
+      &lt;constructor-arg index='3'&gt;&lt;value&gt;50&lt;/value&gt;&lt;/constructor-arg&gt;	
+      &lt;!-- maxRecordToFlush_Page --&gt;
+      &lt;constructor-arg index='4'&gt;&lt;value&gt;100&lt;/value&gt;&lt;/constructor-arg&gt;	
+      &lt;!-- maxTimeMsToFlush_Portal --&gt;
+      &lt;constructor-arg  index='5'&gt;&lt;value&gt;300000&lt;/value&gt;&lt;/constructor-arg&gt;		
+      &lt;!-- maxTimeMsToFlush_User --&gt;
+      &lt;constructor-arg  index='6'&gt;&lt;value&gt;5000&lt;/value&gt;&lt;/constructor-arg&gt;
+      &lt;!-- maxTimeMsToFlush_Page --&gt;
+      &lt;constructor-arg  index='7&gt;&lt;value&gt;60000&lt;/value&gt;&lt;/constructor-arg&gt;
+      &lt;!-- jetspeedDSEntry --&gt;
+      &lt;constructor-arg  index='8'&gt;&lt;ref bean="JetspeedDS"/&gt;&lt;/constructor-arg&gt;
+    &lt;/bean&gt;</source>
+        	</p>
+        	</subsection>
+		</section>
+    </body>
+</document>

Propchange: portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-statistics/index.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-statistics/stats.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-statistics/stats.xml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-statistics/stats.xml (original)
+++ portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-statistics/stats.xml Fri Dec 12 04:06:29 2008
@@ -1,54 +1,54 @@
-<?xml version="1.0" ?>
-<!--
+<?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-2 Statistics</title>
-        <authors>
-            <person name="David Le Strat" email="dlestrat@apache.org" />
-        </authors>
-    </properties>
-    <body>
-        <section name="Viewing Statistics">
-        	<subsection name="Where are the Event Recorded?">
-        	<p>
-        	Portal statistics events collection is injected at multiple points in the portal engine. Some examples are
-        	provided below.
-        	</p>
-        	<p>
-        	For user events, the <code>SecurityValveImpl</code> logs a user login event in <code>getSubject(RequestContext request)</code>.
-        	<source>
-    statistics.logUserLogin(request, 0);</source>
-        	</p>
-        	<p>
-        	For portlet events, the <code>RenderingJobImpl</code> invoked in <code>RenderingJob</code> <code>buildRenderingJob</code> logs
-        	a portlet access event.
-        	<source>
-    statistics.logPortletAccess(requestContext, fragment.getName(), PortalStatistics.HTTP_OK, end - start);</source>       	
-        	</p>
-    		</subsection>
-    		<subsection name="Viewing Statistics">
-    		<p>
-    		Jetpseed-2 provides administrative portlets that report on portal statistics.
-    		<br/><br/>
-    		<img src="../../images/components/portlet-statistics.gif" border="0"/><br/>
-    		<img src="../../images/components/page-statistics.gif" border="0"/>
-    		</p>
-    		</subsection>
-		</section>
-    </body>
+    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-2 Statistics</title>
+        <authors>
+            <person name="David Le Strat" email="dlestrat@apache.org" />
+        </authors>
+    </properties>
+    <body>
+        <section name="Viewing Statistics">
+        	<subsection name="Where are the Event Recorded?">
+        	<p>
+        	Portal statistics events collection is injected at multiple points in the portal engine. Some examples are
+        	provided below.
+        	</p>
+        	<p>
+        	For user events, the <code>SecurityValveImpl</code> logs a user login event in <code>getSubject(RequestContext request)</code>.
+        	<source>
+    statistics.logUserLogin(request, 0);</source>
+        	</p>
+        	<p>
+        	For portlet events, the <code>RenderingJobImpl</code> invoked in <code>RenderingJob</code> <code>buildRenderingJob</code> logs
+        	a portlet access event.
+        	<source>
+    statistics.logPortletAccess(requestContext, fragment.getName(), PortalStatistics.HTTP_OK, end - start);</source>       	
+        	</p>
+    		</subsection>
+    		<subsection name="Viewing Statistics">
+    		<p>
+    		Jetpseed-2 provides administrative portlets that report on portal statistics.
+    		<br/><br/>
+    		<img src="../../images/components/portlet-statistics.gif" border="0"/><br/>
+    		<img src="../../images/components/page-statistics.gif" border="0"/>
+    		</p>
+    		</subsection>
+		</section>
+    </body>
 </document>
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-statistics/stats.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/src/site/xdoc/guides/guide-desktop.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/tutorial/portal/src/webapp/decorations/portlet/express-portlet/css/styles.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/tutorial/portal/src/webapp/decorations/portlet/express-portlet/css/styles.css?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/tutorial/portal/src/webapp/decorations/portlet/express-portlet/css/styles.css (original)
+++ portals/jetspeed-2/portal/trunk/tutorial/portal/src/webapp/decorations/portlet/express-portlet/css/styles.css Fri Dec 12 04:06:29 2008
@@ -1,169 +1,169 @@
-/*
+/*
 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.
-*/
-
-.express-portlet
-{
-    font-family: Verdana, Helvetica, Arial, sans-serif;
-    voice-family: "\"}\"";
-    voice-family: inherit;
-    font-size: x-small;
-}
-
-.express-portlet .PTitle
-{
-    padding-left:2px;
-    padding-top: 2px;
-    padding-bottom: 16px;
-    padding-right: 2px; 
-    border-left: 1px solid #517B94;
-    border-right: 1px solid #517B94;
-    border-top: 1px solid #517B94;
-    color: #990000;
-    
-    background-image: url(../images/grad2blue.png);
-}
-
-.express-portlet .PTitleContent
-{   
-    font-weight:bold;
-    display: inline;
-    float: left;
-
-}
-
-.express-portlet .PActionBar
-{
-   float: right;
-   display: inline;
-
-}
- 
-.express-portlet .PContent
-{   
-    padding-left:2px;
-    padding-right:2px;
-    border-left: 1px solid #517B94;
-    border-right: 1px solid #517B94;
-    border-bottom: 1px solid #517B94;
-}
-
-/* Custom stuff for UGS added by EDB */
-.express-portlet p.corelink
-{
-    margin-top: 0.5em;
-    margin-bottom: 0em;
-    font-size: 12px;
-}
-
-.express-portlet p.abstract
-{
-    margin-top: 0em;
-    margin-bottom: 0.5em;
-    font-size: 11px;
-}
-
-.express-portlet p.title
-{
-    font-family: Arial, Helvetica, sans-serif; 
-    font-size: 17px; 
-    font-weight: bold; 
-    padding-bottom: 0em; 
-    margin-top: 0em; 
-    margin-bottom: 0em;
-}
-
-.express-portlet p.download
-{
-    font-size:12px;
-    margin-top:0.25em;
-    margin-bottom:0em;
-}
-
-.express-portlet p.side
-{ 
-    font-size: 12px;
-    margin-left: 0.85em;
-    text-indent: -0.85em;
-    margin-top: 0.25em;
-    margin-bottom:
-    0.25em;
-}
-
-.express-portlet img
-{
-    display: inline;
-    margin: 0em;
-}
-
-/** Below are tab styles */
-    .express-portlet .tabContainer
-    {
-      background-image: url(../images/grad1blue.png);
-      width: 100%;
-     
-    }
-    
-    .express-portlet .tabSpacer
-    {
-      border-bottom: thin solid #01375D;
-      height: 3px;      
-      width: 100%;
-    }
-    
-    .express-portlet A.tab,
-    .express-portlet A:LINK.tab,
-    .express-portlet A:ACTIVE.tab,
-    .express-portlet A:VISITED.tab,
-    .express-portlet A:HOVER.tab
-    {
-      color: #02385E;
-      font-size: x-small;
-      text-decoration: none;
-      padding-left: 4px;
-      padding-right: 4px;
-    }
-    
-    .express-portlet A.tabActive
-    {
-       
-        background-color: #85A3B8;
-        border-top: thin solid     #01375D;
-        border-left: thin solid #01375D;
-        border-right: thin solid #01375D;        
-        
-    }
-    
-    .express-portlet A:LINK.tabActive,
-    .express-portlet A:ACTIVE.tabActive,
-    .express-portlet A:VISITED.tabActive
-    {
-        color: #FFFFFF;
-    }
-    
-    .express-portlet A.tabInactive
-    {
-      background-image: none;
-      border-bottom: thin solid #01375D;
-      border-top: 0 none;
-    }
-    
-    .express-portlet A:HOVER.tabInactive
-    {
-      background-image: url(../images/grad2blue.png);
-      border-top: thin solid #990000;
-    }
-
+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.
+*/
+
+.express-portlet
+{
+    font-family: Verdana, Helvetica, Arial, sans-serif;
+    voice-family: "\"}\"";
+    voice-family: inherit;
+    font-size: x-small;
+}
+
+.express-portlet .PTitle
+{
+    padding-left:2px;
+    padding-top: 2px;
+    padding-bottom: 16px;
+    padding-right: 2px; 
+    border-left: 1px solid #517B94;
+    border-right: 1px solid #517B94;
+    border-top: 1px solid #517B94;
+    color: #990000;
+    
+    background-image: url(../images/grad2blue.png);
+}
+
+.express-portlet .PTitleContent
+{   
+    font-weight:bold;
+    display: inline;
+    float: left;
+
+}
+
+.express-portlet .PActionBar
+{
+   float: right;
+   display: inline;
+
+}
+ 
+.express-portlet .PContent
+{   
+    padding-left:2px;
+    padding-right:2px;
+    border-left: 1px solid #517B94;
+    border-right: 1px solid #517B94;
+    border-bottom: 1px solid #517B94;
+}
+
+/* Custom stuff for UGS added by EDB */
+.express-portlet p.corelink
+{
+    margin-top: 0.5em;
+    margin-bottom: 0em;
+    font-size: 12px;
+}
+
+.express-portlet p.abstract
+{
+    margin-top: 0em;
+    margin-bottom: 0.5em;
+    font-size: 11px;
+}
+
+.express-portlet p.title
+{
+    font-family: Arial, Helvetica, sans-serif; 
+    font-size: 17px; 
+    font-weight: bold; 
+    padding-bottom: 0em; 
+    margin-top: 0em; 
+    margin-bottom: 0em;
+}
+
+.express-portlet p.download
+{
+    font-size:12px;
+    margin-top:0.25em;
+    margin-bottom:0em;
+}
+
+.express-portlet p.side
+{ 
+    font-size: 12px;
+    margin-left: 0.85em;
+    text-indent: -0.85em;
+    margin-top: 0.25em;
+    margin-bottom:
+    0.25em;
+}
+
+.express-portlet img
+{
+    display: inline;
+    margin: 0em;
+}
+
+/** Below are tab styles */
+    .express-portlet .tabContainer
+    {
+      background-image: url(../images/grad1blue.png);
+      width: 100%;
+     
+    }
+    
+    .express-portlet .tabSpacer
+    {
+      border-bottom: thin solid #01375D;
+      height: 3px;      
+      width: 100%;
+    }
+    
+    .express-portlet A.tab,
+    .express-portlet A:LINK.tab,
+    .express-portlet A:ACTIVE.tab,
+    .express-portlet A:VISITED.tab,
+    .express-portlet A:HOVER.tab
+    {
+      color: #02385E;
+      font-size: x-small;
+      text-decoration: none;
+      padding-left: 4px;
+      padding-right: 4px;
+    }
+    
+    .express-portlet A.tabActive
+    {
+       
+        background-color: #85A3B8;
+        border-top: thin solid     #01375D;
+        border-left: thin solid #01375D;
+        border-right: thin solid #01375D;        
+        
+    }
+    
+    .express-portlet A:LINK.tabActive,
+    .express-portlet A:ACTIVE.tabActive,
+    .express-portlet A:VISITED.tabActive
+    {
+        color: #FFFFFF;
+    }
+    
+    .express-portlet A.tabInactive
+    {
+      background-image: none;
+      border-bottom: thin solid #01375D;
+      border-top: 0 none;
+    }
+    
+    .express-portlet A:HOVER.tabInactive
+    {
+      background-image: url(../images/grad2blue.png);
+      border-top: thin solid #990000;
+    }
+

Propchange: portals/jetspeed-2/portal/trunk/tutorial/portal/src/webapp/decorations/portlet/express-portlet/css/styles.css
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/tutorial/portal/src/webapp/decorations/portlet/express-portlet/decorator.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/tutorial/portal/src/webapp/decorations/portlet/express-portlet/decorator.properties?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/tutorial/portal/src/webapp/decorations/portlet/express-portlet/decorator.properties (original)
+++ portals/jetspeed-2/portal/trunk/tutorial/portal/src/webapp/decorations/portlet/express-portlet/decorator.properties Fri Dec 12 04:06:29 2008
@@ -3,17 +3,17 @@
 # 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.
-
-id=express-portlet
-template.type=velocity
-template.extension=.vm
-decorates=portlet
+# 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.
+
+id=express-portlet
+template.type=velocity
+template.extension=.vm
+decorates=portlet

Propchange: portals/jetspeed-2/portal/trunk/tutorial/portal/src/webapp/decorations/portlet/express-portlet/decorator.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/tutorial/portal/src/webapp/themes/express/css/PortalAccordionContainer.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/tutorial/portal/src/webapp/themes/express/css/PortalAccordionContainer.css?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/tutorial/portal/src/webapp/themes/express/css/PortalAccordionContainer.css (original)
+++ portals/jetspeed-2/portal/trunk/tutorial/portal/src/webapp/themes/express/css/PortalAccordionContainer.css Fri Dec 12 04:06:29 2008
@@ -1,16 +1,16 @@
-/*
+/*
 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.
-*/
+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.
+*/

Propchange: portals/jetspeed-2/portal/trunk/tutorial/portal/src/webapp/themes/express/css/PortalAccordionContainer.css
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/tutorial/portal/src/webapp/themes/express/css/PortalBreadcrumbContainer.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/tutorial/portal/src/webapp/themes/express/css/PortalBreadcrumbContainer.css?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/tutorial/portal/src/webapp/themes/express/css/PortalBreadcrumbContainer.css (original)
+++ portals/jetspeed-2/portal/trunk/tutorial/portal/src/webapp/themes/express/css/PortalBreadcrumbContainer.css Fri Dec 12 04:06:29 2008
@@ -1,16 +1,16 @@
-/*
+/*
 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.
-*/
+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.
+*/

Propchange: portals/jetspeed-2/portal/trunk/tutorial/portal/src/webapp/themes/express/css/PortalBreadcrumbContainer.css
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/tutorial/portal/src/webapp/themes/express/css/PortalTabContainer.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/tutorial/portal/src/webapp/themes/express/css/PortalTabContainer.css?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/tutorial/portal/src/webapp/themes/express/css/PortalTabContainer.css (original)
+++ portals/jetspeed-2/portal/trunk/tutorial/portal/src/webapp/themes/express/css/PortalTabContainer.css Fri Dec 12 04:06:29 2008
@@ -1,179 +1,179 @@
-/*
+/*
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.
 The ASF licenses this file to You under the Apache License, Version 2.0
 (the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-.dojoTabContainer {
-	position : relative;
-}
-
-.dojoTabPaneWrapper {
-	border : 1px solid #6290d2;
-	_zoom: 1; /* force IE6 layout mode so top border doesnt disappear */
-	display: block;
-	clear: both;
-}
-
-.dojoTabLabels-top {
-	position : relative;
-	top : 0px;
-	left : 0px;
-	overflow : visible;
-	margin-bottom : -1px;
-	width : 100%;
-	z-index: 2;	/* so the bottom of the tab label will cover up the border of dojoTabPaneWrapper */
-}
-
-.dojoTabNoLayout.dojoTabLabels-top .dojoTab {
-	margin-bottom: -1px;
-	_margin-bottom: 0px; /* IE filter so top border lines up correctly */
-}
-
-.dojoTab {
-	position : relative;
-	float : left;
-	padding-left : 9px;
-	border-bottom : 1px solid #6290d2;
-	background : url(../images/tabs/tab_left.gif) no-repeat left top;
-	cursor: pointer;
-	white-space: nowrap;
-	z-index: 3;
-}
-
-.dojoTab div {
-	display : block;
-	padding : 4px 15px 4px 6px;
-	background : url(../images/tabs/tab_top_right.gif) no-repeat right top;
-	color : #333;
-	font-size : 90%;
-}
-
-.dojoTab .close {
-	display : inline-block;
-	height : 12px;
-	width : 12px;
-	padding : 0 12px 0 0;
-	margin : 0 -10px 0 10px;
-	cursor : default;
-	font-size: small;
-}
-
-.dojoTab .closeImage {
-	background : url(../images/tabs/tab_close.gif) no-repeat right top;
-}
-
-.dojoTab .closeHover {
-	background-image : url(../images/tabs/tab_close_h.gif);
-}
-
-.dojoTab.current {
-	padding-bottom : 1px;
-	border-bottom : 0;
-	background-position : 0 -150px;
-}
-
-.dojoTab.current div {
-	padding-bottom : 5px;
-	margin-bottom : -1px;
-	background-position : 100% -150px;
-}
-
-/* bottom tabs */
-
-.dojoTabLabels-bottom {
-	position : relative;
-	bottom : 0px;
-	left : 0px;
-	overflow : visible;
-	margin-top : -1px;
-	width : 100%;
-	z-index: 2;
-}
-
-.dojoTabNoLayout.dojoTabLabels-bottom {
-	position : relative;
-}
-
-.dojoTabLabels-bottom .dojoTab {
-	border-top :  1px solid #6290d2;
-	border-bottom : 0;
-	background : url(../images/tabs/tab_bot_left.gif) no-repeat left bottom;
-}
-
-.dojoTabLabels-bottom .dojoTab div {
-	background : url(../images/tabs/tab_bot_right.gif) no-repeat right bottom;
-}
-
-.dojoTabLabels-bottom .dojoTab.current {
-	border-top : 0;
-	background : url(../images/tabs/tab_bot_left_curr.gif) no-repeat left bottom;
-}
-
-.dojoTabLabels-bottom .dojoTab.current div {
-	padding-top : 4px;
-	background : url(../images/tabs/tab_bot_right_curr.gif) no-repeat right bottom;
-}
-
-/* right-h tabs */
-
-.dojoTabLabels-right-h {
-	overflow : visible;
-	margin-left : -1px;
-	z-index: 2;
-}
-
-.dojoTabLabels-right-h .dojoTab {
-	padding-left : 0;
-	border-left :  1px solid #6290d2;
-	border-bottom : 0;
-	background : url(../images/tabs/tab_bot_right.gif) no-repeat right bottom;
-	float : none;
-}
-
-.dojoTabLabels-right-h .dojoTab div {
-	padding : 4px 15px 4px 15px;
-}
-
-.dojoTabLabels-right-h .dojoTab.current {
-	border-left :  0;
-	border-bottom :  1px solid #6290d2;
-}
-
-/* left-h tabs */
-
-.dojoTabLabels-left-h {
-	overflow : visible;
-	margin-right : -1px;
-	z-index: 2;
-}
-
-.dojoTabLabels-left-h .dojoTab {
-	border-right :  1px solid #6290d2;
-	border-bottom : 0;
-	float : none;
-	background : url(../images/tabs/tab_top_left.gif) no-repeat left top;
-}
-
-.dojoTabLabels-left-h .dojoTab.current {
-	border-right : 0;
-	border-bottom :  1px solid #6290d2;
-	padding-bottom : 0;
-	background : url(../images/tabs/tab_top_left.gif) no-repeat 0 -150px;
-}
-
-.dojoTabLabels-left-h .dojoTab div {
-	background : 0;
-	border-bottom :  1px solid #6290d2;
-}
+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.
+*/
+
+.dojoTabContainer {
+	position : relative;
+}
+
+.dojoTabPaneWrapper {
+	border : 1px solid #6290d2;
+	_zoom: 1; /* force IE6 layout mode so top border doesnt disappear */
+	display: block;
+	clear: both;
+}
+
+.dojoTabLabels-top {
+	position : relative;
+	top : 0px;
+	left : 0px;
+	overflow : visible;
+	margin-bottom : -1px;
+	width : 100%;
+	z-index: 2;	/* so the bottom of the tab label will cover up the border of dojoTabPaneWrapper */
+}
+
+.dojoTabNoLayout.dojoTabLabels-top .dojoTab {
+	margin-bottom: -1px;
+	_margin-bottom: 0px; /* IE filter so top border lines up correctly */
+}
+
+.dojoTab {
+	position : relative;
+	float : left;
+	padding-left : 9px;
+	border-bottom : 1px solid #6290d2;
+	background : url(../images/tabs/tab_left.gif) no-repeat left top;
+	cursor: pointer;
+	white-space: nowrap;
+	z-index: 3;
+}
+
+.dojoTab div {
+	display : block;
+	padding : 4px 15px 4px 6px;
+	background : url(../images/tabs/tab_top_right.gif) no-repeat right top;
+	color : #333;
+	font-size : 90%;
+}
+
+.dojoTab .close {
+	display : inline-block;
+	height : 12px;
+	width : 12px;
+	padding : 0 12px 0 0;
+	margin : 0 -10px 0 10px;
+	cursor : default;
+	font-size: small;
+}
+
+.dojoTab .closeImage {
+	background : url(../images/tabs/tab_close.gif) no-repeat right top;
+}
+
+.dojoTab .closeHover {
+	background-image : url(../images/tabs/tab_close_h.gif);
+}
+
+.dojoTab.current {
+	padding-bottom : 1px;
+	border-bottom : 0;
+	background-position : 0 -150px;
+}
+
+.dojoTab.current div {
+	padding-bottom : 5px;
+	margin-bottom : -1px;
+	background-position : 100% -150px;
+}
+
+/* bottom tabs */
+
+.dojoTabLabels-bottom {
+	position : relative;
+	bottom : 0px;
+	left : 0px;
+	overflow : visible;
+	margin-top : -1px;
+	width : 100%;
+	z-index: 2;
+}
+
+.dojoTabNoLayout.dojoTabLabels-bottom {
+	position : relative;
+}
+
+.dojoTabLabels-bottom .dojoTab {
+	border-top :  1px solid #6290d2;
+	border-bottom : 0;
+	background : url(../images/tabs/tab_bot_left.gif) no-repeat left bottom;
+}
+
+.dojoTabLabels-bottom .dojoTab div {
+	background : url(../images/tabs/tab_bot_right.gif) no-repeat right bottom;
+}
+
+.dojoTabLabels-bottom .dojoTab.current {
+	border-top : 0;
+	background : url(../images/tabs/tab_bot_left_curr.gif) no-repeat left bottom;
+}
+
+.dojoTabLabels-bottom .dojoTab.current div {
+	padding-top : 4px;
+	background : url(../images/tabs/tab_bot_right_curr.gif) no-repeat right bottom;
+}
+
+/* right-h tabs */
+
+.dojoTabLabels-right-h {
+	overflow : visible;
+	margin-left : -1px;
+	z-index: 2;
+}
+
+.dojoTabLabels-right-h .dojoTab {
+	padding-left : 0;
+	border-left :  1px solid #6290d2;
+	border-bottom : 0;
+	background : url(../images/tabs/tab_bot_right.gif) no-repeat right bottom;
+	float : none;
+}
+
+.dojoTabLabels-right-h .dojoTab div {
+	padding : 4px 15px 4px 15px;
+}
+
+.dojoTabLabels-right-h .dojoTab.current {
+	border-left :  0;
+	border-bottom :  1px solid #6290d2;
+}
+
+/* left-h tabs */
+
+.dojoTabLabels-left-h {
+	overflow : visible;
+	margin-right : -1px;
+	z-index: 2;
+}
+
+.dojoTabLabels-left-h .dojoTab {
+	border-right :  1px solid #6290d2;
+	border-bottom : 0;
+	float : none;
+	background : url(../images/tabs/tab_top_left.gif) no-repeat left top;
+}
+
+.dojoTabLabels-left-h .dojoTab.current {
+	border-right : 0;
+	border-bottom :  1px solid #6290d2;
+	padding-bottom : 0;
+	background : url(../images/tabs/tab_top_left.gif) no-repeat 0 -150px;
+}
+
+.dojoTabLabels-left-h .dojoTab div {
+	background : 0;
+	border-bottom :  1px solid #6290d2;
+}

Propchange: portals/jetspeed-2/portal/trunk/tutorial/portal/src/webapp/themes/express/css/PortalTabContainer.css
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/tutorial/portal/src/webapp/themes/express/css/PortalTaskBar.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/tutorial/portal/src/webapp/themes/express/css/PortalTaskBar.css?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/tutorial/portal/src/webapp/themes/express/css/PortalTaskBar.css (original)
+++ portals/jetspeed-2/portal/trunk/tutorial/portal/src/webapp/themes/express/css/PortalTaskBar.css Fri Dec 12 04:06:29 2008
@@ -1,74 +1,74 @@
-/*
+/*
 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.
-*/
-
-.dojoTaskBarItem {
-    background-image: url(../windowicons/blue-metalic-28.jpg);
-    background-repeat: no-repeat;
-	height: 28px;
-	/*width: 200px;*/
-    overflow: hidden;
-    padding-right: 8px;
-	font-size: 9pt;
-    cursor: pointer;
-}
-.portalTaskBarItemEndCap {
-    background-image: url(../windowicons/blue-metalic-endcap-28.jpg);
-    background-repeat: no-repeat;
-    height: 28px;
-	width: 4px;
-}
-.portalTaskBarItemTable {
-    display: inline;
-    padding: 0px;
-    margin: 0px 2px 6px 2px;
-    /*border-spacing: 0;*/  /* could get rid of cellspacing attribute if IE would support CSS2 better */
-}
-
-
-
-/*
-.dojoTaskBarItem {
-    background-image: url(../windoXXXXXXXXXX/blue-metalic-28.jpg);
-    background-repeat: no-repeat;
-	border: outset 2px;
-	display: inline;
-	margin-right: 5px;
-	cursor: pointer;
-	height: 28px;
-	width: 200px;
-	font-size: 8pt;
-	white-space: nowrap;
-	text-align: center;
-}
-*/
-
-.dojoTaskBarItem img {
-	vertical-align: top;
-	margin-right: 5px;
-	margin-left: 5px;
-    margin-top: 1px;
-    padding-top: 0px;
-	height: 16px;
-	width: 16px;
-}
-
-.dojoTaskBarItem a {
-	color: black;
-	text-decoration: none;
-}
-
-
+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.
+*/
+
+.dojoTaskBarItem {
+    background-image: url(../windowicons/blue-metalic-28.jpg);
+    background-repeat: no-repeat;
+	height: 28px;
+	/*width: 200px;*/
+    overflow: hidden;
+    padding-right: 8px;
+	font-size: 9pt;
+    cursor: pointer;
+}
+.portalTaskBarItemEndCap {
+    background-image: url(../windowicons/blue-metalic-endcap-28.jpg);
+    background-repeat: no-repeat;
+    height: 28px;
+	width: 4px;
+}
+.portalTaskBarItemTable {
+    display: inline;
+    padding: 0px;
+    margin: 0px 2px 6px 2px;
+    /*border-spacing: 0;*/  /* could get rid of cellspacing attribute if IE would support CSS2 better */
+}
+
+
+
+/*
+.dojoTaskBarItem {
+    background-image: url(../windoXXXXXXXXXX/blue-metalic-28.jpg);
+    background-repeat: no-repeat;
+	border: outset 2px;
+	display: inline;
+	margin-right: 5px;
+	cursor: pointer;
+	height: 28px;
+	width: 200px;
+	font-size: 8pt;
+	white-space: nowrap;
+	text-align: center;
+}
+*/
+
+.dojoTaskBarItem img {
+	vertical-align: top;
+	margin-right: 5px;
+	margin-left: 5px;
+    margin-top: 1px;
+    padding-top: 0px;
+	height: 16px;
+	width: 16px;
+}
+
+.dojoTaskBarItem a {
+	color: black;
+	text-decoration: none;
+}
+
+

Propchange: portals/jetspeed-2/portal/trunk/tutorial/portal/src/webapp/themes/express/css/PortalTaskBar.css
------------------------------------------------------------------------------
    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