You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by we...@apache.org on 2004/12/01 18:06:32 UTC
cvs commit: jakarta-jetspeed-2/components/file-cache locator.ent project.xml
weaver 2004/12/01 09:06:32
Modified: portal/src/java/org/apache/jetspeed/deployment/impl
DeployDecoratorEventListener.java
components/capability project.xml locator.ent
components/prefs locator.ent project.xml
components/registry locator.ent project.xml
components/id-generator project.xml locator.ent
components/search locator.ent project.xml
components/security locator.ent project.xml
components/locator project.xml locator.ent
components/page-manager project.xml locator.ent
components/sso locator.ent project.xml
components/web-content project.xml locator.ent
components/cm locator.ent project.xml
components/persistence project.xml locator.ent
components/jetspeed project.xml locator.ent
. .classpath locator.ent
portal locator.ent project.xml
components/rdbms locator.ent project.xml
components/profiler locator.ent project.xml
components/file-cache locator.ent project.xml
Added: etc/project-dependencies commons-config-dep.xml
jmock-deps.xml
Log:
-Added jmock and common-config deps as entities.
- Rename of pico-nano-groovy to spring-deps
Revision Changes Path
1.6 +1 -1 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/deployment/impl/DeployDecoratorEventListener.java
Index: DeployDecoratorEventListener.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/deployment/impl/DeployDecoratorEventListener.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DeployDecoratorEventListener.java 9 Jul 2004 18:27:28 -0000 1.5
+++ DeployDecoratorEventListener.java 1 Dec 2004 17:06:28 -0000 1.6
@@ -76,7 +76,7 @@
conf.load(configStream);
}
}
- catch (IOException e1)
+ catch (Exception e1)
{
// TODO Auto-generated catch block
1.12 +3 -1 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- project.xml 7 Nov 2004 18:44:44 -0000 1.11
+++ project.xml 1 Dec 2004 17:06:29 -0000 1.12
@@ -39,9 +39,11 @@
<shortDescription>Capability Components</shortDescription>
<dependencies>
- &pico-nano-groovy;
+ &spring-deps;
&db-ojb-deps;
+
+ &commons-config-dep;
<dependency>
<id>jetspeed-cm</id>
1.4 +2 -1 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- locator.ent 13 Oct 2004 15:53:21 -0000 1.3
+++ locator.ent 1 Dec 2004 17:06:29 -0000 1.4
@@ -1,6 +1,7 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM "file:../../etc/project-dependencies/spring-deps.xml">
+<!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">
<!-- Project resources -->
<!ENTITY db-ojb-resources SYSTEM "file:../../etc/project-resources/db-ojb-resources.xml">
1.4 +2 -1 jakarta-jetspeed-2/components/prefs/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/prefs/locator.ent,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- locator.ent 13 Oct 2004 15:53:21 -0000 1.3
+++ locator.ent 1 Dec 2004 17:06:29 -0000 1.4
@@ -1,6 +1,7 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM "file:../../etc/project-dependencies/spring-deps.xml">
+<!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">
<!-- Project resources -->
<!ENTITY db-ojb-resources SYSTEM "file:../../etc/project-resources/db-ojb-resources.xml">
1.21 +3 -9 jakarta-jetspeed-2/components/prefs/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/prefs/project.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- project.xml 15 Nov 2004 22:48:15 -0000 1.20
+++ project.xml 1 Dec 2004 17:06:29 -0000 1.21
@@ -36,10 +36,12 @@
<dependencies>
- &pico-nano-groovy;
+ &spring-deps;
&db-ojb-deps;
+ &commons-config-dep;
+
<dependency>
<id>jetspeed-cm</id>
<groupId>jetspeed2</groupId>
@@ -106,14 +108,6 @@
<version>1.2.8</version>
<properties>
<war.bundle>true</war.bundle>
- </properties>
- </dependency>
-
- <dependency>
- <id>commons-configuration</id>
- <version>1.0-dev</version>
- <properties>
- <war.bundle>false</war.bundle>
</properties>
</dependency>
<dependency>
1.4 +3 -1 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- locator.ent 13 Oct 2004 15:53:22 -0000 1.3
+++ locator.ent 1 Dec 2004 17:06:29 -0000 1.4
@@ -1,6 +1,8 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM "file:../../etc/project-dependencies/spring-deps.xml">
+<!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 jmock-deps SYSTEM "file:../../etc/project-dependencies/jmock-deps.xml">
+<!ENTITY commons-config-dep SYSTEM "file:../../etc/project-dependencies/commons-config-dep.xml">
<!-- Project resources -->
<!ENTITY db-ojb-resources SYSTEM "file:../../etc/project-resources/db-ojb-resources.xml">
1.32 +5 -9 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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- project.xml 15 Nov 2004 22:48:15 -0000 1.31
+++ project.xml 1 Dec 2004 17:06:29 -0000 1.32
@@ -37,10 +37,14 @@
<shortDescription>Registry Components</shortDescription>
<dependencies>
- &pico-nano-groovy;
+ &spring-deps;
&db-ojb-deps;
+ &jmock-deps;
+
+ &commons-config-dep;
+
<dependency>
<id>jetspeed-cm</id>
<groupId>jetspeed2</groupId>
@@ -241,14 +245,6 @@
<version>1.0.1</version>
<properties>
<war.bundle>true</war.bundle>
- </properties>
- </dependency>
-
- <dependency>
- <id>jmock</id>
- <version>SNAPSHOT</version>
- <properties>
- <war.bundle>false</war.bundle>
</properties>
</dependency>
</dependencies>
1.7 +1 -1 jakarta-jetspeed-2/components/id-generator/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/id-generator/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 25 Sep 2004 23:01:19 -0000 1.6
+++ project.xml 1 Dec 2004 17:06:29 -0000 1.7
@@ -36,7 +36,7 @@
</repository>
<dependencies>
- &pico-nano-groovy;
+ &spring-deps;
<dependency>
<id>jetspeed2:jetspeed-commons</id>
<version>2.0-a1-dev</version>
1.4 +1 -1 jakarta-jetspeed-2/components/id-generator/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/id-generator/locator.ent,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- locator.ent 13 Oct 2004 15:53:22 -0000 1.3
+++ locator.ent 1 Dec 2004 17:06:29 -0000 1.4
@@ -1,5 +1,5 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM "file:../../etc/project-dependencies/spring-deps.xml">
+<!ENTITY spring-deps SYSTEM "file:../../etc/project-dependencies/spring-deps.xml">
<!-- Project resources -->
<!ENTITY log4j-resources SYSTEM "file:../../etc/project-resources/log4j-resources.xml">
1.3 +2 -1 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- locator.ent 13 Oct 2004 15:53:21 -0000 1.2
+++ locator.ent 1 Dec 2004 17:06:29 -0000 1.3
@@ -1,5 +1,6 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM "file:../../etc/project-dependencies/spring-deps.xml">
+<!ENTITY spring-deps SYSTEM "file:../../etc/project-dependencies/spring-deps.xml">
+<!ENTITY commons-config-dep SYSTEM "file:../../etc/project-dependencies/commons-config-dep.xml">
<!-- Project resources -->
<!ENTITY log4j-resources SYSTEM "file:../../etc/project-resources/log4j-resources.xml">
1.5 +2 -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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 17 Oct 2004 14:20:40 -0000 1.4
+++ project.xml 1 Dec 2004 17:06:29 -0000 1.5
@@ -36,7 +36,8 @@
<shortDescription>Search</shortDescription>
<dependencies>
-
+
+ &commons-config-dep;
<dependency>
<id>jetspeed-api</id>
<groupId>jetspeed2</groupId>
@@ -71,10 +72,6 @@
<dependency>
<id>commons-beanutils</id>
<version>1.6.1</version>
- </dependency>
- <dependency>
- <id>commons-configuration</id>
- <version>1.0-dev</version>
</dependency>
<dependency>
<id>junit</id>
1.4 +2 -1 jakarta-jetspeed-2/components/security/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/security/locator.ent,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- locator.ent 13 Oct 2004 15:53:21 -0000 1.3
+++ locator.ent 1 Dec 2004 17:06:29 -0000 1.4
@@ -1,6 +1,7 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM "file:../../etc/project-dependencies/spring-deps.xml">
+<!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">
<!-- Project resources -->
<!ENTITY db-ojb-resources SYSTEM "file:../../etc/project-resources/db-ojb-resources.xml">
1.24 +3 -9 jakarta-jetspeed-2/components/security/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/security/project.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- project.xml 15 Nov 2004 22:48:15 -0000 1.23
+++ project.xml 1 Dec 2004 17:06:29 -0000 1.24
@@ -37,9 +37,11 @@
<dependencies>
- &pico-nano-groovy;
+ &spring-deps;
&db-ojb-deps;
+
+ &commons-config-dep;
<!-- Components -->
<dependency>
@@ -118,14 +120,6 @@
<version>1.2.8</version>
<properties>
<war.bundle>true</war.bundle>
- </properties>
- </dependency>
-
- <dependency>
- <id>commons-configuration</id>
- <version>1.0-dev</version>
- <properties>
- <war.bundle>false</war.bundle>
</properties>
</dependency>
<dependency>
1.7 +1 -1 jakarta-jetspeed-2/components/locator/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/locator/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 25 Sep 2004 23:01:19 -0000 1.6
+++ project.xml 1 Dec 2004 17:06:29 -0000 1.7
@@ -37,7 +37,7 @@
</repository>
<dependencies>
- &pico-nano-groovy;
+ &spring-deps;
<dependency>
<id>jetspeed2:jetspeed-commons</id>
<version>2.0-a1-dev</version>
1.4 +1 -1 jakarta-jetspeed-2/components/locator/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/locator/locator.ent,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- locator.ent 13 Oct 2004 15:53:21 -0000 1.3
+++ locator.ent 1 Dec 2004 17:06:29 -0000 1.4
@@ -1,5 +1,5 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM "file:../../etc/project-dependencies/spring-deps.xml">
+<!ENTITY spring-deps SYSTEM "file:../../etc/project-dependencies/spring-deps.xml">
<!-- Project resources -->
<!ENTITY log4j-resources SYSTEM "file:../../etc/project-resources/log4j-resources.xml">
1.13 +3 -1 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- project.xml 15 Nov 2004 22:48:15 -0000 1.12
+++ project.xml 1 Dec 2004 17:06:29 -0000 1.13
@@ -37,9 +37,11 @@
<shortDescription>Page Manager</shortDescription>
<dependencies>
- &pico-nano-groovy;
+ &spring-deps;
&db-ojb-deps;
+
+ &commons-config-dep;
<dependency>
<id>jetspeed2:jetspeed-commons</id>
1.4 +2 -1 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- locator.ent 13 Oct 2004 15:53:22 -0000 1.3
+++ locator.ent 1 Dec 2004 17:06:29 -0000 1.4
@@ -1,6 +1,7 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM "file:../../etc/project-dependencies/spring-deps.xml">
+<!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">
<!-- Project resources -->
<!ENTITY db-ojb-resources SYSTEM "file:../../etc/project-resources/db-ojb-resources.xml">
1.2 +2 -1 jakarta-jetspeed-2/components/sso/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/sso/locator.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- locator.ent 16 Nov 2004 19:08:47 -0000 1.1
+++ locator.ent 1 Dec 2004 17:06:29 -0000 1.2
@@ -1,6 +1,7 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM "file:../../etc/project-dependencies/spring-deps.xml">
+<!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">
<!-- Project resources -->
<!ENTITY db-ojb-resources SYSTEM "file:../../etc/project-resources/db-ojb-resources.xml">
1.2 +3 -9 jakarta-jetspeed-2/components/sso/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/sso/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 16 Nov 2004 19:08:47 -0000 1.1
+++ project.xml 1 Dec 2004 17:06:29 -0000 1.2
@@ -37,9 +37,11 @@
<dependencies>
- &pico-nano-groovy;
+ &spring-deps;
&db-ojb-deps;
+
+ &commons-config-dep;
<!-- Components -->
<!-- Servlet API -->
@@ -130,14 +132,6 @@
<version>1.2.8</version>
<properties>
<war.bundle>true</war.bundle>
- </properties>
- </dependency>
-
- <dependency>
- <id>commons-configuration</id>
- <version>1.0-dev</version>
- <properties>
- <war.bundle>false</war.bundle>
</properties>
</dependency>
<dependency>
1.1 jakarta-jetspeed-2/etc/project-dependencies/commons-config-dep.xml
Index: commons-config-dep.xml
===================================================================
<dependency>
<id>commons-configuration</id>
<version>1.0</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
1.1 jakarta-jetspeed-2/etc/project-dependencies/jmock-deps.xml
Index: jmock-deps.xml
===================================================================
<dependency>
<id>jmock</id>
<version>SNAPSHOT</version>
<properties>
<war.bundle>false</war.bundle>
</properties>
</dependency>
1.6 +2 -1 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 26 Nov 2004 18:56:34 -0000 1.5
+++ project.xml 1 Dec 2004 17:06:30 -0000 1.6
@@ -37,7 +37,8 @@
<shortDescription>Web Content</shortDescription>
<dependencies>
- &pico-nano-groovy;
+ &spring-deps;
+ &commons-config-dep;
<dependency>
<id>jetspeed2:jetspeed-commons</id>
1.4 +2 -1 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- locator.ent 13 Oct 2004 15:53:23 -0000 1.3
+++ locator.ent 1 Dec 2004 17:06:30 -0000 1.4
@@ -1,5 +1,6 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM "file:../../etc/project-dependencies/spring-deps.xml">
+<!ENTITY spring-deps SYSTEM "file:../../etc/project-dependencies/spring-deps.xml">
+<!ENTITY commons-config-dep SYSTEM "file:../../etc/project-dependencies/commons-config-dep.xml">
<!-- Project resources -->
<!ENTITY log4j-resources SYSTEM "file:../../etc/project-resources/log4j-resources.xml">
1.5 +1 -1 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- locator.ent 29 Oct 2004 13:50:13 -0000 1.4
+++ locator.ent 1 Dec 2004 17:06:30 -0000 1.5
@@ -1,5 +1,5 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM "file:../../etc/project-dependencies/spring-deps.xml">
+<!ENTITY spring-deps SYSTEM "file:../../etc/project-dependencies/spring-deps.xml">
<!ENTITY db-ojb-deps SYSTEM "file:../../etc/project-dependencies/db-ojb-deps.xml">
<!-- Project resources -->
1.16 +1 -1 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- project.xml 29 Oct 2004 13:50:13 -0000 1.15
+++ project.xml 1 Dec 2004 17:06:30 -0000 1.16
@@ -36,7 +36,7 @@
</repository>
<dependencies>
- &pico-nano-groovy;
+ &spring-deps;
&db-ojb-deps;
<dependency>
<id>jetspeed2:jetspeed-api</id>
1.27 +1 -1 jakarta-jetspeed-2/components/persistence/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/persistence/project.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- project.xml 15 Nov 2004 22:48:15 -0000 1.26
+++ project.xml 1 Dec 2004 17:06:30 -0000 1.27
@@ -36,7 +36,7 @@
<dependencies>
- &pico-nano-groovy;
+ &spring-deps;
&db-ojb-deps;
1.4 +1 -1 jakarta-jetspeed-2/components/persistence/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/persistence/locator.ent,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- locator.ent 13 Oct 2004 15:53:22 -0000 1.3
+++ locator.ent 1 Dec 2004 17:06:30 -0000 1.4
@@ -1,5 +1,5 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM "file:../../etc/project-dependencies/spring-deps.xml">
+<!ENTITY spring-deps SYSTEM "file:../../etc/project-dependencies/spring-deps.xml">
<!ENTITY db-ojb-deps SYSTEM "file:../../etc/project-dependencies/db-ojb-deps.xml">
<!-- Project resources -->
1.13 +2 -9 jakarta-jetspeed-2/components/jetspeed/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/jetspeed/project.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- project.xml 12 Oct 2004 19:38:14 -0000 1.12
+++ project.xml 1 Dec 2004 17:06:30 -0000 1.13
@@ -36,7 +36,8 @@
</repository>
<dependencies>
- &pico-nano-groovy;
+ &spring-deps;
+ &commons-config-dep;
<dependency>
<id>jetspeed-cm</id>
<groupId>jetspeed2</groupId>
@@ -64,14 +65,6 @@
<version>1.2.8</version>
<properties>
<war.bundle>true</war.bundle>
- </properties>
- </dependency>
-
- <dependency>
- <id>commons-configuration</id>
- <version>1.0-dev</version>
- <properties>
- <war.bundle>false</war.bundle>
</properties>
</dependency>
<dependency>
1.4 +2 -1 jakarta-jetspeed-2/components/jetspeed/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/jetspeed/locator.ent,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- locator.ent 13 Oct 2004 15:53:22 -0000 1.3
+++ locator.ent 1 Dec 2004 17:06:31 -0000 1.4
@@ -1,5 +1,6 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM "file:../../etc/project-dependencies/spring-deps.xml">
+<!ENTITY spring-deps SYSTEM "file:../../etc/project-dependencies/spring-deps.xml">
+<!ENTITY commons-config-dep SYSTEM "file:../../etc/project-dependencies/commons-config-dep.xml">
<!-- Project reports -->
<!ENTITY j2-reports SYSTEM "file:../../etc/project-reports/j2-reports.xml">
1.82 +1 -1 jakarta-jetspeed-2/.classpath
Index: .classpath
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/.classpath,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- .classpath 25 Nov 2004 02:25:58 -0000 1.81
+++ .classpath 1 Dec 2004 17:06:31 -0000 1.82
@@ -82,7 +82,7 @@
<classpathentry kind="var" path="MAVEN_REPO/commons-httpclient/jars/commons-httpclient-2.0.jar"/>
<classpathentry exported="true" kind="var" path="MAVEN_REPO/velocity-tools/jars/velocity-tools-view-1.1-beta1.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/commons-dbcp/jars/commons-dbcp-1.2.1.jar"/>
- <classpathentry exported="true" kind="var" path="MAVEN_REPO/commons-configuration/jars/commons-configuration-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="MAVEN_REPO/commons-configuration/jars/commons-configuration-1.0.jar"/>
<classpathentry exported="true" kind="var" path="MAVEN_REPO/mockrunner/jars/mockrunner-0.2.7.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/struts/jars/struts-1.2.1.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/jmock/jars/jmock-SNAPSHOT.jar"/>
1.5 +3 -1 jakarta-jetspeed-2/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/locator.ent,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- locator.ent 17 Nov 2004 01:08:32 -0000 1.4
+++ locator.ent 1 Dec 2004 17:06:31 -0000 1.5
@@ -1,8 +1,10 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM "file:etc/project-dependencies/spring-deps.xml">
+<!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 myfaces-deps SYSTEM "file:etc/project-dependencies/myfaces-deps.xml">
<!ENTITY myfaces-bridge-deps SYSTEM "file:etc/project-dependencies/myfaces-bridge-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">
<!-- Project resources -->
<!ENTITY db-ojb-resources SYSTEM "file:etc/project-resources/db-ojb-resources.xml">
1.5 +3 -1 jakarta-jetspeed-2/portal/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/locator.ent,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- locator.ent 13 Oct 2004 15:53:21 -0000 1.4
+++ locator.ent 1 Dec 2004 17:06:31 -0000 1.5
@@ -1,6 +1,8 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM "file:../etc/project-dependencies/spring-deps.xml">
+<!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 jmock-deps SYSTEM "file:../etc/project-dependencies/jmock-deps.xml">
+<!ENTITY commons-config-dep SYSTEM "file:../etc/project-dependencies/commons-config-dep.xml">
<!-- Project resources -->
<!ENTITY db-ojb-resources SYSTEM "file:../etc/project-resources/db-ojb-resources.xml">
1.112 +6 -9 jakarta-jetspeed-2/portal/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/project.xml,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- project.xml 26 Nov 2004 21:25:01 -0000 1.111
+++ project.xml 1 Dec 2004 17:06:31 -0000 1.112
@@ -34,9 +34,13 @@
<dependencies>
- &pico-nano-groovy;
+ &spring-deps;
&db-ojb-deps;
+
+ &jmock-deps;
+
+ &commons-config-dep;
<dependency>
<id>jetspeed-cm</id>
@@ -227,7 +231,7 @@
</dependency>
<dependency>
<id>commons-configuration</id>
- <version>1.0-dev</version>
+ <version>1.0</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
@@ -441,13 +445,6 @@
<dependency>
<id>mockrunner</id>
<version>0.2.7</version>
- <properties>
- <war.bundle>false</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <id>jmock</id>
- <version>SNAPSHOT</version>
<properties>
<war.bundle>false</war.bundle>
</properties>
1.4 +1 -1 jakarta-jetspeed-2/components/rdbms/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/rdbms/locator.ent,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- locator.ent 13 Oct 2004 15:53:21 -0000 1.3
+++ locator.ent 1 Dec 2004 17:06:31 -0000 1.4
@@ -1,5 +1,5 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM "file:../../etc/project-dependencies/spring-deps.xml">
+<!ENTITY spring-deps SYSTEM "file:../../etc/project-dependencies/spring-deps.xml">
<!-- Project reports -->
<!ENTITY j2-reports SYSTEM "file:../../etc/project-reports/j2-reports.xml">
1.11 +1 -1 jakarta-jetspeed-2/components/rdbms/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/rdbms/project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.xml 25 Sep 2004 23:02:02 -0000 1.10
+++ project.xml 1 Dec 2004 17:06:31 -0000 1.11
@@ -36,7 +36,7 @@
</repository>
<dependencies>
- &pico-nano-groovy;
+ &spring-deps;
<dependency>
<id>jetspeed-cm</id>
<groupId>jetspeed2</groupId>
1.4 +2 -1 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- locator.ent 13 Oct 2004 15:53:22 -0000 1.3
+++ locator.ent 1 Dec 2004 17:06:32 -0000 1.4
@@ -1,6 +1,7 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM "file:../../etc/project-dependencies/spring-deps.xml">
+<!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">
<!-- Project resources -->
<!ENTITY db-ojb-resources SYSTEM "file:../../etc/project-resources/db-ojb-resources.xml">
1.7 +3 -1 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 15 Nov 2004 22:48:15 -0000 1.6
+++ project.xml 1 Dec 2004 17:06:32 -0000 1.7
@@ -37,9 +37,11 @@
<shortDescription>Profiler</shortDescription>
<dependencies>
- &pico-nano-groovy;
+ &spring-deps;
&db-ojb-deps;
+
+ &commons-config-dep;
<dependency>
<id>jetspeed-cm</id>
1.4 +1 -1 jakarta-jetspeed-2/components/file-cache/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/file-cache/locator.ent,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- locator.ent 13 Oct 2004 15:53:23 -0000 1.3
+++ locator.ent 1 Dec 2004 17:06:32 -0000 1.4
@@ -1,5 +1,5 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM "file:../../etc/project-dependencies/spring-deps.xml">
+<!ENTITY spring-deps SYSTEM "file:../../etc/project-dependencies/spring-deps.xml">
<!-- Project resources -->
<!ENTITY log4j-resources SYSTEM "file:../../etc/project-resources/log4j-resources.xml">
1.9 +1 -1 jakarta-jetspeed-2/components/file-cache/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/file-cache/project.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.xml 25 Sep 2004 23:01:20 -0000 1.8
+++ project.xml 1 Dec 2004 17:06:32 -0000 1.9
@@ -37,7 +37,7 @@
</repository>
<dependencies>
- &pico-nano-groovy;
+ &spring-deps;
<dependency>
<id>jetspeed2:jetspeed-commons</id>
<version>2.0-a1-dev</version>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org