weaver 2004/06/23 11:33:19
Modified: components/registry project.xml
components/prefs project.xml
components/page-manager project.xml
components/rdbms project.xml
components/persistence project.xml
Added: components/registry locator.ent
components/prefs locator.ent
components/page-manager locator.ent
components/rdbms locator.ent
components/persistence locator.ent
Log:
started JS2-80 dep handling.
JS2-46 pico upgrade
Revision Changes Path
1.23 +5 -29 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- project.xml 18 Jun 2004 20:46:00 -0000 1.22
+++ project.xml 23 Jun 2004 18:33:19 -0000 1.23
@@ -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
@@ -33,6 +36,7 @@
<shortDescription>Registry Components</shortDescription>
<dependencies>
+ &pico-nano-groovy;
<dependency>
<id>jetspeed-cm</id>
<groupId>jetspeed2</groupId>
@@ -207,35 +211,7 @@
<properties>
<war.bundle.jar>false</war.bundle.jar>
</properties>
- </dependency>
- <dependency>
- <id>picocontainer</id>
- <version>1.0-beta-5</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
- </dependency>
- <dependency>
- <id>nanocontainer</id>
- <version>1.0-beta-1</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
- </dependency>
- <dependency>
- <id>groovy</id>
- <version>1.0-beta-4-snapshot</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
- </dependency>
- <dependency>
- <id>asm</id>
- <version>1.4.1</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
- </dependency>
+ </dependency>
<dependency>
<id>jetspeed-commons</id>
<groupId>jetspeed2</groupId>
1.1 jakarta-jetspeed-2/components/registry/locator.ent
Index: locator.ent
===================================================================
<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/pico-nano-groovy.xml">
1.15 +5 -28 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- project.xml 10 Jun 2004 20:35:22 -0000 1.14
+++ project.xml 23 Jun 2004 18:33:19 -0000 1.15
@@ -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,6 +35,7 @@
</repository>
<dependencies>
+ &pico-nano-groovy;
<dependency>
<id>jetspeed-cm</id>
<groupId>jetspeed2</groupId>
@@ -187,34 +191,7 @@
<war.bundle.jar>false</war.bundle.jar>
</properties>
</dependency>
- <dependency>
- <id>picocontainer</id>
- <version>1.0-beta-5</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
- </dependency>
- <dependency>
- <id>nanocontainer</id>
- <version>1.0-beta-1</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
- </dependency>
- <dependency>
- <id>groovy</id>
- <version>1.0-beta-4-snapshot</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
- </dependency>
- <dependency>
- <id>asm</id>
- <version>1.4.1</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
- </dependency>
+
<dependency>
<id>jta</id>
<jar>jta1.0.1.jar</jar>
1.1 jakarta-jetspeed-2/components/prefs/locator.ent
Index: locator.ent
===================================================================
<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/pico-nano-groovy.xml">
1.5 +4 -4 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 1 Jun 2004 05:25:43 -0000 1.4
+++ project.xml 23 Jun 2004 18:33:19 -0000 1.5
@@ -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
@@ -33,6 +36,7 @@
<shortDescription>Page Manager</shortDescription>
<dependencies>
+ &pico-nano-groovy;
<dependency>
<id>jetspeed2:jetspeed-commons</id>
<version>2.0-a1-dev</version>
@@ -126,10 +130,6 @@
<id>commons-dbcp</id>
<version>1.1</version>
</dependency>
- <dependency>
- <id>picocontainer</id>
- <version>1.0-beta-5</version>
- </dependency>
<dependency>
<id>castor</id>
<version>0.9.4.3</version>
1.1 jakarta-jetspeed-2/components/page-manager/locator.ent
Index: locator.ent
===================================================================
<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/pico-nano-groovy.xml">
1.6 +5 -28 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 25 May 2004 16:18:54 -0000 1.5
+++ project.xml 23 Jun 2004 18:33:19 -0000 1.6
@@ -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
@@ -33,6 +36,7 @@
</repository>
<dependencies>
+ &pico-nano-groovy;
<dependency>
<id>jetspeed-cm</id>
<groupId>jetspeed2</groupId>
@@ -111,34 +115,7 @@
<war.bundle.jar>true</war.bundle.jar>
</properties>
</dependency>
- <dependency>
- <id>picocontainer</id>
- <version>1.0-beta-5</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
- </dependency>
- <dependency>
- <id>nanocontainer</id>
- <version>1.0-beta-1</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
- </dependency>
- <dependency>
- <id>groovy</id>
- <version>1.0-beta-4-snapshot</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
- </dependency>
- <dependency>
- <id>asm</id>
- <version>1.4.1</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
- </dependency>
+
</dependencies>
<build>
<sourceDirectory>src/java</sourceDirectory>
1.1 jakarta-jetspeed-2/components/rdbms/locator.ent
Index: locator.ent
===================================================================
<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/pico-nano-groovy.xml">
1.20 +12 -4 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- project.xml 10 Jun 2004 20:35:41 -0000 1.19
+++ project.xml 23 Jun 2004 18:33:19 -0000 1.20
@@ -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,6 +35,7 @@
</repository>
<dependencies>
+ &pico-nano-groovy;
<dependency>
<id>jetspeed-commons</id>
<groupId>jetspeed2</groupId>
@@ -117,10 +121,7 @@
<id>hsqldb</id>
<version>1.7.1</version>
</dependency>
- <dependency>
- <id>picocontainer</id>
- <version>1.0-beta-5</version>
- </dependency>
+
<dependency>
<id>jta</id>
<jar>jta1.0.1.jar</jar>
@@ -134,6 +135,13 @@
<dependency>
<id>tyrex</id>
<version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <id>jmock</id>
+ <version>1.0.1</version>
+ <properties>
+ <war.bundle.jar>false</war.bundle.jar>
+ </properties>
</dependency>
</dependencies>
<build>
1.1 jakarta-jetspeed-2/components/persistence/locator.ent
Index: locator.ent
===================================================================
<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/pico-nano-groovy.xml">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
