portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wea...@apache.org
Subject svn commit: r216252 - in /portals/jetspeed-2/trunk/portals-bridges: ./ common/ frameworks/ jsf/ perl/ php/ struts/ velocity/
Date Wed, 13 Jul 2005 21:14:15 GMT
Author: weaver
Date: Wed Jul 13 14:14:11 2005
New Revision: 216252

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

Removed:
    portals/jetspeed-2/trunk/portals-bridges/common/locator.ent
    portals/jetspeed-2/trunk/portals-bridges/common/locator.path
    portals/jetspeed-2/trunk/portals-bridges/frameworks/locator.ent
    portals/jetspeed-2/trunk/portals-bridges/frameworks/locator.path
    portals/jetspeed-2/trunk/portals-bridges/jsf/locator.ent
    portals/jetspeed-2/trunk/portals-bridges/jsf/locator.path
    portals/jetspeed-2/trunk/portals-bridges/locator.ent
    portals/jetspeed-2/trunk/portals-bridges/locator.path
    portals/jetspeed-2/trunk/portals-bridges/perl/locator.ent
    portals/jetspeed-2/trunk/portals-bridges/perl/locator.path
    portals/jetspeed-2/trunk/portals-bridges/php/locator.ent
    portals/jetspeed-2/trunk/portals-bridges/php/locator.path
    portals/jetspeed-2/trunk/portals-bridges/struts/locator.ent
    portals/jetspeed-2/trunk/portals-bridges/struts/locator.path
    portals/jetspeed-2/trunk/portals-bridges/velocity/locator.ent
    portals/jetspeed-2/trunk/portals-bridges/velocity/locator.path
Modified:
    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/project.xml
    portals/jetspeed-2/trunk/portals-bridges/struts/project.xml
    portals/jetspeed-2/trunk/portals-bridges/velocity/project.xml

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=216252&r1=216251&r2=216252&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/common/project.xml (original)
+++ portals/jetspeed-2/trunk/portals-bridges/common/project.xml Wed Jul 13 14:14:11 2005
@@ -1,59 +1,33 @@
 <?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>
-    <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>
+  <extend>${basedir}/../project.xml</extend>
+  <pomVersion>3</pomVersion>
+  <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>
+  <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>
 </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=216252&r1=216251&r2=216252&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/frameworks/project.xml (original)
+++ portals/jetspeed-2/trunk/portals-bridges/frameworks/project.xml Wed Jul 13 14:14:11 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,107 +17,66 @@
     $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>
+  <extend>${basedir}/../project.xml</extend>
+  <pomVersion>3</pomVersion>
+  <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>
+      <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>
+      <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>
+	   <id>springframework:spring</id>
+	   <version>${spring.version}</version>
+	   <properties>
+	      <war.bundle>true</war.bundle>
+	   </properties>
+    </dependency> 
 
-        &bridges-reports;
+    <dependency>
+      <id>commons-beanutils</id>
+      <version>1.7.0</version>
+      <url>http://jakarta.apache.org/commons/beanutils/</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
 
-    </reports>
+    <dependency>
+      <id>portals-bridges:portals-bridges-common</id>
+      <version>${portals.bridges.common.version}</version>
+    </dependency>
+    
+    <dependency>
+      <id>portals-bridges:portals-bridges-velocity</id>
+      <version>${portals.bridges.velocity.version}</version>
+    </dependency>
+    
+  </dependencies>
 </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=216252&r1=216251&r2=216252&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/jsf/project.xml (original)
+++ portals/jetspeed-2/trunk/portals-bridges/jsf/project.xml Wed Jul 13 14:14:11 2005
@@ -1,101 +1,69 @@
 <?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>
-    <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>
+  <extend>${basedir}/../project.xml</extend>
+  <pomVersion>3</pomVersion>
+  <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;
-
-        <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;
+  <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>
+      <id>commons-logging</id>
+      <version>${commons.logging.version}</version>
+    </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-common</id>
+      <version>${portals.bridges.common.version}</version>
+    </dependency>
+  </dependencies>
 
-    </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=216252&r1=216251&r2=216252&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/perl/project.xml (original)
+++ portals/jetspeed-2/trunk/portals-bridges/perl/project.xml Wed Jul 13 14:14:11 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,68 +17,44 @@
     $Id$
 -->
 <project>
-    <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>
-</project>
+  <extend>${basedir}/../project.xml</extend>
+  <pomVersion>3</pomVersion>
+  <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>
+      <id>jetspeed2:jetspeed-rewriter</id>
+      <version>${jetspeed.version}</version>
+      <type>jar</type>
+    </dependency>		
+    <dependency>
+      <id>commons-logging</id>
+      <version>${commons.logging.version}</version>
+    </dependency>
+    <dependency>
+      <id>portals-bridges:portals-bridges-common</id>
+      <version>${portals.bridges.common.version}</version>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file

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=216252&r1=216251&r2=216252&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/php/project.xml (original)
+++ portals/jetspeed-2/trunk/portals-bridges/php/project.xml Wed Jul 13 14:14:11 2005
@@ -1,89 +1,62 @@
 <?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>
-    <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>
+  <extend>${basedir}/../project.xml</extend>
+  <pomVersion>3</pomVersion>
+  <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>
-
-        &bridges-reports;
+  <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>
+      <id>commons-logging</id>
+      <version>${commons.logging.version}</version>
+    </dependency>
+    <dependency>
+      <id>portals-bridges:portals-bridges-common</id>
+      <version>${portals.bridges.common.version}</version>
+    </dependency>
+  </dependencies>
 
-    </reports>
 </project>

Modified: portals/jetspeed-2/trunk/portals-bridges/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portals-bridges/project.xml?rev=216252&r1=216251&r2=216252&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/project.xml (original)
+++ portals/jetspeed-2/trunk/portals-bridges/project.xml Wed Jul 13 14:14:11 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,10 +17,11 @@
   $Id$
 -->
 <project>
+    <extend>../project-info.xml</extend>
     <pomVersion>3</pomVersion>
     <name>Portals Bridges</name>
     <groupId>portals-bridges</groupId>
-    <currentVersion>&portals-bridges-version;</currentVersion>
+    <currentVersion>${portals.bridges.version}</currentVersion>
     <organization>
         <name>Apache Software Foundation</name>
         <url>http://portals.apache.org/</url>
@@ -157,7 +155,17 @@
             </roles>
         </developer>
     </developers>
-    <dependencies/>
+    <dependencies>
+        <!-- These apis will be common to all bridges builds -->
+	    <dependency>
+	      <id>portlet-api</id>
+	      <version>${portlet.api.version}</version>
+	    </dependency>
+	     <dependency>
+	      <id>servletapi</id>
+	      <version>${servlet.api.version}</version>
+	    </dependency>
+    </dependencies>
     <build>
         <nagEmailAddress>ate@douma.nu</nagEmailAddress>
         <sourceDirectory>src/java</sourceDirectory>
@@ -166,7 +174,18 @@
         <report>maven-dashboard-plugin</report>
         <report>maven-multiproject-plugin</report>
         <report>maven-multichanges-plugin</report>
-        <report>maven-tasklist-plugin</report>
+        <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-jcoverage-plugin</report>
+		<report>maven-linkcheck-plugin</report>
+		<report>maven-tasklist-plugin</report>
     </reports>
     <properties/>
 </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=216252&r1=216251&r2=216252&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/struts/project.xml (original)
+++ portals/jetspeed-2/trunk/portals-bridges/struts/project.xml Wed Jul 13 14:14:11 2005
@@ -1,110 +1,70 @@
 <?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>
-    <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>
+  <extend>${basedir}/../project.xml</extend>
+  <pomVersion>3</pomVersion>
+  <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>
-
-        &bridges-reports;
-
-    </reports>
+  <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>
+      <id>commons-logging</id>
+      <version>${commons.logging.version}</version>
+    </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>struts</id>
+      <version>1.2.4</version>
+    </dependency>
+    <dependency>
+      <id>struts:struts-el</id>
+      <version>1.2.4</version>
+    </dependency>
+    <dependency>
+      <id>portals-bridges:portals-bridges-common</id>
+      <version>${portals.bridges.common.version}</version>
+    </dependency>
+  </dependencies>
 </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=216252&r1=216251&r2=216252&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portals-bridges/velocity/project.xml (original)
+++ portals/jetspeed-2/trunk/portals-bridges/velocity/project.xml Wed Jul 13 14:14:11 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,72 +17,34 @@
     $Id$
 -->
 <project>
-    <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>
+  <extend>${basedir}/../project.xml</extend>
+  <pomVersion>3</pomVersion>
+  <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>
+      <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>
+      <id>portals-bridges:portals-bridges-common</id>
+      <version>${portals.bridges.common.version}</version>
+    </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