dion 2003/01/26 21:24:17 Modified: jelly/jelly-tags/betwixt project.xml jelly/jelly-tags/soap project.xml jelly/jelly-tags/junit project.xml jelly/jelly-tags/email project.xml jelly/jelly-tags/beanshell project.xml jelly/jelly-tags/ojb project.xml jelly/jelly-tags/quartz project.xml jelly/jelly-tags/log project.xml jelly/jelly-tags/velocity project.xml jelly/jelly-tags/swt project.xml jelly/jelly-tags/avalon project.xml jelly/jelly-tags/swing project.xml jelly/jelly-tags/xmlunit project.xml jelly/jelly-tags/xml project.xml jelly/jelly-tags/jms project.xml jelly/jelly-tags/http project.xml jelly/jelly-tags/fmt project.xml jelly/jelly-tags/define project.xml jelly/jelly-tags/interaction project.xml jelly/jelly-tags/validate project.xml jelly/jelly-tags/antlr project.xml jelly/jelly-tags/bean project.xml jelly/jelly-tags/sql project.xml jelly/jelly-tags/util project.xml jelly/jelly-tags/bsf project.xml jelly/jelly-tags/dynabean project.xml jelly/jelly-tags tag-project.xml jelly/jelly-tags/ant project.xml jelly/jelly-tags/html project.xml jelly/jelly-tags/jsl project.xml jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/swing gridBagDemo.jelly jelly/jelly-tags/threads project.xml jelly/jelly-tags/jetty project.xml Log: Using new maven dependency inheritance instead of the commonDependencies.ent entity Fix some compile errors Fix missing dependencies Revision Changes Path 1.12 +1 -9 jakarta-commons-sandbox/jelly/jelly-tags/betwixt/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/betwixt/project.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- project.xml 21 Jan 2003 21:38:00 -0000 1.11 +++ project.xml 27 Jan 2003 05:24:14 -0000 1.12 @@ -1,12 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!-- - see file "file:../../commonDependencies.ent" for explanation of Jelly dependencies - BRITTLE! cannot explicitly include 'file:' protocol below or Maven will - not run this script outside of the base directory - --> - <!ENTITY commonDeps SYSTEM "file:../../commonDependencies.ent"> -]> <project> <extend>${basedir}/../tag-project.xml</extend> <id>commons-jelly-tags-betwixt</id> @@ -27,7 +19,7 @@ <dependencies> - &commonDeps; + <!-- START for compilation --> 1.5 +1 -9 jakarta-commons-sandbox/jelly/jelly-tags/soap/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/soap/project.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- project.xml 21 Jan 2003 21:38:00 -0000 1.4 +++ project.xml 27 Jan 2003 05:24:15 -0000 1.5 @@ -1,12 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!-- - see file "file:../../commonDependencies.ent" for explanation of Jelly dependencies - BRITTLE! cannot explicitly include 'file:' protocol below or Maven will - not run this script outside of the base directory - --> - <!ENTITY commonDeps SYSTEM "file:../../commonDependencies.ent"> -]> <project> <extend>${basedir}/../tag-project.xml</extend> <id>commons-jelly-tags-soap</id> @@ -28,7 +20,7 @@ <dependencies> - &commonDeps; + <!-- START for compilation --> 1.5 +1 -9 jakarta-commons-sandbox/jelly/jelly-tags/junit/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/junit/project.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- project.xml 21 Jan 2003 21:38:00 -0000 1.4 +++ project.xml 27 Jan 2003 05:24:15 -0000 1.5 @@ -1,12 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!-- - see file "file:../../commonDependencies.ent" for explanation of Jelly dependencies - BRITTLE! cannot explicitly include 'file:' protocol below or Maven will - not run this script outside of the base directory - --> - <!ENTITY commonDeps SYSTEM "file:../../commonDependencies.ent"> -]> <project> <extend>${basedir}/../tag-project.xml</extend> <id>commons-jelly-tags-junit</id> @@ -30,7 +22,7 @@ <dependencies> - &commonDeps; + <!-- START for compilation --> 1.4 +1 -9 jakarta-commons-sandbox/jelly/jelly-tags/email/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/email/project.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- project.xml 21 Jan 2003 21:38:00 -0000 1.3 +++ project.xml 27 Jan 2003 05:24:15 -0000 1.4 @@ -1,12 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!-- - see file "file:../../commonDependencies.ent" for explanation of Jelly dependencies - BRITTLE! cannot explicitly include 'file:' protocol below or Maven will - not run this script outside of the base directory - --> - <!ENTITY commonDeps SYSTEM "file:../../commonDependencies.ent"> -]> <project> <extend>${basedir}/../tag-project.xml</extend> <id>commons-jelly-tags-email</id> @@ -28,7 +20,7 @@ <dependencies> - &commonDeps; + <!-- START for compilation --> <dependency> 1.5 +1 -9 jakarta-commons-sandbox/jelly/jelly-tags/beanshell/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/beanshell/project.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- project.xml 21 Jan 2003 21:38:00 -0000 1.4 +++ project.xml 27 Jan 2003 05:24:15 -0000 1.5 @@ -1,12 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!-- - see file "file:../../commonDependencies.ent" for explanation of Jelly dependencies - BRITTLE! cannot explicitly include 'file:' protocol below or Maven will - not run this script outside of the base directory - --> - <!ENTITY commonDeps SYSTEM "file:../../commonDependencies.ent"> -]> <project> <extend>${basedir}/../tag-project.xml</extend> <id>commons-jelly-tags-beanshell</id> @@ -28,7 +20,7 @@ <dependencies> - &commonDeps; + <!-- START for compilation --> 1.5 +1 -9 jakarta-commons-sandbox/jelly/jelly-tags/ojb/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/ojb/project.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- project.xml 21 Jan 2003 21:38:00 -0000 1.4 +++ project.xml 27 Jan 2003 05:24:15 -0000 1.5 @@ -1,12 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!-- - see file "file:../../commonDependencies.ent" for explanation of Jelly dependencies - BRITTLE! cannot explicitly include 'file:' protocol below or Maven will - not run this script outside of the base directory - --> - <!ENTITY commonDeps SYSTEM "file:../../commonDependencies.ent"> -]> <project> <extend>${basedir}/../tag-project.xml</extend> <id>commons-jelly-tags-ojb</id> @@ -29,7 +21,7 @@ <dependencies> - &commonDeps; + <dependency> <id>commons-jelly</id> 1.5 +1 -9 jakarta-commons-sandbox/jelly/jelly-tags/quartz/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/quartz/project.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- project.xml 21 Jan 2003 21:38:00 -0000 1.4 +++ project.xml 27 Jan 2003 05:24:15 -0000 1.5 @@ -1,12 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!-- - see file "file:../../commonDependencies.ent" for explanation of Jelly dependencies - BRITTLE! cannot explicitly include 'file:' protocol below or Maven will - not run this script outside of the base directory - --> - <!ENTITY commonDeps SYSTEM "file:../../commonDependencies.ent"> -]> <project> <extend>${basedir}/../tag-project.xml</extend> <id>commons-jelly-tags-quartz</id> @@ -28,7 +20,7 @@ <dependencies> - &commonDeps; + <!-- START for compilation --> 1.4 +3 -15 jakarta-commons-sandbox/jelly/jelly-tags/log/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/log/project.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- project.xml 21 Jan 2003 21:38:00 -0000 1.3 +++ project.xml 27 Jan 2003 05:24:15 -0000 1.4 @@ -1,12 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!-- - see file "file:../../commonDependencies.ent" for explanation of Jelly dependencies - BRITTLE! cannot explicitly include 'file:' protocol below or Maven will - not run this script outside of the base directory - --> - <!ENTITY commonDeps SYSTEM "file:../../commonDependencies.ent"> -]> <project> <extend>${basedir}/../tag-project.xml</extend> <id>commons-jelly-tags-log</id> @@ -30,17 +22,13 @@ <dependencies> - &commonDeps; - - <!-- START for compilation --> - <dependency> - <id>commons-jelly</id> + <groupId>commons-jelly</groupId> + <artifactId>commons-jelly-tags-junit</artifactId> <version>SNAPSHOT</version> + <url>http://jakarta.apache.org/commons/sandbox/jelly/tags/junit/</url> </dependency> - <!-- END for compilation --> - </dependencies> </project> 1.4 +1 -9 jakarta-commons-sandbox/jelly/jelly-tags/velocity/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/velocity/project.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- project.xml 21 Jan 2003 21:38:00 -0000 1.3 +++ project.xml 27 Jan 2003 05:24:15 -0000 1.4 @@ -1,12 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!-- - see file "file:../../commonDependencies.ent" for explanation of Jelly dependencies - BRITTLE! cannot explicitly include 'file:' protocol below or Maven will - not run this script outside of the base directory - --> - <!ENTITY commonDeps SYSTEM "file:../../commonDependencies.ent"> -]> <project> <extend>${basedir}/../tag-project.xml</extend> <id>commons-jelly-tags-velocity</id> @@ -28,7 +20,7 @@ <dependencies> - &commonDeps; + <!-- START for compilation --> 1.6 +1 -9 jakarta-commons-sandbox/jelly/jelly-tags/swt/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/swt/project.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- project.xml 21 Jan 2003 21:38:00 -0000 1.5 +++ project.xml 27 Jan 2003 05:24:15 -0000 1.6 @@ -1,12 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!-- - see file "file:../../commonDependencies.ent" for explanation of Jelly dependencies - BRITTLE! cannot explicitly include 'file:' protocol below or Maven will - not run this script outside of the base directory - --> - <!ENTITY commonDeps SYSTEM "file:../../commonDependencies.ent"> -]> <project> <extend>${basedir}/../tag-project.xml</extend> <id>commons-jelly-tags-swt</id> @@ -29,7 +21,7 @@ <dependencies> - &commonDeps; + <!-- START for compilation --> 1.2 +1 -9 jakarta-commons-sandbox/jelly/jelly-tags/avalon/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/avalon/project.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- project.xml 22 Jan 2003 09:19:30 -0000 1.1 +++ project.xml 27 Jan 2003 05:24:15 -0000 1.2 @@ -1,12 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!-- - see file "../../commonDependencies.ent" for explanation of Jelly dependencies - BRITTLE! cannot explicitly include 'file:' protocol below or Maven will - not run this script outside of the base directory - --> - <!ENTITY commonDeps SYSTEM "file:../../commonDependencies.ent"> -]> <project> <extend>${basedir}/../tag-project.xml</extend> <id>commons-jelly-avalon</id> @@ -28,7 +20,7 @@ <dependencies> - &commonDeps; + <!-- START for compilation --> 1.9 +39 -13 jakarta-commons-sandbox/jelly/jelly-tags/swing/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/swing/project.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- project.xml 21 Jan 2003 21:38:00 -0000 1.8 +++ project.xml 27 Jan 2003 05:24:15 -0000 1.9 @@ -1,12 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!-- - see file "file:../../commonDependencies.ent" for explanation of Jelly dependencies - BRITTLE! cannot explicitly include 'file:' protocol below or Maven will - not run this script outside of the base directory - --> - <!ENTITY commonDeps SYSTEM "file:../../commonDependencies.ent"> -]> <project> <extend>${basedir}/../tag-project.xml</extend> <id>commons-jelly-tags-swing</id> @@ -30,16 +22,50 @@ <dependencies> - &commonDeps; - - <!-- START for compilation --> + + <!-- START for test --> <dependency> - <id>commons-jelly</id> + <groupId>commons-jelly</groupId> + <artifactId>commons-jelly-tags-define</artifactId> <version>SNAPSHOT</version> + <url>http://jakarta.apache.org/commons/sandbox/jelly/tags/define/</url> + <properties> + <classloader>root.maven</classloader> + </properties> + </dependency> + + <dependency> + <groupId>commons-jelly</groupId> + <artifactId>commons-jelly-tags-interaction</artifactId> + <version>SNAPSHOT</version> + <url>http://jakarta.apache.org/commons/sandbox/jelly/tags/interaction/</url> + <properties> + <classloader>root.maven</classloader> + </properties> </dependency> - <!-- END for compilation --> + <dependency> + <groupId>commons-jelly</groupId> + <artifactId>commons-jelly-tags-junit</artifactId> + <version>SNAPSHOT</version> + <properties> + <classloader>root.maven</classloader> + </properties> + <url>http://jakarta.apache.org/commons/sandbox/jelly/tags/junit/</url> + </dependency> + + <dependency> + <groupId>commons-jelly</groupId> + <artifactId>commons-jelly-tags-log</artifactId> + <version>SNAPSHOT</version> + <url>http://jakarta.apache.org/commons/sandbox/jelly/tags/log/</url> + <properties> + <classloader>root.maven</classloader> + </properties> + </dependency> + + <!-- END for test --> <!-- START for demos --> 1.7 +1 -9 jakarta-commons-sandbox/jelly/jelly-tags/xmlunit/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/xmlunit/project.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- project.xml 21 Jan 2003 21:38:00 -0000 1.6 +++ project.xml 27 Jan 2003 05:24:15 -0000 1.7 @@ -1,12 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!-- - see file "file:../../commonDependencies.ent" for explanation of Jelly dependencies - BRITTLE! cannot explicitly include 'file:' protocol below or Maven will - not run this script outside of the base directory - --> - <!ENTITY commonDeps SYSTEM "file:../../commonDependencies.ent"> -]> <project> <extend>${basedir}/../tag-project.xml</extend> <id>commons-jelly-tags-xmlunit</id> @@ -30,7 +22,7 @@ <dependencies> - &commonDeps; + <!-- START for compilation --> 1.5 +1 -9 jakarta-commons-sandbox/jelly/jelly-tags/xml/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/xml/project.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- project.xml 21 Jan 2003 21:38:00 -0000 1.4 +++ project.xml 27 Jan 2003 05:24:15 -0000 1.5 @@ -1,12 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!-- - see file "file:../../commonDependencies.ent" for explanation of Jelly dependencies - BRITTLE! cannot explicitly include 'file:' protocol below or Maven will - not run this script outside of the base directory - --> - <!ENTITY commonDeps SYSTEM "file:../../commonDependencies.ent"> -]> <project> <extend>${basedir}/../tag-project.xml</extend> <id>commons-jelly-tags-xml</id> @@ -30,7 +22,7 @@ <dependencies> - &commonDeps; + <!-- START for compilation --> 1.4 +1 -9 jakarta-commons-sandbox/jelly/jelly-tags/jms/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/jms/project.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- project.xml 21 Jan 2003 21:38:01 -0000 1.3 +++ project.xml 27 Jan 2003 05:24:16 -0000 1.4 @@ -1,12 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!-- - see file "file:../../commonDependencies.ent" for explanation of Jelly dependencies - BRITTLE! cannot explicitly include 'file:' protocol below or Maven will - not run this script outside of the base directory - --> - <!ENTITY commonDeps SYSTEM "file:../../commonDependencies.ent"> -]> <project> <extend>${basedir}/../tag-project.xml</extend> <id>commons-jelly-tags-jms</id> @@ -28,7 +20,7 @@ <dependencies> - &commonDeps; + <!-- START for compilation --> 1.9 +1 -9 jakarta-commons-sandbox/jelly/jelly-tags/http/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/http/project.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- project.xml 21 Jan 2003 21:38:01 -0000 1.8 +++ project.xml 27 Jan 2003 05:24:16 -0000 1.9 @@ -1,12 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!-- - see file "file:../../commonDependencies.ent" for explanation of Jelly dependencies - BRITTLE! cannot explicitly include 'file:' protocol below or Maven will - not run this script outside of the base directory - --> - <!ENTITY commonDeps SYSTEM "file:../../commonDependencies.ent"> -]> <project> <extend>${basedir}/../tag-project.xml</extend> <id>commons-jelly-tags-http</id> @@ -29,7 +21,7 @@ <dependencies> - &commonDeps; + <dependency> <id>commons-jelly</id> 1.6 +1 -9 jakarta-commons-sandbox/jelly/jelly-tags/fmt/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/fmt/project.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- project.xml 21 Jan 2003 21:38:01 -0000 1.5 +++ project.xml 27 Jan 2003 05:24:16 -0000 1.6 @@ -1,12 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!-- - see file "file:../../commonDependencies.ent" for explanation of Jelly dependencies - BRITTLE! cannot explicitly include 'file:' protocol below or Maven will - not run this script outside of the base directory - --> - <!ENTITY commonDeps SYSTEM "file:../../commonDependencies.ent"> -]> <project> <extend>${basedir}/../tag-project.xml</extend> <id>commons-jelly-tags-fmt</id> @@ -31,7 +23,7 @@ <dependencies> - &commonDeps; + <!-- START for compilation --> 1.7 +1 -9 jakarta-commons-sandbox/jelly/jelly-tags/define/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/define/project.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- project.xml 21 Jan 2003 21:38:01 -0000 1.6 +++ project.xml 27 Jan 2003 05:24:16 -0000 1.7 @@ -1,12 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!-- - see file "file:../../commonDependencies.ent" for explanation of Jelly dependencies - BRITTLE! cannot explicitly include 'file:' protocol below or Maven will - not run this script outside of the base directory - --> - <!ENTITY commonDeps SYSTEM "file:../../commonDependencies.ent"> -]> <project> <extend>${basedir}/../tag-project.xml</extend> <id>commons-jelly-tags-define</id> @@ -30,7 +22,7 @@ <dependencies> - &commonDeps; + <!-- START for compilation --> 1.4 +0 -17 jakarta-commons-sandbox/jelly/jelly-tags/interaction/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/interaction/project.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- project.xml 21 Jan 2003 21:38:01 -0000 1.3 +++ project.xml 27 Jan 2003 05:24:16 -0000 1.4 @@ -1,12 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!-- - see file "file:../../commonDependencies.ent" for explanation of Jelly dependencies - BRITTLE! cannot explicitly include 'file:' protocol below or Maven will - not run this script outside of the base directory - --> - <!ENTITY commonDeps SYSTEM "file:../../commonDependencies.ent"> -]> <project> <extend>${basedir}/../tag-project.xml</extend> <id>commons-jelly-tags-interaction</id> @@ -28,15 +20,6 @@ <dependencies> - &commonDeps; - - <!-- START for compilation --> - - <dependency> - <id>commons-jelly</id> - <version>SNAPSHOT</version> - </dependency> - </dependencies> </project> 1.7 +1 -9 jakarta-commons-sandbox/jelly/jelly-tags/validate/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/validate/project.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- project.xml 21 Jan 2003 21:38:01 -0000 1.6 +++ project.xml 27 Jan 2003 05:24:16 -0000 1.7 @@ -1,12 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!-- - see file "file:../../commonDependencies.ent" for explanation of Jelly dependencies - BRITTLE! cannot explicitly include 'file:' protocol below or Maven will - not run this script outside of the base directory - --> - <!ENTITY commonDeps SYSTEM "file:../../commonDependencies.ent"> -]> <project> <extend>${basedir}/../tag-project.xml</extend> <id>commons-jelly-tags-validate</id> @@ -29,7 +21,7 @@ <dependencies> - &commonDeps; + <!-- START for compilation --> 1.5 +1 -9 jakarta-commons-sandbox/jelly/jelly-tags/antlr/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/antlr/project.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- project.xml 21 Jan 2003 21:38:01 -0000 1.4 +++ project.xml 27 Jan 2003 05:24:16 -0000 1.5 @@ -1,12 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!-- - see file "file:../../commonDependencies.ent" for explanation of Jelly dependencies - BRITTLE! cannot explicitly include 'file:' protocol below or Maven will - not run this script outside of the base directory - --> - <!ENTITY commonDeps SYSTEM "file:../../commonDependencies.ent"> -]> <project> <extend>${basedir}/../tag-project.xml</extend> <id>commons-jelly-tags-antlr</id> @@ -28,7 +20,7 @@ <dependencies> - &commonDeps; + <!-- START for compilation --> 1.7 +1 -9 jakarta-commons-sandbox/jelly/jelly-tags/bean/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/bean/project.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- project.xml 21 Jan 2003 21:38:01 -0000 1.6 +++ project.xml 27 Jan 2003 05:24:16 -0000 1.7 @@ -1,12 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!-- - see file "file:../../commonDependencies.ent" for explanation of Jelly dependencies - BRITTLE! cannot explicitly include 'file:' protocol below or Maven will - not run this script outside of the base directory - --> - <!ENTITY commonDeps SYSTEM "file:../../commonDependencies.ent"> -]> <project> <extend>${basedir}/../tag-project.xml</extend> <id>commons-jelly-tags-bean</id> @@ -30,7 +22,7 @@ <dependencies> - &commonDeps; + <!-- START for compilation --> 1.6 +1 -9 jakarta-commons-sandbox/jelly/jelly-tags/sql/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/sql/project.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- project.xml 21 Jan 2003 21:38:01 -0000 1.5 +++ project.xml 27 Jan 2003 05:24:17 -0000 1.6 @@ -1,12 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!-- - see file "file:../../commonDependencies.ent" for explanation of Jelly dependencies - BRITTLE! cannot explicitly include 'file:' protocol below or Maven will - not run this script outside of the base directory - --> - <!ENTITY commonDeps SYSTEM "file:../../commonDependencies.ent"> -]> <project> <extend>${basedir}/../tag-project.xml</extend> <id>commons-jelly-tags-sql</id> @@ -28,7 +20,7 @@ <dependencies> - &commonDeps; + <!-- START for compilation --> 1.6 +1 -9 jakarta-commons-sandbox/jelly/jelly-tags/util/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/util/project.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- project.xml 21 Jan 2003 21:38:01 -0000 1.5 +++ project.xml 27 Jan 2003 05:24:17 -0000 1.6 @@ -1,12 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!-- - see file "file:../../commonDependencies.ent" for explanation of Jelly dependencies - BRITTLE! cannot explicitly include 'file:' protocol below or Maven will - not run this script outside of the base directory - --> - <!ENTITY commonDeps SYSTEM "file:../../commonDependencies.ent"> -]> <project> <extend>${basedir}/../tag-project.xml</extend> <id>commons-jelly-tags-util</id> @@ -29,7 +21,7 @@ <dependencies> - &commonDeps; + <!-- START for compilation --> 1.4 +1 -9 jakarta-commons-sandbox/jelly/jelly-tags/bsf/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/bsf/project.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- project.xml 21 Jan 2003 21:38:01 -0000 1.3 +++ project.xml 27 Jan 2003 05:24:17 -0000 1.4 @@ -1,12 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!-- - see file "file:../../commonDependencies.ent" for explanation of Jelly dependencies - BRITTLE! cannot explicitly include 'file:' protocol below or Maven will - not run this script outside of the base directory - --> - <!ENTITY commonDeps SYSTEM "file:../../commonDependencies.ent"> -]> <project> <extend>${basedir}/../tag-project.xml</extend> <id>commons-jelly-tags-bsf</id> @@ -28,7 +20,7 @@ <dependencies> - &commonDeps; + <!-- START for compilation --> <dependency> 1.5 +1 -9 jakarta-commons-sandbox/jelly/jelly-tags/dynabean/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/dynabean/project.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- project.xml 21 Jan 2003 21:38:01 -0000 1.4 +++ project.xml 27 Jan 2003 05:24:17 -0000 1.5 @@ -1,12 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!-- - see file "file:../../commonDependencies.ent" for explanation of Jelly dependencies - BRITTLE! cannot explicitly include 'file:' protocol below or Maven will - not run this script outside of the base directory - --> - <!ENTITY commonDeps SYSTEM "file:../../commonDependencies.ent"> -]> <project> <extend>${basedir}/../tag-project.xml</extend> <id>commons-jelly-tags-dynabean</id> @@ -30,7 +22,7 @@ <dependencies> - &commonDeps; + <!-- START for compilation --> 1.2 +53 -0 jakarta-commons-sandbox/jelly/jelly-tags/tag-project.xml Index: tag-project.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/tag-project.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tag-project.xml 5 Jan 2003 04:55:17 -0000 1.1 +++ tag-project.xml 27 Jan 2003 05:24:17 -0000 1.2 @@ -210,6 +210,59 @@ </contributor> </contributors> + <dependencies> + <!-- + the common Maven dependencies for Jelly shared by the core + build and all individual taglib builds. Use this + file to keep all dependency versions in sync. + Does not include CLI (Command Line Interface). + --> + <dependency> + <id>commons-jelly</id> + <version>SNAPSHOT</version> + <url>http://jakarta.apache.org/commons/sandbox/jelly/</url> + <properties> + <classloader>root.maven</classloader> + </properties> + </dependency> + + <dependency> + <id>commons-jexl</id> + <version>1.0-beta-1</version> + </dependency> + + <dependency> + <id>xml-apis</id> + <version>1.0.b2</version> + </dependency> + + <dependency> + <id>commons-beanutils</id> + <version>1.6</version> + </dependency> + + <dependency> + <id>commons-collections</id> + <version>2.1</version> + </dependency> + + <dependency> + <id>commons-logging</id> + <version>1.0</version> + </dependency> + + <dependency> + <id>dom4j</id> + <version>1.4-dev-8</version> + </dependency> + + <dependency> + <id>xerces</id> + <version>2.2.1</version> + </dependency> + + </dependencies> + <build> <nagEmailAddress>[EMAIL PROTECTED]</nagEmailAddress> <sourceDirectory>src/java</sourceDirectory> 1.12 +0 -10 jakarta-commons-sandbox/jelly/jelly-tags/ant/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/ant/project.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- project.xml 21 Jan 2003 21:38:01 -0000 1.11 +++ project.xml 27 Jan 2003 05:24:17 -0000 1.12 @@ -1,12 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!-- - see file "file:../../commonDependencies.ent" for explanation of Jelly dependencies - BRITTLE! cannot explicitly include 'file:' protocol below or Maven will - not run this script outside of the base directory - --> - <!ENTITY commonDeps SYSTEM "file:../../commonDependencies.ent"> -]> <project> <!-- BRITTLE! must include ${basedir} location or Maven will @@ -31,8 +23,6 @@ <dependencies> - - &commonDeps; <!-- START for compilation --> 1.12 +1 -9 jakarta-commons-sandbox/jelly/jelly-tags/html/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/html/project.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- project.xml 21 Jan 2003 21:38:01 -0000 1.11 +++ project.xml 27 Jan 2003 05:24:17 -0000 1.12 @@ -1,12 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!-- - see file "file:../../commonDependencies.ent" for explanation of Jelly dependencies - BRITTLE! cannot explicitly include 'file:' protocol below or Maven will - not run this script outside of the base directory - --> - <!ENTITY commonDeps SYSTEM "file:../../commonDependencies.ent"> -]> <project> <extend>${basedir}/../tag-project.xml</extend> <id>commons-jelly-tags-html</id> @@ -28,7 +20,7 @@ <dependencies> - &commonDeps; + <!-- START for compilation --> 1.13 +1 -9 jakarta-commons-sandbox/jelly/jelly-tags/jsl/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/jsl/project.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- project.xml 21 Jan 2003 21:38:01 -0000 1.12 +++ project.xml 27 Jan 2003 05:24:17 -0000 1.13 @@ -1,12 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!-- - see file "file:../../commonDependencies.ent" for explanation of Jelly dependencies - BRITTLE! cannot explicitly include 'file:' protocol below or Maven will - not run this script outside of the base directory - --> - <!ENTITY commonDeps SYSTEM "file:../../commonDependencies.ent"> -]> <project> <extend>${basedir}/../tag-project.xml</extend> <id>commons-jelly-tags-jsl</id> @@ -30,7 +22,7 @@ <dependencies> - &commonDeps; + <!-- START for compilation --> 1.3 +1 -1 jakarta-commons-sandbox/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/swing/gridBagDemo.jelly Index: gridBagDemo.jelly =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/swing/gridBagDemo.jelly,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gridBagDemo.jelly 12 Nov 2002 08:20:24 -0000 1.2 +++ gridBagDemo.jelly 27 Jan 2003 05:24:17 -0000 1.3 @@ -4,7 +4,7 @@ xmlns="jelly:swing" xmlns:log="jelly:log" xmlns:define="jelly:define" - xmlns:bsh="jelly:org.apache.commons.jelly.tags.beanshell.BeanShellTagLibrary"> + xmlns:bsh="jelly:beanshell"> <!-- TODO: 1.5 +1 -9 jakarta-commons-sandbox/jelly/jelly-tags/threads/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/threads/project.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- project.xml 21 Jan 2003 21:38:02 -0000 1.4 +++ project.xml 27 Jan 2003 05:24:17 -0000 1.5 @@ -1,12 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!-- - see file "file:../../commonDependencies.ent" for explanation of Jelly dependencies - BRITTLE! cannot explicitly include 'file:' protocol below or Maven will - not run this script outside of the base directory - --> - <!ENTITY commonDeps SYSTEM "file:../../commonDependencies.ent"> -]> <project> <extend>${basedir}/../tag-project.xml</extend> <id>commons-jelly-tags-threads</id> @@ -30,7 +22,7 @@ <dependencies> - &commonDeps; + <!-- START for compilation --> 1.11 +1 -9 jakarta-commons-sandbox/jelly/jelly-tags/jetty/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/jetty/project.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- project.xml 21 Jan 2003 21:38:02 -0000 1.10 +++ project.xml 27 Jan 2003 05:24:17 -0000 1.11 @@ -1,12 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!-- - see file "file:../../commonDependencies.ent" for explanation of Jelly dependencies - BRITTLE! cannot explicitly include 'file:' protocol below or Maven will - not run this script outside of the base directory - --> - <!ENTITY commonDeps SYSTEM "file:../../commonDependencies.ent"> -]> <project> <extend>${basedir}/../tag-project.xml</extend> <id>commons-jelly-tags-jetty</id> @@ -29,7 +21,7 @@ <dependencies> - &commonDeps; + <!-- START for compilation -->
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>