portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dlest...@apache.org
Subject svn commit: r216060 - in /portals/jetspeed-2/trunk: portal-webapp/ portals-bridges/common/ portals-bridges/frameworks/ portals-bridges/jsf/ portals-bridges/perl/ portals-bridges/php/ portals-bridges/struts/ portals-bridges/velocity/ portlet-api/ taglib...
Date Wed, 13 Jul 2005 00:50:05 GMT
Author: dlestrat
Date: Tue Jul 12 17:50:04 2005
New Revision: 216060

URL: http://svn.apache.org/viewcvs?rev=216060&view=rev
Log:
http://issues.apache.org/jira/browse/JS2-304?page=comments#action_12315646 

Modified:
    portals/jetspeed-2/trunk/portal-webapp/maven.xml
    portals/jetspeed-2/trunk/portal-webapp/project.xml
    portals/jetspeed-2/trunk/portals-bridges/common/project.xml
    portals/jetspeed-2/trunk/portals-bridges/frameworks/project.xml
    portals/jetspeed-2/trunk/portals-bridges/jsf/project.xml
    portals/jetspeed-2/trunk/portals-bridges/perl/project.xml
    portals/jetspeed-2/trunk/portals-bridges/php/project.xml
    portals/jetspeed-2/trunk/portals-bridges/struts/project.xml
    portals/jetspeed-2/trunk/portals-bridges/velocity/project.xml
    portals/jetspeed-2/trunk/portlet-api/project.xml
    portals/jetspeed-2/trunk/taglibs/maven.xml
    portals/jetspeed-2/trunk/taglibs/project.xml
    portals/jetspeed-2/trunk/taglibs/treecontrol/maven.xml
    portals/jetspeed-2/trunk/taglibs/treecontrol/project.xml

Modified: portals/jetspeed-2/trunk/portal-webapp/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal-webapp/maven.xml?rev=216060&r1=216059&r2=216060&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portal-webapp/maven.xml (original)
+++ portals/jetspeed-2/trunk/portal-webapp/maven.xml Tue Jul 12 17:50:04 2005
@@ -19,165 +19,6 @@
 -->
 <project default="java:jar" xmlns:j="jelly:core" xmlns:define="jelly:define" xmlns:maven="jelly:maven">
 
-    <goal name="pam.layoutdeploy">
-        <j:set var="maven.war.final.name" value="jetspeed-layouts" />
-        <attainGoal name="jetspeed2:deploy" />
-    </goal>
-
-    <goal name="pam.demodeploy">
-        <j:set var="maven.war.final.name" value="demo" />
-        <attainGoal name="jetspeed2:deploy" />
-    </goal>
-
-    <goal name="pam.demoundeploy">
-        <j:set var="maven.war.final.name" value="demo" />
-        <attainGoal name="jetspeed2:undeploy" />
-    </goal>
-
-    <goal name="pam.palmdeploy">
-        <j:set var="maven.war.final.name" value="palm" />
-        <attainGoal name="jetspeed2:deploy" />
-    </goal>
-
-    <goal name="pam.palmundeploy">
-        <j:set var="maven.war.final.name" value="palm" />
-        <attainGoal name="jetspeed2:undeploy" />
-    </goal>
-
-    <goal name="pam.pamdeploy">
-        <j:set var="maven.war.final.name" value="pam" />
-        <attainGoal name="jetspeed2:deploy" />
-    </goal>
-
-    <goal name="pam.pamundeploy">
-        <j:set var="maven.war.final.name" value="pam" />
-        <attainGoal name="pam.template.undeploy" />
-    </goal>
-
-    <goal name="pam.tsdeploy">
-        <j:set var="maven.war.final.name" value="testsuite" />
-        <attainGoal name="jetspeed2:deploy" />
-    </goal>
-
-    <goal name="pam.tsundeploy">
-        <j:set var="maven.war.final.name" value="testsuite" />
-        <attainGoal name="jetspeed2:undeploy" />
-    </goal>
-
-    <goal name="pam.strutsdeploy">
-        <j:set var="maven.war.final.name" value="struts-demo" />
-        <attainGoal name="jetspeed2:deploy" />
-    </goal>
-
-    <goal name="pam.strutsundeploy">
-        <j:set var="maven.war.final.name" value="struts-demo" />
-        <attainGoal name="jetspeed2:undeploy" />
-    </goal>
-
-    <goal name="pam.jpetstoredeploy">
-        <j:set var="maven.war.final.name" value="jpetstore" />
-        <attainGoal name="jetspeed2:deploy" />
-    </goal>
-
-    <goal name="pam.jpetstoreundeploy">
-        <j:set var="maven.war.final.name" value="jpetstore" />
-        <attainGoal name="pam.template.undeploy" />
-    </goal>
-
-    <goal name="pam.jsfdeploy">
-        <j:set var="maven.war.final.name" value="jsf-demo" />
-        <attainGoal name="jetspeed2:deploy" />
-    </goal>
-
-    <goal name="pam.jsfundeploy">
-        <j:set var="maven.war.final.name" value="jsf-demo" />
-        <attainGoal name="jetspeed2:undeploy" />
-    </goal>
-
-    <goal name="pam.jsfmyfacesdeploy">
-        <j:set var="maven.war.final.name" value="jsf-demo-myfaces" />
-        <attainGoal name="jetspeed2:deploy" />
-    </goal>
-
-    <goal name="pam.jsfmyfacesundeploy">
-        <j:set var="maven.war.final.name" value="jsf-demo-myfaces" />
-        <attainGoal name="jetspeed2:undeploy" />
-    </goal>
-
-    <goal name="pam.securitydeploy">
-        <j:set var="maven.war.final.name" value="security" />
-        <attainGoal name="jetspeed2:deploy" />
-    </goal>
-
-    <goal name="pam.securityundeploy">
-        <j:set var="maven.war.final.name" value="security" />
-        <attainGoal name="jetspeed2:undeploy" />
-    </goal>
-
-    <goal name="pam.phpdeploy">
-        <j:set var="maven.war.final.name" value="php" />
-        <attainGoal name="jetspeed2:deploy" />
-    </goal>
-
-    <goal name="pam.phpundeploy">
-        <j:set var="maven.war.final.name" value="php" />
-        <attainGoal name="jetspeed2:undeploy" />
-    </goal>
-
-    <goal name="pam.perldeploy">
-        <j:set var="maven.war.final.name" value="perl" />
-        <attainGoal name="jetspeed2:deploy" />
-    </goal>
-
-    <goal name="pam.perlundeploy">
-        <j:set var="maven.war.final.name" value="perl" />
-        <attainGoal name="jetspeed2:undeploy" />
-    </goal>
-
-    <goal name="pam.rssdeploy">
-        <j:set var="maven.war.final.name" value="rss" />
-        <attainGoal name="jetspeed2:deploy" />
-    </goal>
-
-    <goal name="pam.rssundeploy">
-        <j:set var="maven.war.final.name" value="rss" />
-        <attainGoal name="jetspeed2:undeploy" />
-    </goal>
-
-    <!-- ================================================================ -->
-    <!-- Deploy to Catalina and Expand                                    -->
-    <!-- ================================================================ -->
-    <goal name="deploy">
-        <echo message="Deploying ${pom.id}, ${pom.name}" />
-        <delete dir="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.name}" />
-        <copy file="./target/${pom.artifactId}.war"
-            tofile="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.name}.war" />
-        <unwar src="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.name}.war"
-            dest="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.name}" />
-
-        <j:set var="catalina_version_major" value="${org.apache.jetspeed.catalina.version.major}" />
-        <j:choose>
-            <j:when test="${catalina_version_major == '5.5'}">
-                <j:set var="context_file_source" value="jetspeed-tomcat-5.5.xml" />
-            </j:when>
-            <j:otherwise>
-                <j:set var="context_file_source" value="jetspeed-tomcat-5.xml" />
-            </j:otherwise>
-        </j:choose>
-        <j:set var="context_file_target"
-            value="${org.apache.jetspeed.server.home}/conf/Catalina/localhost/jetspeed.xml" />
-        <copy file="./src/resources/${context_file_source}" tofile="${context_file_target}" overwrite="true">
-            <filterset begintoken="@" endtoken="@">
-                <filter token="USERNAME" value="${org.apache.jetspeed.production.database.user}" />
-                <filter token="PASSWORD" value="${org.apache.jetspeed.production.database.password}" />
-                <filter token="DRIVER" value="${org.apache.jetspeed.production.database.driver}" />
-                <filter token="URL" value="${org.apache.jetspeed.production.database.url}" />
-            </filterset>
-        </copy>
-        <attainGoal name="catalina:base-shared" />
-        <attainGoal name="catalina:shared" />
-    </goal>
-
     <!-- ================================================================ -->
     <!-- Hot Deploy for mundane everyday development under Catalina       -->
     <!-- ================================================================ -->
@@ -196,218 +37,5 @@
     <preGoal name="hotdeploy">
         <attainGoal name="java:compile" />
     </preGoal>
-
-    <!-- ================================================================ -->
-    <!-- Does all three deployment steps at once                                                                        -->
-    <!-- ================================================================ -->
-    <goal name="fullDeploy">
-
-        <attainGoal name="deploy" />
-        <attainGoal name="pam.layoutdeploy" />
-        <attainGoal name="pam.demodeploy" />
-        <attainGoal name="pam.palmdeploy" />
-        <attainGoal name="pam.pamdeploy" />
-        <attainGoal name="pam.strutsdeploy" />
-        <attainGoal name="pam.jsfdeploy" />
-        <attainGoal name="pam.jsfmyfacesdeploy" />
-        <attainGoal name="pam.securitydeploy" />
-        <attainGoal name="pam.phpdeploy" />
-        <attainGoal name="pam.perldeploy" />
-        <attainGoal name="pam.rssdeploy" />
-        <attainGoal name="pam.jpetstoredeploy" />
-
-        <attainGoal name="db.entities" />
-    </goal>
-
-    <goal name="nodbfullDeploy">
-        <attainGoal name="deploy" />
-        <attainGoal name="pam.layoutdeploy" />
-        <attainGoal name="pam.demodeploy" />
-        <attainGoal name="pam.palmdeploy" />
-        <attainGoal name="pam.pamdeploy" />
-        <attainGoal name="pam.strutsdeploy" />
-        <attainGoal name="pam.jsfdeploy" />
-        <attainGoal name="pam.jsfmyfacesdeploy" />
-        <attainGoal name="pam.securitydeploy" />
-        <attainGoal name="pam.phpdeploy" />
-        <attainGoal name="pam.perldeploy" />
-        <attainGoal name="pam.rssdeploy" />
-        <attainGoal name="pam.jpetstoredeploy" />
-    </goal>
-
-    <goal name='minDeploy'>
-        <attainGoal name="deploy" />
-        <attainGoal name="pam.layoutdeploy" />
-        <attainGoal name="pam.securitydeploy" />
-        <attainGoal name="db.entities" />
-    </goal>
-
-    <goal name='nodbMinDeploy'>
-        <attainGoal name="remove.wars" />
-        <attainGoal name="deploy" />
-        <attainGoal name="pam.layoutdeploy" />
-        <attainGoal name="pam.securitydeploy" />
-    </goal>
-
-    <goal name="catalina:base-shared" description="Copy all base jars necessary for common container">
-        <echo>Copying from ${maven.repo.local} to ${org.apache.jetspeed.server.shared}...</echo>
-        <copy file="${maven.repo.local}/pluto/jars/pluto-&pluto-version;.jar"
-            todir="${org.apache.jetspeed.server.shared}" />
-        <copy
-            file="${maven.repo.local}/portals-bridges/jars/portals-bridges-common-&portals-bridges-common-version;.jar"
-            todir="${org.apache.jetspeed.server.shared}" />
-    </goal>
-
-    <goal name="catalina:shared" description="Copy all jars necessary for common container">
-        <copy file="../commons/target/jetspeed-commons-&jetspeed-version;.jar"
-            todir="${org.apache.jetspeed.server.shared}" />
-        <copy file="../jetspeed-api/target/jetspeed-api-&jetspeed-version;.jar"
-            todir="${org.apache.jetspeed.server.shared}" />
-        <copy file="../portlet-api/target/portlet-api-1.0.jar" todir="${org.apache.jetspeed.server.shared}" />
-    </goal>
-
-    <!-- ================================================================ -->
-    <!-- Copy OJB mapping for registry into the portal directory-->
-    <!-- ================================================================ -->
-    <goal name="db.test.properties">
-        <j:set var="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.test.database.url}" />
-        <j:set var="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.test.database.driver}" />
-        <j:set var="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.test.database.user}" />
-        <j:set var="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.test.database.password}" />
-        <j:set var="org.apache.jetspeed.jdbc.drivers.path" value="${org.apache.jetspeed.test.jdbc.drivers.path}" />
-    </goal>
-
-    <goal name="db.production.properties">
-        <j:set var="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.production.database.url}" />
-        <j:set var="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.production.database.driver}" />
-        <j:set var="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.production.database.user}" />
-        <j:set var="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.production.database.password}" />
-        <j:set var="org.apache.jetspeed.jdbc.drivers.path" value="${org.apache.jetspeed.production.jdbc.drivers.path}" />
-    </goal>
-
-    <!-- ================================================================ -->
-    <!-- EXECUTE a DB SCRIPT                                              -->
-    <!-- ================================================================ -->
-    <goal name="db.execute">
-        <sql driver="${org.apache.jetspeed.database.driver}" classpathref="maven.dependency.classpath"
-            url="${org.apache.jetspeed.database.url}" userid="${org.apache.jetspeed.database.user}"
-            password="${org.apache.jetspeed.database.password}" src="${database.arg.script}">
-            <classpath>
-                <path refid="maven.dependency.classpath" />
-                <pathelement path="${org.apache.jetspeed.jdbc.drivers.path}" />
-            </classpath>
-        </sql>
-    </goal>
-
-    <goal name="db.entities">
-        <j:set var="dbase" value="${org.apache.jetspeed.production.database.default.name}" />
-        <attainGoal name="db.production.properties" />
-        <!--
-            <j:choose>
-            <j:when test="${dbase == 'mysql'}" >
-            <j:set var="database.arg.script" value="../src/sql/mysql/populate-entities-for-default-psml.sql" />
-            </j:when>
-            <j:otherwise>
-            <j:set var="database.arg.script" value="../src/sql/populate-entities-for-default-psml.sql" />
-            </j:otherwise>
-            </j:choose>
-            
-            <attainGoal name="db.execute" />
-        -->
-        <j:choose>
-            <j:when test="${dbase == 'mssql'}">
-                <j:set var="database.arg.script" value="../src/sql/mssql/populate-userinfo-for-default-psml.sql" />
-            </j:when>
-            <j:when test="${dbase == 'mysql'}">
-                <j:set var="database.arg.script" value="../src/sql/mysql/populate-userinfo-for-default-psml.sql" />
-            </j:when>
-            <j:when test="${dbase == 'oracle'}">
-                <j:set var="database.arg.script" value="../src/sql/oracle/populate-userinfo-for-default-psml.sql" />
-            </j:when>
-            <j:when test="${dbase == 'hsql'}">
-                <j:set var="database.arg.script" value="../src/sql/hsql/populate-userinfo-for-default-psml.sql" />
-            </j:when>
-            <j:otherwise>
-                <j:set var="database.arg.script" value="../src/sql/populate-userinfo-for-default-psml.sql" />
-            </j:otherwise>
-        </j:choose>
-        <attainGoal name="db.execute" />
-    </goal>
-
-    <goal name="ojb.set.production.database.platform">
-        <copy todir="${maven.build.dest}" overwrite="true">
-            <fileset dir="../etc/db-ojb" />
-            <filterset begintoken="@" endtoken="@">
-                <filter token="PLATFORM" value="${org.apache.jetspeed.production.database.ojb.platform}" />
-            </filterset>
-        </copy>
-    </goal>
-
-    <preGoal name="war:init">
-        <attainGoal name="jar:install" />
-        <j:set var="maven.test.skip" value="true" />
-        <echo>Testing flag is: ${maven.test.skip} for war:install</echo>
-    </preGoal>
-
-    <postGoal name="war:install">
-        <j:set var="maven.test.skip" value="false" />
-    </postGoal>
-
-    <preGoal name="war:webapp">
-        <attainGoal name="ojb.set.production.database.platform" />
-    </preGoal>
-
-    <postGoal name="war:webapp">
-        <copy file="${maven.war.src}/WEB-INF/conf/jetspeed.properties"
-            tofile="${maven.war.webapp.dir}/WEB-INF/conf/jetspeed.properties" overwrite="true">
-            <filterset begintoken="@" endtoken="@">
-                <filter token="AUTODEPLOYMENT_SERVER" value="${org.apache.jetspeed.services.autodeployment.server}" />
-                <filter token="AUTODEPLOYMENT_USER" value="${org.apache.jetspeed.services.autodeployment.user}" />
-                <filter token="AUTODEPLOYMENT_PASSWORD" value="${org.apache.jetspeed.services.autodeployment.password}" />
-            </filterset>
-            <!-- Below filter is special because this concerns a numeric property for which a non-numeric token results
-                in a test failure (TestSpringEngine)
-                This property therefore MUST remain defined EXACTLY as specified for this filter to be able to work
-            -->
-            <filterset begintoken="autodeployment.catalina.version.major" endtoken="5">
-                <filter token="="
-                    value="autodeployment.catalina.version.major=${org.apache.jetspeed.catalina.version.major}" />
-            </filterset>
-            <filterset begintoken="autodeployment.port" endtoken="8080">
-                <filter token="=" value="autodeployment.port=${org.apache.jetspeed.services.autodeployment.port}" />
-            </filterset>
-        </copy>
-    </postGoal>
-
-    <goal name='remove.wars'>
-        <delete dir="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.name}" />
-        <delete file="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.name}.war" />
-        <delete dir="${org.apache.jetspeed.deploy.war.dir}/demo" />
-        <delete file="${org.apache.jetspeed.deploy.war.dir}/demo.war" />
-        <delete dir="${org.apache.jetspeed.deploy.war.dir}/palm" />
-        <delete file="${org.apache.jetspeed.deploy.war.dir}/palm.war" />
-        <delete dir="${org.apache.jetspeed.deploy.war.dir}/pam" />
-        <delete file="${org.apache.jetspeed.deploy.war.dir}/pam.war" />
-        <delete dir="${org.apache.jetspeed.deploy.war.dir}/security" />
-        <delete file="${org.apache.jetspeed.deploy.war.dir}/security.war" />
-        <delete dir="${org.apache.jetspeed.deploy.war.dir}/struts-demo" />
-        <delete file="${org.apache.jetspeed.deploy.war.dir}/struts-demo.war" />
-        <delete dir="${org.apache.jetspeed.deploy.war.dir}/jsf-demo" />
-        <delete file="${org.apache.jetspeed.deploy.war.dir}/jsf-demo.war" />
-        <delete dir="${org.apache.jetspeed.deploy.war.dir}/jsf-demo-myfaces" />
-        <delete file="${org.apache.jetspeed.deploy.war.dir}/jsf-demo-myfaces.war" />
-        <delete dir="${org.apache.jetspeed.deploy.war.dir}/php" />
-        <delete file="${org.apache.jetspeed.deploy.war.dir}/php.war" />
-        <delete dir="${org.apache.jetspeed.deploy.war.dir}/perl" />
-        <delete file="${org.apache.jetspeed.deploy.war.dir}/perl.war" />
-        <delete dir="${org.apache.jetspeed.deploy.war.dir}/rss" />
-        <delete file="${org.apache.jetspeed.deploy.war.dir}/rss.war" />
-        <delete dir="${org.apache.jetspeed.deploy.war.dir}/jpetstore" />
-        <delete file="${org.apache.jetspeed.deploy.war.dir}/jpetstore.war" />
-        <j:set var="context_dir" value="${org.apache.jetspeed.server.home}/conf/Catalina/localhost" />
-        <delete file="${context_dir}/${org.apache.jetspeed.portal.name}.xml" />
-        <delete file="${context_dir}/security.xml" />
-        <delete file="${context_dir}/jpetstore.xml" />
-    </goal>
 
 </project>

Modified: portals/jetspeed-2/trunk/portal-webapp/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal-webapp/project.xml?rev=216060&r1=216059&r2=216060&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portal-webapp/project.xml (original)
+++ portals/jetspeed-2/trunk/portal-webapp/project.xml Tue Jul 12 17:50:04 2005
@@ -3,524 +3,90 @@
   <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities;
 ]>
 <!--
-Copyright 2004 The Apache Software Foundation
+    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>
+    <extend>${basedir}/../project.xml</extend>
+    <pomVersion>3</pomVersion>
+    <artifactId>jetspeed</artifactId>
+    <name>Jetspeed-2 Portal Engine</name>
+    <description>Portlet content is aggregated into one page by this engine.</description>
+    <shortDescription>Portal Aggregation Engine</shortDescription>
+
+    <repository>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/portal</connection>
+        <developerConnection>
+            scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/portal
+        </developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/portal/</url>
+    </repository>
+
+	&portal-webapp-deps;
+
+    <build>
+        <sourceDirectory>src/java</sourceDirectory>
+        <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+        <unitTest>
+            <excludes>
+                <exclude>org/apache/jetspeed/test/JetspeedTest</exclude>
+                <exclude>org/apache/jetspeed/test/JetspeedTestSuite</exclude>
+                <exclude>**/TestJMX*.java</exclude>
+                <exclude>**/TestEngine.java</exclude>
+            </excludes>
+            <includes>
+                <include>**/Test*.java</include>
+            </includes>
+            <resources>
+                <resource>
+                    <directory>${basedir}/src/java</directory>
+                    <excludes>
+                        <exclude>**/*.java</exclude>
+                        <exclude>repository_database.xml</exclude>
+                    </excludes>
+                </resource>
+                <resource>
+                    <directory>${basedir}/src/test</directory>
+                    <excludes>
+                        <exclude>**/*.java</exclude>
+                    </excludes>
+                </resource>
+
+                &log4j-resources;
+
+            </resources>
+
+        </unitTest>
+        <resources>
+            <resource>
+                <directory>${basedir}/src/java</directory>
+                <excludes>
+                    <exclude>**/*.java</exclude>
+                </excludes>
+            </resource>
+
+            &db-ojb-resources;
 
-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
+        </resources>
 
-    http://www.apache.org/licenses/LICENSE-2.0
+    </build>
+    <reports>
 
-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.
+        &j2-reports;
 
-  $Id$
--->
-<project>
-  <extend>${basedir}/../project.xml</extend>
-  <pomVersion>3</pomVersion>
-  <id>jetspeed</id>
-  <name>Jetspeed-2 Portal Engine</name>
-  <description>
-    Portlet content is aggregated into one page by this engine.
-  </description>
-  <shortDescription>Portal Aggregation Engine</shortDescription>
-
-  <repository>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/portal</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/portal</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/portal/</url>
-  </repository>
-
-  <dependencies>
-  
-  	&spring-deps;
-  	
-  	&db-ojb-deps;
-  	
-  	&jmock-deps;
-  	
-  	&commons-config-dep;
-
-    <dependency>
-      <id>jetspeed-cm</id>
-      <groupId>jetspeed2</groupId>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-     <dependency>
-      <id>content-server</id>
-      <groupId>jetspeed2</groupId>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>jetspeed-components</id>
-      <groupId>jetspeed2</groupId>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>jetspeed-deploy-tools</id>
-      <groupId>jetspeed2</groupId>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>	
-    <dependency>
-      <id>jetspeed-rdbms</id>
-      <groupId>jetspeed2</groupId>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>jetspeed-persistence</id>
-      <groupId>jetspeed2</groupId>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>jetspeed-prefs</id>
-      <groupId>jetspeed2</groupId>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>jetspeed-search</id>
-      <groupId>jetspeed2</groupId>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>jetspeed-security</id>
-      <groupId>jetspeed2</groupId>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>jetspeed-registry</id>
-      <groupId>jetspeed2</groupId>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-     <dependency>
-      <id>jetspeed2:jetspeed-id-generator</id>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>    
-    <dependency>
-      <id>jetspeed2:jetspeed-file-cache</id>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-     <dependency>
-      <id>jetspeed2:jetspeed-api</id>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>false</war.bundle>
-      </properties>
-    </dependency>
-     <dependency>
-      <id>jetspeed2:jetspeed-locator</id>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>jetspeed2:jetspeed-capability</id>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>    
-    <dependency>
-      <id>jetspeed2:jetspeed-profiler</id>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>jetspeed2:jetspeed-page-manager</id>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>jetspeed2:jetspeed-portlet-factory</id>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>jetspeed-portal</id>
-      <groupId>jetspeed2</groupId>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>    
-    <dependency>
-      <id>portals-bridges:portals-bridges-common</id>
-      <version>&portals-bridges-common-version;</version>
-      <properties>
-        <war.bundle>false</war.bundle>
-      </properties>
-    </dependency> 
-    <dependency>
-      <id>portals-bridges-velocity</id>
-      <groupId>portals-bridges</groupId>
-      <version>&portals-bridges-velocity-version;</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>    
-      
-      &pluto-deps;
-      
-     <dependency>
-      <id>castor</id>
-      <version>0.9.4.3</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>commons-beanutils</id>
-      <version>1.6.1</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>commons-digester</id>
-      <version>1.5</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>commons-configuration</id>
-      <version>1.0</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>commons-collections</id>
-      <version>3.0</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>commons-fileupload</id>
-      <version>1.0</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>commons-httpclient</id>
-      <version>2.0</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>commons-io</id>
-      <version>0.1</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>commons-lang</id>
-      <version>2.0</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>commons-logging</id>
-      <version>1.0.3</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>hsqldb</id>
-      <version>1.7.1</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    
-    <dependency>
-      <id>commons-pool</id>
-      <version>1.2</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>commons-dbcp</id>
-      <version>1.2.1</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>jdbc-se</id>
-      <jar>jdbc-se2.0.jar</jar>
-      <properties>
-        <war.bundle>false</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>jetspeed-commons</id>
-      <groupId>jetspeed2</groupId>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>false</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>lucene</id>
-      <version>1.4.1</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>junit</id>
-      <version>3.8.1</version>
-      <properties>
-        <war.bundle>false</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>jta</id>
-      <jar>jta1.0.1.jar</jar>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>log4j</id>
-      <version>1.2.8</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>portlet-api</id>
-      <version>1.0</version>
-      <properties>
-        <war.bundle>false</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>servletapi</id>
-      <version>2.3</version>
-      <properties>
-        <war.bundle>false</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>tyrex</id>
-      <version>1.0.1</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>xalan</id>
-      <version>2.4.1</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>xerces</id>
-      <version>2.3.0</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>xml-apis</id>
-      <version>2.0.2</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>saxpath</id>
-      <version>1.0-FCS</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-      <dependency>
-      <id>jaxen</id>
-      <version>1.0-FCS-full</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-     <dependency>
-      <id>jdom</id>
-      <version>1.0</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>regexp</id>
-      <version>1.2</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>jstl</id>
-      <version>1.0.6</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>taglibs:standard</id>
-      <version>1.0.6</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>taglibs:request</id>
-      <version>1.0.1</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>velocity</id>
-      <version>1.4</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>velocity-tools</id>
-      <version>1.1</version>
-      <url>http://jakarta.apache.org/velocity</url>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>mockrunner</id>
-      <version>0.2.7</version>
-      <properties>
-        <war.bundle>false</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>commons-codec</id>
-      <version>1.3</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>  
-     <dependency>
-      <id>jetspeed-sso</id>
-      <groupId>jetspeed2</groupId>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>  
-  </dependencies>
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
-    <unitTest>
-      <excludes>
-        <exclude>org/apache/jetspeed/test/JetspeedTest</exclude>
-        <exclude>org/apache/jetspeed/test/JetspeedTestSuite</exclude>
-        <exclude>**/TestJMX*.java</exclude>
-        <exclude>**/TestEngine.java</exclude>
-      </excludes>
-      <includes>
-        <include>**/Test*.java</include>
-      </includes>
-      <resources>
-      <resource>
-        <directory>${basedir}/src/java</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-          <exclude>repository_database.xml</exclude>
-        </excludes>
-      </resource>
-      <resource>
-          <directory>${basedir}/src/test</directory>
-          <excludes>
-           <exclude>**/*.java</exclude>
-          </excludes>
-      </resource>
-      
-      &log4j-resources;
-      
-    </resources>
-
-    </unitTest>
-    <resources>
-      <resource>
-        <directory>${basedir}/src/java</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
-      
-      &db-ojb-resources;
-      
-    </resources>
-
-  </build>
-  <reports>
-  
-  	&j2-reports;
-  
-  </reports>  
+    </reports>
 </project>
 

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=216060&r1=216059&r2=216060&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/common/project.xml (original)
+++ portals/jetspeed-2/trunk/portals-bridges/common/project.xml Tue Jul 12 17:50:04 2005
@@ -3,57 +3,57 @@
   <!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
-
+    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$
+    
+    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>
-  <extend>${basedir}/../project.xml</extend>
-  <pomVersion>3</pomVersion>
-  <groupId>portals-bridges</groupId>
-  <id>portals-bridges-common</id>
-  <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
-  </description>
-  <shortDescription>Apache Portals Bridges Common Utilities and Interfaces</shortDescription>
-  <repository>
-    <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>
-      <groupId>portlet-api</groupId>
-      <artifactId>portlet-api</artifactId>
-      <version>1.0</version>
-    </dependency>
-     <dependency>
-      <groupId>servletapi</groupId>
-      <artifactId>servletapi</artifactId>
-      <version>2.3</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-  </build>
-  <reports>
+    <extend>${basedir}/../project.xml</extend>
+    <pomVersion>3</pomVersion>
+    <groupId>portals-bridges</groupId>
+    <artifactId>portals-bridges-common</artifactId>
+    <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</description>
+    <shortDescription>Apache Portals Bridges Common Utilities and Interfaces</shortDescription>
+    <repository>
+        <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>
+            <groupId>portlet-api</groupId>
+            <artifactId>portlet-api</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>servletapi</groupId>
+            <artifactId>servletapi</artifactId>
+            <version>2.3</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <sourceDirectory>src/java</sourceDirectory>
+    </build>
+    <reports>
 
         &bridges-reports;
 
-  </reports>
+    </reports>
 </project>

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=216060&r1=216059&r2=216060&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/frameworks/project.xml (original)
+++ portals/jetspeed-2/trunk/portals-bridges/frameworks/project.xml Tue Jul 12 17:50:04 2005
@@ -3,118 +3,124 @@
   <!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
-
+    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>
-  <extend>${basedir}/../project.xml</extend>
-  <pomVersion>3</pomVersion>
-  <groupId>portals-bridges</groupId>
-  <id>portals-bridges-frameworks</id>
-  <name>Frameworks</name>
-  <currentVersion>&portals-bridges-frameworks-version;</currentVersion>
-  <package>org.apache.portals.bridges.frameworks</package>
-  <description>
-    Apache Portals Bridges Frameworks
-  </description>
-  <shortDescription>Apache Portals Bridges Frameworks</shortDescription>
-  <repository>
-    <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>
-      <groupId>portlet-api</groupId>
-      <artifactId>portlet-api</artifactId>
-      <version>1.0</version>
-    </dependency>
-     <dependency>
-      <groupId>servletapi</groupId>
-      <artifactId>servletapi</artifactId>
-      <version>2.3</version>
-    </dependency>
-    <dependency>
-      <id>velocity</id>
-      <version>1.4</version>
-    </dependency>
-    <dependency>
-      <id>velocity-tools</id>
-      <version>1.1</version>
-      <url>http://jakarta.apache.org/velocity</url>
-    </dependency>
-    <dependency>
-      <groupId>commons-validator</groupId>
-      <artifactId>commons-validator</artifactId>
-      <version>1.1.3</version>
-      <url>http://jakarta.apache.org/commons/validator/</url>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>    
-    </dependency>
-    <dependency>
-      <id>springframework:spring-core</id>
-      <version>1.1.1</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>commons-beanutils</groupId>
-      <artifactId>commons-beanutils</artifactId>
-      <version>1.7.0</version>
-      <url>http://jakarta.apache.org/commons/beanutils/</url>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-
-    <dependency>
-      <groupId>portals-bridges</groupId>
-      <artifactId>portals-bridges-common</artifactId>
-      <version>&portals-bridges-common-version;</version>
-    </dependency>
     
-    <dependency>
-      <groupId>portals-bridges</groupId>
-      <artifactId>portals-bridges-velocity</artifactId>
-      <version>&portals-bridges-velocity-version;</version>
-    </dependency>
+    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.
     
-  </dependencies>
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    <resources>
-      <resource>
-        <directory>${basedir}/src/java</directory>
-        <includes>
-          <include>META-INF/*</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>${basedir}/src/java</directory>
-        <includes>
-           <include>**/*.xml</include>
-        </includes>
-      </resource>      
-    </resources>
-  </build>
-  <reports>
+    $Id$
+-->
+<project>
+    <extend>${basedir}/../project.xml</extend>
+    <pomVersion>3</pomVersion>
+    <groupId>portals-bridges</groupId>
+    <artifactId>portals-bridges-frameworks</artifactId>
+    <name>Frameworks</name>
+    <currentVersion>
+        &portals-bridges-frameworks-version;
+    </currentVersion>
+    <package>org.apache.portals.bridges.frameworks</package>
+    <description>Apache Portals Bridges Frameworks</description>
+    <shortDescription>Apache Portals Bridges Frameworks</shortDescription>
+    <repository>
+        <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>
+            <groupId>portlet-api</groupId>
+            <artifactId>portlet-api</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>servletapi</groupId>
+            <artifactId>servletapi</artifactId>
+            <version>2.3</version>
+        </dependency>
+        <dependency>
+            <id>velocity</id>
+            <version>1.4</version>
+        </dependency>
+        <dependency>
+            <id>velocity-tools</id>
+            <version>1.1</version>
+            <url>http://jakarta.apache.org/velocity</url>
+        </dependency>
+        <dependency>
+            <groupId>commons-validator</groupId>
+            <artifactId>commons-validator</artifactId>
+            <version>1.1.3</version>
+            <url>http://jakarta.apache.org/commons/validator/</url>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>springframework:spring-core</id>
+            <version>1.1.1</version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>1.7.0</version>
+            <url>http://jakarta.apache.org/commons/beanutils/</url>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+
+        <dependency>
+            <groupId>portals-bridges</groupId>
+            <artifactId>portals-bridges-common</artifactId>
+            <version>
+                &portals-bridges-common-version;
+            </version>
+        </dependency>
+
+        <dependency>
+            <groupId>portals-bridges</groupId>
+            <artifactId>portals-bridges-velocity</artifactId>
+            <version>
+                &portals-bridges-velocity-version;
+            </version>
+        </dependency>
+
+    </dependencies>
+    <build>
+        <sourceDirectory>src/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>${basedir}/src/java</directory>
+                <includes>
+                    <include>META-INF/*</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>${basedir}/src/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+            </resource>
+        </resources>
+    </build>
+    <reports>
 
         &bridges-reports;
 
-  </reports>
+    </reports>
 </project>

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=216060&r1=216059&r2=216060&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/jsf/project.xml (original)
+++ portals/jetspeed-2/trunk/portals-bridges/jsf/project.xml Tue Jul 12 17:50:04 2005
@@ -4,96 +4,98 @@
 ]>
 
 <!--
-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
-
+    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>
-  <extend>${basedir}/../project.xml</extend>
-  <pomVersion>3</pomVersion>
-  <groupId>portals-bridges</groupId>
-  <id>portals-bridges-jsf</id>
-  <name>JSF Bridge</name>
-  <currentVersion>&portals-bridges-jsf-version;</currentVersion>
-  <package>org.apache.portals.bridges.jsf</package>
-  <description>
-    Apache Portals JSF Bridge
-  </description>
-  <shortDescription>Apache Portals JSF Bridge</shortDescription>
-  <repository>
-    <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>
-      <name>David Le Strat</name>
-      <id>dlestrat</id>
-      <email>dlestrat@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>
-  </developers>
-  <dependencies>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.0.3</version>
-    </dependency>
-	  <dependency>
-      <groupId>portlet-api</groupId>
-      <artifactId>portlet-api</artifactId>
-      <version>1.0</version>
-    </dependency>
-     <dependency>
-      <groupId>servletapi</groupId>
-      <artifactId>servletapi</artifactId>
-      <version>2.3</version>
-    </dependency>
     
-    &jsf-api-deps;
+    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.
     
-    <dependency>
-      <groupId>portals-bridges</groupId>
-      <artifactId>portals-bridges-common</artifactId>
-      <version>&portals-bridges-common-version;</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    <resources>
-      <resource>
-        <directory>${basedir}/src/java</directory>
-        <includes>
-          <include>META-INF/*</include>
-        </includes>
-      </resource>
-    </resources>
-  </build>
-  <reports>
+    $Id$
+-->
+<project>
+    <extend>${basedir}/../project.xml</extend>
+    <pomVersion>3</pomVersion>
+    <groupId>portals-bridges</groupId>
+    <artifactId>portals-bridges-jsf</artifactId>
+    <name>JSF Bridge</name>
+    <currentVersion>
+        &portals-bridges-jsf-version;
+    </currentVersion>
+    <package>org.apache.portals.bridges.jsf</package>
+    <description>Apache Portals JSF Bridge</description>
+    <shortDescription>Apache Portals JSF Bridge</shortDescription>
+    <repository>
+        <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>
+            <name>David Le Strat</name>
+            <id>dlestrat</id>
+            <email>dlestrat@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>
+    </developers>
+    <dependencies>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.0.3</version>
+        </dependency>
+        <dependency>
+            <groupId>portlet-api</groupId>
+            <artifactId>portlet-api</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>servletapi</groupId>
+            <artifactId>servletapi</artifactId>
+            <version>2.3</version>
+        </dependency>
+
+        &jsf-api-deps;
+
+        <dependency>
+            <groupId>portals-bridges</groupId>
+            <artifactId>portals-bridges-common</artifactId>
+            <version>
+                &portals-bridges-common-version;
+            </version>
+        </dependency>
+    </dependencies>
+    <build>
+        <sourceDirectory>src/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>${basedir}/src/java</directory>
+                <includes>
+                    <include>META-INF/*</include>
+                </includes>
+            </resource>
+        </resources>
+    </build>
+    <reports>
 
         &bridges-reports;
 
-  </reports>
+    </reports>
 </project>

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=216060&r1=216059&r2=216060&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/perl/project.xml (original)
+++ portals/jetspeed-2/trunk/portals-bridges/perl/project.xml Tue Jul 12 17:50:04 2005
@@ -3,83 +3,85 @@
   <!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
-
+    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$
+    
+    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>
-  <extend>${basedir}/../project.xml</extend>
-  <pomVersion>3</pomVersion>
-  <groupId>portals-bridges</groupId>
-  <id>portals-bridges-perl</id>
-  <name>Perl Bridge</name>
-  <currentVersion>&portals-bridges-perl-version;</currentVersion>
-  <package>org.apache.portals.bridges.perl</package>
-  <description>
-    Apache Portals Perl Framework Bridge
-  </description>
-  <shortDescription>Apache Portals Perl Framework Bridge</shortDescription>
-  <repository>
-    <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>
-      <name>Roger Ruttimann</name>
-      <id>rogerrut</id>
-      <email>rogerrut@apache.org</email>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-    </developer>
-  </developers>
-  <dependencies>
-    <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>
-      <version>1.0.3</version>
-    </dependency>
-	  <dependency>
-      <groupId>portlet-api</groupId>
-      <artifactId>portlet-api</artifactId>
-      <version>1.0</version>
-    </dependency>
-     <dependency>
-      <groupId>servletapi</groupId>
-      <artifactId>servletapi</artifactId>
-      <version>2.3</version>
-    </dependency>
-    <dependency>
-      <groupId>portals-bridges</groupId>
-      <artifactId>portals-bridges-common</artifactId>
-      <version>&portals-bridges-common-version;</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-  </build>
-  <reports>
+    <extend>${basedir}/../project.xml</extend>
+    <pomVersion>3</pomVersion>
+    <groupId>portals-bridges</groupId>
+    <artifactId>portals-bridges-perl</artifactId>
+    <name>Perl Bridge</name>
+    <currentVersion>
+        &portals-bridges-perl-version;
+    </currentVersion>
+    <package>org.apache.portals.bridges.perl</package>
+    <description>Apache Portals Perl Framework Bridge</description>
+    <shortDescription>Apache Portals Perl Framework Bridge</shortDescription>
+    <repository>
+        <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>
+            <name>Roger Ruttimann</name>
+            <id>rogerrut</id>
+            <email>rogerrut@apache.org</email>
+            <roles>
+                <role>Java Developer</role>
+            </roles>
+        </developer>
+    </developers>
+    <dependencies>
+        <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>
+            <version>1.0.3</version>
+        </dependency>
+        <dependency>
+            <groupId>portlet-api</groupId>
+            <artifactId>portlet-api</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>servletapi</groupId>
+            <artifactId>servletapi</artifactId>
+            <version>2.3</version>
+        </dependency>
+        <dependency>
+            <groupId>portals-bridges</groupId>
+            <artifactId>portals-bridges-common</artifactId>
+            <version>
+                &portals-bridges-common-version;
+            </version>
+        </dependency>
+    </dependencies>
+    <build>
+        <sourceDirectory>src/java</sourceDirectory>
+    </build>
+    <reports>
 
         &bridges-reports;
 
-  </reports>
+    </reports>
 </project>

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=216060&r1=216059&r2=216060&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/php/project.xml (original)
+++ portals/jetspeed-2/trunk/portals-bridges/php/project.xml Tue Jul 12 17:50:04 2005
@@ -3,85 +3,87 @@
   <!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
-
+    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$
+    
+    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>
-  <extend>${basedir}/../project.xml</extend>
-  <pomVersion>3</pomVersion>
-  <groupId>portals-bridges</groupId>
-  <id>portals-bridges-php</id>
-  <name>PHP Bridge</name>
-  <currentVersion>&portals-bridges-php-version;</currentVersion>
-  <package>org.apache.portals.bridges.php</package>
-  <description>
-    Apache Portals PHP Framework Bridge
-  </description>
-  <shortDescription>Apache Portals PHP Framework Bridge</shortDescription>
-  <repository>
-    <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>
-      <name>Roger Ruttimann</name>
-      <id>rogerrut</id>
-      <email>rogerrut@apache.org</email>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-    </developer>
-  </developers>
-  <dependencies>
-  <dependency>
-      <id>itgroundwork:phpportlet</id>
-      <version>1.0</version>
-      <type>jar</type>
-      <properties>
-        <war.bundle.jar>true</war.bundle.jar>
-      </properties>
-    </dependency>	
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.0.3</version>
-    </dependency>
-	  <dependency>
-      <groupId>portlet-api</groupId>
-      <artifactId>portlet-api</artifactId>
-      <version>1.0</version>
-    </dependency>
-     <dependency>
-      <groupId>servletapi</groupId>
-      <artifactId>servletapi</artifactId>
-      <version>2.3</version>
-    </dependency>
-    <dependency>
-      <groupId>portals-bridges</groupId>
-      <artifactId>portals-bridges-common</artifactId>
-      <version>&portals-bridges-common-version;</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-  </build>
-  <reports>
+    <extend>${basedir}/../project.xml</extend>
+    <pomVersion>3</pomVersion>
+    <groupId>portals-bridges</groupId>
+    <artifactId>portals-bridges-php</artifactId>
+    <name>PHP Bridge</name>
+    <currentVersion>
+        &portals-bridges-php-version;
+    </currentVersion>
+    <package>org.apache.portals.bridges.php</package>
+    <description>Apache Portals PHP Framework Bridge</description>
+    <shortDescription>Apache Portals PHP Framework Bridge</shortDescription>
+    <repository>
+        <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>
+            <name>Roger Ruttimann</name>
+            <id>rogerrut</id>
+            <email>rogerrut@apache.org</email>
+            <roles>
+                <role>Java Developer</role>
+            </roles>
+        </developer>
+    </developers>
+    <dependencies>
+        <dependency>
+            <id>itgroundwork:phpportlet</id>
+            <version>1.0</version>
+            <type>jar</type>
+            <properties>
+                <war.bundle.jar>true</war.bundle.jar>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.0.3</version>
+        </dependency>
+        <dependency>
+            <groupId>portlet-api</groupId>
+            <artifactId>portlet-api</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>servletapi</groupId>
+            <artifactId>servletapi</artifactId>
+            <version>2.3</version>
+        </dependency>
+        <dependency>
+            <groupId>portals-bridges</groupId>
+            <artifactId>portals-bridges-common</artifactId>
+            <version>
+                &portals-bridges-common-version;
+            </version>
+        </dependency>
+    </dependencies>
+    <build>
+        <sourceDirectory>src/java</sourceDirectory>
+    </build>
+    <reports>
 
         &bridges-reports;
 
-  </reports>
+    </reports>
 </project>

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=216060&r1=216059&r2=216060&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/struts/project.xml (original)
+++ portals/jetspeed-2/trunk/portals-bridges/struts/project.xml Tue Jul 12 17:50:04 2005
@@ -3,106 +3,108 @@
   <!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
-
+    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$
+    
+    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>
-  <extend>${basedir}/../project.xml</extend>
-  <pomVersion>3</pomVersion>
-  <groupId>portals-bridges</groupId>
-  <id>portals-bridges-struts</id>
-  <name>Struts Bridge</name>
-  <currentVersion>&portals-bridges-struts-version;</currentVersion>
-  <package>org.apache.portals.bridges.struts</package>
-  <description>
-    Apache Portals Struts Bridge
-  </description>
-  <shortDescription>Apache Portals Struts Bridge</shortDescription>
-  <repository>
-    <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>
-      <name>Ate Douma</name>
-      <id>ate</id>
-      <email>ate@douma.nu</email>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-    </developer>
-  </developers>
-  <dependencies>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.0.4</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-digester</groupId>
-      <artifactId>commons-digester</artifactId>
-      <version>1.5</version>
-      <url>http://jakarta.apache.org/commons/digester.html</url>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>portlet-api</groupId>
-      <artifactId>portlet-api</artifactId>
-      <version>1.0</version>
-    </dependency>
-    <dependency>
-      <groupId>servletapi</groupId>
-      <artifactId>servletapi</artifactId>
-      <version>2.3</version>
-    </dependency>
-    <dependency>
-      <groupId>struts</groupId>
-      <artifactId>struts</artifactId>
-      <version>1.2.4</version>
-    </dependency>
-    <dependency>
-      <groupId>struts</groupId>
-      <artifactId>struts-el</artifactId>
-      <version>1.2.4</version>
-    </dependency>
-    <dependency>
-      <groupId>portals-bridges</groupId>
-      <artifactId>portals-bridges-common</artifactId>
-      <version>&portals-bridges-common-version;</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    <resources>
-      <resource>
-        <directory>${basedir}/src/java</directory>
-        <includes>
-          <include>META-INF/tlds/*</include>
-        </includes>
-        <filtering>false</filtering>
-      </resource>
-    </resources>
-  </build>
-  <reports>
+    <extend>${basedir}/../project.xml</extend>
+    <pomVersion>3</pomVersion>
+    <groupId>portals-bridges</groupId>
+    <artifactId>portals-bridges-struts</artifactId>
+    <name>Struts Bridge</name>
+    <currentVersion>
+        &portals-bridges-struts-version;
+    </currentVersion>
+    <package>org.apache.portals.bridges.struts</package>
+    <description>Apache Portals Struts Bridge</description>
+    <shortDescription>Apache Portals Struts Bridge</shortDescription>
+    <repository>
+        <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>
+            <name>Ate Douma</name>
+            <id>ate</id>
+            <email>ate@douma.nu</email>
+            <roles>
+                <role>Java Developer</role>
+            </roles>
+        </developer>
+    </developers>
+    <dependencies>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.0.4</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-digester</groupId>
+            <artifactId>commons-digester</artifactId>
+            <version>1.5</version>
+            <url>http://jakarta.apache.org/commons/digester.html</url>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>portlet-api</groupId>
+            <artifactId>portlet-api</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>servletapi</groupId>
+            <artifactId>servletapi</artifactId>
+            <version>2.3</version>
+        </dependency>
+        <dependency>
+            <groupId>struts</groupId>
+            <artifactId>struts</artifactId>
+            <version>1.2.4</version>
+        </dependency>
+        <dependency>
+            <groupId>struts</groupId>
+            <artifactId>struts-el</artifactId>
+            <version>1.2.4</version>
+        </dependency>
+        <dependency>
+            <groupId>portals-bridges</groupId>
+            <artifactId>portals-bridges-common</artifactId>
+            <version>
+                &portals-bridges-common-version;
+            </version>
+        </dependency>
+    </dependencies>
+    <build>
+        <sourceDirectory>src/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>${basedir}/src/java</directory>
+                <includes>
+                    <include>META-INF/tlds/*</include>
+                </includes>
+                <filtering>false</filtering>
+            </resource>
+        </resources>
+    </build>
+    <reports>
 
         &bridges-reports;
 
-  </reports>
+    </reports>
 </project>
 

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=216060&r1=216059&r2=216060&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/velocity/project.xml (original)
+++ portals/jetspeed-2/trunk/portals-bridges/velocity/project.xml Tue Jul 12 17:50:04 2005
@@ -3,85 +3,89 @@
   <!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
-
+    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$
+    
+    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>
-  <extend>${basedir}/../project.xml</extend>
-  <pomVersion>3</pomVersion>
-  <groupId>portals-bridges</groupId>
-  <id>portals-bridges-velocity</id>
-  <name>Velocity Bridge</name>
-  <currentVersion>&portals-bridges-velocity-version;</currentVersion>
-  <package>org.apache.portals.bridges.velocity</package>
-  <description>
-    Apache Portals Velocity Bridge
-  </description>
-  <shortDescription>Apache Portals Velocity Bridge</shortDescription>
-  <repository>
-    <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>
-      <groupId>portlet-api</groupId>
-      <artifactId>portlet-api</artifactId>
-      <version>1.0</version>
-    </dependency>
-     <dependency>
-      <groupId>servletapi</groupId>
-      <artifactId>servletapi</artifactId>
-      <version>2.3</version>
-    </dependency>
-    <dependency>
-      <id>velocity</id>
-      <version>1.4</version>
-    </dependency>
-    <dependency>
-      <id>velocity-tools</id>
-      <version>1.1</version>
-      <url>http://jakarta.apache.org/velocity</url>
-    </dependency>
-    <dependency>
-      <groupId>portals-bridges</groupId>
-      <artifactId>portals-bridges-common</artifactId>
-      <version>&portals-bridges-common-version;</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    <resources>
-      <resource>
-        <directory>${basedir}/src/java</directory>
-        <includes>
-          <include>META-INF/*</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>${basedir}/src/java</directory>
-        <includes>
-           <include>**/*.xml</include>
-        </includes>
-      </resource>      
-    </resources>
-  </build>
-  <reports>
+    <extend>${basedir}/../project.xml</extend>
+    <pomVersion>3</pomVersion>
+    <groupId>portals-bridges</groupId>
+    <artifactId>portals-bridges-velocity</artifactId>
+    <name>Velocity Bridge</name>
+    <currentVersion>
+        &portals-bridges-velocity-version;
+    </currentVersion>
+    <package>org.apache.portals.bridges.velocity</package>
+    <description>Apache Portals Velocity Bridge</description>
+    <shortDescription>Apache Portals Velocity Bridge</shortDescription>
+    <repository>
+        <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>
+            <groupId>portlet-api</groupId>
+            <artifactId>portlet-api</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>servletapi</groupId>
+            <artifactId>servletapi</artifactId>
+            <version>2.3</version>
+        </dependency>
+        <dependency>
+            <id>velocity</id>
+            <version>1.4</version>
+        </dependency>
+        <dependency>
+            <id>velocity-tools</id>
+            <version>1.1</version>
+            <url>http://jakarta.apache.org/velocity</url>
+        </dependency>
+        <dependency>
+            <groupId>portals-bridges</groupId>
+            <artifactId>portals-bridges-common</artifactId>
+            <version>
+                &portals-bridges-common-version;
+            </version>
+        </dependency>
+    </dependencies>
+    <build>
+        <sourceDirectory>src/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>${basedir}/src/java</directory>
+                <includes>
+                    <include>META-INF/*</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>${basedir}/src/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+            </resource>
+        </resources>
+    </build>
+    <reports>
 
         &bridges-reports;
 
-  </reports>
+    </reports>
 </project>

Modified: portals/jetspeed-2/trunk/portlet-api/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portlet-api/project.xml?rev=216060&r1=216059&r2=216060&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portlet-api/project.xml (original)
+++ portals/jetspeed-2/trunk/portlet-api/project.xml Tue Jul 12 17:50:04 2005
@@ -21,7 +21,7 @@
 -->
 <project>
   <pomVersion>3</pomVersion>
-  <id>portlet-api</id>
+  <artifactId>portlet-api</artifactId>
   <name>Java Portlet API</name>
   <currentVersion>1.0</currentVersion>
   <package>javax.portlet</package>

Modified: portals/jetspeed-2/trunk/taglibs/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/taglibs/maven.xml?rev=216060&r1=216059&r2=216060&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/taglibs/maven.xml (original)
+++ portals/jetspeed-2/trunk/taglibs/maven.xml Tue Jul 12 17:50:04 2005
@@ -18,12 +18,6 @@
          xmlns:j="jelly:core" 
          xmlns:define="jelly:define"
          xmlns:maven="jelly:maven">
-
-  <goal name="deployJar">
-  	<attainGoal name="jar:install"/>
-
-  	<copy file="${basedir}/target/${maven.final.name}.jar" todir="${org.apache.jetspeed.server.shared}"/>
-  </goal>
   
   <goal name="allBuild">
   	<maven:reactor

Modified: portals/jetspeed-2/trunk/taglibs/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/taglibs/project.xml?rev=216060&r1=216059&r2=216060&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/taglibs/project.xml (original)
+++ portals/jetspeed-2/trunk/taglibs/project.xml Tue Jul 12 17:50:04 2005
@@ -22,7 +22,7 @@
 <project>
   <extend>${basedir}/../project.xml</extend>
   <pomVersion>3</pomVersion>
-  <id>jetspeed2-taglibs</id>
+  <artifactId>jetspeed2-taglibs</artifactId>
   <name>Jetspeed 2 TagLibs</name>
   <groupId>jetspeed2</groupId>
   

Modified: portals/jetspeed-2/trunk/taglibs/treecontrol/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/taglibs/treecontrol/maven.xml?rev=216060&r1=216059&r2=216060&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/taglibs/treecontrol/maven.xml (original)
+++ portals/jetspeed-2/trunk/taglibs/treecontrol/maven.xml Tue Jul 12 17:50:04 2005
@@ -1,27 +1,17 @@
 <?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
-
+    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.
+    
+    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:define="jelly:define">
-
-  <goal name="deployJar">
-  	<attainGoal name="jar:install"/>
-
-  	<copy file="${basedir}/target/${maven.final.name}.jar" todir="${org.apache.jetspeed.server.shared}"/>
-  </goal>
-
-</project>
+<project default="java:jar" xmlns:j="jelly:core" xmlns:define="jelly:define" />

Modified: portals/jetspeed-2/trunk/taglibs/treecontrol/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/taglibs/treecontrol/project.xml?rev=216060&r1=216059&r2=216060&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/taglibs/treecontrol/project.xml (original)
+++ portals/jetspeed-2/trunk/taglibs/treecontrol/project.xml Tue Jul 12 17:50:04 2005
@@ -22,7 +22,7 @@
 <project>
 <extend>${basedir}/../../project.xml</extend>
   <pomVersion>3</pomVersion>
-  <id>jetspeed2-taglib-treecontrol</id>
+  <artifactId>jetspeed2-taglib-treecontrol</artifactId>
   <name>Jetspeed 2 TreeControl TagLib</name>
   <groupId>jetspeed2</groupId>
   



---------------------------------------------------------------------
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