portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wea...@apache.org
Subject svn commit: r216237 [1/2] - in /portals/jetspeed-2/trunk: app-servers/security/jboss/ applications/ applications/demo/ applications/gems/ applications/jpetstore/ applications/jsf-demo-myfaces/ applications/jsf-demo/ applications/palm/ applications/pam/...
Date Wed, 13 Jul 2005 20:57:07 GMT
Author: weaver
Date: Wed Jul 13 13:57:05 2005
New Revision: 216237

URL: http://svn.apache.org/viewcvs?rev=216237&view=rev
Log:
JS2-302: http://issues.apache.org/jira/browse/JS2-304#action_12315720

Use of XML entities has been removed.  We now use a standard,
project descriptor hierarchy approach.

Removed:
    portals/jetspeed-2/trunk/app-servers/security/jboss/locator.ent
    portals/jetspeed-2/trunk/app-servers/security/jboss/locator.path
    portals/jetspeed-2/trunk/applications/demo/locator.ent
    portals/jetspeed-2/trunk/applications/demo/locator.path
    portals/jetspeed-2/trunk/applications/gems/locator.ent
    portals/jetspeed-2/trunk/applications/gems/locator.path
    portals/jetspeed-2/trunk/applications/jpetstore/locator.ent
    portals/jetspeed-2/trunk/applications/jpetstore/locator.path
    portals/jetspeed-2/trunk/applications/jsf-demo-myfaces/locator.ent
    portals/jetspeed-2/trunk/applications/jsf-demo-myfaces/locator.path
    portals/jetspeed-2/trunk/applications/jsf-demo/locator.ent
    portals/jetspeed-2/trunk/applications/jsf-demo/locator.path
    portals/jetspeed-2/trunk/applications/palm/locator.ent
    portals/jetspeed-2/trunk/applications/palm/locator.path
    portals/jetspeed-2/trunk/applications/pam/locator.ent
    portals/jetspeed-2/trunk/applications/pam/locator.path
    portals/jetspeed-2/trunk/applications/perl/locator.ent
    portals/jetspeed-2/trunk/applications/perl/locator.path
    portals/jetspeed-2/trunk/applications/php/locator.ent
    portals/jetspeed-2/trunk/applications/php/locator.path
    portals/jetspeed-2/trunk/applications/rss/locator.ent
    portals/jetspeed-2/trunk/applications/rss/locator.path
    portals/jetspeed-2/trunk/applications/security/locator.ent
    portals/jetspeed-2/trunk/applications/security/locator.path
    portals/jetspeed-2/trunk/applications/struts-demo/locator.ent
    portals/jetspeed-2/trunk/applications/struts-demo/locator.path
Modified:
    portals/jetspeed-2/trunk/app-servers/security/jboss/project.xml
    portals/jetspeed-2/trunk/applications/demo/project.xml
    portals/jetspeed-2/trunk/applications/gems/project.xml
    portals/jetspeed-2/trunk/applications/jpetstore/project.xml
    portals/jetspeed-2/trunk/applications/jsf-demo-myfaces/project.xml
    portals/jetspeed-2/trunk/applications/jsf-demo/project.xml
    portals/jetspeed-2/trunk/applications/palm/project.xml
    portals/jetspeed-2/trunk/applications/pam/project.xml
    portals/jetspeed-2/trunk/applications/perl/project.xml
    portals/jetspeed-2/trunk/applications/php/project.xml
    portals/jetspeed-2/trunk/applications/project.xml
    portals/jetspeed-2/trunk/applications/rss/project.xml
    portals/jetspeed-2/trunk/applications/security/project.xml
    portals/jetspeed-2/trunk/applications/struts-demo/project.xml

Modified: portals/jetspeed-2/trunk/app-servers/security/jboss/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/app-servers/security/jboss/project.xml?rev=216237&r1=216236&r2=216237&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/app-servers/security/jboss/project.xml (original)
+++ portals/jetspeed-2/trunk/app-servers/security/jboss/project.xml Wed Jul 13 13:57:05 2005
@@ -1,209 +1,158 @@
 <?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.xml,v 1.28 2005/03/31 14:07:14 ate Exp $
+<!--
+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.xml,v 1.28 2005/03/31 14:07:14 ate Exp $
 -->
 <project>
-    <extend>${basedir}/../../../project.xml</extend>
-    <pomVersion>3</pomVersion>
-    <artifactId>jetspeed-jboss-security-service</artifactId>
-    <groupId>jetspeed2</groupId>
-    <name>Jetspeed-2 JBoss Security Service</name>
-
-    <package>org.apache.jetspeed</package>
+  <extend>${basedir}/../../../project-info.xml</extend>
+  <pomVersion>3</pomVersion>
+  <id>jetspeed-jboss-security-service</id>
+  <name>Jetspeed-2 JBoss Security Service</name>
+  
+  <package>org.apache.jetspeed</package>
     <description>Security Service for JBoss</description>
-    <shortDescription>Security Service</shortDescription>
+  <shortDescription>Security Service</shortDescription>
 
-    <repository>
+  <repository>
         <connection>
             scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-jetspeed-2/appservers/security/jboss
         </connection>
-        <url>http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/appservers/security/jboss</url>
-    </repository>
-
-    <dependencies>
-
-        <!-- Dependencies copied from general (included)
-            dependencies. Must be copied (and preceeding the included
-            dependencies) for setting the sar.bundle property. May be removed
-            if sar.bundle property is maintained in included file. -->
-
-        <dependency>
-            <id>springframework:spring</id>
-            <version>1.1.5</version>
-            <properties>
-                <sar.bundle>true</sar.bundle>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <id>aopalliance</id>
-            <version>1.0</version>
-            <properties>
-                <sar.bundle>true</sar.bundle>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <id>ojb:db-ojb</id>
-            <version>1.0.1</version>
-            <properties>
-                <sar.bundle>true</sar.bundle>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <id>commons-lang</id>
-            <version>2.0</version>
-            <properties>
-                <sar.bundle>true</sar.bundle>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <id>jetspeed-commons</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-            <properties>
-                <sar.bundle>true</sar.bundle>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <id>commons-configuration</id>
-            <version>1.0</version>
-            <properties>
-                <sar.bundle>true</sar.bundle>
-            </properties>
-        </dependency>
-
-        <!-- General dependencies -->
-
-        &spring-deps;
-
-        &db-ojb-deps;
-
-        &commons-config-dep;
-
-        <!-- Components -->
-
-        <dependency>
-            <id>jetspeed-security</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-            <properties>
-                <sar.bundle>true</sar.bundle>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <id>jetspeed-cm</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-            <properties>
-                <sar.bundle>true</sar.bundle>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <id>jetspeed-api</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-            <properties>
-                <sar.bundle>true</sar.bundle>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <id>commons-pool</id>
-            <version>1.2</version>
-            <properties>
-                <sar.bundle>true</sar.bundle>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <id>commons-dbcp</id>
-            <version>1.2.1</version>
-            <properties>
-                <sar.bundle>true</sar.bundle>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <id>commons-codec</id>
-            <version>1.3</version>
-            <properties>
-                <sar.bundle>true</sar.bundle>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <id>commons-collections</id>
-            <version>3.0</version>
-            <properties>
-                <sar.bundle>true</sar.bundle>
-            </properties>
-        </dependency>
-
-        <!-- Testing only -->
-    </dependencies>
-
-    <build>
-
-        <sourceDirectory>src/java</sourceDirectory>
-
-        <resources>
-
-            <resource>
-                <directory>${basedir}/src/java</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </resource>
-
-            <resource>
-                <directory>${org.apache.jetspeed.project.home}/etc/db-ojb</directory>
-                <includes>
-                    <include>*.xml</include>
-                    <include>*.dtd</include>
-                    <include>*.properties</include>
-                </includes>
-                <excludes>
-                    <exclude>repository_database.xml</exclude>
-                </excludes>
-            </resource>
+    <url>http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/appservers/security/jboss</url>
+  </repository>
 
-        </resources>
+  <dependencies>
 
-    </build>
-    <reports>
+    <!-- Dependencies copied from general (included)
+    dependencies. Must be copied (and preceeding the included
+    dependencies) for setting the sar.bundle property. May be removed
+    if sar.bundle property is maintained in included file. -->
+  
+    <dependency>
+      <id>springframework:spring</id> 
+      <version>${spring.version}</version>
+      <properties>
+        <sar.bundle>true</sar.bundle>
+      </properties>
+    </dependency>   
+
+    <dependency>
+      <id>aopalliance</id>
+      <version>1.0</version>
+      <properties>
+        <sar.bundle>true</sar.bundle>
+      </properties>
+    </dependency>
+
+    <dependency>
+      <id>ojb:db-ojb</id>
+      <version>1.0.1</version>
+      <properties>
+    	<sar.bundle>true</sar.bundle>
+      </properties>
+    </dependency>
+
+    <dependency>
+      <id>commons-lang</id>
+      <version>2.0</version>
+      <properties>
+        <sar.bundle>true</sar.bundle>
+      </properties>
+    </dependency>
+
+    <dependency>
+      <id>jetspeed-commons</id>
+      <groupId>jetspeed2</groupId>
+      <version>${jetspeed.version}</version>
+      <properties>
+        <sar.bundle>true</sar.bundle>
+      </properties>
+    </dependency>
+    
+    <dependency>
+      <id>commons-configuration</id>
+      <version>1.0</version>
+      <properties>
+	    <sar.bundle>true</sar.bundle>
+      </properties>
+    </dependency>
+
+
+    <!-- Components -->
+
+    <dependency>
+      <id>jetspeed-security</id>
+      <groupId>jetspeed2</groupId>
+      <version>${jetspeed.version}</version>
+      <properties>
+        <sar.bundle>true</sar.bundle>
+      </properties>
+    </dependency>
+
+    <dependency>
+      <id>jetspeed-cm</id>
+      <groupId>jetspeed2</groupId>
+      <version>${jetspeed.version}</version>
+      <properties>
+        <sar.bundle>true</sar.bundle>
+      </properties>
+    </dependency>
+
+    <dependency>
+      <id>jetspeed-api</id>
+      <groupId>jetspeed2</groupId>
+      <version>${jetspeed.version}</version>
+      <properties>
+        <sar.bundle>true</sar.bundle>
+      </properties>
+    </dependency>
+
+    <dependency>
+      <id>commons-pool</id>
+      <version>1.2</version>
+      <properties>
+        <sar.bundle>true</sar.bundle>
+      </properties>
+    </dependency>
+
+    <dependency>
+      <id>commons-dbcp</id>
+      <version>1.2.1</version>
+      <properties>
+        <sar.bundle>true</sar.bundle>
+      </properties>
+    </dependency>
+
+    <dependency>
+      <id>commons-codec</id>
+      <version>1.3</version>
+      <properties>
+        <sar.bundle>true</sar.bundle>
+      </properties>
+    </dependency>        
+
+    <dependency>
+      <id>commons-collections</id>
+      <version>3.0</version>
+      <properties>
+        <sar.bundle>true</sar.bundle>
+      </properties>
+    </dependency>
 
-        &j2-reports;
+    <!-- Testing only -->
+  </dependencies>
 
-    </reports>
+  
 </project>

Modified: portals/jetspeed-2/trunk/applications/demo/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/demo/project.xml?rev=216237&r1=216236&r2=216237&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/demo/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/demo/project.xml Wed Jul 13 13:57:05 2005
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
-  <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities;
-]>
 <!--
     Copyright 2004 The Apache Software Foundation
     
@@ -20,7 +17,7 @@
     $Id$
 -->
 <project>
-    <extend>${basedir}/../../project.xml</extend>
+    <extend>${basedir}/../../project-info.xml</extend>
     <pomVersion>3</pomVersion>
     <artifactId>demo</artifactId>
     <name>Jetspeed-2 Demo Portlet Application</name>
@@ -50,9 +47,8 @@
             <type>jar</type>
             <properties>
                 <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-
+            </properties>		  
+		</dependency>		
         <dependency>
             <groupId>commons-digester</groupId>
             <artifactId>commons-digester</artifactId>
@@ -133,9 +129,7 @@
         <dependency>
             <groupId>jetspeed2</groupId>
             <artifactId>jetspeed-commons</artifactId>
-            <version>
-                &jetspeed-version;
-            </version>
+            <version>${jetspeed.version}</version>
             <type>jar</type>
             <properties>
                 <war.bundle>false</war.bundle>
@@ -144,9 +138,7 @@
         <dependency>
             <groupId>portals-gems</groupId>
             <artifactId>portals-gems</artifactId>
-            <version>
-                &jetspeed-version;
-            </version>
+            <version>${jetspeed.version}</version>
             <type>jar</type>
             <properties>
                 <war.bundle>true</war.bundle>
@@ -155,9 +147,7 @@
         <dependency>
             <groupId>portals-bridges</groupId>
             <artifactId>portals-bridges-common</artifactId>
-            <version>
-                &portals-bridges-common-version;
-            </version>
+            <version>${portals.bridges.common.version}</version>
             <type>jar</type>
             <properties>
                 <war.bundle>false</war.bundle>
@@ -166,9 +156,7 @@
         <dependency>
             <groupId>portals-bridges</groupId>
             <artifactId>portals-bridges-velocity</artifactId>
-            <version>
-                &portals-bridges-velocity-version;
-            </version>
+            <version>${portals.bridges.velocity.version}</version>
             <type>jar</type>
             <properties>
                 <war.bundle>true</war.bundle>
@@ -211,19 +199,33 @@
         <dependency>
             <groupId>jetspeed2</groupId>
             <artifactId>jetspeed-web-content</artifactId>
-            <version>
-                &jetspeed-version;
-            </version>
+            <version>${jetspeed.version}</version>
             <type>jar</type>
             <properties>
                 <war.bundle>true</war.bundle>
             </properties>
         </dependency>
         <dependency>
+	        <groupId>jetspeed2</groupId>
+	        <artifactId>jetspeed-components</artifactId>
+      		<version>${jetspeed.version}</version>
+			 <type>jar</type>
+			 <properties>
+			 	<war.bundle>true</war.bundle>
+			 </properties>
+	    </dependency>
+	    <dependency>
+	      <id>castor</id>
+	      <version>0.9.4.3</version>
+	      <properties>
+	        <war.bundle>true</war.bundle>
+	      </properties>
+	    </dependency>
+	    <dependency>
             <groupId>jetspeed2</groupId>
             <artifactId>jetspeed-components</artifactId>
             <version>
-                &jetspeed-version;
+                ${jetspeed.version}
             </version>
             <type>jar</type>
             <properties>
@@ -240,9 +242,7 @@
         <dependency>
             <groupId>jetspeed2</groupId>
             <artifactId>jetspeed-rewriter</artifactId>
-            <version>
-                &jetspeed-version;
-            </version>
+            <version>${jetspeed.version}</version>
             <type>jar</type>
             <properties>
                 <war.bundle>true</war.bundle>
@@ -258,30 +258,5 @@
             </properties>
         </dependency>
     </dependencies>
-    <build>
-        <sourceDirectory>src/java</sourceDirectory>
-        <resources>
-            <resource>
-                <directory>${basedir}/src/java/</directory>
-                <includes>
-                    <include>**/*.properties</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
-        </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-tasklist-plugin</report>
-    </reports>
-    <properties />
+    
 </project>

Modified: portals/jetspeed-2/trunk/applications/gems/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/gems/project.xml?rev=216237&r1=216236&r2=216237&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/gems/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/gems/project.xml Wed Jul 13 13:57:05 2005
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
-  <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities;
-]>
 <!--
     Copyright 2004 The Apache Software Foundation
     
@@ -61,7 +58,7 @@
             <groupId>portals-bridges</groupId>
             <artifactId>portals-bridges-common</artifactId>
             <version>
-                &portals-bridges-common-version;
+                ${portals.bridges.common.version}
             </version>
             <type>jar</type>
         </dependency>
@@ -69,73 +66,14 @@
             <groupId>portals-bridges</groupId>
             <artifactId>portals-bridges-velocity</artifactId>
             <version>
-                &portals-bridges-velocity-version;
+                ${portals.bridges.velocity.version}
             </version>
             <type>jar</type>
         </dependency>
         <dependency>
             <id>velocity</id>
             <version>1.4</version>
-        </dependency>
-
-        <dependency>
-            <id>jetspeed-sso</id>
-            <groupId>jetspeed2</groupId>
-            <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>
-
-    </dependencies>
-    <build>
-        <sourceDirectory>src/java</sourceDirectory>
-        <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
-        <unitTest>
-            <includes>
-                <include>**/Test*.java</include>
-            </includes>
-
-            <resources>
-                <resource>
-                    <directory>${basedir}/src/test</directory>
-                    <excludes>
-                        <exclude>**/*.java</exclude>
-                    </excludes>
-                </resource>
-                <resource>
-                    <directory>${basedir}/src/java</directory>
-                    <excludes>
-                        <exclude>**/*.java</exclude>
-                    </excludes>
-                </resource>
-            </resources>
-        </unitTest>
-
-        <resources>
-            <resource>
-                <directory>${basedir}/src/java</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </resource>
-        </resources>
-
-    </build>
-    <reports>
-
-        &j2-reports;
-
-    </reports>
+        </dependency>  
+  </dependencies>
+  
 </project>

Modified: portals/jetspeed-2/trunk/applications/jpetstore/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jpetstore/project.xml?rev=216237&r1=216236&r2=216237&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/jpetstore/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/jpetstore/project.xml Wed Jul 13 13:57:05 2005
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
-  <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities;
-]>
 <!--
     Copyright 2004 The Apache Software Foundation
     
@@ -20,11 +17,10 @@
     $Id$
 -->
 <project>
-    <extend>${basedir}/../../project.xml</extend>
-    <pomVersion>3</pomVersion>
-    <artifactId>jpetstore</artifactId>
-    <groupId>jetspeed2</groupId>
-    <name>iBATIS JPetstore Demo Portlet</name>
+  <extend>${basedir}/../../project-info.xml</extend>
+  <pomVersion>3</pomVersion>
+  <id>jpetstore</id>
+  <name>iBATIS JPetstore Demo Portlet</name>
 
     <package>com.ibatis.jpetstore</package>
     <description>JPetstore Demo Portlet</description>
@@ -38,210 +34,191 @@
         <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/applications/jpetstore/</url>
     </repository>
 
-    <dependencies>
-        <dependency>
-            <id>servletapi</id>
-            <version>2.3</version>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>log4j</id>
-            <version>1.2.8</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.0.4</version>
-            <url>http://jakarta.apache.org/commons/logging.html</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>portlet-api</groupId>
-            <artifactId>portlet-api</artifactId>
-            <version>1.0</version>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-        <!-- for unit tests -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>3.8.1</version>
-            <url>http://www.junit.org</url>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-        <!-- warred jars -->
-        <dependency>
-            <groupId>antlr</groupId>
-            <artifactId>antlr</artifactId>
-            <version>2.7.2</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-            <version>1.6.1</version>
-            <url>http://jakarta.apache.org/commons/beanutils.html</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>2.1</version>
-            <url>http://jakarta.apache.org/commons/collections.html</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </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>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-            <version>1.0</version>
-            <url>http://jakarta.apache.org/commons/fileupload/</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.0</version>
-            <url>http://jakarta.apache.org/commons/lang.html</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </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>
-            <groupId>oro</groupId>
-            <artifactId>oro</artifactId>
-            <version>2.0.7</version>
-            <url>http://jakarta.apache.org/oro/</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>taglibs</groupId>
-            <artifactId>standard</artifactId>
-            <version>1.0.6</version>
-            <type>jar</type>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>struts</groupId>
-            <artifactId>struts</artifactId>
-            <version>1.2.4</version>
-            <url>http://jakarta.apache.org/struts/</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>struts</groupId>
-            <artifactId>struts-el</artifactId>
-            <version>1.2.4</version>
-            <url>http://jakarta.apache.org/struts/</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>ibatis</groupId>
-            <artifactId>ibatis-common</artifactId>
-            <version>2.0.8</version>
-            <url>http://www.ibatis.com</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>ibatis</groupId>
-            <artifactId>ibatis-dao</artifactId>
-            <version>2.0.8</version>
-            <url>http://www.ibatis.com</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>ibatis</groupId>
-            <artifactId>ibatis-sqlmap</artifactId>
-            <version>2.0.8</version>
-            <url>http://www.ibatis.com</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>hsqldb</groupId>
-            <artifactId>hsqldb</artifactId>
-            <version>1.7.1</version>
-            <type>jar</type>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>portals-bridges</groupId>
-            <artifactId>portals-bridges-struts</artifactId>
-            <version>
-                &portals-bridges-struts-version;
-            </version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-    </dependencies>
+  <dependencies>
+     <dependency>
+      <id>servletapi</id>
+      <version>2.3</version>
+      <properties>
+        <war.bundle>false</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>log4j</id>
+      <version>1.2.8</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.0.4</version>
+      <url>http://jakarta.apache.org/commons/logging.html</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+	<dependency>
+      <groupId>portlet-api</groupId>
+      <artifactId>portlet-api</artifactId>
+      <version>1.0</version>
+      <properties>
+        <war.bundle>false</war.bundle>
+      </properties>
+    </dependency>
+    <!-- for unit tests -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <url>http://www.junit.org</url>
+      <properties>
+        <war.bundle>false</war.bundle>
+      </properties>
+    </dependency>
+    <!-- warred jars -->
+    <dependency>
+      <groupId>antlr</groupId>
+      <artifactId>antlr</artifactId>
+      <version>2.7.2</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+      <version>1.6.1</version>
+      <url>http://jakarta.apache.org/commons/beanutils.html</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>2.1</version>
+      <url>http://jakarta.apache.org/commons/collections.html</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </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>commons-fileupload</groupId>
+      <artifactId>commons-fileupload</artifactId>
+      <version>1.0</version>
+      <url>http://jakarta.apache.org/commons/fileupload/</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.0</version>
+      <url>http://jakarta.apache.org/commons/lang.html</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </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>
+      <groupId>oro</groupId>
+      <artifactId>oro</artifactId>
+      <version>2.0.7</version>
+      <url>http://jakarta.apache.org/oro/</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>taglibs</groupId>
+      <artifactId>standard</artifactId>
+      <version>1.0.6</version>
+      <type>jar</type>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>struts</groupId>
+      <artifactId>struts</artifactId>
+      <version>1.2.4</version>
+      <url>http://jakarta.apache.org/struts/</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>struts</groupId>
+      <artifactId>struts-el</artifactId>
+      <version>1.2.4</version>
+      <url>http://jakarta.apache.org/struts/</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>ibatis</groupId>
+      <artifactId>ibatis-common</artifactId>
+      <version>2.0.8</version>
+      <url>http://www.ibatis.com</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>ibatis</groupId>
+      <artifactId>ibatis-dao</artifactId>
+      <version>2.0.8</version>
+      <url>http://www.ibatis.com</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>ibatis</groupId>
+      <artifactId>ibatis-sqlmap</artifactId>
+      <version>2.0.8</version>
+      <url>http://www.ibatis.com</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <version>1.7.1</version>
+      <type>jar</type>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>portals-bridges</groupId>
+      <artifactId>portals-bridges-struts</artifactId>
+      <version>${portals.bridges.common.version}</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+   </dependencies>
 
-    <build>
-        <sourceDirectory>src/java</sourceDirectory>
-        <resources>
-            <resource>
-                <directory>${basedir}/src/java</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </resource>
-        </resources>
-    </build>
-
-    <reports>
-
-        &j2-reports;
-
-    </reports>
 </project>

Modified: portals/jetspeed-2/trunk/applications/jsf-demo-myfaces/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jsf-demo-myfaces/project.xml?rev=216237&r1=216236&r2=216237&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/jsf-demo-myfaces/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/jsf-demo-myfaces/project.xml Wed Jul 13 13:57:05 2005
@@ -1,152 +1,137 @@
 <?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>
-    <extend>${basedir}/../../project.xml</extend>
-    <pomVersion>3</pomVersion>
-    <artifactId>jsf-demo-myfaces</artifactId>
-    <groupId>jetspeed2</groupId>
-    <name>JSF Portlet Demo - MyFaces Portlet Support</name>
-    <package>org.apache.portals.webapp.example</package>
-    <description>JSF Portlet Demo - MyFaces Portlet Support</description>
-    <shortDescription>JSF Portlet Demo - MyFaces Portlet Support</shortDescription>
-
-    <repository>
-        <connection>
-            scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/applications/jsf-demo-myfaces
-        </connection>
-        <developerConnection>
-            scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/applications/jsf-demo-myfaces
-        </developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/applications/jsf-demo-myfaces/</url>
-    </repository>
-
-    <dependencies>
-        <dependency>
-            <id>servletapi</id>
-            <version>2.3</version>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>portlet-api</groupId>
-            <artifactId>portlet-api</artifactId>
-            <version>1.0</version>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-        <!-- warred jars -->
-        <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-            <version>1.6.1</version>
-            <url>http://jakarta.apache.org/commons/beanutils.html</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.2</version>
-            <url>http://jakarta.apache.org/commons/codec/</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>2.1</version>
-            <url>http://jakarta.apache.org/commons/collections.html</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </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>
-            <id>log4j</id>
-            <version>1.2.8</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-
-        &myfaces-deps;
-
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.0.3</version>
-            <url>http://jakarta.apache.org/commons/logging.html</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>commons-el</groupId>
-            <artifactId>commons-el</artifactId>
-            <version>1.0</version>
-            <url>http://jakarta.apache.org/commons/el/</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <sourceDirectory>../jsf-demo/src/java</sourceDirectory>
-        <sourceModifications>
-            <sourceModification>
-                <className>excludeClass</className>
-                <excludes>
-                    <exclude>**/Tree*.java</exclude>
-                    <exclude>**/Calendar*.java</exclude>
-                </excludes>
-            </sourceModification>
-        </sourceModifications>
-        <resources>
-            <resource>
-                <directory>${basedir}/src/java</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </resource>
-        </resources>
-    </build>
+Copyright 2004 The Apache Software Foundation
 
-    <reports>
+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
 
-        &j2-reports;
+    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.
 
-    </reports>
+  $Id$
+-->
+<project>
+  <extend>${basedir}/../../project-info.xml</extend>
+  <pomVersion>3</pomVersion>
+  <id>jsf-demo-myfaces</id>
+  <name>JSF Portlet Demo - MyFaces Portlet Support</name>
+  <package>org.apache.portals.webapp.example</package>
+  <description>JSF Portlet Demo - MyFaces Portlet Support</description>
+  <shortDescription>JSF Portlet Demo - MyFaces Portlet Support</shortDescription>
+
+  <repository>                 
+    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/applications/jsf-demo-myfaces</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/applications/jsf-demo-myfaces</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/applications/jsf-demo-myfaces/</url>
+  </repository>
+
+  <dependencies>
+     <dependency>
+      <id>servletapi</id>
+      <version>2.3</version>
+      <properties>
+        <war.bundle>false</war.bundle>
+      </properties>
+    </dependency>
+	<dependency>
+      <id>portlet-api</id>
+      <version>1.0</version>
+      <properties>
+        <war.bundle>false</war.bundle>
+      </properties>
+    </dependency>
+    <!-- warred jars -->
+    <dependency>
+      <id>commons-beanutils</id>
+      <version>1.6.1</version>
+      <url>http://jakarta.apache.org/commons/beanutils.html</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>commons-codec</id>
+      <version>1.2</version>
+      <url>http://jakarta.apache.org/commons/codec/</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>commons-collections</id>
+      <version>2.1</version>
+      <url>http://jakarta.apache.org/commons/collections.html</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>commons-digester</id>
+      <version>1.5</version>
+      <url>http://jakarta.apache.org/commons/digester.html</url>
+      <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>myfaces:myfaces</id>
+	    <version>${myfaces.version}</version>
+	    <properties>
+			<war.bundle>true</war.bundle>
+		</properties>
+    </dependency>
+	<dependency>
+	    <id>myfaces:myfaces-jsf-api</id>
+	    <version>${myfaces.version}</version>
+	    <properties>
+			<war.bundle>true</war.bundle>
+		</properties>
+	</dependency>
+    
+    <dependency>
+      <id>commons-logging</id>   
+      <version>1.0.3</version>
+      <url>http://jakarta.apache.org/commons/logging.html</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>commons-el</id>
+      <version>1.0</version>
+      <url>http://jakarta.apache.org/commons/el/</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+        
+   </dependencies>
+
+  <build>
+    <sourceDirectory>../jsf-demo/src/java</sourceDirectory>
+    <sourceModifications>
+      <sourceModification>
+        <className>excludeClass</className>
+        <excludes>
+          <exclude>**/Tree*.java</exclude>
+          <exclude>**/Calendar*.java</exclude>
+        </excludes>
+      </sourceModification>
+    </sourceModifications>
+  </build>
+ 
 </project>

Modified: portals/jetspeed-2/trunk/applications/jsf-demo/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jsf-demo/project.xml?rev=216237&r1=216236&r2=216237&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/jsf-demo/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/jsf-demo/project.xml Wed Jul 13 13:57:05 2005
@@ -1,143 +1,135 @@
 <?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
-    
+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.
+
     $Id$
 -->
 <project>
-    <extend>${basedir}/../../project.xml</extend>
-    <pomVersion>3</pomVersion>
+  <extend>${basedir}/../../project-info.xml</extend>
+  <pomVersion>3</pomVersion>
     <artifactId>jsf-demo</artifactId>
     <groupId>jetspeed2</groupId>
-    <name>JSF Portlet Demo</name>
-    <package>org.apache.portals.webapp.example</package>
-    <description>JSF Portlet Demo</description>
-    <shortDescription>JSF Portlet Demo</shortDescription>
+  <name>JSF Portlet Demo</name>
+  <package>org.apache.portals.webapp.example</package>
+  <description>JSF Portlet Demo</description>
+  <shortDescription>JSF Portlet Demo</shortDescription>
 
-    <repository>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/applications/jsf-demo</connection>
+  <repository>                 
+    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/applications/jsf-demo</connection>
         <developerConnection>
             scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/applications/jsf-demo
         </developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/applications/jsf-demo/</url>
-    </repository>
-
-    <dependencies>
-        <dependency>
-            <id>servletapi</id>
-            <version>2.3</version>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>portlet-api</groupId>
-            <artifactId>portlet-api</artifactId>
-            <version>1.0</version>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-        <!-- warred jars -->
-        <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-            <version>1.6.1</version>
-            <url>http://jakarta.apache.org/commons/beanutils.html</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.2</version>
-            <url>http://jakarta.apache.org/commons/codec/</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>2.1</version>
-            <url>http://jakarta.apache.org/commons/collections.html</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </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>
-            <id>log4j</id>
-            <version>1.2.8</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-
-        &myfaces-deps;
-
-        &jsf-bridge-deps;
-
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.0.3</version>
-            <url>http://jakarta.apache.org/commons/logging.html</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>commons-el</groupId>
-            <artifactId>commons-el</artifactId>
-            <version>1.0</version>
-            <url>http://jakarta.apache.org/commons/el/</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <sourceDirectory>src/java</sourceDirectory>
-        <resources>
-            <resource>
-                <directory>${basedir}/src/java</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </resource>
-        </resources>
-    </build>
-
-    <reports>
-
-        &j2-reports;
+    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/applications/jsf-demo/</url>
+  </repository>
 
-    </reports>
+  <dependencies>
+     <dependency>
+      <id>servletapi</id>
+      <version>2.3</version>
+      <properties>
+        <war.bundle>false</war.bundle>
+      </properties>
+    </dependency>
+	<dependency>
+      <id>portlet-api</id>
+      <version>1.0</version>
+      <properties>
+        <war.bundle>false</war.bundle>
+      </properties>
+    </dependency>
+    <!-- warred jars -->
+    <dependency>
+      <id>commons-beanutils</id>
+      <version>1.6.1</version>
+      <url>http://jakarta.apache.org/commons/beanutils.html</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>commons-codec</id>
+      <version>1.2</version>
+      <url>http://jakarta.apache.org/commons/codec/</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>commons-collections</id>
+      <version>2.1</version>
+      <url>http://jakarta.apache.org/commons/collections.html</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>commons-digester</id>    
+      <version>1.5</version>
+      <url>http://jakarta.apache.org/commons/digester.html</url>
+      <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>myfaces:myfaces</id>
+	    <version>${myfaces.version}</version>
+	    <properties>
+			<war.bundle>true</war.bundle>
+		</properties>
+    </dependency>
+	<dependency>
+	    <id>myfaces:myfaces-jsf-api</id>
+	    <version>${myfaces.version}</version>
+	    <properties>
+			<war.bundle>true</war.bundle>
+		</properties>
+	</dependency>
+    
+    <dependency>
+	    <id>portals-bridges:portals-bridges-jsf</id>
+	    <version>${portals.bridges.jsf.version}</version>
+	    <properties>
+			<war.bundle>true</war.bundle>
+	    </properties>
+    </dependency>
+    
+    <dependency>
+      <id>commons-logging</id>
+      <version>1.0.3</version>
+      <url>http://jakarta.apache.org/commons/logging.html</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>commons-el</id>
+      <version>1.0</version>
+      <url>http://jakarta.apache.org/commons/el/</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+        
+  </dependencies>
+ 
 </project>

Modified: portals/jetspeed-2/trunk/applications/palm/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/palm/project.xml?rev=216237&r1=216236&r2=216237&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/palm/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/palm/project.xml Wed Jul 13 13:57:05 2005
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
-  <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities;
-]>
 <!--
 Copyright 2004 The Apache Software Foundation
 
@@ -20,7 +17,7 @@
   $Id$
 -->
 <project>
-    <extend>${basedir}/../../project.xml</extend>
+    <extend>${basedir}/../../project-info.xml</extend>
     <pomVersion>3</pomVersion>
     <artifactId>palm</artifactId>
     <name>Jetspeed-2 Portlet Application Lifecyle Management</name>
@@ -33,8 +30,7 @@
     </repository>
     <dependencies>
       <dependency>
-          <groupId>portlet-api</groupId>
-          <artifactId>portlet-api</artifactId>
+          <id>portlet-api</id>
           <version>1.0</version>
           <type>jar</type>
           <properties>
@@ -42,8 +38,7 @@
           </properties>
       </dependency>
       <dependency>
-          <groupId>jstl</groupId>
-          <artifactId>jstl</artifactId>
+          <id>jstl</id>
           <version>1.0.6</version>
           <type>jar</type>
           <properties>
@@ -51,8 +46,7 @@
           </properties>
       </dependency>
       <dependency>
-          <groupId>taglibs</groupId>
-          <artifactId>standard</artifactId>
+          <id>taglibs:standard</id>
           <version>1.0.6</version>
           <type>jar</type>
           <properties>
@@ -60,8 +54,7 @@
           </properties>
       </dependency>
       <dependency>
-          <groupId>servletapi</groupId>
-          <artifactId>servletapi</artifactId>
+          <id>servletapi</id>
           <version>2.3</version>
           <type>jar</type>
           <properties>
@@ -69,27 +62,24 @@
           </properties>
       </dependency>
       <dependency>
-          <groupId>jetspeed2</groupId>
-          <artifactId>jetspeed-api</artifactId>
-          <version>&jetspeed-version;</version>
+          <id>jetspeed2:jetspeed-api</id> 
+          <version>${jetspeed.version}</version>
           <type>jar</type>
           <properties>
               <war.bundle>false</war.bundle>
           </properties>
       </dependency>
       <dependency>
-          <groupId>jetspeed2</groupId>
-          <artifactId>jetspeed-commons</artifactId>
-          <version>&jetspeed-version;</version>
+          <id>jetspeed2:jetspeed-commons</id>
+          <version>${jetspeed.version}</version>
           <type>jar</type>
           <properties>
               <war.bundle>false</war.bundle>
           </properties>
       </dependency>
       <dependency>
-        <groupId>portals-gems</groupId>
-        <artifactId>portals-gems</artifactId>
-        <version>&jetspeed-version;</version>
+        <id>portals-gems:portals-gems</id>
+        <version>${jetspeed.version}</version>
         <type>jar</type>
         <properties>
           <war.bundle>true</war.bundle>
@@ -98,17 +88,24 @@
       <dependency>
         <groupId>portals-bridges</groupId>
         <artifactId>portals-bridges-common</artifactId>
-        <version>&portals-bridges-common-version;</version>
+        <version>${portals.bridges.common.version}</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
       </dependency>
       
-      &pluto-deps;
+      <!-- Pluto Container -->
+	  <dependency>
+		  <id>pluto</id>
+		  <version>${pluto.version}</version>
+		  <type>jar</type>
+		  <properties>
+		    <war.bundle>false</war.bundle>
+		  </properties>
+	  </dependency>
       
       <dependency>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
+          <id>log4j</id>
           <version>1.2.8</version>
           <type>jar</type>
           <properties>
@@ -116,8 +113,7 @@
           </properties>
       </dependency>
       <dependency>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
+          <id>commons-logging</id>
           <version>1.0.3</version>
           <type>jar</type>
           <url>http://jakarta.apache.org/commons/logging.html</url>
@@ -126,21 +122,5 @@
           </properties>
       </dependency>
     </dependencies>
-    <build>
-        <sourceDirectory>src/java</sourceDirectory>
-        <resources>
-            <resource>
-                <directory>${basedir}/src/java/</directory>
-                <includes>
-                    <include>**/*.properties</include>
-                </includes>
-            </resource>
-        </resources>
-    </build>
-    <reports>
-
-        &j2-reports;
-
-    </reports>
-    <properties/>
+    
 </project>

Modified: portals/jetspeed-2/trunk/applications/pam/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/pam/project.xml?rev=216237&r1=216236&r2=216237&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/pam/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/pam/project.xml Wed Jul 13 13:57:05 2005
@@ -1,26 +1,23 @@
 <?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
-    
+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.
+
     $Id$
 -->
 <project>
-    <extend>${basedir}/../../project.xml</extend>
+    <extend>${basedir}/../../project-info.xml</extend>
     <pomVersion>3</pomVersion>
     <artifactId>pam</artifactId>
     <name>Jetspeed-2 Portlet Application Manager</name>
@@ -34,44 +31,44 @@
         <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/applications/pam/</url>
     </repository>
     <dependencies>
+		<dependency>
+		  <id>commons-validator</id>
+		  <version>1.1.3</version>
+		  <url>http://jakarta.apache.org/commons/validator/</url>
+		  <properties>
+			<war.bundle>true</war.bundle>
+		  </properties>    
+		</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>
-            <groupId>jetspeed2</groupId>
-            <artifactId>jetspeed-api</artifactId>
-            <version>
-                &jetspeed-version;
-            </version>
+            <id>jetspeed2:jetspeed-api</id>  
+            <version>${jetspeed.version}</version>
             <type>jar</type>
             <properties>
                 <war.bundle>false</war.bundle>
             </properties>
         </dependency>
+      
+        <!-- Pluto Container -->
+		<dependency>
+		  <id>pluto</id>
+		  <version>${pluto.version}</version>
+		  <type>jar</type>
+		  <properties>
+		    <war.bundle>false</war.bundle>
+		  </properties>
+		</dependency>
 
-        &pluto-deps;
-
-        <dependency>
-            <groupId>portals-gems</groupId>
-            <artifactId>portals-gems</artifactId>
-            <version>
-                &jetspeed-version;
-            </version>
-            <type>jar</type>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-
+	    <dependency>
+	        <id>portals-gems</id>
+	        <version>${jetspeed.version}</version>
+	        <type>jar</type>
+	        <properties>
+	            <war.bundle>true</war.bundle>
+	        </properties>
+	    </dependency>
+      
         <dependency>
-            <groupId>portlet-api</groupId>
-            <artifactId>portlet-api</artifactId>
+            <id>portlet-api</id>
             <version>1.0</version>
             <type>jar</type>
             <properties>
@@ -79,8 +76,7 @@
             </properties>
         </dependency>
         <dependency>
-            <groupId>jstl</groupId>
-            <artifactId>jstl</artifactId>
+            <id>jstl</id>
             <version>1.0.6</version>
             <type>jar</type>
             <properties>
@@ -88,8 +84,7 @@
             </properties>
         </dependency>
         <dependency>
-            <groupId>taglibs</groupId>
-            <artifactId>standard</artifactId>
+            <id>taglibs:standard</id>
             <version>1.0.6</version>
             <type>jar</type>
             <properties>
@@ -97,8 +92,7 @@
             </properties>
         </dependency>
         <dependency>
-            <groupId>taglibs</groupId>
-            <artifactId>request</artifactId>
+            <id>taglibs:request</id>
             <version>1.0.1</version>
             <type>jar</type>
             <properties>
@@ -106,8 +100,7 @@
             </properties>
         </dependency>
         <dependency>
-            <groupId>servletapi</groupId>
-            <artifactId>servletapi</artifactId>
+            <id>servletapi</id>
             <version>2.3</version>
             <type>jar</type>
             <properties>
@@ -115,39 +108,31 @@
             </properties>
         </dependency>
         <dependency>
-            <groupId>jetspeed2</groupId>
-            <artifactId>jetspeed-commons</artifactId>
-            <version>
-                &jetspeed-version;
-            </version>
+            <id>jetspeed2:jetspeed-commons</id> 
+            <version>${jetspeed.version}</version>
             <type>jar</type>
             <properties>
                 <war.bundle>false</war.bundle>
             </properties>
         </dependency>
         <dependency>
-            <groupId>jetspeed2</groupId>
-            <artifactId>jetspeed2-taglib-treecontrol</artifactId>
-            <version>
-                &jetspeed-version;
-            </version>
+            <id>jetspeed2:jetspeed2-taglib-treecontrol</id>
+            <version>${jetspeed.version}</version>
             <type>jar</type>
             <properties>
                 <war.bundle>true</war.bundle>
             </properties>
         </dependency>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.8</version>
+            <id>log4j</id>
+            <version>${log4j.version}</version>
             <type>jar</type>
             <properties>
                 <war.bundle>true</war.bundle>
             </properties>
         </dependency>
         <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
+            <id>commons-logging</id>
             <version>1.0.3</version>
             <type>jar</type>
             <url>http://jakarta.apache.org/commons/logging.html</url>
@@ -155,14 +140,32 @@
                 <war.bundle>true</war.bundle>
             </properties>
         </dependency>
-
-        &myfaces-deps;
-
-        &jsf-bridge-deps;
-
+        
+	    <dependency>
+		    <id>myfaces:myfaces</id>
+		    <version>${myfaces.version}</version>
+		    <properties>
+				<war.bundle>true</war.bundle>
+			</properties>
+	    </dependency>
+		<dependency>
+		    <id>myfaces:myfaces-jsf-api</id>
+		    <version>${myfaces.version}</version>
+		    <properties>
+				<war.bundle>true</war.bundle>
+			</properties>
+		</dependency>
+        
+	    <dependency>
+		    <id>portals-bridges:portals-bridges-jsf</id>
+		    <version>${portals.bridges.jsf.version}</version>
+		    <properties>
+				<war.bundle>true</war.bundle>
+		    </properties>
+	    </dependency>
+        
         <dependency>
-            <groupId>commons-el</groupId>
-            <artifactId>commons-el</artifactId>
+            <id>commons-el</id>
             <version>1.0</version>
             <type>jar</type>
             <url>http://jakarta.apache.org/commons/el/</url>
@@ -171,8 +174,7 @@
             </properties>
         </dependency>
         <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
+            <id>commons-collections</id>
             <version>3.0</version>
             <type>jar</type>
             <properties>
@@ -180,8 +182,7 @@
             </properties>
         </dependency>
         <dependency>
-            <groupId>commons-digester</groupId>
-            <artifactId>commons-digester</artifactId>
+            <id>commons-digester</id>
             <version>1.5</version>
             <type>jar</type>
             <url>http://jakarta.apache.org/commons/digester.html</url>
@@ -190,8 +191,7 @@
             </properties>
         </dependency>
         <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
+            <id>commons-beanutils</id>
             <version>1.6.1</version>
             <type>jar</type>
             <url>http://jakarta.apache.org/commons/beanutils.html</url>
@@ -200,8 +200,7 @@
             </properties>
         </dependency>
         <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
+            <id>commons-codec</id>
             <version>1.2</version>
             <type>jar</type>
             <url>http://jakarta.apache.org/commons/codec/</url>
@@ -209,76 +208,51 @@
                 <war.bundle>true</war.bundle>
             </properties>
         </dependency>
-        <dependency>
-            <groupId>portals-bridges</groupId>
-            <artifactId>portals-bridges-frameworks</artifactId>
-            <version>
-                &portals-bridges-frameworks-version;
-            </version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>portals-bridges</groupId>
-            <artifactId>portals-bridges-common</artifactId>
-            <version>
-                &portals-bridges-common-version;
-            </version>
-            <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>
-            <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>
-            <groupId>portals-bridges</groupId>
-            <artifactId>portals-bridges-velocity</artifactId>
-            <version>
-                &portals-bridges-velocity-version;
-            </version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
+	    <dependency>
+	      <id>portals-bridges:portals-bridges-frameworks</id>
+	      <version>${portals.bridges.frameworks.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>true</war.bundle>
+	      </properties>
+	    </dependency>	
+	    <dependency>
+	      <id>springframework:spring</id>
+	      <version>${spring.version}</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>portals-bridges:portals-bridges-velocity</id>
+	      <version>${portals.bridges.velocity.version}</version>
+	      <properties>
+	        <war.bundle>true</war.bundle>
+	      </properties>
+	    </dependency>
+    				
     </dependencies>
-    <build>
-        <sourceDirectory>src/java</sourceDirectory>
-        <resources>
-            <resource>
-                <directory>${basedir}/src/java/</directory>
-                <includes>
-                    <include>**/*.properties</include>
-                </includes>
-            </resource>
-        </resources>
-    </build>
-    <reports>
-
-        &j2-reports;
 
-    </reports>
-    <properties />
 </project>

Modified: portals/jetspeed-2/trunk/applications/perl/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/perl/project.xml?rev=216237&r1=216236&r2=216237&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/perl/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/perl/project.xml Wed Jul 13 13:57:05 2005
@@ -1,213 +1,183 @@
 <?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
-    
+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.
+
     $Id$
 -->
 <project>
-    <extend>${basedir}/../../project.xml</extend>
-    <artifactId>perl</artifactId>
-    <groupId>jetspeed2</groupId>
-    <name>Jetspeed-2 perl Portlet Application</name>
-    <description>perl Portlet</description>
-    <shortDescription>perl Portlets</shortDescription>
+  <extend>${basedir}/../../project-info.xml</extend>
+  <artifactId>perl</artifactId>
+  <groupId>jetspeed2</groupId>
+  <name>Jetspeed-2 perl Portlet Application</name>
+  <description>perl Portlet</description>
+  <shortDescription>perl Portlets</shortDescription>
 
-    <repository>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/applications/perl</connection>
+  <repository>                 
+    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/applications/perl</connection>
         <developerConnection>
             scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/applications/perl
         </developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/applications/perl/</url>
-    </repository>
+    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/applications/perl/</url>
+  </repository>
 
-    <dependencies>
-        <dependency>
-            <id>portals-bridges:portals-bridges-perl</id>
-            <version>
-                &portals-bridges-perl-version;
-            </version>
-            <type>jar</type>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>portlet-api</id>
-            <groupId>portlet-api</groupId>
-            <version>1.0</version>
-            <properties>
-                <war.bundle>false</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>servletapi</id>
-            <version>2.3</version>
-            <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>jetspeed-rewriter</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <!-- warred jars -->
-        <dependency>
-            <id>castor</id>
-            <version>0.9.4.3</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-            <version>1.6.1</version>
-            <url>http://jakarta.apache.org/commons/beanutils.html</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>2.1</version>
-            <url>http://jakarta.apache.org/commons/collections.html</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </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>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-            <version>1.0</version>
-            <url>http://jakarta.apache.org/commons/fileupload/</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.0</version>
-            <url>http://jakarta.apache.org/commons/lang.html</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>commons-validator</groupId>
-            <artifactId>commons-validator</artifactId>
-            <version>1.1.2</version>
-            <url>http://jakarta.apache.org/commons/validator/</url>
-            <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>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.0.3</version>
-            <url>http://jakarta.apache.org/commons/logging.html</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>oro</groupId>
-            <artifactId>oro</artifactId>
-            <version>2.0.7</version>
-            <url>http://jakarta.apache.org/oro/</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-
-    </dependencies>
-
-
-    <build>
-        <sourceDirectory>src/java</sourceDirectory>
-    </build>
-
-    <reports>
-        <report>maven-jdepend-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-linkcheck-plugin</report>
-        <report>maven-tasklist-plugin</report>
-    </reports>
+  <dependencies>
+	<dependency>
+		<id>portals-bridges:portals-bridges-perl</id>
+	    <version>${portals.bridges.perl.version}</version>
+	     <type>jar</type>
+	    <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>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>servletapi</id>
+      <version>2.3</version>
+      <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>jetspeed-rewriter</id>
+      <groupId>jetspeed2</groupId>
+      <version>${jetspeed.version}</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <!-- warred jars -->
+    <dependency>
+      <id>castor</id>
+      <version>0.9.4.3</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+      <version>1.6.1</version>
+      <url>http://jakarta.apache.org/commons/beanutils.html</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>2.1</version>
+      <url>http://jakarta.apache.org/commons/collections.html</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </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>commons-fileupload</groupId>
+      <artifactId>commons-fileupload</artifactId>
+      <version>1.0</version>
+      <url>http://jakarta.apache.org/commons/fileupload/</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.0</version>
+      <url>http://jakarta.apache.org/commons/lang.html</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>commons-validator</groupId>
+      <artifactId>commons-validator</artifactId>
+      <version>1.1.2</version>
+      <url>http://jakarta.apache.org/commons/validator/</url>
+      <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>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.0.3</version>
+      <url>http://jakarta.apache.org/commons/logging.html</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>    
+    <dependency>
+      <groupId>oro</groupId>
+      <artifactId>oro</artifactId>
+      <version>2.0.7</version>
+      <url>http://jakarta.apache.org/oro/</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+  </dependencies>  
 </project>



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