Author: taylor
Date: Mon Feb 26 18:10:14 2007
New Revision: 512110

URL: http://svn.apache.org/viewvc?view=rev&rev=512110
Log:
- new logos
- bug fix

Added:
    portals/jetspeed-2/trunk/graphic_design/Jetspeed_blue.ai
    
portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/Jetspeed_blue.jpg
   (with props)
    
portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/Jetspeed_blue_med.png
   (with props)
    
portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/Jetspeed_blue_sm-1.jpg
   (with props)
    
portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/Jetspeed_blue_sm.jpg
   (with props)
    
portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/Jetspeed_blue_sm.png
   (with props)
    
portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/Jetspeed_white.jpg
   (with props)
    
portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/Jetspeed_white_med.png
   (with props)
    
portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/Jetspeed_white_sm-1.jpg
   (with props)
    
portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/Jetspeed_white_sm.jpg
   (with props)
    
portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/Jetspeed_white_sm.png
   (with props)
    
portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/images/Jetspeed_blue.jpg
   (with props)
    
portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/images/Jetspeed_blue_med.png
   (with props)
    
portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/images/Jetspeed_blue_sm-1.jpg
   (with props)
    
portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/images/Jetspeed_blue_sm.jpg
   (with props)
    
portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/images/Jetspeed_blue_sm.png
   (with props)
    
portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/images/Jetspeed_white.jpg
   (with props)
    
portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/images/Jetspeed_white_med.png
   (with props)
    
portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/images/Jetspeed_white_sm-1.jpg
   (with props)
    
portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/images/Jetspeed_white_sm.jpg
   (with props)
    
portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/images/Jetspeed_white_sm.png
   (with props)
    portals/jetspeed-2/trunk/xdocs/images/Jetspeed_blue.jpg   (with props)
    portals/jetspeed-2/trunk/xdocs/images/Jetspeed_blue_sm.jpg   (with props)
    portals/jetspeed-2/trunk/xdocs/images/Jetspeed_white.jpg   (with props)
    portals/jetspeed-2/trunk/xdocs/images/Jetspeed_white_sm.jpg   (with props)
Modified:
    
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/info/about.html
    
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/info/welcome.html
    
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java
    portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/desktop.jsp
    portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/desktop.vm
    portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/footer.vm
    portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/header.vm
    portals/jetspeed-2/trunk/src/webapp/decorations/layout/jetspeed/header.vm
    portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/header.vm
    portals/jetspeed-2/trunk/src/webapp/decorations/layout/sunflower/header.vm
    portals/jetspeed-2/trunk/src/webapp/decorations/layout/thesolution/header.vm
    portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/desktop.jsp
    portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/desktop.vm
    portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/footer.vm
    portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/header.vm

Modified: 
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/info/about.html
URL: 
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/info/about.html?view=diff&rev=512110&r1=512109&r2=512110
==============================================================================
--- 
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/info/about.html
 (original)
+++ 
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/info/about.html
 Mon Feb 26 18:10:14 2007
@@ -1 +1,26 @@
-<b>About!</b>
+<h2>About the Jetspeed 2.1 Release</h2>
+<p>The Jetspeed 2.1 release is the second major release of the Jetspeed-2 
portal.</p>
+
+<h3>New Features in Version 2.1</h3>
+<ul>
+<li>Jetspeed Desktop - Web 2.0 client-side JSR-168 portlet aggregation.</li>
+<li>Multithreaded Aggregator - multithreaded portlet aggregator with portlet 
timeout tracking, removal of slow rendering portlets.</li>
+<li>Jetspeed Distributed Cluster - support for distributed deployments of the 
portal on multiple application server platforms</li>
+<li>JSR 168 Caching - full caching support of JSR 168 portlet specification, 
distributed cache invalidation</li>
+<li>TCK Compliant as of 2.1 (2.0 was compliant as well)</li>
+<li>New and Improved Administrative and Security Portlets</li>
+<li>XML Schemas for PSML, jetspeed-portlet.xml, and Jetspeed XML (seed 
data)</li>
+<li>Installation choice of either Demo Portal or Minimal Starter Portal</li>
+<li>Maven-2 Build as well as Maven-1</li>
+<li>Remote Portal Application Deployer - deploy portlet applications from 
remote locations on the Web</li>
+<li>Improved Customizers, Portal and Desktop Customizers, drag and drog moving 
of portlets, nested fragment customization</li>
+<li>New Portlet Category Selector</li>
+<li>XML Import/Export of all Jetspeed database data and seed data scripts for 
backup and restore and data migration</li>
+<li>Improved Security Control - fully swappable Security Constraint or 
Security Permission support</li>
+<li>Portlet-level Security checks based on Security Constraints or Security 
Permissions</li> 
+<li>Improved Jetspeed AJAX API</li>
+<li>Improved Delegation of Security Support</li>
+<li>New Site Manager</li>
+</ul>
+
+

Modified: 
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/info/welcome.html
URL: 
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/info/welcome.html?view=diff&rev=512110&r1=512109&r2=512110
==============================================================================
--- 
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/info/welcome.html
 (original)
+++ 
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/info/welcome.html
 Mon Feb 26 18:10:14 2007
@@ -1 +1,27 @@
-<b>Welcome!</b>
+<h2>Welcome to Jetspeed</h2>
+<p>
+Jetspeed, is an open portal platform for true enterprise
+integration, based on an open component architecture and Java standards. The
+end result is an integrator's dream enterprise portal. Some very large
+organizations have switched over from large and expensive portal
+solutions to Jetspeed to develop mission-critical portal
+projects. </p>
+<p>
+Portals are the ultimate end-user integration points for communities
+or businesses. Jetspeed-2 is designed to make application integration
+easy. The Jetspeed API provides the clear assembly and interception
+points for component building and integration.
+</p>
+<p>
+Apache License
+</p>
+<p>
+To find out more about the latest Jetspeed news, check out our websites...
+<ul>
+<li><a href="http://portals.apache.org/jetspeed-2/";>Jetspeed Website</a></li>
+<li><a href="http://wiki.apache.org/portals/Jetspeed2/";>Jetspeed Wiki</a></li>
+<li><a href="http://portals.apache.org/";>Apache Portals</a></li>
+<li><a href="http://portals.apache.org/bridges/";>Apache Portals 
Bridges</a></li>
+<li><a href="http://www.apache.org/";>Apache Software Foundation</a></li>
+</ul>
+</p>

Modified: 
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java
URL: 
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java?view=diff&rev=512110&r1=512109&r2=512110
==============================================================================
--- 
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java
 (original)
+++ 
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java
 Mon Feb 26 18:10:14 2007
@@ -314,7 +314,7 @@
         {
             PortletWindow window = 
(PortletWindow)((Map.Entry)tmpWindows.get(i)).getValue();
             PortletDefinitionComposite windowDef = 
(PortletDefinitionComposite)window.getPortletEntity().getPortletDefinition();   
         
-            if(def != null && 
def.getUniqueName().equals(windowDef.getUniqueName()))
+            if(def != null && windowDef != null && def.getUniqueName() != null 
&& def.getUniqueName().equals(windowDef.getUniqueName()))
             {
                 removeWindow(window);
             }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to