You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2005/06/22 14:35:40 UTC

svn commit: r191820 - in /portals/jetspeed-2/trunk/portals-bridges: ./ common/ common/xdocs/ etc/ etc/project-dependencies/ etc/project-reports/ frameworks/ frameworks/xdocs/ jsf/ jsf/xdocs/ perl/ perl/xdocs/ php/ php/xdocs/ struts/ struts/xdocs/ veloc...

Author: ate
Date: Wed Jun 22 05:35:38 2005
New Revision: 191820

URL: http://svn.apache.org/viewcvs?rev=191820&view=rev
Log:
Refactored Portals Bridges subproject configurations for the new Bridges project.
Also includes a first draft for the new Bridges Home page.

See: http://issues.apache.org/jira/browse/JS2-284, 
     http://issues.apache.org/jira/browse/JS2-285,
     http://issues.apache.org/jira/browse/JS2-286 and
     http://issues.apache.org/jira/browse/JS2-292

Added:
    portals/jetspeed-2/trunk/portals-bridges/LICENSE.TXT
    portals/jetspeed-2/trunk/portals-bridges/checkstyle.license
    portals/jetspeed-2/trunk/portals-bridges/checkstyle.xml
    portals/jetspeed-2/trunk/portals-bridges/etc/
    portals/jetspeed-2/trunk/portals-bridges/etc/artifact-versions.ent
    portals/jetspeed-2/trunk/portals-bridges/etc/project-dependencies/
    portals/jetspeed-2/trunk/portals-bridges/etc/project-dependencies/jsf-api-deps.xml
    portals/jetspeed-2/trunk/portals-bridges/etc/project-reports/
    portals/jetspeed-2/trunk/portals-bridges/etc/project-reports/bridges-reports.xml
    portals/jetspeed-2/trunk/portals-bridges/locator.ent
    portals/jetspeed-2/trunk/portals-bridges/locator.path
    portals/jetspeed-2/trunk/portals-bridges/maven.xml
    portals/jetspeed-2/trunk/portals-bridges/project.properties
    portals/jetspeed-2/trunk/portals-bridges/project.xml
    portals/jetspeed-2/trunk/portals-bridges/xdocs/
    portals/jetspeed-2/trunk/portals-bridges/xdocs/index.xml
    portals/jetspeed-2/trunk/portals-bridges/xdocs/navigation.xml
Modified:
    portals/jetspeed-2/trunk/portals-bridges/   (props changed)
    portals/jetspeed-2/trunk/portals-bridges/common/project.properties
    portals/jetspeed-2/trunk/portals-bridges/common/project.xml
    portals/jetspeed-2/trunk/portals-bridges/common/xdocs/navigation.xml
    portals/jetspeed-2/trunk/portals-bridges/frameworks/project.properties
    portals/jetspeed-2/trunk/portals-bridges/frameworks/project.xml
    portals/jetspeed-2/trunk/portals-bridges/frameworks/xdocs/navigation.xml
    portals/jetspeed-2/trunk/portals-bridges/jsf/project.properties
    portals/jetspeed-2/trunk/portals-bridges/jsf/project.xml
    portals/jetspeed-2/trunk/portals-bridges/jsf/xdocs/navigation.xml
    portals/jetspeed-2/trunk/portals-bridges/perl/project.properties
    portals/jetspeed-2/trunk/portals-bridges/perl/project.xml
    portals/jetspeed-2/trunk/portals-bridges/perl/xdocs/navigation.xml
    portals/jetspeed-2/trunk/portals-bridges/php/project.properties
    portals/jetspeed-2/trunk/portals-bridges/php/project.xml
    portals/jetspeed-2/trunk/portals-bridges/php/xdocs/navigation.xml
    portals/jetspeed-2/trunk/portals-bridges/struts/locator.ent
    portals/jetspeed-2/trunk/portals-bridges/struts/locator.path
    portals/jetspeed-2/trunk/portals-bridges/struts/project.properties
    portals/jetspeed-2/trunk/portals-bridges/struts/project.xml
    portals/jetspeed-2/trunk/portals-bridges/struts/xdocs/features.xml
    portals/jetspeed-2/trunk/portals-bridges/struts/xdocs/index.xml
    portals/jetspeed-2/trunk/portals-bridges/struts/xdocs/navigation.xml
    portals/jetspeed-2/trunk/portals-bridges/velocity/project.properties
    portals/jetspeed-2/trunk/portals-bridges/velocity/project.xml
    portals/jetspeed-2/trunk/portals-bridges/velocity/xdocs/navigation.xml

Propchange: portals/jetspeed-2/trunk/portals-bridges/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jun 22 05:35:38 2005
@@ -0,0 +1 @@
+target

Added: portals/jetspeed-2/trunk/portals-bridges/LICENSE.TXT
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/LICENSE.TXT?rev=191820&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/LICENSE.TXT (added)
+++ portals/jetspeed-2/trunk/portals-bridges/LICENSE.TXT Wed Jun 22 05:35:38 2005
@@ -0,0 +1,190 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2004 The Apache Software Foundation
+

Added: portals/jetspeed-2/trunk/portals-bridges/checkstyle.license
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/checkstyle.license?rev=191820&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/checkstyle.license (added)
+++ portals/jetspeed-2/trunk/portals-bridges/checkstyle.license Wed Jun 22 05:35:38 2005
@@ -0,0 +1,15 @@
+/*
+ * Copyright (\d\d\d\d-)+2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */

Added: portals/jetspeed-2/trunk/portals-bridges/checkstyle.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/checkstyle.xml?rev=191820&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/checkstyle.xml (added)
+++ portals/jetspeed-2/trunk/portals-bridges/checkstyle.xml Wed Jun 22 05:35:38 2005
@@ -0,0 +1,146 @@
+<?xml version="1.0"?>
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    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.
+-->
+<!DOCTYPE module PUBLIC
+    "-//Puppy Crawl//DTD Check Configuration 1.1//EN"
+    "http://www.puppycrawl.com/dtds/configuration_1_1.dtd">
+
+<!-- Checkstyle properties for Cactus projects -->
+<module name="Checker">
+  
+  <module name="NewlineAtEndOfFile"/>
+
+  <module name="TreeWalker">
+    
+    <!-- General file checks -->
+    <module name="FileLength"/>
+    <module name="RegexpHeader">
+      <property name="headerFile" value="${checkstyle.header.file}"/>
+      <!-- invalid property
+      <property name="ignoreLines" value="4"/>
+      -->
+    </module>
+    <module name="LineLength">
+      <property name="ignorePattern" value="(@version|@see|^import)"/>
+    </module>
+    <module name="TabCharacter"/>
+    
+    <!-- Imports -->
+    <module name="AvoidStarImport"/>
+    <module name="IllegalImport"/>
+    <module name="RedundantImport"/>
+    <module name="UnusedImports"/>
+    
+    <!-- Naming conventions -->
+    <module name="ConstantName"/>
+    <module name="MemberName"/>
+    <module name="MethodName"/>
+    <module name="LocalFinalVariableName"/>
+    <module name="LocalVariableName"/>
+    <module name="PackageName"/>
+    <module name="ParameterName">
+      <property name="format" value="^(the|is|has)[A-Z][a-zA-Z0-9]*$"/>
+    </module>
+    <module name="StaticVariableName"/>
+    <module name="TypeName"/>
+    
+    <!-- Code formatting -->
+    <module name="EmptyBlock">
+      <property name="tokens" value="LITERAL_CATCH"/>
+      <property name="option" value="text"/>
+    </module>
+    <module name="NeedBraces"/>
+    <module name="NoWhitespaceAfter"/>
+    <module name="NoWhitespaceBefore"/>
+    <module name="NoWhitespaceAfter">
+      <property name="tokens" value="DOT"/>
+      <property name="allowLineBreaks" value="true"/>
+    </module>
+    <module name="NoWhitespaceBefore">
+      <property name="tokens" value="DOT"/>
+      <property name="allowLineBreaks" value="true"/>
+    </module>
+    <module name="OperatorWrap"/>
+    <module name="LeftCurly">
+      <property name="option" value="nl"/>
+    </module>
+    <module name="RightCurly">
+      <property name="option" value="alone"/>
+    </module>
+    <module name="WhitespaceAfter"/>
+    <module name="WhitespaceAround"/>
+    
+    <!-- Coding style -->
+    <module name="EqualsHashCode"/>
+    <module name="IllegalInstantiation">
+      <property name="classes" value="java.lang.Boolean, java.lang.String"/>
+    </module>
+    <module name="InnerAssignment"/>
+    <module name="MethodLength"/>
+    <module name="MissingSwitchDefault"/>
+    <module name="ModifierOrder"/>
+    <module name="ParameterNumber"/>
+    <module name="ParenPad"/>
+    <module name="RedundantModifier"/>
+    <module name="SimplifyBooleanExpression"/>
+    <module name="SimplifyBooleanReturn"/>
+    <module name="UpperEll"/>
+    <module name="VisibilityModifier">
+      <property name="protectedAllowed" value="true"/>
+      <property name="publicMemberPattern" value="^[a-z][a-zA-Z0-9]*$"/>
+    </module>
+    <module name="FinalClass"/>
+
+    <!-- Avoid finalizers (this will not find violations that contain 
+         linebreaks) -->
+    <module name="GenericIllegalRegexp">
+      <property name="format"
+          value="((public)|(protected))\s+void\s+finalize\(\s*\)"/>
+      <property name="message" value="Avoid finalizers"/>
+    </module>
+
+    <!-- No direct printing to System.out or System.err -->
+    <module name="GenericIllegalRegexp">
+      <property name="format" value="System\.(out|err)\."/>
+      <property name="message"
+          value="Don't write directly to System.out our System.err"/>
+    </module>
+
+    <!-- No @author tags -->
+    <module name="GenericIllegalRegexp">
+      <property name="format" value="@author"/>
+      <property name="message"
+          value="No @author tag allowed"/>
+    </module>
+
+    <!-- Javadoc related checks -->
+    <module name="JavadocType">
+      <property name="scope" value="private"/>
+      <!--property name="authorFormat" value=""/-->
+      <property name="versionFormat" value="\$Id.*\$"/>
+    </module>
+    <module name="JavadocMethod">
+      <property name="scope" value="private"/>
+      <property name="allowUndeclaredRTE" value="true"/>
+    </module>
+    <module name="JavadocVariable">
+      <property name="scope" value="private"/>
+    </module>
+    
+  </module>
+  
+</module>
+

Modified: portals/jetspeed-2/trunk/portals-bridges/common/project.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/common/project.properties?rev=191820&r1=191819&r2=191820&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/common/project.properties (original)
+++ portals/jetspeed-2/trunk/portals-bridges/common/project.properties Wed Jun 22 05:35:38 2005
@@ -15,5 +15,5 @@
 # $Id$
 
 maven.multiproject.type=jar
-maven.license.licenseFile=${basedir}/../../LICENSE.TXT
+maven.license.licenseFile=${basedir}/../LICENSE.TXT
 

Modified: portals/jetspeed-2/trunk/portals-bridges/common/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/common/project.xml?rev=191820&r1=191819&r2=191820&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/common/project.xml (original)
+++ portals/jetspeed-2/trunk/portals-bridges/common/project.xml Wed Jun 22 05:35:38 2005
@@ -20,21 +20,21 @@
   $Id$
 -->
 <project>
-  <extend>${basedir}/../../project.xml</extend>
+  <extend>${basedir}/../project.xml</extend>
   <pomVersion>3</pomVersion>
   <groupId>portals-bridges</groupId>
   <id>portals-bridges-common</id>
-  <name>Apache Portals Bridges common utilities and interfaces</name>
+  <name>Common Utilities and Interfaces</name>
   <currentVersion>&portals-bridges-common-version;</currentVersion>
   <package>org.apache.portals.bridges.common</package>
   <description>
-	  Apache Portals Bridges common utilties and interfaces
+	  Apache Portals Bridges Common Utilties and Interfaces
   </description>
-  <shortDescription>Apache Portals Bridges common utilities</shortDescription>
+  <shortDescription>Apache Portals Bridges Common Utilities and Interfaces</shortDescription>
   <repository>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/portals-bridges/common</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/portals-bridges/common</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/portals-bridges/common/</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/bridges/trunk/common</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/bridges/trunk/common</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/portals/bridges/trunk/common/</url>
   </repository>
   <dependencies>
 	  <dependency>
@@ -52,20 +52,8 @@
     <sourceDirectory>src/java</sourceDirectory>
   </build>
   <reports>
-    <report>maven-jdepend-plugin</report>
-<!--
-    <report>maven-checkstyle-plugin</report>
--->
-    <report>maven-pmd-plugin</report>
-    <report>maven-changelog-plugin</report>
-    <report>maven-file-activity-plugin</report>
-    <report>maven-developer-activity-plugin</report>
-    <report>maven-license-plugin</report>
-    <report>maven-javadoc-plugin</report>
-    <report>maven-jxr-plugin</report>
-    <report>maven-junit-report-plugin</report>
-    <report>maven-jcoverage-plugin</report>
-    <report>maven-linkcheck-plugin</report>
-    <report>maven-tasklist-plugin</report>
+
+        &bridges-reports;
+
   </reports>
 </project>

Modified: portals/jetspeed-2/trunk/portals-bridges/common/xdocs/navigation.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/common/xdocs/navigation.xml?rev=191820&r1=191819&r2=191820&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/common/xdocs/navigation.xml (original)
+++ portals/jetspeed-2/trunk/portals-bridges/common/xdocs/navigation.xml Wed Jun 22 05:35:38 2005
@@ -15,9 +15,14 @@
 limitations under the License.
 -->
 <project>
+
+  <title>Portals Bridges - Common Utilities and Interfaces</title>
+
   <body>
-      <links>
-        <item name="Jetspeed 2" href="../../index.html"/>
-      </links>
+    <links>
+      <item name="Jetspeed 2" href="http://portals.apache.org/jetspeed-2" target="_nw"/>
+      <item name="Bridges Home" href="../../index.html"/>
+    </links>
+      
   </body>
 </project>

Added: portals/jetspeed-2/trunk/portals-bridges/etc/artifact-versions.ent
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/etc/artifact-versions.ent?rev=191820&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/etc/artifact-versions.ent (added)
+++ portals/jetspeed-2/trunk/portals-bridges/etc/artifact-versions.ent Wed Jun 22 05:35:38 2005
@@ -0,0 +1,8 @@
+<!ENTITY portals-bridges-version "0.4-SNAPSHOT">
+<!ENTITY portals-bridges-common-version "0.4-SNAPSHOT">
+<!ENTITY portals-bridges-frameworks-version "0.4-SNAPSHOT">
+<!ENTITY portals-bridges-jsf-version "0.4-SNAPSHOT">
+<!ENTITY portals-bridges-perl-version "0.4-SNAPSHOT">
+<!ENTITY portals-bridges-php-version "0.4-SNAPSHOT">
+<!ENTITY portals-bridges-struts-version "0.4-SNAPSHOT">
+<!ENTITY portals-bridges-velocity-version "0.4-SNAPSHOT">

Added: portals/jetspeed-2/trunk/portals-bridges/etc/project-dependencies/jsf-api-deps.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/etc/project-dependencies/jsf-api-deps.xml?rev=191820&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/etc/project-dependencies/jsf-api-deps.xml (added)
+++ portals/jetspeed-2/trunk/portals-bridges/etc/project-dependencies/jsf-api-deps.xml Wed Jun 22 05:35:38 2005
@@ -0,0 +1,8 @@
+<dependency>
+    <groupId>myfaces</groupId>
+    <artifactId>myfaces-jsf-api</artifactId>
+    <version>1.0.9</version>
+    <properties>
+		<war.bundle>true</war.bundle>
+	</properties>
+</dependency>
\ No newline at end of file

Added: portals/jetspeed-2/trunk/portals-bridges/etc/project-reports/bridges-reports.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/etc/project-reports/bridges-reports.xml?rev=191820&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/etc/project-reports/bridges-reports.xml (added)
+++ portals/jetspeed-2/trunk/portals-bridges/etc/project-reports/bridges-reports.xml Wed Jun 22 05:35:38 2005
@@ -0,0 +1,15 @@
+<report>maven-jdepend-plugin</report>
+<!--
+<report>maven-checkstyle-plugin</report>
+-->
+<report>maven-pmd-plugin</report>
+<report>maven-changelog-plugin</report>
+<report>maven-file-activity-plugin</report>
+<report>maven-developer-activity-plugin</report>
+<report>maven-license-plugin</report>
+<report>maven-javadoc-plugin</report>
+<report>maven-jxr-plugin</report>
+<report>maven-junit-report-plugin</report>
+<report>maven-jcoverage-plugin</report>
+<report>maven-linkcheck-plugin</report>
+<report>maven-tasklist-plugin</report>
\ No newline at end of file

Modified: portals/jetspeed-2/trunk/portals-bridges/frameworks/project.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/frameworks/project.properties?rev=191820&r1=191819&r2=191820&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/frameworks/project.properties (original)
+++ portals/jetspeed-2/trunk/portals-bridges/frameworks/project.properties Wed Jun 22 05:35:38 2005
@@ -14,5 +14,5 @@
 #
 # $Id$
 maven.multiproject.type=jar
-maven.license.licenseFile=${basedir}/../../LICENSE.TXT
+maven.license.licenseFile=${basedir}/../LICENSE.TXT
 

Modified: portals/jetspeed-2/trunk/portals-bridges/frameworks/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/frameworks/project.xml?rev=191820&r1=191819&r2=191820&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/frameworks/project.xml (original)
+++ portals/jetspeed-2/trunk/portals-bridges/frameworks/project.xml Wed Jun 22 05:35:38 2005
@@ -20,11 +20,11 @@
   $Id$
 -->
 <project>
-  <extend>${basedir}/../../project.xml</extend>
+  <extend>${basedir}/../project.xml</extend>
   <pomVersion>3</pomVersion>
   <groupId>portals-bridges</groupId>
   <id>portals-bridges-frameworks</id>
-  <name>Apache Portals Bridges Frameworks</name>
+  <name>Frameworks</name>
   <currentVersion>&portals-bridges-frameworks-version;</currentVersion>
   <package>org.apache.portals.bridges.frameworks</package>
   <description>
@@ -32,9 +32,9 @@
   </description>
   <shortDescription>Apache Portals Bridges Frameworks</shortDescription>
   <repository>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/portals-bridges/frameworks/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/portals-bridges/frameworks/</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/portals-bridges/frameworks/</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/bridges/trunk/frameworks/</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/bridges/trunk/frameworks/</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/portals/bridges/trunk/frameworks/</url>
   </repository>
   <dependencies>
 	  <dependency>
@@ -113,20 +113,8 @@
     </resources>
   </build>
   <reports>
-    <report>maven-jdepend-plugin</report>
-<!--
-    <report>maven-checkstyle-plugin</report>
--->
-    <report>maven-pmd-plugin</report>
-    <report>maven-changelog-plugin</report>
-    <report>maven-file-activity-plugin</report>
-    <report>maven-developer-activity-plugin</report>
-    <report>maven-license-plugin</report>
-    <report>maven-javadoc-plugin</report>
-    <report>maven-jxr-plugin</report>
-    <report>maven-junit-report-plugin</report>
-    <report>maven-jcoverage-plugin</report>
-    <report>maven-linkcheck-plugin</report>
-    <report>maven-tasklist-plugin</report>
+
+        &bridges-reports;
+
   </reports>
 </project>

Modified: portals/jetspeed-2/trunk/portals-bridges/frameworks/xdocs/navigation.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/frameworks/xdocs/navigation.xml?rev=191820&r1=191819&r2=191820&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/frameworks/xdocs/navigation.xml (original)
+++ portals/jetspeed-2/trunk/portals-bridges/frameworks/xdocs/navigation.xml Wed Jun 22 05:35:38 2005
@@ -15,9 +15,14 @@
 limitations under the License.
 -->
 <project>
+
+  <title>Portals Bridges - Frameworks</title>
+
   <body>
-      <links>
-        <item name="Jetspeed 2" href="../../index.html"/>
-      </links>
+    <links>
+      <item name="Jetspeed 2" href="http://portals.apache.org/jetspeed-2" target="_nw"/>
+      <item name="Bridges Home" href="../../index.html"/>
+    </links>
+      
   </body>
 </project>

Modified: portals/jetspeed-2/trunk/portals-bridges/jsf/project.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/jsf/project.properties?rev=191820&r1=191819&r2=191820&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/jsf/project.properties (original)
+++ portals/jetspeed-2/trunk/portals-bridges/jsf/project.properties Wed Jun 22 05:35:38 2005
@@ -14,5 +14,5 @@
 #
 # $Id$
 maven.multiproject.type=jar
-maven.license.licenseFile=${basedir}/../../LICENSE.TXT
+maven.license.licenseFile=${basedir}/../LICENSE.TXT
 

Modified: portals/jetspeed-2/trunk/portals-bridges/jsf/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/jsf/project.xml?rev=191820&r1=191819&r2=191820&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/jsf/project.xml (original)
+++ portals/jetspeed-2/trunk/portals-bridges/jsf/project.xml Wed Jun 22 05:35:38 2005
@@ -21,11 +21,11 @@
   $Id$
 -->
 <project>
-  <extend>${basedir}/../../project.xml</extend>
+  <extend>${basedir}/../project.xml</extend>
   <pomVersion>3</pomVersion>
   <groupId>portals-bridges</groupId>
   <id>portals-bridges-jsf</id>
-  <name>Apache Portals JSF Bridge</name>
+  <name>JSF Bridge</name>
   <currentVersion>&portals-bridges-jsf-version;</currentVersion>
   <package>org.apache.portals.bridges.jsf</package>
   <description>
@@ -33,9 +33,9 @@
   </description>
   <shortDescription>Apache Portals JSF Bridge</shortDescription>
   <repository>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/portals-bridges/jsf</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/portals-bridges/jsf</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/portals-bridges/jsf/</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/bridges/trunk/jsf</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/bridges/trunk/jsf</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/portals/bridges/trunk/jsf/</url>
   </repository>
   <developers>
     <developer>
@@ -92,20 +92,8 @@
     </resources>
   </build>
   <reports>
-    <report>maven-jdepend-plugin</report>
-<!--
-    <report>maven-checkstyle-plugin</report>
--->
-    <report>maven-pmd-plugin</report>
-    <report>maven-changelog-plugin</report>
-    <report>maven-file-activity-plugin</report>
-    <report>maven-developer-activity-plugin</report>
-    <report>maven-license-plugin</report>
-    <report>maven-javadoc-plugin</report>
-    <report>maven-jxr-plugin</report>
-    <report>maven-junit-report-plugin</report>
-    <report>maven-jcoverage-plugin</report>
-    <report>maven-linkcheck-plugin</report>
-    <report>maven-tasklist-plugin</report>
+
+        &bridges-reports;
+
   </reports>
 </project>

Modified: portals/jetspeed-2/trunk/portals-bridges/jsf/xdocs/navigation.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/jsf/xdocs/navigation.xml?rev=191820&r1=191819&r2=191820&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/jsf/xdocs/navigation.xml (original)
+++ portals/jetspeed-2/trunk/portals-bridges/jsf/xdocs/navigation.xml Wed Jun 22 05:35:38 2005
@@ -15,9 +15,14 @@
 limitations under the License.
 -->
 <project>
+
+  <title>Portals Bridges - JSF Bridge</title>
+
   <body>
-      <links>
-        <item name="Jetspeed 2" href="../../index.html"/>
-      </links>
+    <links>
+      <item name="Jetspeed 2" href="http://portals.apache.org/jetspeed-2" target="_nw"/>
+      <item name="Bridges Home" href="../../index.html"/>
+    </links>
+      
   </body>
 </project>

Added: portals/jetspeed-2/trunk/portals-bridges/locator.ent
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/locator.ent?rev=191820&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/locator.ent (added)
+++ portals/jetspeed-2/trunk/portals-bridges/locator.ent Wed Jun 22 05:35:38 2005
@@ -0,0 +1,11 @@
+<!-- derive root relative locator-path -->
+<!ENTITY % locator-path SYSTEM "file:locator.path">
+
+<!-- Artifact versions -->
+<!ENTITY % artifact-versions-ent '<!ENTITY &#37; artifact-versions SYSTEM "file:%locator-path;etc/artifact-versions.ent"> &#37;artifact-versions;'> %artifact-versions-ent;
+
+<!-- Project dependencies -->
+<!ENTITY % jsf-api-deps-ent '<!ENTITY jsf-api-deps SYSTEM "file:%locator-path;etc/project-dependencies/jsf-api-deps.xml">'> %jsf-api-deps-ent;
+
+<!-- Project reports -->
+<!ENTITY % bridges-reports-ent '<!ENTITY bridges-reports SYSTEM "file:%locator-path;etc/project-reports/bridges-reports.xml">'> %bridges-reports-ent;

Added: portals/jetspeed-2/trunk/portals-bridges/locator.path
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/locator.path?rev=191820&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/locator.path (added)
+++ portals/jetspeed-2/trunk/portals-bridges/locator.path Wed Jun 22 05:35:38 2005
@@ -0,0 +1 @@
+./
\ No newline at end of file

Added: portals/jetspeed-2/trunk/portals-bridges/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/maven.xml?rev=191820&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/maven.xml (added)
+++ portals/jetspeed-2/trunk/portals-bridges/maven.xml Wed Jun 22 05:35:38 2005
@@ -0,0 +1,88 @@
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<project default="java:jar"
+         xmlns:j="jelly:core"
+         xmlns:maven="jelly:maven"
+         xmlns:ant="jelly:ant">
+
+  <goal name="_findProjectFile">
+    <j:set var="_projectFileFound" value="false"/>
+    <j:set var="_projectFile" value=""/>
+    <j:set var="myPom" value="${pom}"/>
+    <j:while test="${myPom!=null}">
+      <j:set var="pomDir" value="${myPom.file.parent}"/>
+      <j:new var="file" className="java.io.File">
+        <j:arg value="${pomDir}/${_findProjectFile}"/>
+      </j:new>
+      <j:if test="${file.exists()}">
+        <j:set var="_projectFile" value="${file}"/>
+        <j:set var="_projectFileFound" value="true"/>
+        <j:break/>
+      </j:if>
+      <j:set var="myPom" value="${myPom.parent}"/>
+    </j:while>
+  </goal>
+
+  <goal name="set.checkstyle.properties">
+
+    <j:set var="_findProjectFile" value="${org.apache.portals.bridges.checkstyle.header.file}"/>
+    <attainGoal name="_findProjectFile"/>
+    <j:if test="${!_projectFileFound}">
+      <fail message="org.apache.portals.bridges.checkstyle.header.file ${org.apache.portals.bridges.checkstyle.header.file} not found in the project tree"/>
+    </j:if>
+    <j:set var="maven.checkstyle.header.file" value="${_projectFile.absolutePath}"/>
+    <echo message="using maven.checkstyle.header.file ${maven.checkstyle.header.file}"/>
+
+    <j:set var="_findProjectFile" value="${org.apache.portals.bridges.checkstyle.properties}"/>
+    <attainGoal name="_findProjectFile"/>
+    <j:if test="${!_projectFileFound}">
+      <fail message="org.apache.portals.bridges.checkstyle.properties ${org.apache.portals.bridges.checkstyle.properties} not found in the project tree"/>
+    </j:if>
+    <j:set var="maven.checkstyle.properties" value="${_projectFile.absolutePath}"/>
+    <echo message="using maven.checkstyle.properties ${maven.checkstyle.properties}"/>
+  </goal>
+
+  <goal name="set.license.properties">
+
+    <j:set var="_findProjectFile" value="${org.apache.portals.bridges.license.licenseFile}"/>
+    <attainGoal name="_findProjectFile"/>
+    <j:if test="${!_projectFileFound}">
+      <fail message="org.apache.portals.bridges.license.licenseFile ${org.apache.portals.bridges.license.licenseFile} not found in the project tree"/>
+    </j:if>
+    <j:set var="maven.license.licenseFile" value="${_projectFile.absolutePath}"/>
+    <echo message="using maven.license.licenseFile ${maven.license.licenseFile}"/>
+
+  </goal>
+
+  <preGoal name="checkstyle:init">
+    <attainGoal name="set.checkstyle.properties"/>
+    <attainGoal name="set.license.properties"/>
+  </preGoal>
+
+  <goal name="allClean">
+    <attainGoal name="multiproject:clean"/>
+    <attainGoal name="clean"/>
+  </goal>
+
+  <goal name="allBuild">
+    <attainGoal name="multiproject:install"/>
+  </goal>
+
+  <goal name="allSite">
+    <attainGoal name="multiproject:site"/>
+  </goal>
+    
+</project>

Modified: portals/jetspeed-2/trunk/portals-bridges/perl/project.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/perl/project.properties?rev=191820&r1=191819&r2=191820&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/perl/project.properties (original)
+++ portals/jetspeed-2/trunk/portals-bridges/perl/project.properties Wed Jun 22 05:35:38 2005
@@ -15,5 +15,5 @@
 # $Id$
 
 maven.multiproject.type=jar
-maven.license.licenseFile=${basedir}/../../LICENSE.TXT
+maven.license.licenseFile=${basedir}/../LICENSE.TXT
 

Modified: portals/jetspeed-2/trunk/portals-bridges/perl/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/perl/project.xml?rev=191820&r1=191819&r2=191820&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/perl/project.xml (original)
+++ portals/jetspeed-2/trunk/portals-bridges/perl/project.xml Wed Jun 22 05:35:38 2005
@@ -20,11 +20,11 @@
   $Id$
 -->
 <project>
-  <extend>${basedir}/../../project.xml</extend>
+  <extend>${basedir}/../project.xml</extend>
   <pomVersion>3</pomVersion>
   <groupId>portals-bridges</groupId>
   <id>portals-bridges-perl</id>
-  <name>Apache Portals Perl Framework Bridge</name>
+  <name>Perl Bridge</name>
   <currentVersion>&portals-bridges-perl-version;</currentVersion>
   <package>org.apache.portals.bridges.perl</package>
   <description>
@@ -32,9 +32,9 @@
   </description>
   <shortDescription>Apache Portals Perl Framework Bridge</shortDescription>
   <repository>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/portals-bridges/perl</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/portals-bridges/perl</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/portals-bridges/perl/</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/bridges/trunk/perl</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/bridges/trunk/perl</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/portals/bridges/trunk/perl/</url>
   </repository>
   <developers>
     <developer>
@@ -47,15 +47,12 @@
     </developer>
   </developers>
   <dependencies>
-  <dependency>
-            <groupId>jetspeed2</groupId>
-            <artifactId>jetspeed-rewriter</artifactId>
-            <version>&jetspeed-version;</version>
-            <type>jar</type>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>		
+    <dependency>
+      <groupId>jetspeed2</groupId>
+      <artifactId>jetspeed-rewriter</artifactId>
+      <version>2.0-M3</version>
+      <type>jar</type>
+    </dependency>		
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
@@ -81,20 +78,8 @@
     <sourceDirectory>src/java</sourceDirectory>
   </build>
   <reports>
-    <report>maven-jdepend-plugin</report>
-<!--
-    <report>maven-checkstyle-plugin</report>
--->
-    <report>maven-pmd-plugin</report>
-    <report>maven-changelog-plugin</report>
-    <report>maven-file-activity-plugin</report>
-    <report>maven-developer-activity-plugin</report>
-    <report>maven-license-plugin</report>
-    <report>maven-javadoc-plugin</report>
-    <report>maven-jxr-plugin</report>
-    <report>maven-junit-report-plugin</report>
-    <report>maven-jcoverage-plugin</report>
-    <report>maven-linkcheck-plugin</report>
-    <report>maven-tasklist-plugin</report>
+
+        &bridges-reports;
+
   </reports>
 </project>

Modified: portals/jetspeed-2/trunk/portals-bridges/perl/xdocs/navigation.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/perl/xdocs/navigation.xml?rev=191820&r1=191819&r2=191820&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/perl/xdocs/navigation.xml (original)
+++ portals/jetspeed-2/trunk/portals-bridges/perl/xdocs/navigation.xml Wed Jun 22 05:35:38 2005
@@ -15,9 +15,13 @@
 limitations under the License.
 -->
 <project>
+  <title>Portals Bridges - Perl Bridge</title>
+
   <body>
-      <links>
-        <item name="Jetspeed 2" href="../../index.html"/>
-      </links>
+    <links>
+      <item name="Jetspeed 2" href="http://portals.apache.org/jetspeed-2" target="_nw"/>
+      <item name="Bridges Home" href="../../index.html"/>
+    </links>
+      
   </body>
 </project>

Modified: portals/jetspeed-2/trunk/portals-bridges/php/project.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/php/project.properties?rev=191820&r1=191819&r2=191820&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/php/project.properties (original)
+++ portals/jetspeed-2/trunk/portals-bridges/php/project.properties Wed Jun 22 05:35:38 2005
@@ -15,5 +15,5 @@
 # $Id$
 
 maven.multiproject.type=jar
-maven.license.licenseFile=${basedir}/../../LICENSE.TXT
+maven.license.licenseFile=${basedir}/../LICENSE.TXT
 

Modified: portals/jetspeed-2/trunk/portals-bridges/php/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/php/project.xml?rev=191820&r1=191819&r2=191820&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/php/project.xml (original)
+++ portals/jetspeed-2/trunk/portals-bridges/php/project.xml Wed Jun 22 05:35:38 2005
@@ -20,11 +20,11 @@
   $Id$
 -->
 <project>
-  <extend>${basedir}/../../project.xml</extend>
+  <extend>${basedir}/../project.xml</extend>
   <pomVersion>3</pomVersion>
   <groupId>portals-bridges</groupId>
   <id>portals-bridges-php</id>
-  <name>Apache Portals PHP Framework Bridge</name>
+  <name>PHP Bridge</name>
   <currentVersion>&portals-bridges-php-version;</currentVersion>
   <package>org.apache.portals.bridges.php</package>
   <description>
@@ -32,9 +32,9 @@
   </description>
   <shortDescription>Apache Portals PHP Framework Bridge</shortDescription>
   <repository>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/portals-bridges/php</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/portals-bridges/php</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/portals-bridges/perl/</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/bridges/trunk/php</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/bridges/trunk/php</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/portals/bridges/trunk/bridges/perl/</url>
   </repository>
   <developers>
     <developer>
@@ -80,20 +80,8 @@
     <sourceDirectory>src/java</sourceDirectory>
   </build>
   <reports>
-    <report>maven-jdepend-plugin</report>
-<!--
-    <report>maven-checkstyle-plugin</report>
--->
-    <report>maven-pmd-plugin</report>
-    <report>maven-changelog-plugin</report>
-    <report>maven-file-activity-plugin</report>
-    <report>maven-developer-activity-plugin</report>
-    <report>maven-license-plugin</report>
-    <report>maven-javadoc-plugin</report>
-    <report>maven-jxr-plugin</report>
-    <report>maven-junit-report-plugin</report>
-    <report>maven-jcoverage-plugin</report>
-    <report>maven-linkcheck-plugin</report>
-    <report>maven-tasklist-plugin</report>
+
+        &bridges-reports;
+
   </reports>
 </project>

Modified: portals/jetspeed-2/trunk/portals-bridges/php/xdocs/navigation.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/php/xdocs/navigation.xml?rev=191820&r1=191819&r2=191820&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/php/xdocs/navigation.xml (original)
+++ portals/jetspeed-2/trunk/portals-bridges/php/xdocs/navigation.xml Wed Jun 22 05:35:38 2005
@@ -15,9 +15,13 @@
 limitations under the License.
 -->
 <project>
+  <title>Portals Bridges - PHP Bridge</title>
+
   <body>
-      <links>
-        <item name="Jetspeed 2" href="../../index.html"/>
-      </links>
+    <links>
+      <item name="Jetspeed 2" href="http://portals.apache.org/jetspeed-2" target="_nw"/>
+      <item name="Bridges Home" href="../../index.html"/>
+    </links>
+      
   </body>
 </project>

Added: portals/jetspeed-2/trunk/portals-bridges/project.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/project.properties?rev=191820&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/project.properties (added)
+++ portals/jetspeed-2/trunk/portals-bridges/project.properties Wed Jun 22 05:35:38 2005
@@ -0,0 +1,73 @@
+# Copyright 2004 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     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.
+
+maven.repo.remote = http://www.bluesunrise.com/maven/, http://www.ibiblio.org/maven/, http://dist.codehaus.org/, http://cvs.apache.org/repository
+
+# Display the date on the Maven web site
+maven.xdoc.date = left
+
+# Display the maven version the web site is documenting
+maven.xdoc.version = ${pom.currentVersion}
+
+maven.compile.deprecation=on
+
+# Whether to skip tests.
+maven.test.skip=true
+
+maven.junit.fork=true
+maven.compile.fork=yes
+
+# Include private method and field in Javadoc.
+# Note: make sure only one is set to true (which is the reason to define all tree: default protected scope is true)
+maven.javadoc.package=false
+maven.javadoc.private=true
+maven.javadoc.public=false
+
+# Removed the rule rulesets/naming.xml from the default
+# maven.pmd.rulesetfiles.  This is because the LongVariableName rule is to
+# restrictive.  We need to increase the limit from 12 to 20
+maven.pmd.rulesetfiles=rulesets/strings.xml,rulesets/junit.xml,rulesets/braces.xml,rulesets/basic.xml,rulesets/unusedcode.xml,rulesets/design.xml,rulesets/imports.xml,rulesets/codesize.xml
+
+# ---------------------------------------------------------------------------
+# Multiproject settings
+maven.multiproject.includes=*/project.xml
+maven.multiproject.excludes=project.xml
+maven.multiproject.site.goals=site,dashboard:report-single
+
+jar.includes=*/project.xml
+jar.excludes=
+
+# Bridges checkstyle and license properties
+# These are use to dynamically set checkstyle and license properties also for subprojects
+# without needing them to be defined there as well (or through relative path references).
+# The files are looked up in the subproject or, when not found, upwards in the parent project(s).
+org.apache.portals.bridges.checkstyle.header.file=checkstyle.license
+org.apache.portals.bridges.checkstyle.properties=checkstyle.xml
+org.apache.portals.bridges.license.licenseFile=LICENSE.TXT
+
+## Dashboard plugin
+maven.dashboard.includes=${maven.multiproject.includes}
+maven.dashboard.excludes=${maven.multiproject.excludes}
+maven.dashboard.rungoals = false
+maven.dashboard.aggregators=cserrors,cswarnings,clovertpc,cloverloc,cloverncloc,junitpassrate,juniterrors,junitfailures,simiantdl
+maven.dashboard.ignoreFailures=true
+
+## MultiChanges plugin
+maven.multichanges.includes=${maven.multiproject.includes}
+maven.multichanges.excludes=${maven.multiproject.excludes}
+maven.multichanges.ignoreFailures=true
+
+# tell changelog plugin (and others) about the SCM repo type (SVN)
+maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
+

Added: portals/jetspeed-2/trunk/portals-bridges/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/project.xml?rev=191820&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/project.xml (added)
+++ portals/jetspeed-2/trunk/portals-bridges/project.xml Wed Jun 22 05:35:38 2005
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+  <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities;
+]>
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+  $Id$
+-->
+<project>
+    <pomVersion>3</pomVersion>
+    <name>Portals Bridges</name>
+    <groupId>portals-bridges</groupId>
+    <currentVersion>&portals-bridges-version;</currentVersion>
+    <organization>
+        <name>Apache Software Foundation</name>
+        <url>http://portals.apache.org/</url>
+        <logo>http://portals.apache.org/images/apache-portals.gif</logo>
+    </organization>
+    <inceptionYear>2005</inceptionYear>
+    <package>org.apache.portals.bridges</package>
+    <description>
+      Portals Bridges provides support for JSR-168 compliant Portlet development
+      using common web frameworks like Struts, JSF, PHP, Perl and Velocity
+    </description>
+    <shortDescription>JSR-168 Portlet development support for common web frameworks</shortDescription>
+    <url>http://portals.apache.org/bridges</url>
+    <issueTrackingUrl>http://issues.apache.org/jira/browse/PB</issueTrackingUrl>
+    <siteAddress>portals.apache.org</siteAddress>
+    <siteDirectory>/www/portals.apache.org/bridges</siteDirectory>
+    <repository>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/bridges/trunk</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/bridges/trunk</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/portals/bridges/trunk/</url>
+    </repository>
+    <mailingLists>
+        <mailingList>
+            <name>Portals Bridges User List</name>
+            <subscribe>bridges-user-subscribe@portals.apache.org</subscribe>
+            <unsubscribe>bridges-user-unsubscribe@portals.apache.org</unsubscribe>
+            <archive>http://mail-archives.apache.org/mod_mbox/portals-bridges-user/</archive>
+        </mailingList>
+        <mailingList>
+            <name>Portals Bridges Developer List</name>
+            <subscribe>bridges-dev-subscribe@portals.apache.org</subscribe>
+            <unsubscribe>bridges-dev-unsubscribe@portals.apache.org</unsubscribe>
+            <archive>http://mail-archives.apache.org/mod_mbox/portals-bridges-dev/</archive>
+        </mailingList>
+        <mailingList>
+            <name>Portals Bridges SCM List</name>
+            <subscribe>bridges-commits-subscribe@portals.apache.org</subscribe>
+            <unsubscribe>bridges-commits-unsubscribe@portals.apache.org</unsubscribe>
+            <archive>http://mail-archives.apache.org/mod_mbox/portals-bridges-commits/</archive>
+        </mailingList>
+    </mailingLists>
+    <developers>
+        <developer>
+            <name>Ate Douma</name>
+            <id>ate</id>
+            <email>ate@apache.org</email>
+            <timezone>+2</timezone>
+            <organization>iWise B.V.</organization>
+            <roles>
+                <role>Java Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Jeremy Ford</name>
+            <id>jford</id>
+            <email>jford@apache.org</email>
+            <roles>
+                <role>Java Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>David Le Strat</name>
+            <id>dls</id>
+            <email>dlestrat@apache.org</email>
+            <roles>
+                <role>Java Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Raphael Luta</name>
+            <id>raphael</id>
+            <email>raphael@apache.org</email>
+            <roles>
+                <role>Java Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Mark Orciuch</name>
+            <id>mark</id>
+            <email>mark_oriuch@nqsltd.com</email>
+            <roles>
+                <role>Java Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Roger Ruttimann</name>
+            <id>roger</id>
+            <email>rogerrut@apache.org</email>
+            <roles>
+                <role>Java Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Paul Spencer</name>
+            <id>paulsp</id>
+            <email>paulsp@apache.org</email>
+            <roles>
+                <role>Java Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Shinsuke Sugaya</name>
+            <id>shinsuke</id>
+            <email>shinsuke@apache.org</email>
+            <roles>
+                <role>Java Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>David Sean Taylor</name>
+            <id>taylor</id>
+            <email>taylor@apache.org</email>
+            <roles>
+                <role>Java Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Randy Watler</name>
+            <id>rwatler</id>
+            <email>rwatler@apache.org</email>
+            <roles>
+                <role>Java Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Scott Weaver</name>
+            <id>weaver</id>
+            <email>Sweaver@rippe.com</email>
+            <roles>
+                <role>Java Developer</role>
+            </roles>
+        </developer>
+    </developers>
+    <dependencies/>
+    <build>
+        <nagEmailAddress>ate@douma.nu</nagEmailAddress>
+        <sourceDirectory>src/java</sourceDirectory>
+    </build>
+    <reports>
+        <report>maven-dashboard-plugin</report>
+        <report>maven-multiproject-plugin</report>
+        <report>maven-multichanges-plugin</report>
+        <report>maven-tasklist-plugin</report>
+    </reports>
+    <properties/>
+</project>

Modified: portals/jetspeed-2/trunk/portals-bridges/struts/locator.ent
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/struts/locator.ent?rev=191820&r1=191819&r2=191820&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/struts/locator.ent (original)
+++ portals/jetspeed-2/trunk/portals-bridges/struts/locator.ent Wed Jun 22 05:35:38 2005
@@ -1,2 +1,2 @@
 <!-- derive locator.ent from parent -->
-<!ENTITY % locator-ent SYSTEM "file:../../locator.ent"> %locator-ent;
+<!ENTITY % locator-ent SYSTEM "file:../locator.ent"> %locator-ent;

Modified: portals/jetspeed-2/trunk/portals-bridges/struts/locator.path
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/struts/locator.path?rev=191820&r1=191819&r2=191820&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/struts/locator.path (original)
+++ portals/jetspeed-2/trunk/portals-bridges/struts/locator.path Wed Jun 22 05:35:38 2005
@@ -1 +1 @@
-../../
\ No newline at end of file
+../
\ No newline at end of file

Modified: portals/jetspeed-2/trunk/portals-bridges/struts/project.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/struts/project.properties?rev=191820&r1=191819&r2=191820&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/struts/project.properties (original)
+++ portals/jetspeed-2/trunk/portals-bridges/struts/project.properties Wed Jun 22 05:35:38 2005
@@ -15,5 +15,5 @@
 # $Id$
 
 maven.multiproject.type=jar
-maven.license.licenseFile=${basedir}/../../LICENSE.TXT
+maven.license.licenseFile=${basedir}/../LICENSE.TXT
 

Modified: portals/jetspeed-2/trunk/portals-bridges/struts/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/struts/project.xml?rev=191820&r1=191819&r2=191820&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/struts/project.xml (original)
+++ portals/jetspeed-2/trunk/portals-bridges/struts/project.xml Wed Jun 22 05:35:38 2005
@@ -20,11 +20,11 @@
   $Id$
 -->
 <project>
-  <extend>${basedir}/../../project.xml</extend>
+  <extend>${basedir}/../project.xml</extend>
   <pomVersion>3</pomVersion>
   <groupId>portals-bridges</groupId>
   <id>portals-bridges-struts</id>
-  <name>Apache Portals Struts Bridge</name>
+  <name>Struts Bridge</name>
   <currentVersion>&portals-bridges-struts-version;</currentVersion>
   <package>org.apache.portals.bridges.struts</package>
   <description>
@@ -32,9 +32,9 @@
   </description>
   <shortDescription>Apache Portals Struts Bridge</shortDescription>
   <repository>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/portals-bridges/struts</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/portals-bridges/struts</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/portals-bridges/struts/</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/bridges/trunk/struts</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/bridges/trunk/struts</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/portals/bridges/trunk/struts/</url>
   </repository>
   <developers>
     <developer>
@@ -101,7 +101,7 @@
   </build>
   <reports>
 
-        &j2-reports;
+        &bridges-reports;
 
   </reports>
 </project>

Modified: portals/jetspeed-2/trunk/portals-bridges/struts/xdocs/features.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/struts/xdocs/features.xml?rev=191820&r1=191819&r2=191820&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/struts/xdocs/features.xml (original)
+++ portals/jetspeed-2/trunk/portals-bridges/struts/xdocs/features.xml Wed Jun 22 05:35:38 2005
@@ -106,7 +106,7 @@
         </p>
         <p>
           But, because the Portlet Specification is build upon the Servlet Specification (2.3), the Portlet Container
-          implementation (like <a href="http://portals.apache.org/pluto">Pluto</a>) and/or the Portal itself, usually
+          implementation (like <a href="http://portals.apache.org/pluto" target="_nw">Pluto</a>) and/or the Portal itself, usually
           has direct access to, and also uses the <code>ServletContext</code>, even during the
           <code>ActionRequest</code> event.           
         </p>
@@ -122,7 +122,7 @@
           To be able to use the Struts Bridge, a <code>StrutsPortlet</code> must therefore be provided with a concrete
           implementation of the <code>ServletContextProvider</code> interface (through its initialization parameters).
           This implementation class can be supplied together with the Portlet or be provided natively by the Portal as
-          the <a href="http://portals.apache.org/jetspeed-2">Jetspeed-2</a> Portal does. 
+          the <a href="http://portals.apache.org/jetspeed-2" target="_nw">Jetspeed-2</a> Portal does. 
         </p>
       </subsection>      
       <subsection name="Portals requiring a more complex interface">
@@ -201,7 +201,7 @@
           A properly MVC configured Struts application though can (and should) make use of a (client-side) redirect
           after the Action processing Action by using an ActionForward with redirect="true". The behavior of such a
           Struts Application then truly complies to the requirements for a Portlet. In fact, the reference
-          implementation of the Portlet Specification, <a href="http://portals.apache.org/pluto">Pluto</a>, actually
+          implementation of the Portlet Specification, <a href="http://portals.apache.org/pluto" target="_nw">Pluto</a>, actually
           sends a redirect to the client (browser) after an ActionRequest.
         </p>
         <p>
@@ -244,7 +244,7 @@
               </render-context>
             </config>]]></source>
           <em>(This (adapted) example is taken from the JPetstore Portlet example provided with the
-          <a href="http://portals.apache.org/jetspeed-2">Jetspeed-2</a> Portal.)</em>           
+          <a href="http://portals.apache.org/jetspeed-2" target="_nw">Jetspeed-2</a> Portal.)</em>           
         </p>
         <p>
           With the above example configuration, all request attributes named <em>errors</em> and <em>message</em> are
@@ -357,7 +357,7 @@
               </portlet-url-type>
             </config>]]></source>
           <em>(This is the full configuration used for the JPetstore Portlet example provided with the
-          <a href="http://portals.apache.org/jetspeed-2">Jetspeed-2</a> Portal.)</em>           
+          <a href="http://portals.apache.org/jetspeed-2" target="_nw">Jetspeed-2</a> Portal.)</em>           
         </p>
         <p>
           In the above example the portlet-url-type element contains three different sub elements: action, render and
@@ -367,7 +367,7 @@
         <p>
           Not shown in the above example is the optional default="render"|"action" attribute for the portlet-url-type
           element. With it, the default type of portlet-url can be changed from "render" to "action" as is used in the
-          Struts Mailreader Demo Portlet (also provided by the <a href="http://portals.apache.org/jetspeed-2">Jetspeed-2</a>
+          Struts Mailreader Demo Portlet (also provided by the <a href="http://portals.apache.org/jetspeed-2" target="_nw">Jetspeed-2</a>
           Portal):
           <source><![CDATA[
             <?xml version="1.0" encoding="UTF-8"?>
@@ -389,7 +389,7 @@
           with  
           <source><![CDATA[<html:image src="../images/struts-bridge.gif"/>]]></source>
           A simple change with no technical impact, but it will allow the same JSP to be used for both a Web Application
-          and a Portlet. The JPetstore Portlet example as provided by <a href="http://portals.apache.org/jetspeed-2">Jetspeed-2</a>
+          and a Portlet. The JPetstore Portlet example as provided by <a href="http://portals.apache.org/jetspeed-2" target="_nw">Jetspeed-2</a>
           makes full use of this feature.
         </p>
       </subsection>      
@@ -425,7 +425,7 @@
           Web Application at the same time!
         </p>
         <p>
-          The JPetstore Portlet example provided by <a href="http://portals.apache.org/jetspeed-2">Jetspeed-2</a> is one
+          The JPetstore Portlet example provided by <a href="http://portals.apache.org/jetspeed-2" target="_nw">Jetspeed-2</a> is one
           example of such a "dual" mode Struts Application.
         </p>
         <p>

Modified: portals/jetspeed-2/trunk/portals-bridges/struts/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/struts/xdocs/index.xml?rev=191820&r1=191819&r2=191820&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/struts/xdocs/index.xml (original)
+++ portals/jetspeed-2/trunk/portals-bridges/struts/xdocs/index.xml Wed Jun 22 05:35:38 2005
@@ -24,8 +24,8 @@
   <body>
     <section name="Summary">
       <p>
-        The Struts Bridge allows <a href="http://struts.apache.org">Struts</a> and Struts Tiles applications to be run
-        as <a href="http://www.jcp.org/en/jsr/detail?id=168">JSR-168</a> compliant Portlets.
+        The Struts Bridge allows <a href="http://struts.apache.org" target="_nw">Struts</a> and Struts Tiles applications to be run
+        as <a href="http://www.jcp.org/en/jsr/detail?id=168" target="_nw">JSR-168</a> compliant Portlets.
       </p>
       <p>
         Existing or new Struts Applications can be transparently deployed as Portlet Application or
@@ -51,7 +51,7 @@
         easy to do, if not done already.
       </p>
       <p>
-        The Apache Portals <a href="http://portals.apache.org/jetspeed-2">Jetspeed-2 Portal</a> provides this interface
+        The Apache Portals <a href="http://portals.apache.org/jetspeed-2" target="_nw">Jetspeed-2 Portal</a> provides this interface
         natively, as well as example Struts Portlet Applications using the Struts Bridge like a JPetstore Portlet. 
       </p>
     </section>

Modified: portals/jetspeed-2/trunk/portals-bridges/struts/xdocs/navigation.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/struts/xdocs/navigation.xml?rev=191820&r1=191819&r2=191820&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/struts/xdocs/navigation.xml (original)
+++ portals/jetspeed-2/trunk/portals-bridges/struts/xdocs/navigation.xml Wed Jun 22 05:35:38 2005
@@ -20,11 +20,11 @@
 
   <body>
     <links>
-      <item name="Portlet Specification" href="http://www.jcp.org/en/jsr/detail?id=168"/>
-      <item name="Jetspeed 2" href="../../index.html"/>
+      <item name="Jetspeed 2" href="http://portals.apache.org/jetspeed-2" target="_nw"/>
+      <item name="Bridges Home" href="../../index.html"/>
     </links>
       
-    <menu name="Documentation">
+    <menu name="Struts Bridge">
       <item name="Summary" href="index.html"/>
       <item name="Features" href="features.html"/>
     </menu>      

Modified: portals/jetspeed-2/trunk/portals-bridges/velocity/project.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/velocity/project.properties?rev=191820&r1=191819&r2=191820&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/velocity/project.properties (original)
+++ portals/jetspeed-2/trunk/portals-bridges/velocity/project.properties Wed Jun 22 05:35:38 2005
@@ -14,5 +14,5 @@
 #
 # $Id$
 maven.multiproject.type=jar
-maven.license.licenseFile=${basedir}/../../LICENSE.TXT
+maven.license.licenseFile=${basedir}/../LICENSE.TXT
 

Modified: portals/jetspeed-2/trunk/portals-bridges/velocity/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/velocity/project.xml?rev=191820&r1=191819&r2=191820&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/velocity/project.xml (original)
+++ portals/jetspeed-2/trunk/portals-bridges/velocity/project.xml Wed Jun 22 05:35:38 2005
@@ -20,11 +20,11 @@
   $Id$
 -->
 <project>
-  <extend>${basedir}/../../project.xml</extend>
+  <extend>${basedir}/../project.xml</extend>
   <pomVersion>3</pomVersion>
   <groupId>portals-bridges</groupId>
   <id>portals-bridges-velocity</id>
-  <name>Apache Portals Velocity Bridge</name>
+  <name>Velocity Bridge</name>
   <currentVersion>&portals-bridges-velocity-version;</currentVersion>
   <package>org.apache.portals.bridges.velocity</package>
   <description>
@@ -32,9 +32,9 @@
   </description>
   <shortDescription>Apache Portals Velocity Bridge</shortDescription>
   <repository>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/portals-bridges/velocity</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/portals-bridges/velocity</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/portals-bridges/velocity/</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/bridges/trunk/velocity</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/bridges/trunk/velocity</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/portals/bridges/trunk/velocity/</url>
   </repository>
   <dependencies>
 	  <dependency>
@@ -80,20 +80,8 @@
     </resources>
   </build>
   <reports>
-    <report>maven-jdepend-plugin</report>
-<!--
-    <report>maven-checkstyle-plugin</report>
--->
-    <report>maven-pmd-plugin</report>
-    <report>maven-changelog-plugin</report>
-    <report>maven-file-activity-plugin</report>
-    <report>maven-developer-activity-plugin</report>
-    <report>maven-license-plugin</report>
-    <report>maven-javadoc-plugin</report>
-    <report>maven-jxr-plugin</report>
-    <report>maven-junit-report-plugin</report>
-    <report>maven-jcoverage-plugin</report>
-    <report>maven-linkcheck-plugin</report>
-    <report>maven-tasklist-plugin</report>
+
+        &bridges-reports;
+
   </reports>
 </project>

Modified: portals/jetspeed-2/trunk/portals-bridges/velocity/xdocs/navigation.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/velocity/xdocs/navigation.xml?rev=191820&r1=191819&r2=191820&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/velocity/xdocs/navigation.xml (original)
+++ portals/jetspeed-2/trunk/portals-bridges/velocity/xdocs/navigation.xml Wed Jun 22 05:35:38 2005
@@ -15,9 +15,13 @@
 limitations under the License.
 -->
 <project>
+  <title>Portals Bridges - Velocity Bridge</title>
+
   <body>
-      <links>
-        <item name="Jetspeed 2" href="../../index.html"/>
-      </links>
+    <links>
+      <item name="Jetspeed 2" href="http://portals.apache.org/jetspeed-2" target="_nw"/>
+      <item name="Bridges Home" href="../../index.html"/>
+    </links>
+      
   </body>
 </project>

Added: portals/jetspeed-2/trunk/portals-bridges/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/xdocs/index.xml?rev=191820&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/xdocs/index.xml (added)
+++ portals/jetspeed-2/trunk/portals-bridges/xdocs/index.xml Wed Jun 22 05:35:38 2005
@@ -0,0 +1,147 @@
+<?xml version="1.0"?>
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<document>
+  <properties>
+    <title>Portals Bridges Home Page</title>
+    <subtitle>Welcome to Portals Bridges</subtitle>
+    <authors>
+      <person name="Ate Douma" email="ate@douma.nu"/>
+    </authors>
+  </properties>
+  <body>
+<section name="Overview">
+      <p>
+      Portals Bridges provides support for <a href="http://www.jcp.org/en/jsr/detail?id=168" target="_nw">JSR-168</a> compliant
+      Portlet development using common web frameworks like Struts, JSF, PHP, Perl and Velocity.  
+      </p>
+      <subsection name="JavaServer Faces">
+      <p>
+      JavaServer Faces (JSF) applications can be run within an Portlet environment with little or no changes using the
+      the <a href="multiproject/portals-bridges-jsf/index.html">JSF bridge</a> which provides a JSFPortlet ready to be deployed.
+      </p>
+      </subsection>
+      <subsection name="Struts and PHP">
+      </subsection>
+      <p>
+      Pure servlet based frameworks like Struts or PHP 4 (with the Java binding) are very difficult to use in a
+      Portlet environment because they only support and understand a single request event.
+      </p>
+      <p>
+      For a Portlet, the request processing has to be handled in two separated action and render events. Furthermore,
+      the Portlet Specification doesn't allow servlet access during the action request event.
+      </p>
+      <p>
+      A distinctive feature of the Portals Bridges is that it removes these barriers and thereby allows the mapping of
+      an action request event to the underlying servlet handler implementation (e.g. a StrutsAction).
+      </p>
+      <p>
+      All that is needed is an implementation of the generic ServletContextProvider interface, provided with The Portals
+      Bridges <a href="multiproject/portals-bridges-common/index.html">Common</a> library, for a specific Portal.
+      </p>
+      <p>
+      The <a href="multiproject/portals-bridges-struts/index.html">Portals Struts Bridge</a> furthermore provides a truly transparent mapping of the two request events
+      onto the underlying Struts Action mappings and enables an existing Struts Application to be run within a Portlet context
+      with very little changes.
+      </p>
+      <p>
+      The following table contains a list of Portals already known to support this solution:
+      </p>
+      <table> 
+      <tr>
+        <th>Portal</th>
+        <th>License</th>
+        <th>Support</th>
+        <th>Comment</th>
+      </tr>
+      <tr>
+        <td nowrap="true"><a href="http://portals.apache.org/jetspeed-2" target="_nw">Jetspeed 2 Enterprise Portal</a></td>
+        <td>Apache</td>
+        <td>Native</td>
+        <td>All the Apache Portals Bridges are developed using Jetspeed 2</td>
+      </tr>
+      <tr>
+        <td nowrap="true"><a href="http://portals.apache.org/jetspeed-1" target="_nw">Jetspeed 1 Enterprise Portal</a></td>
+        <td>Apache</td>
+        <td>Native (Fusion)</td>
+        <td>The 1.6 Fusion release provides JSR-168 support using Jetspeed 2 as embedded portlet container</td>
+      </tr>
+      <tr>
+        <td><a href="http://www.jboss.org/products/jbossportal" target="_nw">JBoss Portal</a></td>
+        <td>LGPL</td>
+        <td>Native</td>
+        <td>The Struts Bridge is provided with JBoss Portal 2.0</td>
+      </tr>
+      <tr>
+        <td><a href="http://www.nabh.com/projects/sbportal" target="_nw">Stringbeans Portal</a></td>
+        <td>GPL, Commercial</td>
+        <td>Native</td>
+        <td>The Struts Bridge is provided with Stringbeans Portal 2.5</td>
+      </tr>
+      <tr>
+        <td><a href="http://www.vignette.com" target="_nw">Vignette Application Portal</a></td>
+        <td>Commercial</td>
+        <td>Custom</td>
+        <td>The Struts Bridge is successfully used with VAP 7.x</td>
+      </tr>
+      </table>
+      <subsection name="Velocity">
+      <p>
+      Although JavaServer Pages (JSP) are very much promoted for Portlet View rendering, other technologies can be
+      used just as easily. The <a href="multiproject/portals-bridges-velocity/index.html">Portals Velocity Bridge</a> provides several ready to use Velocity based
+      Portlets, together with a library of useful scripts. 
+      </p>
+      </subsection>
+      <subsection name="Perl">
+      <p>
+      Perl based web applications can be accessed as a Portlet using the <a href="multiproject/portals-bridges-perl/index.html">Portals Perl Bridge</a>.
+      </p>
+      <subsection name="Common Utilities and Interfaces">
+      <p>
+      The <a href="multiproject/portals-bridges-common/index.html">Portals Bridges Common</a> library provides, besides
+      the already mentioned ServletContextProvider interface, several additional utilities like a GenericServletPortlet
+      which you can use for simple JSP based Portlets (or any invokable view Render technology). Or use it as base
+      class for your own Bridge.
+      </p>
+      <p>
+      Other useful utilities included are a PreferenceHelper and a simple PortletMessaging component.
+      </p>
+      </subsection>
+      </subsection>
+      <subsection name="Frameworks">
+      <p>Todo</p>
+      </subsection>
+      <subsection name="Library">
+      <p>Todo</p>
+      </subsection>
+      <subsection name="Examples">
+      <p>
+      Several examples using the bridges are supplied by <a href="http://portals.apache.org/jetspeed-2">Jetspeed 2</a>:
+      <ul>
+        <li>The <a href="http://portals.apache.org/jetspeed-2/multiproject/jsf-demo" target="_nw">JSF Portlet Demo</a> application using Apache Portals JSF Portlet Bridge</li>
+        <li>The <a href="http://portals.apache.org/jetspeed-2/multiproject/jsf-demo-myfaces" target="_nw">JSF Portlet Demo</a> application using MyFaces built-in Portlet Bridge</li>
+        <li>The <a href="http://portals.apache.org/jetspeed-2/multiproject/struts-demo" target="_nw">Struts Mailer Demo</a> application</li>
+        <li>The <a href="http://portals.apache.org/jetspeed-2/multiproject/jpetstore" target="_nw">iBATIS JPetstore Demo Portlet</a> application</li>
+        <li>The <a href="http://portals.apache.org/jetspeed-2/multiproject/php" target="_nw">PHP Portlet</a> application</li>
+        <li>The <a href="http://portals.apache.org/jetspeed-2/multiproject/security" target="_nw">Security Portlets</a> using the Velocity Bridge</li>
+        <li>The <a href="http://portals.apache.org/jetspeed-2/multiproject/perl" target="_nw">Perl Portlet</a> application</li>
+      </ul>
+      </p>
+      </subsection>
+</section>
+>
+  </body>
+</document>
\ No newline at end of file

Added: portals/jetspeed-2/trunk/portals-bridges/xdocs/navigation.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/xdocs/navigation.xml?rev=191820&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/xdocs/navigation.xml (added)
+++ portals/jetspeed-2/trunk/portals-bridges/xdocs/navigation.xml Wed Jun 22 05:35:38 2005
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<project>
+ <body>
+    <links>
+      <item name="JSR-168" href="http://www.jcp.org/en/jsr/detail?id=168" target="_nw"/>
+      <item name="Jetspeed 2" href="http://portals.apache.org/jetspeed-2" target="_nw"/>
+    </links>
+   <menu name="Portals Bridges">
+      <item name="Overview" href="index.html"/>
+      <item name="Common Utilities and Interfaces" href="multiproject/portals-bridges-common/index.html"/>
+      <item name="JSF Bridge" href="multiproject/portals-bridges-jsf/index.html"/>
+      <item name="Struts Bridge" href="multiproject/portals-bridges-struts/index.html"/>
+      <item name="PHP Bridge" href="multiproject/portals-bridges-php/index.html"/>
+      <item name="Velocity Bridge" href="multiproject/portals-bridges-velocity/index.html"/>
+      <item name="Perl Bridge" href="multiproject/portals-bridges-perl/index.html"/>
+      <item name="Frameworks" href="multiproject/portals-bridges-frameworks/index.html"/>
+    </menu>
+  </body>
+</project>



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