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 [31/48] - in /portals/jetspeed-2/portal/trunk: ./ app-servers/security/jboss/src/java/META-INF/jboss-secsvc/ app-servers/security/jboss/src/java/org/apache/jetspeed/appservers/security/jboss/ applications/jetspeed/src/main/javascrip...
Date Fri, 12 Dec 2008 12:07:04 GMT
Modified: portals/jetspeed-2/portal/trunk/docs/release/JETSPEED-2.0-README.txt
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/docs/release/JETSPEED-2.0-README.txt?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/docs/release/JETSPEED-2.0-README.txt (original)
+++ portals/jetspeed-2/portal/trunk/docs/release/JETSPEED-2.0-README.txt Fri Dec 12 04:06:29 2008
@@ -1,177 +1,177 @@
---------------------------  
- Jetspeed 2.0 Release
-   December 8, 2005
---------------------------
-
-The Apache Portals Jetspeed Team is pleased to announce the final release of 
-the Jetspeed-2 Open Source Enterprise Portal. This final release is 
-fully-compliant with the Portlet Specification 1.0 (JSR-168).
-Jetspeed-2 has passed the TCK (Test Compatibility Kit) suite and is fully 
-CERTIFIED to the Java Portlet Standard.
-
-
-Features of the Final Release Include:
-
-Standardized:
-* Fully compliant with Java Portlet API Standard 1.0 (JSR 168)
-* Passed JSR-168 TCK Compatibility Test Suite
-* J2EE Security based on JAAS Standard, JAAS DB Portal Security Policy
-* LDAP Support for User Authentication
-
-Foundation Component Architecture:
-* Spring-based Components and Scalable Architecture
-* Configurable Pipeline Request Processor
-* Auto Deployment of Portlet Applications
-* Jetspeed Component Java API
-* Jetspeed AJAX XML API
-* PSML: Extended Portlet Site Markup Language
-    - Database Persistent
-    - Content Management Facilities
-    - Security Constraints
-
-Portal Core Features:
-* Declarative Security Constraints and JAAS Database Security Policy
-* Runtime Portlet API Standard Role-based Security
-* Portal Content Management and Navigations: Pages, Menus, Folders, Links
-* Multithreaded Aggregation Engine
-* PSML Folder CMS Navigations, Menus, Links
-* Jetspeed SSO (Single Sign-on)
-* Rules-based Profiler for page and resource location
-* Integrates with most popular databases including
-   - Derby, MySQL, MS SQL, Oracle, Postgres, DB2
-* Client independent capability engine (HTML, XHTML, WML, VML)
-* Internationalization: Localized Portal Resources in 12 Languages
-* Statistics Logging Engine
-* Portlet Registry
-* Full Text Search of Portlet Resources with Lucene
-* User Registration
-* Forgotten Password
-* Rich Login and Password Configuration Management
-
-Administrative Portlets:
-* User, Role, Group, Password, and Profile Management
-* JSR 168 Generic User Attributes Editor
-    - JSR 168 Preferences Editor 
-    -  Site Manager
-    -  SSO Manager
-    -  Portlet Application and Lifecycle Management
-    -  Profiler Administration
-    -  Statistics Reports
-
-Web Framework Support and Sample Portlets:
-* Bridges to other Web Frameworks
-   - JSF, Struts, PHP, Perl, Velocity
-* Sample Portlets
-   - RSS, IFrame, Calendar XSLT, Bookmark, Database Browser
-   - Integration with Display Tags, Spring MVC
-
-Customization Features:
-* Administrative Site Manager
-* Page Customizer
-
-Portal Design Features:
-* Deployment Jetspeed Portlet and Page Skins (Decorators) CSS Components
-* Configurable CSS Page Layouts
-* Easy to Use Velocity Macro Language for Skin and Layout Components
-
-Development Tools
-* Automated Maven Build
-* Jetspeed-2 Maven Plugin for Custom Portal Development
-* AutoDeployment of Portlet Applications, Portal Resources
-* Deployment Tools
-* Plugin Goals integrated with Auto Deployment Feature
-
-Application Servers Supported:
-* Tomcat 5.0.x
-* Tomcat 5.5.x
-* Websphere 5.1, 6.0
-* JBoss 
-
-The release is available for download from the Apache Download Mirrors:
-
-http://www.apache.org/dyn/closer.cgi 
-
-----------------------------------------------------------------------------------------
-
----------------------------
- Installation Requirements
----------------------------
-1. JVM 1.4.2_04 or greater
-2. 256 MB of Disk Space
-3. 512 MB of Memory
-
----------------------------
- Installation Instructions
----------------------------
-
-1. For an installation with a built-ready-to-run-Derby database, download:
-  
-   Jetspeed2.0-derby-install.jar
-   
-   For an installation allowing you to choose your database, download:
-
-   Jetspeed2.0-MultiDb-install.jar
-   
-2. Run the installer 
-   
-	java -jar Jetspeed2.0-derby-install.jar	
-	-- or --
-	java -jar Jetspeed2.0-MultiDb-install.jar
-	
-	The installer will operate in both graphical and headless-commandline mode.
-	You may choose the location of the install.
-	
-3. startup Tomcat 
-
-   execute /usr/local/ApacheJetspeed2.0/bin/startup.sh
-   
-   For Windows:
-   
-   execute c:\Program Files\Apache Jetspeed 2.0\bin\startup.bat
-   
-
-4. The very first invocation of the portal requires approximately one minute for initial 
-   startup and final installation. Please wait one minute, and then start up a web browser 
-   and navigate to http://localhost:8080/jetspeed/portal
-
-5. Login 
-
- Sample accounts to login as:
-    
- admin/admin
- manager/manager
- user/user
-
----------------------------
-Release Notes
----------------------------
-1. RSS Portlet requires xalan-2.4.1.jar in common/lib of Tomcat
-   If you are running Java 1.5, you will need to copy the xalan-2.3.jar there
-   from your jetspeed/WEB-INF/lib directory.
-
-2. The User Registration and Forgotten Password Portlets require an SMTP server 
-   to function. The default settings are configured to a mail server on localhost
-   with no username or password. To change these settings, edit the Spring configuration
-   for the mailSender component, located in the jetspeed/WEB-INF/assembly/administration.xml file.
-
-3. Multi-Database installer Notes
-
-   a. Valid values for the 'database type':
-		derby 
-		mssql
-		mysql
-		oracle
-		hsql
-		postgres
-		sapdb
-
-   b. With the exception of Derby, you will need to create an empty database schema in 
-      your particular database to store the Jetspeed tables.
-      
-   c. With the exception of Derby, you can not run the installer twice against the 
-     same database schema. You have to manually drop the tables yourself before 
-     running the installer a second time.
-
-
-
-
+--------------------------  
+ Jetspeed 2.0 Release
+   December 8, 2005
+--------------------------
+
+The Apache Portals Jetspeed Team is pleased to announce the final release of 
+the Jetspeed-2 Open Source Enterprise Portal. This final release is 
+fully-compliant with the Portlet Specification 1.0 (JSR-168).
+Jetspeed-2 has passed the TCK (Test Compatibility Kit) suite and is fully 
+CERTIFIED to the Java Portlet Standard.
+
+
+Features of the Final Release Include:
+
+Standardized:
+* Fully compliant with Java Portlet API Standard 1.0 (JSR 168)
+* Passed JSR-168 TCK Compatibility Test Suite
+* J2EE Security based on JAAS Standard, JAAS DB Portal Security Policy
+* LDAP Support for User Authentication
+
+Foundation Component Architecture:
+* Spring-based Components and Scalable Architecture
+* Configurable Pipeline Request Processor
+* Auto Deployment of Portlet Applications
+* Jetspeed Component Java API
+* Jetspeed AJAX XML API
+* PSML: Extended Portlet Site Markup Language
+    - Database Persistent
+    - Content Management Facilities
+    - Security Constraints
+
+Portal Core Features:
+* Declarative Security Constraints and JAAS Database Security Policy
+* Runtime Portlet API Standard Role-based Security
+* Portal Content Management and Navigations: Pages, Menus, Folders, Links
+* Multithreaded Aggregation Engine
+* PSML Folder CMS Navigations, Menus, Links
+* Jetspeed SSO (Single Sign-on)
+* Rules-based Profiler for page and resource location
+* Integrates with most popular databases including
+   - Derby, MySQL, MS SQL, Oracle, Postgres, DB2
+* Client independent capability engine (HTML, XHTML, WML, VML)
+* Internationalization: Localized Portal Resources in 12 Languages
+* Statistics Logging Engine
+* Portlet Registry
+* Full Text Search of Portlet Resources with Lucene
+* User Registration
+* Forgotten Password
+* Rich Login and Password Configuration Management
+
+Administrative Portlets:
+* User, Role, Group, Password, and Profile Management
+* JSR 168 Generic User Attributes Editor
+    - JSR 168 Preferences Editor 
+    -  Site Manager
+    -  SSO Manager
+    -  Portlet Application and Lifecycle Management
+    -  Profiler Administration
+    -  Statistics Reports
+
+Web Framework Support and Sample Portlets:
+* Bridges to other Web Frameworks
+   - JSF, Struts, PHP, Perl, Velocity
+* Sample Portlets
+   - RSS, IFrame, Calendar XSLT, Bookmark, Database Browser
+   - Integration with Display Tags, Spring MVC
+
+Customization Features:
+* Administrative Site Manager
+* Page Customizer
+
+Portal Design Features:
+* Deployment Jetspeed Portlet and Page Skins (Decorators) CSS Components
+* Configurable CSS Page Layouts
+* Easy to Use Velocity Macro Language for Skin and Layout Components
+
+Development Tools
+* Automated Maven Build
+* Jetspeed-2 Maven Plugin for Custom Portal Development
+* AutoDeployment of Portlet Applications, Portal Resources
+* Deployment Tools
+* Plugin Goals integrated with Auto Deployment Feature
+
+Application Servers Supported:
+* Tomcat 5.0.x
+* Tomcat 5.5.x
+* Websphere 5.1, 6.0
+* JBoss 
+
+The release is available for download from the Apache Download Mirrors:
+
+http://www.apache.org/dyn/closer.cgi 
+
+----------------------------------------------------------------------------------------
+
+---------------------------
+ Installation Requirements
+---------------------------
+1. JVM 1.4.2_04 or greater
+2. 256 MB of Disk Space
+3. 512 MB of Memory
+
+---------------------------
+ Installation Instructions
+---------------------------
+
+1. For an installation with a built-ready-to-run-Derby database, download:
+  
+   Jetspeed2.0-derby-install.jar
+   
+   For an installation allowing you to choose your database, download:
+
+   Jetspeed2.0-MultiDb-install.jar
+   
+2. Run the installer 
+   
+	java -jar Jetspeed2.0-derby-install.jar	
+	-- or --
+	java -jar Jetspeed2.0-MultiDb-install.jar
+	
+	The installer will operate in both graphical and headless-commandline mode.
+	You may choose the location of the install.
+	
+3. startup Tomcat 
+
+   execute /usr/local/ApacheJetspeed2.0/bin/startup.sh
+   
+   For Windows:
+   
+   execute c:\Program Files\Apache Jetspeed 2.0\bin\startup.bat
+   
+
+4. The very first invocation of the portal requires approximately one minute for initial 
+   startup and final installation. Please wait one minute, and then start up a web browser 
+   and navigate to http://localhost:8080/jetspeed/portal
+
+5. Login 
+
+ Sample accounts to login as:
+    
+ admin/admin
+ manager/manager
+ user/user
+
+---------------------------
+Release Notes
+---------------------------
+1. RSS Portlet requires xalan-2.4.1.jar in common/lib of Tomcat
+   If you are running Java 1.5, you will need to copy the xalan-2.3.jar there
+   from your jetspeed/WEB-INF/lib directory.
+
+2. The User Registration and Forgotten Password Portlets require an SMTP server 
+   to function. The default settings are configured to a mail server on localhost
+   with no username or password. To change these settings, edit the Spring configuration
+   for the mailSender component, located in the jetspeed/WEB-INF/assembly/administration.xml file.
+
+3. Multi-Database installer Notes
+
+   a. Valid values for the 'database type':
+		derby 
+		mssql
+		mysql
+		oracle
+		hsql
+		postgres
+		sapdb
+
+   b. With the exception of Derby, you will need to create an empty database schema in 
+      your particular database to store the Jetspeed tables.
+      
+   c. With the exception of Derby, you can not run the installer twice against the 
+     same database schema. You have to manually drop the tables yourself before 
+     running the installer a second time.
+
+
+
+

Propchange: portals/jetspeed-2/portal/trunk/docs/release/JETSPEED-2.0-README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/docs/release/JETSPEED-2.1-ANNOUNCEMENT.txt
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/docs/release/JETSPEED-2.1-ANNOUNCEMENT.txt?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/docs/release/JETSPEED-2.1-ANNOUNCEMENT.txt (original)
+++ portals/jetspeed-2/portal/trunk/docs/release/JETSPEED-2.1-ANNOUNCEMENT.txt Fri Dec 12 04:06:29 2008
@@ -1,78 +1,78 @@
-Email destinations:
-
-* jetspeed-dev@portals.apache.org
-* jetspeed-user@portals.apache.org
-* general@portals.apache.org
-* announce@apache.org
-
-Subject: Jetspeed 2.1 Final Release
-
-Message:
-
-The Apache Portals Jetspeed Team is pleased to announce the final release of the Jetspeed 2.1 Open Source Enterprise Portal. 
-
-Jetspeed is an Open Portal Platform and Enterprise Information Portal, written all in open source under the Apache license in Java and XML. 
-Jetspeed is build upon an open component architecture based on standards. All access to the portal is managed through a robust portal security policy. 
-Within the Jetspeed portal, individual portlets can be aggregated to create a page. Each portlet is an independent application with Jetspeed 
-acting as the central hub making information from multiple sources available in an easy to use manner.
-
-Version 2.1 continues the evolution of the Jetspeed portal technology, with a more stabilized codebase.
-This release includes many new features including Web 2.0 client-side aggregator, distributed portal and portlet caching,
-parallel rendering and aggregation, and many more improvements and bug fixes.
-
-This final release is fully-compliant with the Portlet Specification 1.0 (JSR-168).
-
-The Jetspeed team will be presenting the new 2.1 release at ApacheCon Europe 2007 in Amsterdam.
-
---------------------------  
- Jetspeed 2.1 Release
-   March 3, 2007
---------------------------
-
-New Features in Version 2.1 include:
-
- * Jetspeed Desktop - Web 2.0 client-side JSR-168 portlet aggregation.
- * Parallel Rendering - multithreaded portlet aggregator with portlet timeout tracking, removal of slow rendering portlets.
- * Jetspeed Distributed Cluster - support for distributed deployments of the portal on multiple application server platforms
- * JSR 168 Caching - full caching support of JSR 168 portlet specification, distributed cache invalidation
- * TCK Compliant as of 2.1 (2.0 was compliant as well)
- * Custom Portlet Modes and Window States - a "print" PortletMode and "solo" WindowState are now standard supported
- * Improved LDAP support - full security maintenance using LDAP is now supported for many LDAP providers 
- * New and Improved Administrative and Security Portlets
- * XML Schemas for PSML, jetspeed-portlet.xml, and Jetspeed XML (seed data)
- * Installation choice of either Demo Portal or Minimal Starter Portal
- * New Jetspeed Tutorial
- * Maven-2 build support as well as Maven-1
- * Remote Portal Application Deployer - hot deploy portlet applications from remote locations on the Web
- * Improved Customizers - Portal and Desktop Customizers, drag and drop moving of portlets, nested fragment customization
- * New Portlet Category Selector
- * XML Import/Export of all Jetspeed database data and seed data scripts for backup and restore and data migration
- * Improved Security Control - fully swappable Security Constraint or Security Permission support
- * Portlet-level Security checks based on Security Constraints or Security Permissions 
- * Improved Jetspeed AJAX API
- * Improved Delegation of Security Support
- * New Site Manager
- * Improved Database Page Manager
- * New binary installers making it very easy to setup a basic or demo Jetspeed Portal
- 
-----------------------------------------------------------------------
-
-The release and the new binary installers are available for download from the Apache Download Mirrors through:
-
-    * http://portals.apache.org/jetspeed-2/download.html
-     
-The readme, installation instructions and detailed release notes:
-
-    * http://www.apache.org/dist/portals/jetspeed-2/JETSPEED-2.1-README.txt
-
-
-We hope you enjoy using Jetspeed! If you have any questions, please consult:
-
-    * The web site: http://portals.apache.org/jetspeed-2/
-
-    * The jetspeed-user mailing list: http://portals.apache.org/jetspeed-2/mail-lists.html
-
-For news and information, see:
-
-    * http://portals.apache.org/news.html
-
+Email destinations:
+
+* jetspeed-dev@portals.apache.org
+* jetspeed-user@portals.apache.org
+* general@portals.apache.org
+* announce@apache.org
+
+Subject: Jetspeed 2.1 Final Release
+
+Message:
+
+The Apache Portals Jetspeed Team is pleased to announce the final release of the Jetspeed 2.1 Open Source Enterprise Portal. 
+
+Jetspeed is an Open Portal Platform and Enterprise Information Portal, written all in open source under the Apache license in Java and XML. 
+Jetspeed is build upon an open component architecture based on standards. All access to the portal is managed through a robust portal security policy. 
+Within the Jetspeed portal, individual portlets can be aggregated to create a page. Each portlet is an independent application with Jetspeed 
+acting as the central hub making information from multiple sources available in an easy to use manner.
+
+Version 2.1 continues the evolution of the Jetspeed portal technology, with a more stabilized codebase.
+This release includes many new features including Web 2.0 client-side aggregator, distributed portal and portlet caching,
+parallel rendering and aggregation, and many more improvements and bug fixes.
+
+This final release is fully-compliant with the Portlet Specification 1.0 (JSR-168).
+
+The Jetspeed team will be presenting the new 2.1 release at ApacheCon Europe 2007 in Amsterdam.
+
+--------------------------  
+ Jetspeed 2.1 Release
+   March 3, 2007
+--------------------------
+
+New Features in Version 2.1 include:
+
+ * Jetspeed Desktop - Web 2.0 client-side JSR-168 portlet aggregation.
+ * Parallel Rendering - multithreaded portlet aggregator with portlet timeout tracking, removal of slow rendering portlets.
+ * Jetspeed Distributed Cluster - support for distributed deployments of the portal on multiple application server platforms
+ * JSR 168 Caching - full caching support of JSR 168 portlet specification, distributed cache invalidation
+ * TCK Compliant as of 2.1 (2.0 was compliant as well)
+ * Custom Portlet Modes and Window States - a "print" PortletMode and "solo" WindowState are now standard supported
+ * Improved LDAP support - full security maintenance using LDAP is now supported for many LDAP providers 
+ * New and Improved Administrative and Security Portlets
+ * XML Schemas for PSML, jetspeed-portlet.xml, and Jetspeed XML (seed data)
+ * Installation choice of either Demo Portal or Minimal Starter Portal
+ * New Jetspeed Tutorial
+ * Maven-2 build support as well as Maven-1
+ * Remote Portal Application Deployer - hot deploy portlet applications from remote locations on the Web
+ * Improved Customizers - Portal and Desktop Customizers, drag and drop moving of portlets, nested fragment customization
+ * New Portlet Category Selector
+ * XML Import/Export of all Jetspeed database data and seed data scripts for backup and restore and data migration
+ * Improved Security Control - fully swappable Security Constraint or Security Permission support
+ * Portlet-level Security checks based on Security Constraints or Security Permissions 
+ * Improved Jetspeed AJAX API
+ * Improved Delegation of Security Support
+ * New Site Manager
+ * Improved Database Page Manager
+ * New binary installers making it very easy to setup a basic or demo Jetspeed Portal
+ 
+----------------------------------------------------------------------
+
+The release and the new binary installers are available for download from the Apache Download Mirrors through:
+
+    * http://portals.apache.org/jetspeed-2/download.html
+     
+The readme, installation instructions and detailed release notes:
+
+    * http://www.apache.org/dist/portals/jetspeed-2/JETSPEED-2.1-README.txt
+
+
+We hope you enjoy using Jetspeed! If you have any questions, please consult:
+
+    * The web site: http://portals.apache.org/jetspeed-2/
+
+    * The jetspeed-user mailing list: http://portals.apache.org/jetspeed-2/mail-lists.html
+
+For news and information, see:
+
+    * http://portals.apache.org/news.html
+

Propchange: portals/jetspeed-2/portal/trunk/docs/release/JETSPEED-2.1-ANNOUNCEMENT.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/docs/release/JETSPEED-2.1-README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/docs/release/JETSPEED-2.1-TODO.txt
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/docs/release/JETSPEED-2.1-TODO.txt?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/docs/release/JETSPEED-2.1-TODO.txt (original)
+++ portals/jetspeed-2/portal/trunk/docs/release/JETSPEED-2.1-TODO.txt Fri Dec 12 04:06:29 2008
@@ -1,99 +1,99 @@
-Feature                         Cat     Hours  Assigned  Due    Issue
-----------------------------------------------------------------------
-01. Profiler Docs               Docs     04      DST    Aug 18   573  DONE
-
-02. Spring MVC + doHeader       Portlets 08      SM     Aug 18   570  DONE
-
-03. Prefs per User              Portal   08      DST    Aug 22   499  DONE
-
-04. Rewrite Site Manager        Custom   24      DST    Sep 08 306  IN PROG
-
-05. XML Serialization           Light    08      DST    Aug 08   461 IN PROG
-
-06. Persist layout row/col in   DT-java  06      SM     Sep 08   ... IN PROG
-      correct fragment          
-
-07. PSML Security Editor        Custom   24      SM     Sep 01   574   DONE
-
-08. Complete desktop for column DT-brow  03      SM     .....   ...
-      sizes and layout chg api
-
-09. Change desktop form         DT-brow  02      SM     .....   ...
-      content annotation to 
-      get rid of javascript:
-      form action
-
-10. New Example Portlets       Portlets 08      -ALL-   .....   ...
-     map, weather, domtree                     
-     fix Google Portlet on /portal
-
-11. Maven-2 Archetypes          Build    24      ???    Sep 15   ...
-    Jetspeed Lite 
-    Jetspeed Enterprise
-
-12. Rework Demo Site            Demo     16      -ALL-   Sep 22   ...
-    more users, custom 
-
-
---------------------------------------------------------------------------
-
-19. Desktop Customizer features Custom   16      SM     ------   ...
-     from /portal
-
-20. Page Manager Resources      PSML     32      --     ------   ...
-21. Dynamic Menuing             PSML     80      --     ------   ...
-    Logical Navigations
-
-22. JSR-168 Caching             Portal   16      ---    ------   361
-23. Parallel Render             Portal   80      DST    Sep 29   226
-     Spring Task Executor 
-
-24. Normalize Security DB       Portal   32      HB     Sep 22   560
-    Federated Model
-
-25. Graffito Portlets           Graffito 32      ---    Sep 29   ...
-     rewrite in DOJO/Spring 
-26. Release Graffito                             ---    -----    ...
-
-
-30. MyFaces Upgrade             Bridge   04      ---    ------   538
-31. Mulitle User Attributes     Portal   04      ---    ------   301
-32. Create User Page fr Roles   PSML     04      ---    ------   476
-33. Engine State                Portal   04      ---    ------   341
-34. Statistic Cleanup           Stats    04      ---    ------   480
-35. Secure AJAX Requests        Ajax     08      SM     Sep 15   517
-36. Desktop Block on Action     Desktop  08      SM     Sep 01   ...
-37. Decorator Factory, refactor Portal   08      ---    ------   ...
-    optimize fallback
-    dont check file everytime
-38. Improve Portlet Selector    Custom   08      ---    ------   ...
-
-44. Jetty Support               Portal   08      ---    ------   ...
-    Jetspeed Lite + Jetty
-    Jetspeed Ent + Jetty
-45. Official WAS Support        Portal   08      ---    ------   ...
-
-
-60. Portlet modes in desktop    DT-brow  04      SM     ------
-61. Detect from psml portlet    DT-brow  03      SM     ------
-      row/col vs. x/y;
-      UI to toggle between    
-62. Persist desktop vertical    DT-java  ?       SM     ------
-      expand to fit;
-      UI to toggle between
-63. doHeader support to replace DT-java  ?       SM    -------
-      <head> in desktop-theme
-64. Portlet selector desktop    DT-brow  ?       SM    -------
-      changes for doHeader (63)
-65. Security permissions        j2-admin 02      SM    -------
-      broken in desktop 
-
-70. Test Tapestry Support       Portlets 08      ---    ------  566
-    - example
-    - document
-
-80. Installer, Rewrite          Install  32      HB     Sep 29  448
-81. Derby SQL is not generated  DB       08      HB     Sep 29  ...
-82. Bug fixes in JIRA(DST)      Bugs     16      DST    Sep 28  ...
-83. Profile by IP               Profile  10      PMD     Sept 15th  490 
-
+Feature                         Cat     Hours  Assigned  Due    Issue
+----------------------------------------------------------------------
+01. Profiler Docs               Docs     04      DST    Aug 18   573  DONE
+
+02. Spring MVC + doHeader       Portlets 08      SM     Aug 18   570  DONE
+
+03. Prefs per User              Portal   08      DST    Aug 22   499  DONE
+
+04. Rewrite Site Manager        Custom   24      DST    Sep 08 306  IN PROG
+
+05. XML Serialization           Light    08      DST    Aug 08   461 IN PROG
+
+06. Persist layout row/col in   DT-java  06      SM     Sep 08   ... IN PROG
+      correct fragment          
+
+07. PSML Security Editor        Custom   24      SM     Sep 01   574   DONE
+
+08. Complete desktop for column DT-brow  03      SM     .....   ...
+      sizes and layout chg api
+
+09. Change desktop form         DT-brow  02      SM     .....   ...
+      content annotation to 
+      get rid of javascript:
+      form action
+
+10. New Example Portlets       Portlets 08      -ALL-   .....   ...
+     map, weather, domtree                     
+     fix Google Portlet on /portal
+
+11. Maven-2 Archetypes          Build    24      ???    Sep 15   ...
+    Jetspeed Lite 
+    Jetspeed Enterprise
+
+12. Rework Demo Site            Demo     16      -ALL-   Sep 22   ...
+    more users, custom 
+
+
+--------------------------------------------------------------------------
+
+19. Desktop Customizer features Custom   16      SM     ------   ...
+     from /portal
+
+20. Page Manager Resources      PSML     32      --     ------   ...
+21. Dynamic Menuing             PSML     80      --     ------   ...
+    Logical Navigations
+
+22. JSR-168 Caching             Portal   16      ---    ------   361
+23. Parallel Render             Portal   80      DST    Sep 29   226
+     Spring Task Executor 
+
+24. Normalize Security DB       Portal   32      HB     Sep 22   560
+    Federated Model
+
+25. Graffito Portlets           Graffito 32      ---    Sep 29   ...
+     rewrite in DOJO/Spring 
+26. Release Graffito                             ---    -----    ...
+
+
+30. MyFaces Upgrade             Bridge   04      ---    ------   538
+31. Mulitle User Attributes     Portal   04      ---    ------   301
+32. Create User Page fr Roles   PSML     04      ---    ------   476
+33. Engine State                Portal   04      ---    ------   341
+34. Statistic Cleanup           Stats    04      ---    ------   480
+35. Secure AJAX Requests        Ajax     08      SM     Sep 15   517
+36. Desktop Block on Action     Desktop  08      SM     Sep 01   ...
+37. Decorator Factory, refactor Portal   08      ---    ------   ...
+    optimize fallback
+    dont check file everytime
+38. Improve Portlet Selector    Custom   08      ---    ------   ...
+
+44. Jetty Support               Portal   08      ---    ------   ...
+    Jetspeed Lite + Jetty
+    Jetspeed Ent + Jetty
+45. Official WAS Support        Portal   08      ---    ------   ...
+
+
+60. Portlet modes in desktop    DT-brow  04      SM     ------
+61. Detect from psml portlet    DT-brow  03      SM     ------
+      row/col vs. x/y;
+      UI to toggle between    
+62. Persist desktop vertical    DT-java  ?       SM     ------
+      expand to fit;
+      UI to toggle between
+63. doHeader support to replace DT-java  ?       SM    -------
+      <head> in desktop-theme
+64. Portlet selector desktop    DT-brow  ?       SM    -------
+      changes for doHeader (63)
+65. Security permissions        j2-admin 02      SM    -------
+      broken in desktop 
+
+70. Test Tapestry Support       Portlets 08      ---    ------  566
+    - example
+    - document
+
+80. Installer, Rewrite          Install  32      HB     Sep 29  448
+81. Derby SQL is not generated  DB       08      HB     Sep 29  ...
+82. Bug fixes in JIRA(DST)      Bugs     16      DST    Sep 28  ...
+83. Profile by IP               Profile  10      PMD     Sept 15th  490 
+

Propchange: portals/jetspeed-2/portal/trunk/docs/release/JETSPEED-2.1-TODO.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/etc/apacheds/apacheds-server.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/etc/apacheds/j2-apacheds.ldif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/etc/apacheds/j2-apacheds.ldif?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/etc/apacheds/j2-apacheds.ldif (original)
+++ portals/jetspeed-2/portal/trunk/etc/apacheds/j2-apacheds.ldif Fri Dec 12 04:06:29 2008
@@ -13,20 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# -----------------------------------------#
-# Sample LDIF data for the Jetspeed 2      #
-# -----------------------------------------#
-version: 1
-dn: uid=admin,ou=users,o=sevenSeas
-objectclass: jetspeed-2-user
-objectclass: inetorgperson
-objectclass: organizationalPerson
-objectclass: uidObject
-objectclass: person
-objectclass: top
-cn: admin
-ou: users
-sn: admin
-uid: admin
-userPassword: admin
-
+# -----------------------------------------#
+# Sample LDIF data for the Jetspeed 2      #
+# -----------------------------------------#
+version: 1
+dn: uid=admin,ou=users,o=sevenSeas
+objectclass: jetspeed-2-user
+objectclass: inetorgperson
+objectclass: organizationalPerson
+objectclass: uidObject
+objectclass: person
+objectclass: top
+cn: admin
+ou: users
+sn: admin
+uid: admin
+userPassword: admin
+

Propchange: portals/jetspeed-2/portal/trunk/etc/apacheds/j2-apacheds.ldif
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/etc/database/hsql/manageProd.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Dec 12 04:06:29 2008
@@ -1 +1 @@
-native
+LF

Propchange: portals/jetspeed-2/portal/trunk/etc/database/hsql/manageTest.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Dec 12 04:06:29 2008
@@ -1 +1 @@
-native
+LF

Modified: portals/jetspeed-2/portal/trunk/etc/editors/jetspeedEclipseFormat.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/etc/editors/jetspeedEclipseFormat.xml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/etc/editors/jetspeedEclipseFormat.xml (original)
+++ portals/jetspeed-2/portal/trunk/etc/editors/jetspeedEclipseFormat.xml Fri Dec 12 04:06:29 2008
@@ -1,200 +1,200 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
 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.
--->
-
-<profiles version="5">
-<profile name="Jetspeed" version="5">
-<setting id="comment_clear_blank_lines" value="false"/>
-<setting id="comment_format_comments" value="true"/>
-<setting id="comment_format_header" value="false"/>
-<setting id="comment_format_html" value="true"/>
-<setting id="comment_format_source_code" value="true"/>
-<setting id="comment_indent_parameter_description" value="true"/>
-<setting id="comment_indent_root_tags" value="true"/>
-<setting id="comment_line_length" value="80"/>
-<setting id="comment_new_line_for_parameter" value="true"/>
-<setting id="comment_separate_root_tags" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.filling_space" value=" "/>
-<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_control_statements" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.preserve_user_linebreaks" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.remove_unnecessary_semicolon" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
-</profile>
-</profiles>
+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.
+-->
+
+<profiles version="5">
+<profile name="Jetspeed" version="5">
+<setting id="comment_clear_blank_lines" value="false"/>
+<setting id="comment_format_comments" value="true"/>
+<setting id="comment_format_header" value="false"/>
+<setting id="comment_format_html" value="true"/>
+<setting id="comment_format_source_code" value="true"/>
+<setting id="comment_indent_parameter_description" value="true"/>
+<setting id="comment_indent_root_tags" value="true"/>
+<setting id="comment_line_length" value="80"/>
+<setting id="comment_new_line_for_parameter" value="true"/>
+<setting id="comment_separate_root_tags" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.filling_space" value=" "/>
+<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_control_statements" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.preserve_user_linebreaks" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.remove_unnecessary_semicolon" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
+</profile>
+</profiles>

Propchange: portals/jetspeed-2/portal/trunk/etc/editors/jetspeedEclipseFormat.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/etc/import/assembly/import-page-manager.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/etc/import/assembly/repository-datasource-spring.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/etc/import/export.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/etc/import/export.properties?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/etc/import/export.properties (original)
+++ portals/jetspeed-2/portal/trunk/etc/import/export.properties Fri Dec 12 04:06:29 2008
@@ -13,20 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# comma-separated list of boot assemblies for Spring
-boot.assemblies =  repository-datasource-spring.xml
-# comma-separated list of assemblies for Spring
-assemblies = import-page-manager.xml, transaction.xml, interceptors.xml
-# root folder to start importing from
-root.folder = /
-# overwrite folders flag, set to true to replace existing folders
-overwrite.folders = true
-# overwrite pages flag, set to true to replace existing pages 
-overwrite.pages = true
-# if this flag is true, will also try to export page.security 
-full.import = true
-# source page manager Spring component name
-source.page.manager = dbPageManager
-# destination page manager Spring component name
-dest.page.manager = castorPageManager
-
+# comma-separated list of boot assemblies for Spring
+boot.assemblies =  repository-datasource-spring.xml
+# comma-separated list of assemblies for Spring
+assemblies = import-page-manager.xml, transaction.xml, interceptors.xml
+# root folder to start importing from
+root.folder = /
+# overwrite folders flag, set to true to replace existing folders
+overwrite.folders = true
+# overwrite pages flag, set to true to replace existing pages 
+overwrite.pages = true
+# if this flag is true, will also try to export page.security 
+full.import = true
+# source page manager Spring component name
+source.page.manager = dbPageManager
+# destination page manager Spring component name
+dest.page.manager = castorPageManager
+

Propchange: portals/jetspeed-2/portal/trunk/etc/import/export.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/etc/import/import.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/etc/import/import.properties?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/etc/import/import.properties (original)
+++ portals/jetspeed-2/portal/trunk/etc/import/import.properties Fri Dec 12 04:06:29 2008
@@ -13,19 +13,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# comma-separated list of boot assemblies for Spring
-boot.assemblies =  repository-datasource-spring.xml
-# comma-separated list of assemblies for Spring
-assemblies = import-page-manager.xml, transaction.xml, interceptors.xml
-# root folder to start exporting from
-root.folder = /
-# overwrite folders flag, set to true to replace existing folders
-overwrite.folders = true
-# overwrite pages flag, set to true to replace existing pages 
-overwrite.pages = true
-# if this flag is true, will also try to import page.security 
-full.import = true
-# source page manager Spring component name
-source.page.manager = castorPageManager
-# destination page manager Spring component name
-dest.page.manager = dbPageManager
+# comma-separated list of boot assemblies for Spring
+boot.assemblies =  repository-datasource-spring.xml
+# comma-separated list of assemblies for Spring
+assemblies = import-page-manager.xml, transaction.xml, interceptors.xml
+# root folder to start exporting from
+root.folder = /
+# overwrite folders flag, set to true to replace existing folders
+overwrite.folders = true
+# overwrite pages flag, set to true to replace existing pages 
+overwrite.pages = true
+# if this flag is true, will also try to import page.security 
+full.import = true
+# source page manager Spring component name
+source.page.manager = castorPageManager
+# destination page manager Spring component name
+dest.page.manager = dbPageManager

Propchange: portals/jetspeed-2/portal/trunk/etc/import/import.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/etc/ldif/jetspeed-example.ldif
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/etc/ldif/server.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/etc/localization/README.txt
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/etc/localization/README.txt?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/etc/localization/README.txt (original)
+++ portals/jetspeed-2/portal/trunk/etc/localization/README.txt Fri Dec 12 04:06:29 2008
@@ -1,8 +1,8 @@
-Localization files in this directory are in 'native' format.
-These files must be processed, by native2ascii, before committing.
-In case anyone needs the original format, they are here.
-For example ua-windows-1251 contains property files in Cp1251.
-ua-windows-1251 folder contains sources, before running native2ascii
-I think building process should process these files to ascii and then
-package them to application archives. However, we do not yet have this process in place.
-
+Localization files in this directory are in 'native' format.
+These files must be processed, by native2ascii, before committing.
+In case anyone needs the original format, they are here.
+For example ua-windows-1251 contains property files in Cp1251.
+ua-windows-1251 folder contains sources, before running native2ascii
+I think building process should process these files to ascii and then
+package them to application archives. However, we do not yet have this process in place.
+

Propchange: portals/jetspeed-2/portal/trunk/etc/localization/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/etc/registration/assembly/registry.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/etc/registration/registration.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/etc/registration/registration.properties?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/etc/registration/registration.properties (original)
+++ portals/jetspeed-2/portal/trunk/etc/registration/registration.properties Fri Dec 12 04:06:29 2008
@@ -13,22 +13,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# comma-separated list of boot assemblies for Spring
-boot.assemblies =  repository-datasource-spring.xml
-# comma-separated list of assemblies for Spring
-assemblies = registry.xml, transaction.xml, cache.xml
-# overwrite portlet applications flag, set to true to replace existing portlet applications
-overwrite.apps = true
-# registry component name
-registry.component = org.apache.jetspeed.components.portletregistry.PortletRegistry
-# apps to register
-apps = jetspeed-layouts, demo, j2-admin
-# app descriptor locations
-descriptors = ./layout-portlets/target/jetspeed-layout-portlets/WEB-INF/portlet.xml, ./applications/demo/src/webapp/WEB-INF/portlet.xml, ./applications/j2-admin/src/webapp/WEB-INF/portlet.xml
-# webapp descriptor locations
-webapp.descriptors = ./layout-portlets/target/jetspeed-layout-portlets/WEB-INF/web.xml, ./applications/demo/src/webapp/WEB-INF/web.xml, ./applications/j2-admin/src/webapp/WEB-INF/web.xml
-# extended app descriptor locations
-extended.descriptors = ./layout-portlets/target/jetspeed-layout-portlets/WEB-INF/jetspeed-portlet.xml, ./applications/demo/src/webapp/WEB-INF/jetspeed-portlet.xml, ./applications/j2-admin/src/webapp/WEB-INF/jetspeed-portlet.xml
-
-
-
+# comma-separated list of boot assemblies for Spring
+boot.assemblies =  repository-datasource-spring.xml
+# comma-separated list of assemblies for Spring
+assemblies = registry.xml, transaction.xml, cache.xml
+# overwrite portlet applications flag, set to true to replace existing portlet applications
+overwrite.apps = true
+# registry component name
+registry.component = org.apache.jetspeed.components.portletregistry.PortletRegistry
+# apps to register
+apps = jetspeed-layouts, demo, j2-admin
+# app descriptor locations
+descriptors = ./layout-portlets/target/jetspeed-layout-portlets/WEB-INF/portlet.xml, ./applications/demo/src/webapp/WEB-INF/portlet.xml, ./applications/j2-admin/src/webapp/WEB-INF/portlet.xml
+# webapp descriptor locations
+webapp.descriptors = ./layout-portlets/target/jetspeed-layout-portlets/WEB-INF/web.xml, ./applications/demo/src/webapp/WEB-INF/web.xml, ./applications/j2-admin/src/webapp/WEB-INF/web.xml
+# extended app descriptor locations
+extended.descriptors = ./layout-portlets/target/jetspeed-layout-portlets/WEB-INF/jetspeed-portlet.xml, ./applications/demo/src/webapp/WEB-INF/jetspeed-portlet.xml, ./applications/j2-admin/src/webapp/WEB-INF/jetspeed-portlet.xml
+
+
+

Propchange: portals/jetspeed-2/portal/trunk/etc/registration/registration.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/etc/remote-repository/portlet-repository.xml
------------------------------------------------------------------------------
    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