Menu
▾
▴
xdoclet-plugins-commits — Commit logs from CVS
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(94) |
Sep
(205) |
Oct
(139) |
Nov
(144) |
Dec
(252) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(44) |
Feb
(3) |
Mar
|
Apr
(32) |
May
(40) |
Jun
(24) |
Jul
(4) |
Aug
(20) |
Sep
(10) |
Oct
(61) |
Nov
(86) |
Dec
(79) |
| 2005 |
Jan
(82) |
Feb
(124) |
Mar
(9) |
Apr
(123) |
May
(125) |
Jun
(115) |
Jul
(35) |
Aug
(111) |
Sep
(62) |
Oct
(82) |
Nov
(77) |
Dec
(167) |
| 2006 |
Jan
(31) |
Feb
(29) |
Mar
(8) |
Apr
(16) |
May
(11) |
Jun
(104) |
Jul
(4) |
Aug
(115) |
Sep
(37) |
Oct
(2) |
Nov
(4) |
Dec
(6) |
| 2007 |
Jan
(2) |
Feb
(1) |
Mar
|
Apr
(2) |
May
(3) |
Jun
|
Jul
(3) |
Aug
(1) |
Sep
|
Oct
|
Nov
(2) |
Dec
|
| 2008 |
Jan
|
Feb
(3) |
Mar
(5) |
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(5) |
Sep
(1) |
Oct
(1) |
Nov
(4) |
Dec
(1) |
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
(9) |
May
(1) |
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
(5) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(3) |
Oct
|
Nov
|
Dec
|
|
From: <ko...@us...> - 2007-05-08 07:59:56
|
Revision: 628
http://svn.sourceforge.net/xdoclet-plugins/?rev=628&view=rev
Author: ko5tik
Date: 2007-05-08 00:59:07 -0700 (Tue, 08 May 2007)
Log Message:
-----------
fix for XDP-216, comment is placed on strange place
Modified Paths:
--------------
trunk/xdoclet-plugins/plugin-web/src/main/java/org/xdoclet/plugin/web/WebPlugin.jelly
trunk/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/testapp/web/expected/web-2_2.xml
trunk/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/testapp/web/expected/web-2_3.xml
trunk/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/testapp/web/expected/web-2_4.xml
Added Paths:
-----------
trunk/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/testapp/web/mergedir/web-settings.xml
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 627
http://svn.sourceforge.net/xdoclet-plugins/?rev=627&view=rev
Author: ko5tik
Date: 2007-05-03 03:59:34 -0700 (Thu, 03 May 2007)
Log Message:
-----------
fix for xdp-217
Modified Paths:
--------------
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/qtags/HibernateKeyManyToOneTag.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ko...@us...> - 2007-04-17 19:40:03
|
Revision: 626
http://svn.sourceforge.net/xdoclet-plugins/?rev=626&view=rev
Author: ko5tik
Date: 2007-04-17 12:39:55 -0700 (Tue, 17 Apr 2007)
Log Message:
-----------
synchronize repository
Modified Paths:
--------------
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Class.jelly
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/qtags/HibernateTimestampTag.java
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/qtags/parameter/Generated.java
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/pojo/Timestamp.hbm.xml
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/pojo/Timestamp.java
trunk/xdoclet-plugins/pom.xml
trunk/xdoclet-plugins/testapp-web/pom.xml
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ko...@us...> - 2007-04-17 19:01:50
|
Revision: 625
http://svn.sourceforge.net/xdoclet-plugins/?rev=625&view=rev
Author: ko5tik
Date: 2007-04-17 12:01:52 -0700 (Tue, 17 Apr 2007)
Log Message:
-----------
fix for XDP-215. Thanks Marco
Modified Paths:
--------------
trunk/xdoclet-plugins/plugin-web/src/main/java/org/xdoclet/plugin/web/WebPlugin.jelly
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ko...@us...> - 2007-02-16 12:56:31
|
Revision: 624
http://svn.sourceforge.net/xdoclet-plugins/?rev=624&view=rev
Author: ko5tik
Date: 2007-02-16 04:56:31 -0800 (Fri, 16 Feb 2007)
Log Message:
-----------
if there is value, parameters have to be ignored on result.
wrap everything text into cdata
Modified Paths:
--------------
trunk/xdoclet-plugins/plugin-xwork/src/main/java/org/xdoclet/plugin/xwork/XWorkXMLPlugin.jelly
trunk/xdoclet-plugins/plugin-xwork/src/main/java/org/xdoclet/plugin/xwork/qtags/XworkResultTag.java
trunk/xdoclet-plugins/plugin-xwork/src/test/java/org/xdoclet/plugin/xwork/complete/TrickyAction.java
trunk/xdoclet-plugins/plugin-xwork/src/test/java/org/xdoclet/plugin/xwork/complete/xwork.xml
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ko...@us...> - 2007-01-26 07:57:09
|
Revision: 623
http://svn.sourceforge.net/xdoclet-plugins/?rev=623&view=rev
Author: ko5tik
Date: 2007-01-25 23:57:09 -0800 (Thu, 25 Jan 2007)
Log Message:
-----------
fix for xdp-212. Thanks Michael
Modified Paths:
--------------
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Class.jelly
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Property.jelly
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/qtags/HibernatePropertyTag.java
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/qtags/HibernateTimestampTag.java
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/qtags/HibernateVersionTag.java
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/pojo/Simple.hbm.xml
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/pojo/Simple.java
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/pojo/Timestamp.hbm.xml
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/pojo/Timestamp.java
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/pojo/Version.hbm.xml
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/pojo/Version.java
Added Paths:
-----------
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/qtags/parameter/Generated.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ko...@us...> - 2007-01-20 20:07:33
|
Revision: 622
http://svn.sourceforge.net/xdoclet-plugins/?rev=622&view=rev
Author: ko5tik
Date: 2007-01-20 12:07:34 -0800 (Sat, 20 Jan 2007)
Log Message:
-----------
fox for XDP-67. Thanks to MIchael
Modified Paths:
--------------
trunk/xdoclet-plugins/plugin-hibernate/pom.xml
Added Paths:
-----------
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/qtags/HibernateJoinKeyTag.java
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/JoinKeyTestCase.java
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/pojo/JoinKeyMapping.hbm.xml
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/pojo/JoinKeyMapping.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ko...@us...> - 2006-12-25 15:08:16
|
Revision: 621
http://svn.sourceforge.net/xdoclet-plugins/?rev=621&view=rev
Author: ko5tik
Date: 2006-12-25 07:08:14 -0800 (Mon, 25 Dec 2006)
Log Message:
-----------
dependency cleanup,added missing test source
Modified Paths:
--------------
trunk/xdoclet-plugins/pom.xml
Added Paths:
-----------
trunk/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/testapp/web/OverridenClassTag.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ko...@us...> - 2006-12-21 19:50:30
|
Revision: 620
http://svn.sourceforge.net/xdoclet-plugins/?rev=620&view=rev
Author: ko5tik
Date: 2006-12-21 11:50:31 -0800 (Thu, 21 Dec 2006)
Log Message:
-----------
fix for XDT-203 appliet, thanks Tomasz
Modified Paths:
--------------
trunk/xdoclet-plugins/plugin-hibernate/pom.xml
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Class.jelly
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/JoinedSubclass.jelly
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Subclass.jelly
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/UnionSubclass.jelly
Added Paths:
-----------
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/InheritanceJoinedSubclassTestCase.java
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/InheritanceSubclassTestCase.java
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/InheritanceUnionSubclassTestCase.java
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/inheritance/
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/inheritance/joined/
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/inheritance/joined/A.java
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/inheritance/joined/B.java
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/inheritance/joined/C.java
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/inheritance/joined/D.java
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/inheritance/joined/Entity.java
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/inheritance/joined/mapping.hbm.xml
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/inheritance/subclass/
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/inheritance/subclass/A.java
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/inheritance/subclass/B.java
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/inheritance/subclass/C.java
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/inheritance/subclass/D.java
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/inheritance/subclass/Entity.java
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/inheritance/subclass/mapping.hbm.xml
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/inheritance/union/
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/inheritance/union/A.java
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/inheritance/union/B.java
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/inheritance/union/C.java
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/inheritance/union/D.java
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/inheritance/union/Entity.java
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/inheritance/union/mapping.hbm.xml
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ko...@us...> - 2006-12-20 21:36:24
|
Revision: 619
http://svn.sourceforge.net/xdoclet-plugins/?rev=619&view=rev
Author: ko5tik
Date: 2006-12-20 13:36:24 -0800 (Wed, 20 Dec 2006)
Log Message:
-----------
fix for XDP-209
Modified Paths:
--------------
trunk/xdoclet-plugins/plugin-hibernate/pom.xml
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Filter.jelly
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/HibernateMappingPlugin.java
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/HibernateMappingPlugin.jelly
Added Paths:
-----------
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/FilterInheritTestCase.java
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/filterinherit/
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/filterinherit/ChildInterface.java
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/filterinherit/FilterInheritMapping.hbm.xml
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/filterinherit/FilterInheritMapping.java
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/filterinherit/ParentClass.java
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/filterinherit/ParentInterface.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ko...@us...> - 2006-12-20 21:10:50
|
Revision: 618
http://svn.sourceforge.net/xdoclet-plugins/?rev=618&view=rev
Author: ko5tik
Date: 2006-12-20 13:10:47 -0800 (Wed, 20 Dec 2006)
Log Message:
-----------
fix for XDP-205 & refactoring of queries
noq queries are to be defined where they have to appear
( no inheritance anymore )
Modified Paths:
--------------
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Class.jelly
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/JoinedSubclass.jelly
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Subclass.jelly
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/UnionSubclass.jelly
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/qtags/HibernateQueryTag.java
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/qtags/HibernateSqlQueryTag.java
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/intf/Glarch.java
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/intf/Interface.hbm.xml
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/intf/Interface.java
Added Paths:
-----------
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/SqlQuery.jelly
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ko...@us...> - 2006-12-01 19:30:27
|
Revision: 617
http://svn.sourceforge.net/xdoclet-plugins/?rev=617&view=rev
Author: ko5tik
Date: 2006-12-01 11:30:27 -0800 (Fri, 01 Dec 2006)
Log Message:
-----------
added mutable attribute
Modified Paths:
--------------
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Array.jelly
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Bag.jelly
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Idbag.jelly
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/List.jelly
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Map.jelly
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/PrimitiveArray.jelly
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Set.jelly
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ko...@us...> - 2006-12-01 14:06:13
|
Revision: 616
http://svn.sourceforge.net/xdoclet-plugins/?rev=616&view=rev
Author: ko5tik
Date: 2006-12-01 06:06:06 -0800 (Fri, 01 Dec 2006)
Log Message:
-----------
added mutability parameter to collections. snapshot follows this evening
Modified Paths:
--------------
trunk/xdoclet-plugins/plugin-hibernate/pom.xml
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/qtags/BaseCollectionTag.java
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/qtags/HibernateClassTag.java
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/qtags/HibernateNaturalIdTag.java
Added Paths:
-----------
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/qtags/parameter/Mutable.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ko...@us...> - 2006-11-19 19:15:34
|
Revision: 615
http://svn.sourceforge.net/xdoclet-plugins/?rev=615&view=rev
Author: ko5tik
Date: 2006-11-19 11:15:31 -0800 (Sun, 19 Nov 2006)
Log Message:
-----------
fix problem with double quesry generation - pull query defs from
current class only
Modified Paths:
--------------
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Query.jelly
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ko...@us...> - 2006-11-18 20:06:59
|
Revision: 614
http://svn.sourceforge.net/xdoclet-plugins/?rev=614&view=rev
Author: ko5tik
Date: 2006-11-18 12:06:55 -0800 (Sat, 18 Nov 2006)
Log Message:
-----------
now it is possible to override tag class
Modified Paths:
--------------
trunk/xdoclet-plugins/plugin-web/src/main/java/org/xdoclet/plugin/web/TaglibPlugin.jelly
trunk/xdoclet-plugins/plugin-web/src/main/java/org/xdoclet/plugin/web/qtags/JspTagTag.java
trunk/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/testapp/web/expected/taglib-1_2.tld
trunk/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/testapp/web/expected/taglib-2_0.tld
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ko...@us...> - 2006-11-16 19:35:01
|
Revision: 613
http://svn.sourceforge.net/xdoclet-plugins/?rev=613&view=rev
Author: ko5tik
Date: 2006-11-16 11:34:55 -0800 (Thu, 16 Nov 2006)
Log Message:
-----------
fix to prove that XDP-207 is non-issue
Modified Paths:
--------------
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/SqlDeleteAll.jelly
trunk/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/SqlOperations.jelly
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/pojo/Simple.hbm.xml
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/pojo/Simple.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ko...@us...> - 2006-11-07 12:15:25
|
Revision: 612
http://svn.sourceforge.net/xdoclet-plugins/?rev=612&view=rev
Author: ko5tik
Date: 2006-11-07 04:15:21 -0800 (Tue, 07 Nov 2006)
Log Message:
-----------
test commit
Modified Paths:
--------------
trunk/xdoclet-plugins/plugin-portlet/src/main/java/org/xdoclet/plugin/portlet/PortletUtils.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ko...@us...> - 2006-10-28 18:46:30
|
Revision: 611
http://svn.sourceforge.net/xdoclet-plugins/?rev=611&view=rev
Author: ko5tik
Date: 2006-10-28 11:45:57 -0700 (Sat, 28 Oct 2006)
Log Message:
-----------
removed unnecesary configs, added sample of merging via maven in to
testapp-web ( yes, it does merge now )
Modified Paths:
--------------
trunk/xdoclet-plugins/taglib/pom.xml
Added Paths:
-----------
trunk/xdoclet-plugins/testapp-web/pom.xml
trunk/xdoclet-plugins/testapp-web/src/merge/
trunk/xdoclet-plugins/testapp-web/src/merge/ejb-local-refs.xml
Removed Paths:
-------------
trunk/xdoclet-plugins/plugin-ejb/src/test/java/log4j.properties
trunk/xdoclet-plugins/plugin-hibernate/src/test/java/log4j.properties
trunk/xdoclet-plugins/plugin-spring/src/test/java/log4j.properties
trunk/xdoclet-plugins/plugin-struts/src/test/java/log4j.properties
trunk/xdoclet-plugins/plugin-weblogic/src/test/java/log4j.properties
trunk/xdoclet-plugins/plugin-xwork/src/test/java/log4j.properties
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ko...@us...> - 2006-10-28 14:32:21
|
Revision: 610
http://svn.sourceforge.net/xdoclet-plugins/?rev=610&view=rev
Author: ko5tik
Date: 2006-10-28 07:31:33 -0700 (Sat, 28 Oct 2006)
Log Message:
-----------
ifixed problem with unit tests and merging
Modified Paths:
--------------
trunk/xdoclet-plugins/plugin-castor/src/main/java/org/xdoclet/plugin/castor/CastorMappingXMLPlugin.java
trunk/xdoclet-plugins/plugin-castor/src/main/java/org/xdoclet/plugin/castor/CastorMappingXMLPlugin.jelly
trunk/xdoclet-plugins/plugin-castor/src/main/java/org/xdoclet/plugin/castor/mappingxml/Classes.jelly
trunk/xdoclet-plugins/plugin-castor/src/main/java/org/xdoclet/plugin/castor/mappingxml/Fields.jelly
trunk/xdoclet-plugins/plugin-castor/src/test/java/org/xdoclet/plugin/castor/AbstractCastorMappingTestCase.java
trunk/xdoclet-plugins/plugin-castor/src/test/java/org/xdoclet/plugin/castor/CompleteMappingFieldsOnlyTest.java
trunk/xdoclet-plugins/plugin-castor/src/test/java/org/xdoclet/plugin/castor/CompleteMappingMethodsOnlyTest.java
trunk/xdoclet-plugins/plugin-castor/src/test/java/org/xdoclet/plugin/castor/CompleteMappingNoAutoExtendsTest.java
trunk/xdoclet-plugins/plugin-castor/src/test/java/org/xdoclet/plugin/castor/CompleteMappingNoShortNamesTest.java
trunk/xdoclet-plugins/plugin-castor/src/test/java/org/xdoclet/plugin/castor/CompleteMappingTest.java
trunk/xdoclet-plugins/plugin-castor/src/test/java/org/xdoclet/plugin/castor/MergeFileTest.java
trunk/xdoclet-plugins/plugin-castor/src/test/java/org/xdoclet/plugin/castor/complete/merge/class-mappings.xml
trunk/xdoclet-plugins/plugin-castor/src/test/java/org/xdoclet/plugin/castor/simple/expected/mapping-includes.xml
trunk/xdoclet-plugins/plugin-castor/src/test/java/org/xdoclet/plugin/castor/simple/expected/mapping.xml
trunk/xdoclet-plugins/plugin-castor/src/test/java/org/xdoclet/plugin/castor/simple/merge/class-mappings.xml
trunk/xdoclet-plugins/plugin-spring/src/main/java/org/xdoclet/plugin/spring/SpringConfigXMLPlugin.jelly
trunk/xdoclet-plugins/plugin-spring/src/test/java/org/xdoclet/plugin/spring/SpringConfigTest.java
trunk/xdoclet-plugins/plugin-xwork/src/test/java/org/xdoclet/plugin/xwork/CompleteTest.java
trunk/xdoclet-plugins/plugin-xwork/src/test/java/org/xdoclet/plugin/xwork/complete/xwork-mergefile.xml
trunk/xdoclet-plugins/pom.xml
trunk/xdoclet-plugins/taglib/pom.xml
Removed Paths:
-------------
trunk/xdoclet-plugins/plugin-castor/src/test/java/log4j.properties
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Konstantin P. <ko...@us...> - 2006-09-24 18:20:40
|
Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/testapp/web/expected In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29547/plugin-web/src/test/java/org/xdoclet/testapp/web/expected Modified Files: web-2_2.xml web-2_3.xml web-2_4.xml Log Message: cleaned up dependencies, reworked merging ( at least for jelly, now taglib in generama ), test are running. wwb plugin needs attentioo veocuity merghing too Index: web-2_4.xml =================================================================== RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/testapp/web/expected/web-2_4.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** web-2_4.xml 24 Sep 2006 11:58:57 -0000 1.2 --- web-2_4.xml 24 Sep 2006 18:20:03 -0000 1.3 *************** *** 2,8 **** <web-app xmlns="http://java.sun.com/xml/ns/j2ee" ! xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ! xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" ! version="2.4"> <!-- TODO : <distributable/>--> --- 2,8 ---- <web-app xmlns="http://java.sun.com/xml/ns/j2ee" ! xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ! xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" ! version="2.4"> <!-- TODO : <distributable/>--> *************** *** 40,50 **** <filter-class>org.xdoclet.testapp.web.ThirdFilter</filter-class> </filter> <filter> ! <filter-name>glum</filter-name> ! <display-name>Glum</display-name> ! <filter-class>org.xdoclet.testapp.web.BlaBla</filter-class> </filter> ! <!-- TODO : mergedir/filter-mappings.xml --> <filter-mapping> <filter-name>TimerFilter</filter-name> --- 40,57 ---- <filter-class>org.xdoclet.testapp.web.ThirdFilter</filter-class> </filter> + <!--start merging from source:org/xdoclet/testapp/web/mergedir/filters.xml--> <filter> ! <description>blurge bang</description> ! <display-name>Merged Filter</display-name> ! <icon> ! <small-icon>icon239.gif</small-icon> ! </icon> ! <filter-name>MergedFilter</filter-name> ! <filter-class>org.xdoclet.testapp.web.MergedFilter</filter-class> </filter> + <!--end merging from source:org/xdoclet/testapp/web/mergedir/filters.xml--> ! ! <filter-mapping> <filter-name>TimerFilter</filter-name> *************** *** 65,84 **** <servlet-name>/third</servlet-name> </filter-mapping> <!-- TODO : mergedir/listeners.xml --> <listener> ! <listener-class>org.xdoclet.testapp.web.TestSessionListener</listener-class> </listener> <listener> ! <listener-class>org.xdoclet.testapp.web.TestServletContextListener</listener-class> </listener> <listener> ! <listener-class>org.xdoclet.testapp.web.DummyServletRequestListener</listener-class> </listener> <listener> ! <listener-class>org.xdoclet.testapp.web.SimpleListener</listener-class> </listener> --- 72,97 ---- <servlet-name>/third</servlet-name> </filter-mapping> + <!--start merging from source:org/xdoclet/testapp/web/mergedir/filter-mappings.xml--> + <filter-mapping> + <filter-name>MergedFilter</filter-name> + <servlet-name>/merged</servlet-name> + </filter-mapping> + <!--end merging from source:org/xdoclet/testapp/web/mergedir/filter-mappings.xml--> <!-- TODO : mergedir/listeners.xml --> <listener> ! <listener-class>org.xdoclet.testapp.web.TestSessionListener</listener-class> </listener> <listener> ! <listener-class>org.xdoclet.testapp.web.TestServletContextListener</listener-class> </listener> <listener> ! <listener-class>org.xdoclet.testapp.web.DummyServletRequestListener</listener-class> </listener> <listener> ! <listener-class>org.xdoclet.testapp.web.SimpleListener</listener-class> </listener> *************** *** 137,144 **** <resource-ref> <description>Test resource reference</description> ! <res-ref-name>jdbc/EmployeeAppDB</res-ref-name> ! <res-type>javax.sql.DataSource</res-type> ! <res-auth>Container</res-auth> ! <res-sharing-scope>Shareable</res-sharing-scope> </resource-ref> --- 150,157 ---- <resource-ref> <description>Test resource reference</description> ! <res-ref-name>jdbc/EmployeeAppDB</res-ref-name> ! <res-type>javax.sql.DataSource</res-type> ! <res-auth>Container</res-auth> ! <res-sharing-scope>Shareable</res-sharing-scope> </resource-ref> Index: web-2_2.xml =================================================================== RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/testapp/web/expected/web-2_2.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** web-2_2.xml 24 Sep 2006 11:58:57 -0000 1.2 --- web-2_2.xml 24 Sep 2006 18:20:03 -0000 1.3 *************** *** 2,10 **** <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" "http://java.sun.com/dtd/web-app_2_2.dtd"> <web-app> - <filter> - <filter-name>glum</filter-name> - <display-name>Glum</display-name> - <filter-class>org.xdoclet.testapp.web.BlaBla</filter-class> - </filter> <!-- TODO : <distributable/>--> --- 2,5 ---- Index: web-2_3.xml =================================================================== RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/testapp/web/expected/web-2_3.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** web-2_3.xml 24 Sep 2006 11:58:57 -0000 1.2 --- web-2_3.xml 24 Sep 2006 18:20:03 -0000 1.3 *************** *** 1,10 **** <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd"> - <web-app> <!-- TODO : <distributable/>--> <!-- TODO : mergedir/filters.xml (separate from filter-mappings) --> <filter> ! <icon><small-icon>iconOne.gif</small-icon></icon> <filter-name>TimerFilter</filter-name> <display-name>Timer Filter</display-name> --- 1,11 ---- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd"> <web-app> <!-- TODO : <distributable/>--> <!-- TODO : mergedir/filters.xml (separate from filter-mappings) --> <filter> ! <icon> ! <small-icon>iconOne.gif</small-icon> ! </icon> <filter-name>TimerFilter</filter-name> <display-name>Timer Filter</display-name> *************** *** 22,26 **** </filter> <filter> ! <icon><small-icon>icon2.gif</small-icon></icon> <filter-name>SecondFilter</filter-name> <display-name>Second Filter</display-name> --- 23,29 ---- </filter> <filter> ! <icon> ! <small-icon>icon2.gif</small-icon> ! </icon> <filter-name>SecondFilter</filter-name> <display-name>Second Filter</display-name> *************** *** 33,43 **** <filter-class>org.xdoclet.testapp.web.ThirdFilter</filter-class> </filter> <filter> ! <filter-name>glum</filter-name> ! <display-name>Glum</display-name> ! <filter-class>org.xdoclet.testapp.web.BlaBla</filter-class> </filter> ! ! <!-- TODO : mergedir/filter-mappings.xml --> <filter-mapping> <filter-name>TimerFilter</filter-name> --- 36,52 ---- <filter-class>org.xdoclet.testapp.web.ThirdFilter</filter-class> </filter> + <!--start merging from source:org/xdoclet/testapp/web/mergedir/filters.xml--> <filter> ! <icon> ! <small-icon>icon239.gif</small-icon> ! </icon> ! <filter-name>MergedFilter</filter-name> ! <display-name>Merged Filter</display-name> ! <filter-class>org.xdoclet.testapp.web.MergedFilter</filter-class> ! <description>blurge bang</description> </filter> ! <!--end merging from source:org/xdoclet/testapp/web/mergedir/filters.xml--> ! ! <filter-mapping> <filter-name>TimerFilter</filter-name> *************** *** 58,73 **** <servlet-name>/third</servlet-name> </filter-mapping> <!-- TODO : mergedir/listeners.xml --> <listener> ! <listener-class>org.xdoclet.testapp.web.TestSessionListener</listener-class> </listener> <listener> ! <listener-class>org.xdoclet.testapp.web.TestServletContextListener</listener-class> </listener> <listener> ! <listener-class>org.xdoclet.testapp.web.SimpleListener</listener-class> </listener> --- 67,88 ---- <servlet-name>/third</servlet-name> </filter-mapping> + <!--start merging from source:org/xdoclet/testapp/web/mergedir/filter-mappings.xml--> + <filter-mapping> + <filter-name>MergedFilter</filter-name> + <servlet-name>/merged</servlet-name> + </filter-mapping> + <!--end merging from source:org/xdoclet/testapp/web/mergedir/filter-mappings.xml--> <!-- TODO : mergedir/listeners.xml --> <listener> ! <listener-class>org.xdoclet.testapp.web.TestSessionListener</listener-class> </listener> <listener> ! <listener-class>org.xdoclet.testapp.web.TestServletContextListener</listener-class> </listener> <listener> ! <listener-class>org.xdoclet.testapp.web.SimpleListener</listener-class> </listener> *************** *** 88,92 **** </init-param> <load-on-startup>1</load-on-startup> ! <run-as><role-name>TestRole</role-name></run-as> <security-role-ref> <description>A description for the test link role</description> --- 103,109 ---- </init-param> <load-on-startup>1</load-on-startup> ! <run-as> ! <role-name>TestRole</role-name> ! </run-as> <security-role-ref> <description>A description for the test link role</description> *************** *** 124,131 **** <resource-ref> <description>Test resource reference</description> ! <res-ref-name>jdbc/EmployeeAppDB</res-ref-name> ! <res-type>javax.sql.DataSource</res-type> ! <res-auth>Container</res-auth> ! <res-sharing-scope>Shareable</res-sharing-scope> </resource-ref> --- 141,148 ---- <resource-ref> <description>Test resource reference</description> ! <res-ref-name>jdbc/EmployeeAppDB</res-ref-name> ! <res-type>javax.sql.DataSource</res-type> ! <res-auth>Container</res-auth> ! <res-sharing-scope>Shareable</res-sharing-scope> </resource-ref> |
|
From: Konstantin P. <ko...@us...> - 2006-09-24 18:20:10
|
Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/plugin/web In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29547/plugin-web/src/test/java/org/xdoclet/plugin/web Modified Files: AbstractWebPluginTestCase.java WebPluginServlet23TestCase.java WebPluginServlet24TestCase.java Log Message: cleaned up dependencies, reworked merging ( at least for jelly, now taglib in generama ), test are running. wwb plugin needs attentioo veocuity merghing too Index: AbstractWebPluginTestCase.java =================================================================== RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/plugin/web/AbstractWebPluginTestCase.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AbstractWebPluginTestCase.java 24 Sep 2006 11:58:57 -0000 1.2 --- AbstractWebPluginTestCase.java 24 Sep 2006 18:20:03 -0000 1.3 *************** *** 24,34 **** plugin.setServletversion(getTestedServletVersion()); plugin.setValidate(true); ! plugin.setMergedir("org/xdoclet/testapp/web/merge/"); return plugin; } protected MetadataProvider createMetadataProvider() throws IOException { ! URL basedir = getClass().getClassLoader().getResource("."); ! return new QDoxMetadataProvider(new File(basedir.getPath(), "../../../testapp-web/src/main/java/org/xdoclet/testapp/web")); } --- 24,34 ---- plugin.setServletversion(getTestedServletVersion()); plugin.setValidate(true); ! plugin.setMergedir("org/xdoclet/testapp/web/mergedir/"); return plugin; } protected MetadataProvider createMetadataProvider() throws IOException { ! URL reader = getClass().getResource("/org/xdoclet/testapp/web"); ! return new QDoxMetadataProvider(new File(reader.getPath())); } Index: WebPluginServlet23TestCase.java =================================================================== RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/plugin/web/WebPluginServlet23TestCase.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** WebPluginServlet23TestCase.java 4 Dec 2005 18:25:17 -0000 1.1 --- WebPluginServlet23TestCase.java 24 Sep 2006 18:20:03 -0000 1.2 *************** *** 6,10 **** public class WebPluginServlet23TestCase extends AbstractWebPluginTestCase { protected String getTestedServletVersion() { ! return "2.2"; } } --- 6,10 ---- public class WebPluginServlet23TestCase extends AbstractWebPluginTestCase { protected String getTestedServletVersion() { ! return "2.3"; } } Index: WebPluginServlet24TestCase.java =================================================================== RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/plugin/web/WebPluginServlet24TestCase.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** WebPluginServlet24TestCase.java 4 Dec 2005 18:25:17 -0000 1.1 --- WebPluginServlet24TestCase.java 24 Sep 2006 18:20:03 -0000 1.2 *************** *** 6,10 **** public class WebPluginServlet24TestCase extends AbstractWebPluginTestCase { protected String getTestedServletVersion() { ! return "2.2"; } } --- 6,10 ---- public class WebPluginServlet24TestCase extends AbstractWebPluginTestCase { protected String getTestedServletVersion() { ! return "2.4"; } } |
|
From: Konstantin P. <ko...@us...> - 2006-09-24 18:20:09
|
Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/testapp/web/mergedir In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29547/plugin-web/src/test/java/org/xdoclet/testapp/web/mergedir Added Files: filter-mappings.xml Log Message: cleaned up dependencies, reworked merging ( at least for jelly, now taglib in generama ), test are running. wwb plugin needs attentioo veocuity merghing too --- NEW FILE: filter-mappings.xml --- <j:jelly xmlns:j="jelly:core"> <filter-mapping> <filter-name>MergedFilter</filter-name> <servlet-name>/merged</servlet-name> </filter-mapping> </j:jelly> |
|
From: Konstantin P. <ko...@us...> - 2006-09-24 18:20:07
|
Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/main/java/org/xdoclet/plugin/web In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29547/plugin-web/src/main/java/org/xdoclet/plugin/web Modified Files: WebPlugin.java WebPlugin.jelly Log Message: cleaned up dependencies, reworked merging ( at least for jelly, now taglib in generama ), test are running. wwb plugin needs attentioo veocuity merghing too Index: WebPlugin.java =================================================================== RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/main/java/org/xdoclet/plugin/web/WebPlugin.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** WebPlugin.java 24 Sep 2006 11:58:57 -0000 1.25 --- WebPlugin.java 24 Sep 2006 18:20:03 -0000 1.26 *************** *** 61,66 **** } - protected String mergeDir; - private String publicId = WebUtils.WEBXML_PUBLIC_ID_2_3; --- 61,64 ---- *************** *** 99,115 **** } - /** - * base path to resource directory containing resources to be merged they - * shall be made available on class path - * - * @return - */ - public String getMergeDir() { - return mergeDir; - } - - public void setMergeDir(String mergeDir) { - this.mergeDir = mergeDir; - } /** --- 97,100 ---- *************** *** 143,169 **** } ! /** ! * Utility method called from jelly script to resolve a mergeFile reference ! * ! * @param mergeFile ! * The mergeFile to look for ! * ! * @return A File for mergeFile ! */ ! // public File getMergeFile(String mergeFile) { ! // if ((mergeFile != null) && (mergeDir != null) && mergeDir.isDirectory()) { ! // // The listing of mergeDir's files avoid possibly security issues in ! // // path resolving (paranoid?) ! // File[] files = mergeDir.listFiles(); ! // ! // for (int i = 0; i < files.length; i++) { ! // if (mergeFile.trim().equals(files[i].getName())) { ! // return files[i]; ! // } ! // } ! // } ! // ! // return null; ! // } public String getPublicId() { --- 128,132 ---- } ! public String getPublicId() { *************** *** 230,242 **** } - /** - * Setter for mergeDir property - * - * @param mergeDir - * The value for the property - */ - public void setMergedir(String mergeDir) { - this.mergeDir = mergeDir; - } public void setServletversion(String servletversion) { --- 193,196 ---- Index: WebPlugin.jelly =================================================================== RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/main/java/org/xdoclet/plugin/web/WebPlugin.jelly,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** WebPlugin.jelly 24 Sep 2006 11:58:57 -0000 1.22 --- WebPlugin.jelly 24 Sep 2006 18:20:03 -0000 1.23 *************** *** 41,46 **** <!--TODO : distributable : add this tag conditionaly/--> ! ! <!-- filters --> <j:forEach var="filter" items="${plugin.filters}"> <filter> --- 41,47 ---- <!--TODO : distributable : add this tag conditionaly/--> ! <!-- we just skip all the filter stuf, if servlet version is belov 2.3 --> ! <j:if test="${plugin.webUtils.isMinimumServletVersion('2.3')}"> ! <!-- filters --> <j:forEach var="filter" items="${plugin.filters}"> <filter> *************** *** 66,79 **** </filter> </j:forEach> ! <g:merge file="filters.xml"> <x:comment> To add filters that you have deployment descriptor info for, add a file to your XDoclet merge directory called filters.xml ! that contains the <filter></filter> markup for those beans. Define root element as <j:jelly xmlns:j="jelly:core"/> </x:comment> </g:merge> ! <!-- filter-mappings --> <j:forEach var="filter" items="${plugin.filters}"> <j:forEach var="mapping" items="${filter.getTagsByName('web.filter-mapping')}"> --- 67,80 ---- </filter> </j:forEach> ! <g:merge file="filters.xml" inherit="true"> <x:comment> To add filters that you have deployment descriptor info for, add a file to your XDoclet merge directory called filters.xml ! that contains the bla bla <filter></filter> markup for those beans. Define root element as <j:jelly xmlns:j="jelly:core"/> </x:comment> </g:merge> ! <!-- filter-mappings --> <j:forEach var="filter" items="${plugin.filters}"> <j:forEach var="mapping" items="${filter.getTagsByName('web.filter-mapping')}"> *************** *** 94,98 **** </g:merge> ! <!-- listeners --> <j:forEach var="listener" items="${plugin.webUtils.getListeners(metadata)}"> <listener> --- 95,99 ---- </g:merge> ! <!-- listeners --> <j:forEach var="listener" items="${plugin.webUtils.getListeners(metadata)}"> <listener> *************** *** 108,112 **** </x:comment> </g:merge> ! <!-- servlets --> <j:forEach var="servlet" items="${plugin.servlets}"> --- 109,113 ---- </x:comment> </g:merge> ! </j:if> <!-- servlets --> <j:forEach var="servlet" items="${plugin.servlets}"> |
|
From: Konstantin P. <ko...@us...> - 2006-09-24 18:20:07
|
Update of /cvsroot/xdoclet-plugins/xdoclet-plugins In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29547 Modified Files: pom.xml Log Message: cleaned up dependencies, reworked merging ( at least for jelly, now taglib in generama ), test are running. wwb plugin needs attentioo veocuity merghing too Index: pom.xml =================================================================== RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/pom.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** pom.xml 24 Sep 2006 11:58:56 -0000 1.12 --- pom.xml 24 Sep 2006 18:20:03 -0000 1.13 *************** *** 96,99 **** --- 96,100 ---- <include>**/*.jpg</include> <include>**/*.gif</include> + <include>**/*.ftl</include> </includes> </resource> *************** *** 107,110 **** --- 108,112 ---- <include>**/*.vm</include> <include>**/*.tld</include> + <include>**/*.ftl</include> <include>**/*.properties</include> <include>**/*.confluence</include> |
|
From: Konstantin P. <ko...@us...> - 2006-09-24 11:59:02
|
Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/plugin/web In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9889/plugin-web/src/test/java/org/xdoclet/plugin/web Modified Files: AbstractWebPluginTestCase.java Log Message: reworked jelly merge, moved taglib from web plugin to generama to provide standard merge capabilities Index: AbstractWebPluginTestCase.java =================================================================== RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/plugin/web/AbstractWebPluginTestCase.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AbstractWebPluginTestCase.java 4 Dec 2005 18:25:17 -0000 1.1 --- AbstractWebPluginTestCase.java 24 Sep 2006 11:58:57 -0000 1.2 *************** *** 24,27 **** --- 24,28 ---- plugin.setServletversion(getTestedServletVersion()); plugin.setValidate(true); + plugin.setMergedir("org/xdoclet/testapp/web/merge/"); return plugin; } |
