ate 2005/03/30 16:17:20
Modified: applications/security locator.ent project.xml
components/capability project.xml locator.ent
applications/pam locator.ent project.xml
components/page-manager locator.ent project.xml
components/portlet-factory project.xml locator.ent
layout-portlets locator.ent project.xml
components/web-content locator.ent project.xml
portal project.xml locator.ent
components/profiler project.xml locator.ent
commons project.xml
applications/palm locator.ent project.xml
content-server project.xml locator.ent
components/cm project.xml locator.ent
jetspeed-api locator.ent project.xml
. locator.ent
components/search project.xml locator.ent
components/registry locator.ent project.xml
Added: etc/project-dependencies pluto-deps.xml
commons locator.ent
Log:
Replaced all pluto dependencies by entity references to allow easier upgrade
Revision Changes Path
1.3 +1 -0 jakarta-jetspeed-2/applications/security/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/security/locator.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- locator.ent 8 Mar 2005 04:28:25 -0000 1.2
+++ locator.ent 31 Mar 2005 00:17:18 -0000 1.3
@@ -1,6 +1,7 @@
<!-- Project dependencies -->
<!ENTITY myfaces-deps SYSTEM
"file:../../etc/project-dependencies/myfaces-deps.xml">
<!ENTITY jsf-bridge-deps SYSTEM
"file:../../etc/project-dependencies/jsf-bridge-deps.xml">
+<!ENTITY pluto-deps SYSTEM
"file:../../etc/project-dependencies/pluto-deps.xml">
<!-- Project reports -->
<!ENTITY j2-reports SYSTEM "file:../../etc/project-reports/j2-reports.xml">
\ No newline at end of file
1.21 +3 -8 jakarta-jetspeed-2/applications/security/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/security/project.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- project.xml 8 Mar 2005 04:28:25 -0000 1.20
+++ project.xml 31 Mar 2005 00:17:18 -0000 1.21
@@ -232,14 +232,9 @@
<!-- needed for hack around PLUTO-83 bug in ChangePasswordPortlet
TODO: should be removed again when rc2 is release -->
- <dependency>
- <id>pluto</id>
- <groupId>pluto</groupId>
- <version>1.0.1-rc1</version>
- <properties>
- <war.bundle>false</war.bundle>
- </properties>
- </dependency>
+
+ &pluto-deps;
+
<dependency>
<groupId>jetspeed2</groupId>
<artifactId>jetspeed2-taglib-treecontrol</artifactId>
1.15 +3 -5 jakarta-jetspeed-2/components/capability/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/capability/project.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- project.xml 8 Dec 2004 20:35:02 -0000 1.14
+++ project.xml 31 Mar 2005 00:17:19 -0000 1.15
@@ -132,11 +132,9 @@
<id>hsqldb</id>
<version>1.7.1</version>
</dependency>
- <dependency>
- <id>pluto</id>
- <groupId>pluto</groupId>
- <version>1.0.1-rc1</version>
- </dependency>
+
+ &pluto-deps;
+
<dependency>
<!-- portlet-api.jar must be in
%MAVEN_HOME%respository/portlet-api/jars -->
<id>portlet-api</id>
1.5 +1 -0 jakarta-jetspeed-2/components/capability/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/capability/locator.ent,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- locator.ent 1 Dec 2004 17:06:29 -0000 1.4
+++ locator.ent 31 Mar 2005 00:17:19 -0000 1.5
@@ -2,6 +2,7 @@
<!ENTITY spring-deps SYSTEM
"file:../../etc/project-dependencies/spring-deps.xml">
<!ENTITY db-ojb-deps SYSTEM
"file:../../etc/project-dependencies/db-ojb-deps.xml">
<!ENTITY commons-config-dep SYSTEM
"file:../../etc/project-dependencies/commons-config-dep.xml">
+<!ENTITY pluto-deps SYSTEM
"file:../../etc/project-dependencies/pluto-deps.xml">
<!-- Project resources -->
<!ENTITY db-ojb-resources SYSTEM
"file:../../etc/project-resources/db-ojb-resources.xml">
1.3 +1 -0 jakarta-jetspeed-2/applications/pam/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/pam/locator.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- locator.ent 8 Mar 2005 04:28:00 -0000 1.2
+++ locator.ent 31 Mar 2005 00:17:19 -0000 1.3
@@ -1,6 +1,7 @@
<!-- Project dependencies -->
<!ENTITY myfaces-deps SYSTEM
"file:../../etc/project-dependencies/myfaces-deps.xml">
<!ENTITY jsf-bridge-deps SYSTEM
"file:../../etc/project-dependencies/jsf-bridge-deps.xml">
+<!ENTITY pluto-deps SYSTEM
"file:../../etc/project-dependencies/pluto-deps.xml">
<!-- Project reports -->
<!ENTITY j2-reports SYSTEM "file:../../etc/project-reports/j2-reports.xml">
\ No newline at end of file
1.32 +3 -9 jakarta-jetspeed-2/applications/pam/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/pam/project.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- project.xml 26 Mar 2005 02:17:10 -0000 1.31
+++ project.xml 31 Mar 2005 00:17:19 -0000 1.32
@@ -48,15 +48,9 @@
<war.bundle>false</war.bundle>
</properties>
</dependency>
- <dependency>
- <groupId>pluto</groupId>
- <artifactId>pluto</artifactId>
- <version>1.0.1-rc1</version>
- <type>jar</type>
- <properties>
- <war.bundle>false</war.bundle>
- </properties>
- </dependency>
+
+ &pluto-deps;
+
<dependency>
<groupId>portlet-api</groupId>
<artifactId>portlet-api</artifactId>
1.5 +1 -0 jakarta-jetspeed-2/components/page-manager/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/page-manager/locator.ent,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- locator.ent 1 Dec 2004 17:06:29 -0000 1.4
+++ locator.ent 31 Mar 2005 00:17:19 -0000 1.5
@@ -2,6 +2,7 @@
<!ENTITY spring-deps SYSTEM
"file:../../etc/project-dependencies/spring-deps.xml">
<!ENTITY db-ojb-deps SYSTEM
"file:../../etc/project-dependencies/db-ojb-deps.xml">
<!ENTITY commons-config-dep SYSTEM
"file:../../etc/project-dependencies/commons-config-dep.xml">
+<!ENTITY pluto-deps SYSTEM
"file:../../etc/project-dependencies/pluto-deps.xml">
<!-- Project resources -->
<!ENTITY db-ojb-resources SYSTEM
"file:../../etc/project-resources/db-ojb-resources.xml">
1.16 +3 -5 jakarta-jetspeed-2/components/page-manager/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/page-manager/project.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- project.xml 8 Dec 2004 20:35:02 -0000 1.15
+++ project.xml 31 Mar 2005 00:17:19 -0000 1.16
@@ -179,11 +179,9 @@
<id>hsqldb</id>
<version>1.7.1</version>
</dependency>
- <dependency>
- <id>pluto</id>
- <groupId>pluto</groupId>
- <version>1.0.1-rc1</version>
- </dependency>
+
+ &pluto-deps;
+
<dependency>
<!-- portlet-api.jar must be in
%MAVEN_HOME%respository/portlet-api/jars -->
<id>portlet-api</id>
1.6 +3 -8 jakarta-jetspeed-2/components/portlet-factory/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/portlet-factory/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 8 Dec 2004 20:35:02 -0000 1.5
+++ project.xml 31 Mar 2005 00:17:19 -0000 1.6
@@ -37,14 +37,9 @@
</repository>
<dependencies>
- <dependency>
- <id>pluto</id>
- <groupId>pluto</groupId>
- <version>1.0.1-rc1</version>
- <properties>
- <war.bundle>false</war.bundle>
- </properties>
- </dependency>
+
+ &pluto-deps;
+
<dependency>
<!-- portlet-api.jar must be in
%MAVEN_HOME%respository/portlet-api/jars -->
<id>portlet-api</id>
1.2 +3 -0 jakarta-jetspeed-2/components/portlet-factory/locator.ent
Index: locator.ent
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/portlet-factory/locator.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- locator.ent 25 Sep 2004 23:01:19 -0000 1.1
+++ locator.ent 31 Mar 2005 00:17:19 -0000 1.2
@@ -1,2 +1,5 @@
+<!-- Project dependencies -->
+<!ENTITY pluto-deps SYSTEM
"file:../../etc/project-dependencies/pluto-deps.xml">
+
<!-- Project reports -->
<!ENTITY j2-reports SYSTEM "file:../../etc/project-reports/j2-reports.xml">
\ No newline at end of file
1.2 +3 -0 jakarta-jetspeed-2/layout-portlets/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/layout-portlets/locator.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- locator.ent 25 Sep 2004 23:03:17 -0000 1.1
+++ locator.ent 31 Mar 2005 00:17:19 -0000 1.2
@@ -1,2 +1,5 @@
+<!-- Project dependencies -->
+<!ENTITY pluto-deps SYSTEM
"file:../../etc/project-dependencies/pluto-deps.xml">
+
<!-- Project reports -->
<!ENTITY j2-reports SYSTEM "file:../etc/project-reports/j2-reports.xml">
\ No newline at end of file
1.10 +3 -7 jakarta-jetspeed-2/layout-portlets/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/layout-portlets/project.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.xml 8 Dec 2004 20:35:03 -0000 1.9
+++ project.xml 31 Mar 2005 00:17:19 -0000 1.10
@@ -38,13 +38,9 @@
<war.bundle>false</war.bundle>
</properties>
</dependency>
- <dependency>
- <id>pluto</id>
- <version>1.0.1-rc1</version>
- <properties>
- <war.bundle>false</war.bundle>
- </properties>
- </dependency>
+
+ &pluto-deps;
+
<dependency>
<id>servletapi</id>
<version>2.3</version>
1.5 +1 -0 jakarta-jetspeed-2/components/web-content/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/web-content/locator.ent,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- locator.ent 1 Dec 2004 17:06:30 -0000 1.4
+++ locator.ent 31 Mar 2005 00:17:19 -0000 1.5
@@ -1,6 +1,7 @@
<!-- Project dependencies -->
<!ENTITY spring-deps SYSTEM
"file:../../etc/project-dependencies/spring-deps.xml">
<!ENTITY commons-config-dep SYSTEM
"file:../../etc/project-dependencies/commons-config-dep.xml">
+<!ENTITY pluto-deps SYSTEM
"file:../../etc/project-dependencies/pluto-deps.xml">
<!-- Project resources -->
<!ENTITY log4j-resources SYSTEM
"file:../../etc/project-resources/log4j-resources.xml">
1.13 +3 -6 jakarta-jetspeed-2/components/web-content/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/web-content/project.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- project.xml 8 Feb 2005 19:09:33 -0000 1.12
+++ project.xml 31 Mar 2005 00:17:19 -0000 1.13
@@ -101,12 +101,9 @@
<id>xml-apis</id>
<version>2.0.2</version>
</dependency>
- <dependency>
- <id>pluto</id>
- <groupId>pluto</groupId>
- <version>1.0.1-rc1</version>
- </dependency>
-
+
+ &pluto-deps;
+
<dependency>
<id>velocity</id>
<version>1.4</version>
1.1
jakarta-jetspeed-2/etc/project-dependencies/pluto-deps.xml
Index: pluto-deps.xml
===================================================================
<dependency>
<groupId>pluto</groupId>
<artifactId>pluto</artifactId>
<version>1.0.1-rc1</version>
<type>jar</type>
<properties>
<war.bundle>false</war.bundle>
</properties>
</dependency>
1.119 +3 -8 jakarta-jetspeed-2/portal/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/project.xml,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- project.xml 27 Mar 2005 21:38:32 -0000 1.118
+++ project.xml 31 Mar 2005 00:17:19 -0000 1.119
@@ -193,14 +193,9 @@
<war.bundle>true</war.bundle>
</properties>
</dependency>
- <dependency>
- <id>pluto</id>
- <groupId>pluto</groupId>
- <version>1.0.1-rc1</version>
- <properties>
- <war.bundle>false</war.bundle>
- </properties>
- </dependency>
+
+ &pluto-deps;
+
<dependency>
<id>castor</id>
<version>0.9.4.3</version>
1.6 +1 -0 jakarta-jetspeed-2/portal/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/locator.ent,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- locator.ent 1 Dec 2004 17:06:31 -0000 1.5
+++ locator.ent 31 Mar 2005 00:17:19 -0000 1.6
@@ -3,6 +3,7 @@
<!ENTITY db-ojb-deps SYSTEM
"file:../etc/project-dependencies/db-ojb-deps.xml">
<!ENTITY jmock-deps SYSTEM "file:../etc/project-dependencies/jmock-deps.xml">
<!ENTITY commons-config-dep SYSTEM
"file:../etc/project-dependencies/commons-config-dep.xml">
+<!ENTITY pluto-deps SYSTEM
"file:../../etc/project-dependencies/pluto-deps.xml">
<!-- Project resources -->
<!ENTITY db-ojb-resources SYSTEM
"file:../etc/project-resources/db-ojb-resources.xml">
1.10 +3 -5 jakarta-jetspeed-2/components/profiler/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/profiler/project.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.xml 8 Dec 2004 20:35:03 -0000 1.9
+++ project.xml 31 Mar 2005 00:17:19 -0000 1.10
@@ -175,11 +175,9 @@
<id>hsqldb</id>
<version>1.7.1</version>
</dependency>
- <dependency>
- <id>pluto</id>
- <groupId>pluto</groupId>
- <version>1.0.1-rc1</version>
- </dependency>
+
+ &pluto-deps;
+
<dependency>
<!-- portlet-api.jar must be in
%MAVEN_HOME%respository/portlet-api/jars -->
<id>portlet-api</id>
1.5 +1 -0 jakarta-jetspeed-2/components/profiler/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/profiler/locator.ent,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- locator.ent 1 Dec 2004 17:06:32 -0000 1.4
+++ locator.ent 31 Mar 2005 00:17:19 -0000 1.5
@@ -2,6 +2,7 @@
<!ENTITY spring-deps SYSTEM
"file:../../etc/project-dependencies/spring-deps.xml">
<!ENTITY db-ojb-deps SYSTEM
"file:../../etc/project-dependencies/db-ojb-deps.xml">
<!ENTITY commons-config-dep SYSTEM
"file:../../etc/project-dependencies/commons-config-dep.xml">
+<!ENTITY pluto-deps SYSTEM
"file:../../etc/project-dependencies/pluto-deps.xml">
<!-- Project resources -->
<!ENTITY db-ojb-resources SYSTEM
"file:../../etc/project-resources/db-ojb-resources.xml">
1.25 +6 -7 jakarta-jetspeed-2/commons/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/commons/project.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- project.xml 8 Dec 2004 20:35:03 -0000 1.24
+++ project.xml 31 Mar 2005 00:17:19 -0000 1.25
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+ <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities;
+]>
<!--
Copyright 2004 The Apache Software Foundation
@@ -32,13 +35,9 @@
</repository>
<dependencies>
- <dependency>
- <id>pluto</id>
- <version>1.0.1-rc1</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
+
+ &pluto-deps;
+
<dependency>
<id>jetspeed2:jetspeed-api</id>
<version>2.0-M2-dev</version>
1.1 jakarta-jetspeed-2/commons/locator.ent
Index: locator.ent
===================================================================
<!-- Project dependencies -->
<!ENTITY pluto-deps SYSTEM "file:../etc/project-dependencies/pluto-deps.xml">
<!-- Project resources -->
<!-- Project reports -->
1.2 +1 -0 jakarta-jetspeed-2/applications/palm/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/palm/locator.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- locator.ent 26 Mar 2005 02:17:09 -0000 1.1
+++ locator.ent 31 Mar 2005 00:17:19 -0000 1.2
@@ -1,4 +1,5 @@
<!-- Project dependencies -->
+<!ENTITY pluto-deps SYSTEM
"file:../../etc/project-dependencies/pluto-deps.xml">
<!-- Project reports -->
<!ENTITY j2-reports SYSTEM "file:../../etc/project-reports/j2-reports.xml">
\ No newline at end of file
1.2 +3 -9 jakarta-jetspeed-2/applications/palm/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/palm/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 26 Mar 2005 02:17:09 -0000 1.1
+++ project.xml 31 Mar 2005 00:17:19 -0000 1.2
@@ -101,15 +101,9 @@
<war.bundle>true</war.bundle>
</properties>
</dependency>
- <dependency>
- <groupId>pluto</groupId>
- <artifactId>pluto</artifactId>
- <version>1.0.1-rc1</version>
- <type>jar</type>
- <properties>
- <war.bundle>false</war.bundle>
- </properties>
- </dependency>
+
+ &pluto-deps;
+
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
1.12 +3 -8 jakarta-jetspeed-2/content-server/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/content-server/project.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- project.xml 23 Mar 2005 22:35:08 -0000 1.11
+++ project.xml 31 Mar 2005 00:17:19 -0000 1.12
@@ -63,14 +63,9 @@
<war.bundle>false</war.bundle>
</properties>
</dependency>
- <dependency>
- <id>pluto</id>
- <groupId>pluto</groupId>
- <version>1.0.1-rc1</version>
- <properties>
- <war.bundle>false</war.bundle>
- </properties>
- </dependency>
+
+ &pluto-deps;
+
</dependencies>
<build>
1.2 +3 -0 jakarta-jetspeed-2/content-server/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/content-server/locator.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- locator.ent 25 Sep 2004 23:03:17 -0000 1.1
+++ locator.ent 31 Mar 2005 00:17:19 -0000 1.2
@@ -1,2 +1,5 @@
+<!-- Project dependencies -->
+<!ENTITY pluto-deps SYSTEM "file:../etc/project-dependencies/pluto-deps.xml">
+
<!-- Project reports -->
<!ENTITY j2-reports SYSTEM "file:../etc/project-reports/j2-reports.xml">
\ No newline at end of file
1.19 +2 -9 jakarta-jetspeed-2/components/cm/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/cm/project.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- project.xml 8 Dec 2004 20:35:03 -0000 1.18
+++ project.xml 31 Mar 2005 00:17:19 -0000 1.19
@@ -72,15 +72,8 @@
<war.bundle>false</war.bundle>
</properties>
</dependency>
- <dependency>
- <id>pluto</id>
- <groupId>pluto</groupId>
- <version>1.0.1-rc1</version>
- <properties>
- <war.bundle>false</war.bundle>
- </properties>
- </dependency>
-
+
+ &pluto-deps;
</dependencies>
<build>
1.6 +1 -0 jakarta-jetspeed-2/components/cm/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/cm/locator.ent,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- locator.ent 1 Dec 2004 17:06:30 -0000 1.5
+++ locator.ent 31 Mar 2005 00:17:19 -0000 1.6
@@ -1,6 +1,7 @@
<!-- Project dependencies -->
<!ENTITY spring-deps SYSTEM
"file:../../etc/project-dependencies/spring-deps.xml">
<!ENTITY db-ojb-deps SYSTEM
"file:../../etc/project-dependencies/db-ojb-deps.xml">
+<!ENTITY pluto-deps SYSTEM
"file:../../etc/project-dependencies/pluto-deps.xml">
<!-- Project resources -->
<!ENTITY db-ojb-resources SYSTEM
"file:../../etc/project-resources/db-ojb-resources.xml">
1.2 +3 -0 jakarta-jetspeed-2/jetspeed-api/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/jetspeed-api/locator.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- locator.ent 25 Sep 2004 23:03:18 -0000 1.1
+++ locator.ent 31 Mar 2005 00:17:19 -0000 1.2
@@ -1,2 +1,5 @@
+<!-- Project dependencies -->
+<!ENTITY pluto-deps SYSTEM "file:../etc/project-dependencies/pluto-deps.xml">
+
<!-- Project reports -->
<!ENTITY j2-reports SYSTEM "file:../etc/project-reports/j2-reports.xml">
\ No newline at end of file
1.12 +1 -1 jakarta-jetspeed-2/jetspeed-api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/jetspeed-api/project.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- project.xml 8 Dec 2004 20:35:04 -0000 1.11
+++ project.xml 31 Mar 2005 00:17:19 -0000 1.12
@@ -1,6 +1,6 @@
<?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.
-->
<project>
-<extend>${basedir}/../project.xml</extend>
<pomVersion>3</pomVersion>
<id>jetspeed-api</id>
<groupId>jetspeed2</groupId>
<name>Jetspeed-2 Core API</name>
<package>org.apache.jetspeed</package>
<description>
Core API for implmeneting Jetspeed
</description>
<shortDescription>Helps locate resources on the file
system.</shortDescription>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-jetspeed-2/components/jetspeed</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/jetspeed/</url>
</repository>
<dependencies>
<dependency>
<id>junit</id>
<version>3.8.1</version>
</dependency>
<dependency>
<id>pluto</id>
<version>1.0.1-rc1</version>
</dependency>
<dependency>
<id>portlet-api</id>
<version>1.0</version>
</dependency>
<dependency>
<id>servletapi</id>
<version>2.3</version>
</dependency>
</dependencies>
<build>
<sourceDirectory>src/java</sourceDirectory>
<resources>
<resource>
<directory>${basedir}/src/java</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
<unitTest>
<includes>
<include>**/Test*.java</include>
</includes>
<excludes>
</excludes>
<resources>
<resource>
<directory>${basedir}/src/test</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
</unitTest>
</build>
+<extend>${basedir}/../project.xml</extend>
<pomVersion>3</pomVersion>
<id>jetspeed-api</id>
<groupId>jetspeed2</groupId>
<name>Jetspeed-2 Core API</name>
<package>org.apache.jetspeed</package>
<description>
Core API for implmeneting Jetspeed
</description>
<shortDescription>Helps locate resources on the file
system.</shortDescription>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-jetspeed-2/components/jetspeed</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/jetspeed/</url>
</repository>
<dependencies>
<dependency>
<id>junit</id>
<version>3.8.1</version>
</dependency>
&pluto-deps;
<dependency>
<id>portlet-api</id>
<version>1.0</version>
</dependency>
<dependency>
<id>servletapi</id>
<version>2.3</version>
</dependency>
</dependencies>
<build>
<sourceDirectory>src/java</sourceDirectory>
<resources>
<resource>
<directory>${basedir}/src/java</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
<unitTest>
<includes>
<include>**/Test*.java</include>
</includes>
<excludes>
</excludes>
<resources>
<resource>
<directory>${basedir}/src/test</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
</unitTest>
</build>
<reports>
&j2-reports;
</reports>
</project>
1.7 +1 -0 jakarta-jetspeed-2/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/locator.ent,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- locator.ent 8 Mar 2005 04:30:23 -0000 1.6
+++ locator.ent 31 Mar 2005 00:17:19 -0000 1.7
@@ -6,6 +6,7 @@
<!ENTITY myfaces-deps SYSTEM
"file:etc/project-dependencies/myfaces-deps.xml">
<!ENTITY jmock-deps SYSTEM "file:etc/project-dependencies/jmock-deps.xml">
<!ENTITY commons-config-dep SYSTEM
"file:etc/project-dependencies/commons-config-dep.xml">
+<!ENTITY pluto-deps SYSTEM "file:etc/project-dependencies/pluto-deps.xml">
<!-- Project resources -->
<!ENTITY db-ojb-resources SYSTEM
"file:etc/project-resources/db-ojb-resources.xml">
1.8 +3 -5 jakarta-jetspeed-2/components/search/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/search/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 8 Dec 2004 20:35:03 -0000 1.7
+++ project.xml 31 Mar 2005 00:17:19 -0000 1.8
@@ -97,11 +97,9 @@
<id>xml-apis</id>
<version>2.0.2</version>
</dependency>
- <dependency>
- <id>pluto</id>
- <groupId>pluto</groupId>
- <version>1.0.1-rc1</version>
- </dependency>
+
+ &pluto-deps;
+
<dependency>
<!-- portlet-api.jar must be in
%MAVEN_HOME%respository/portlet-api/jars -->
<id>portlet-api</id>
1.4 +1 -0 jakarta-jetspeed-2/components/search/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/search/locator.ent,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- locator.ent 1 Dec 2004 17:06:29 -0000 1.3
+++ locator.ent 31 Mar 2005 00:17:19 -0000 1.4
@@ -1,6 +1,7 @@
<!-- Project dependencies -->
<!ENTITY spring-deps SYSTEM
"file:../../etc/project-dependencies/spring-deps.xml">
<!ENTITY commons-config-dep SYSTEM
"file:../../etc/project-dependencies/commons-config-dep.xml">
+<!ENTITY pluto-deps SYSTEM
"file:../../etc/project-dependencies/pluto-deps.xml">
<!-- Project resources -->
<!ENTITY log4j-resources SYSTEM
"file:../../etc/project-resources/log4j-resources.xml">
1.5 +1 -0 jakarta-jetspeed-2/components/registry/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/registry/locator.ent,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- locator.ent 1 Dec 2004 17:06:29 -0000 1.4
+++ locator.ent 31 Mar 2005 00:17:19 -0000 1.5
@@ -3,6 +3,7 @@
<!ENTITY db-ojb-deps SYSTEM
"file:../../etc/project-dependencies/db-ojb-deps.xml">
<!ENTITY jmock-deps SYSTEM
"file:../../etc/project-dependencies/jmock-deps.xml">
<!ENTITY commons-config-dep SYSTEM
"file:../../etc/project-dependencies/commons-config-dep.xml">
+<!ENTITY pluto-deps SYSTEM
"file:../../etc/project-dependencies/pluto-deps.xml">
<!-- Project resources -->
<!ENTITY db-ojb-resources SYSTEM
"file:../../etc/project-resources/db-ojb-resources.xml">
1.35 +3 -8 jakarta-jetspeed-2/components/registry/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/registry/project.xml,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- project.xml 8 Dec 2004 20:35:02 -0000 1.34
+++ project.xml 31 Mar 2005 00:17:19 -0000 1.35
@@ -210,14 +210,9 @@
<war.bundle>false</war.bundle>
</properties>
</dependency>
- <dependency>
- <id>pluto</id>
- <groupId>pluto</groupId>
- <version>1.0.1-rc1</version>
- <properties>
- <war.bundle>false</war.bundle>
- </properties>
- </dependency>
+
+ &pluto-deps;
+
<dependency>
<!-- portlet-api.jar must be in
%MAVEN_HOME%respository/portlet-api/jars -->
<id>portlet-api</id>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
