3 files changed, 148 insertions, 45 deletions

diff --git a/java/xdoclet/Makefile b/java/xdoclet/Makefile
index c19ec70a75e8..22db2b2ada65 100644
--- a/java/xdoclet/Makefile
+++ b/java/xdoclet/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	xdoclet
-PORTVERSION=	1.2b3
+PORTVERSION=	1.2.3
+PORTEPOCH=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -24,7 +25,7 @@ USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
-XJAVADOC_VER=	1.0
+XJAVADOC_VER=	1.1
 
 PLIST_SUB+=	XJAVADOC_VER="${XJAVADOC_VER}"
 
@@ -32,23 +33,20 @@ PLIST_SUB+=	XJAVADOC_VER="${XJAVADOC_VER}"
 PORTDOCS=	*
 .endif
 
-post-extract:
-	${RMDIR} ${WRKSRC}/docs/stylesheets
-
 do-install:
-	cd ${WRKSRC} && ${FIND} lib -name '*xdoclet*' -exec \
+	cd ${WRKSRC}/xdoclet-${PORTVERSION} && ${FIND} lib -name '*xdoclet*' -exec \
 	    ${INSTALL_DATA} \{} ${JAVAJARDIR} \;
-	cd ${WRKSRC}/samples && ${FIND} . -type d -exec \
+	cd ${WRKSRC}/xdoclet-${PORTVERSION}/samples && ${FIND} . -type d -exec \
 	    ${MKDIR} ${EXAMPLESDIR}/\{} \;
-	cd ${WRKSRC}/samples && ${FIND} . -type f -exec \
+	cd ${WRKSRC}/xdoclet-${PORTVERSION}/samples && ${FIND} . -type f -exec \
 	    ${INSTALL_DATA} \{} ${EXAMPLESDIR}/\{} \;
 	${INSTALL_DATA} \
 	    ${WRKSRC}/xjavadoc-${XJAVADOC_VER}/xjavadoc-${XJAVADOC_VER}.jar \
 	    ${JAVAJARDIR}
 .if !defined(NOPORTDOCS)
-	cd ${WRKSRC}/docs && ${FIND} . -type d -exec \
+	cd ${WRKSRC}/xdoclet-${PORTVERSION}/docs && ${FIND} . -type d -exec \
 	    ${MKDIR} ${DOCSDIR}/\{} \;
-	cd ${WRKSRC}/docs && ${FIND} . -type f -exec \
+	cd ${WRKSRC}/xdoclet-${PORTVERSION}/docs && ${FIND} . -type f -exec \
 	    ${INSTALL_DATA} \{} ${DOCSDIR}/\{} \;
 .endif
 
diff --git a/java/xdoclet/distinfo b/java/xdoclet/distinfo
index b3af863b70da..00e3eb7673e8 100644
--- a/java/xdoclet/distinfo
+++ b/java/xdoclet/distinfo
@@ -1,4 +1,6 @@
-MD5 (xdoclet-bin-1.2b3.zip) = 0d64a9fb9fc5930f7ec194dbd4a71615
-SIZE (xdoclet-bin-1.2b3.zip) = 4608597
-MD5 (xjavadoc-1.0.zip) = 49abd6c481cfeb8b0da97ebdb75c4048
-SIZE (xjavadoc-1.0.zip) = 631175
+MD5 (xdoclet-bin-1.2.3.zip) = a49a9a61baad8f2caf6dadeca933b561
+SHA256 (xdoclet-bin-1.2.3.zip) = 484cee8126469ad6fac7a60f26d25728038037756b5fa112cfa1f76d1b27513d
+SIZE (xdoclet-bin-1.2.3.zip) = 7371258
+MD5 (xjavadoc-1.1.zip) = a2230ed5af111c0eb5b4fcb5cbafed28
+SHA256 (xjavadoc-1.1.zip) = 41e427faa9f639e168aa232561eb3d47fc38fd5b44276435d89c05c904bd6960
+SIZE (xjavadoc-1.1.zip) = 2438695
diff --git a/java/xdoclet/pkg-plist b/java/xdoclet/pkg-plist
index f446a1d7434b..af1d59f8e2c5 100644
--- a/java/xdoclet/pkg-plist
+++ b/java/xdoclet/pkg-plist
@@ -1,8 +1,10 @@
 @comment $FreeBSD$
 %%EXAMPLESDIR%%/build-dist.properties
 %%EXAMPLESDIR%%/build.xml
+%%EXAMPLESDIR%%/lib/ejb.jar
 %%EXAMPLESDIR%%/lib/jboss-j2ee.jar
 %%EXAMPLESDIR%%/lib/jmxri.jar
+%%EXAMPLESDIR%%/lib/jsf-api.jar
 %%EXAMPLESDIR%%/lib/readme.txt
 %%EXAMPLESDIR%%/lib/servlet.jar
 %%EXAMPLESDIR%%/lib/struts-1.1-beta-2.jar
@@ -12,7 +14,10 @@
 %%EXAMPLESDIR%%/project.properties
 %%EXAMPLESDIR%%/project.xml
 %%EXAMPLESDIR%%/readme.txt
+%%EXAMPLESDIR%%/src/java/test/bea/cmr/MagazineBean.java
+%%EXAMPLESDIR%%/src/java/test/bea/cmr/SubscriberBean.java
 %%EXAMPLESDIR%%/src/java/test/dao/CustomerExampleDAO.java
+%%EXAMPLESDIR%%/src/java/test/dao/ExampleDAOFactory.java
 %%EXAMPLESDIR%%/src/java/test/ejb/AccountBean.java
 %%EXAMPLESDIR%%/src/java/test/ejb/AddressBean.java
 %%EXAMPLESDIR%%/src/java/test/ejb/AllTypesEntityBean.java
@@ -39,21 +44,25 @@
 %%EXAMPLESDIR%%/src/java/test/ejb/jdo/Paycheck.java
 %%EXAMPLESDIR%%/src/java/test/ejb/jdo/Staff.java
 %%EXAMPLESDIR%%/src/java/test/ejb/jdo/Transaction.java
+%%EXAMPLESDIR%%/src/java/test/hibernate/Address.java
 %%EXAMPLESDIR%%/src/java/test/hibernate/Animal.java
 %%EXAMPLESDIR%%/src/java/test/hibernate/CompositeId.java
 %%EXAMPLESDIR%%/src/java/test/hibernate/CompositeIdEntity.java
 %%EXAMPLESDIR%%/src/java/test/hibernate/Contraband.java
+%%EXAMPLESDIR%%/src/java/test/hibernate/Error.java
 %%EXAMPLESDIR%%/src/java/test/hibernate/Human.java
 %%EXAMPLESDIR%%/src/java/test/hibernate/ImportedProduct.java
 %%EXAMPLESDIR%%/src/java/test/hibernate/LineItem.java
 %%EXAMPLESDIR%%/src/java/test/hibernate/Lizard.java
 %%EXAMPLESDIR%%/src/java/test/hibernate/Name.java
+%%EXAMPLESDIR%%/src/java/test/hibernate/OIDObject.java
 %%EXAMPLESDIR%%/src/java/test/hibernate/Order.java
 %%EXAMPLESDIR%%/src/java/test/hibernate/Persistent.java
 %%EXAMPLESDIR%%/src/java/test/hibernate/Pet.java
 %%EXAMPLESDIR%%/src/java/test/hibernate/Product.java
 %%EXAMPLESDIR%%/src/java/test/hibernate/Reptile.java
 %%EXAMPLESDIR%%/src/java/test/hibernate/Updateable.java
+%%EXAMPLESDIR%%/src/java/test/hibernate/WorkRequestError.java
 %%EXAMPLESDIR%%/src/java/test/interfaces/ApplicationException.java
 %%EXAMPLESDIR%%/src/java/test/interfaces/Identifiable.java
 %%EXAMPLESDIR%%/src/java/test/interfaces/SecurityOfficer.java
@@ -68,6 +77,9 @@
 %%EXAMPLESDIR%%/src/java/test/jdo/SuperChild.java
 %%EXAMPLESDIR%%/src/java/test/jmx/JBossXMLExample.java
 %%EXAMPLESDIR%%/src/java/test/jmx/SimpleJMX.java
+%%EXAMPLESDIR%%/src/java/test/jsf/JsfConverter.java
+%%EXAMPLESDIR%%/src/java/test/jsf/JsfManagedBean.java
+%%EXAMPLESDIR%%/src/java/test/jsf/JsfValidator.java
 %%EXAMPLESDIR%%/src/java/test/web/SimpleAction.java
 %%EXAMPLESDIR%%/src/java/test/web/SimpleListener.java
 %%EXAMPLESDIR%%/src/java/test/web/SimpleServlet.java
@@ -75,11 +87,29 @@
 %%EXAMPLESDIR%%/src/java/test/web/StrutsAction.java
 %%EXAMPLESDIR%%/src/java/test/web/StrutsDispatchAction.java
 %%EXAMPLESDIR%%/src/java/test/web/TimerFilter.java
+%%EXAMPLESDIR%%/src/java/test/wsee/TestBean.java
+%%EXAMPLESDIR%%/src/java/test/wsee/TestException.java
+%%EXAMPLESDIR%%/src/java/test/wsee/TestObject.java
+%%EXAMPLESDIR%%/src/java/test/wsee/TestSessionBean.java
 %%EXAMPLESDIR%%/src/merge/jboss-service.ent
+%%EXAMPLESDIR%%/src/merge/jboss-webservices.ent
 %%EXAMPLESDIR%%/src/merge/weblogic-security-role-assignment.xml
 %%EXAMPLESDIR%%/src/web/index.jsp
+%%EXAMPLESDIR%%/target/classes/test/bea/cmr/MagazineBean.class
+%%EXAMPLESDIR%%/target/classes/test/bea/cmr/MagazineCMP.class
+%%EXAMPLESDIR%%/target/classes/test/bea/cmr/MagazineData.class
+%%EXAMPLESDIR%%/target/classes/test/bea/cmr/MagazineLocal.class
+%%EXAMPLESDIR%%/target/classes/test/bea/cmr/MagazineLocalHome.class
+%%EXAMPLESDIR%%/target/classes/test/bea/cmr/MagazineUtil.class
+%%EXAMPLESDIR%%/target/classes/test/bea/cmr/SubscriberBean.class
+%%EXAMPLESDIR%%/target/classes/test/bea/cmr/SubscriberCMP.class
+%%EXAMPLESDIR%%/target/classes/test/bea/cmr/SubscriberData.class
+%%EXAMPLESDIR%%/target/classes/test/bea/cmr/SubscriberLocal.class
+%%EXAMPLESDIR%%/target/classes/test/bea/cmr/SubscriberLocalHome.class
+%%EXAMPLESDIR%%/target/classes/test/bea/cmr/SubscriberUtil.class
 %%EXAMPLESDIR%%/target/classes/test/dao/CustomerDAO.class
 %%EXAMPLESDIR%%/target/classes/test/dao/CustomerExampleDAO.class
+%%EXAMPLESDIR%%/target/classes/test/dao/ExampleDAOFactory.class
 %%EXAMPLESDIR%%/target/classes/test/ejb/AccountBean.class
 %%EXAMPLESDIR%%/target/classes/test/ejb/AccountCMP.class
 %%EXAMPLESDIR%%/target/classes/test/ejb/AddressBean.class
@@ -120,6 +150,8 @@
 %%EXAMPLESDIR%%/target/classes/test/ejb/cmr/EmployeeAddressLocal.class
 %%EXAMPLESDIR%%/target/classes/test/ejb/cmr/EmployeeAddressLocalHome.class
 %%EXAMPLESDIR%%/target/classes/test/ejb/cmr/EmployeeAddressUtil.class
+%%EXAMPLESDIR%%/target/classes/test/ejb/cmr/EmployeeAddressValue$1.class
+%%EXAMPLESDIR%%/target/classes/test/ejb/cmr/EmployeeAddressValue$ReadOnlyEmployeeAddressValue.class
 %%EXAMPLESDIR%%/target/classes/test/ejb/cmr/EmployeeAddressValue.class
 %%EXAMPLESDIR%%/target/classes/test/ejb/cmr/EmployeeBean.class
 %%EXAMPLESDIR%%/target/classes/test/ejb/cmr/EmployeeCMP.class
@@ -127,6 +159,8 @@
 %%EXAMPLESDIR%%/target/classes/test/ejb/cmr/EmployeeLocal.class
 %%EXAMPLESDIR%%/target/classes/test/ejb/cmr/EmployeeLocalHome.class
 %%EXAMPLESDIR%%/target/classes/test/ejb/cmr/EmployeeUtil.class
+%%EXAMPLESDIR%%/target/classes/test/ejb/cmr/EmployeeValue$1.class
+%%EXAMPLESDIR%%/target/classes/test/ejb/cmr/EmployeeValue$ReadOnlyEmployeeValue.class
 %%EXAMPLESDIR%%/target/classes/test/ejb/cmr/EmployeeValue.class
 %%EXAMPLESDIR%%/target/classes/test/ejb/cmr/LanguageBean.class
 %%EXAMPLESDIR%%/target/classes/test/ejb/cmr/LanguageCMP.class
@@ -144,21 +178,25 @@
 %%EXAMPLESDIR%%/target/classes/test/ejb/jdo/Paycheck.class
 %%EXAMPLESDIR%%/target/classes/test/ejb/jdo/Staff.class
 %%EXAMPLESDIR%%/target/classes/test/ejb/jdo/Transaction.class
+%%EXAMPLESDIR%%/target/classes/test/hibernate/Address.class
 %%EXAMPLESDIR%%/target/classes/test/hibernate/Animal.class
 %%EXAMPLESDIR%%/target/classes/test/hibernate/CompositeId.class
 %%EXAMPLESDIR%%/target/classes/test/hibernate/CompositeIdEntity.class
 %%EXAMPLESDIR%%/target/classes/test/hibernate/Contraband.class
+%%EXAMPLESDIR%%/target/classes/test/hibernate/Error.class
 %%EXAMPLESDIR%%/target/classes/test/hibernate/Human.class
 %%EXAMPLESDIR%%/target/classes/test/hibernate/ImportedProduct.class
 %%EXAMPLESDIR%%/target/classes/test/hibernate/LineItem.class
 %%EXAMPLESDIR%%/target/classes/test/hibernate/Lizard.class
 %%EXAMPLESDIR%%/target/classes/test/hibernate/Name.class
+%%EXAMPLESDIR%%/target/classes/test/hibernate/OIDObject.class
 %%EXAMPLESDIR%%/target/classes/test/hibernate/Order.class
 %%EXAMPLESDIR%%/target/classes/test/hibernate/Persistent.class
 %%EXAMPLESDIR%%/target/classes/test/hibernate/Pet.class
 %%EXAMPLESDIR%%/target/classes/test/hibernate/Product.class
 %%EXAMPLESDIR%%/target/classes/test/hibernate/Reptile.class
 %%EXAMPLESDIR%%/target/classes/test/hibernate/Updateable.class
+%%EXAMPLESDIR%%/target/classes/test/hibernate/WorkRequestError.class
 %%EXAMPLESDIR%%/target/classes/test/interfaces/Account.class
 %%EXAMPLESDIR%%/target/classes/test/interfaces/AccountData.class
 %%EXAMPLESDIR%%/target/classes/test/interfaces/AccountHome.class
@@ -166,11 +204,15 @@
 %%EXAMPLESDIR%%/target/classes/test/interfaces/AccountLocalHome.class
 %%EXAMPLESDIR%%/target/classes/test/interfaces/AccountPK.class
 %%EXAMPLESDIR%%/target/classes/test/interfaces/AccountUtil.class
+%%EXAMPLESDIR%%/target/classes/test/interfaces/AccountValue$1.class
+%%EXAMPLESDIR%%/target/classes/test/interfaces/AccountValue$ReadOnlyAccountValue.class
 %%EXAMPLESDIR%%/target/classes/test/interfaces/AccountValue.class
 %%EXAMPLESDIR%%/target/classes/test/interfaces/AddressData.class
 %%EXAMPLESDIR%%/target/classes/test/interfaces/AddressLocal.class
 %%EXAMPLESDIR%%/target/classes/test/interfaces/AddressLocalHome.class
 %%EXAMPLESDIR%%/target/classes/test/interfaces/AddressUtil.class
+%%EXAMPLESDIR%%/target/classes/test/interfaces/AddressValue$1.class
+%%EXAMPLESDIR%%/target/classes/test/interfaces/AddressValue$ReadOnlyAddressValue.class
 %%EXAMPLESDIR%%/target/classes/test/interfaces/AddressValue.class
 %%EXAMPLESDIR%%/target/classes/test/interfaces/AllTypesEntity.class
 %%EXAMPLESDIR%%/target/classes/test/interfaces/AllTypesEntityData.class
@@ -184,10 +226,16 @@
 %%EXAMPLESDIR%%/target/classes/test/interfaces/CustomerBMPUtil.class
 %%EXAMPLESDIR%%/target/classes/test/interfaces/CustomerData.class
 %%EXAMPLESDIR%%/target/classes/test/interfaces/CustomerHome.class
+%%EXAMPLESDIR%%/target/classes/test/interfaces/CustomerLightValue$1.class
+%%EXAMPLESDIR%%/target/classes/test/interfaces/CustomerLightValue$ReadOnlyCustomerLightValue.class
 %%EXAMPLESDIR%%/target/classes/test/interfaces/CustomerLightValue.class
+%%EXAMPLESDIR%%/target/classes/test/interfaces/CustomerNormalValue$1.class
+%%EXAMPLESDIR%%/target/classes/test/interfaces/CustomerNormalValue$ReadOnlyCustomerNormalValue.class
 %%EXAMPLESDIR%%/target/classes/test/interfaces/CustomerNormalValue.class
 %%EXAMPLESDIR%%/target/classes/test/interfaces/CustomerPK.class
 %%EXAMPLESDIR%%/target/classes/test/interfaces/CustomerUtil.class
+%%EXAMPLESDIR%%/target/classes/test/interfaces/CustomerValue$1.class
+%%EXAMPLESDIR%%/target/classes/test/interfaces/CustomerValue$ReadOnlyCustomerValue.class
 %%EXAMPLESDIR%%/target/classes/test/interfaces/CustomerValue.class
 %%EXAMPLESDIR%%/target/classes/test/interfaces/FileData.class
 %%EXAMPLESDIR%%/target/classes/test/interfaces/FileLocal.class
@@ -202,6 +250,7 @@
 %%EXAMPLESDIR%%/target/classes/test/interfaces/PersonLocal.class
 %%EXAMPLESDIR%%/target/classes/test/interfaces/PersonLocalHome.class
 %%EXAMPLESDIR%%/target/classes/test/interfaces/PersonNamesForm.class
+%%EXAMPLESDIR%%/target/classes/test/interfaces/QueueBeanUtil.class
 %%EXAMPLESDIR%%/target/classes/test/interfaces/SecurityOfficer.class
 %%EXAMPLESDIR%%/target/classes/test/interfaces/SecurityOfficerHome.class
 %%EXAMPLESDIR%%/target/classes/test/interfaces/Stateful.class
@@ -228,6 +277,9 @@
 %%EXAMPLESDIR%%/target/classes/test/jmx/JBossXMLExampleMBean.class
 %%EXAMPLESDIR%%/target/classes/test/jmx/SimpleJMX.class
 %%EXAMPLESDIR%%/target/classes/test/jmx/SimpleJMXMBean.class
+%%EXAMPLESDIR%%/target/classes/test/jsf/JsfConverter.class
+%%EXAMPLESDIR%%/target/classes/test/jsf/JsfManagedBean.class
+%%EXAMPLESDIR%%/target/classes/test/jsf/JsfValidator.class
 %%EXAMPLESDIR%%/target/classes/test/web/SimpleAction.class
 %%EXAMPLESDIR%%/target/classes/test/web/SimpleListener.class
 %%EXAMPLESDIR%%/target/classes/test/web/SimpleServlet.class
@@ -235,9 +287,25 @@
 %%EXAMPLESDIR%%/target/classes/test/web/StrutsAction.class
 %%EXAMPLESDIR%%/target/classes/test/web/StrutsDispatchAction.class
 %%EXAMPLESDIR%%/target/classes/test/web/TimerFilter.class
+%%EXAMPLESDIR%%/target/classes/test/wsee/TestBean.class
+%%EXAMPLESDIR%%/target/classes/test/wsee/TestException.class
+%%EXAMPLESDIR%%/target/classes/test/wsee/TestObject.class
+%%EXAMPLESDIR%%/target/classes/test/wsee/TestService.class
+%%EXAMPLESDIR%%/target/classes/test/wsee/TestSession.class
+%%EXAMPLESDIR%%/target/classes/test/wsee/TestSessionBean.class
 %%EXAMPLESDIR%%/target/gen-src/actions.html
 %%EXAMPLESDIR%%/target/gen-src/jboss-simple-service.xml
 %%EXAMPLESDIR%%/target/gen-src/metadata.jdo
+%%EXAMPLESDIR%%/target/gen-src/test/bea/cmr/MagazineCMP.java
+%%EXAMPLESDIR%%/target/gen-src/test/bea/cmr/MagazineData.java
+%%EXAMPLESDIR%%/target/gen-src/test/bea/cmr/MagazineLocal.java
+%%EXAMPLESDIR%%/target/gen-src/test/bea/cmr/MagazineLocalHome.java
+%%EXAMPLESDIR%%/target/gen-src/test/bea/cmr/MagazineUtil.java
+%%EXAMPLESDIR%%/target/gen-src/test/bea/cmr/SubscriberCMP.java
+%%EXAMPLESDIR%%/target/gen-src/test/bea/cmr/SubscriberData.java
+%%EXAMPLESDIR%%/target/gen-src/test/bea/cmr/SubscriberLocal.java
+%%EXAMPLESDIR%%/target/gen-src/test/bea/cmr/SubscriberLocalHome.java
+%%EXAMPLESDIR%%/target/gen-src/test/bea/cmr/SubscriberUtil.java
 %%EXAMPLESDIR%%/target/gen-src/test/dao/CustomerDAO.java
 %%EXAMPLESDIR%%/target/gen-src/test/ejb/AccountCMP.java
 %%EXAMPLESDIR%%/target/gen-src/test/ejb/AddressCMP.java
@@ -281,7 +349,9 @@
 %%EXAMPLESDIR%%/target/gen-src/test/ejb/cmr/LanguageUtil.java
 %%EXAMPLESDIR%%/target/gen-src/test/hibernate/Animal.hbm.xml
 %%EXAMPLESDIR%%/target/gen-src/test/hibernate/CompositeIdEntity.hbm.xml
+%%EXAMPLESDIR%%/target/gen-src/test/hibernate/Error.hbm.xml
 %%EXAMPLESDIR%%/target/gen-src/test/hibernate/LineItem.hbm.xml
+%%EXAMPLESDIR%%/target/gen-src/test/hibernate/OIDObject.hbm.xml
 %%EXAMPLESDIR%%/target/gen-src/test/hibernate/Order.hbm.xml
 %%EXAMPLESDIR%%/target/gen-src/test/hibernate/Product.hbm.xml
 %%EXAMPLESDIR%%/target/gen-src/test/interfaces/Account.java
@@ -325,6 +395,7 @@
 %%EXAMPLESDIR%%/target/gen-src/test/interfaces/PersonLocal.java
 %%EXAMPLESDIR%%/target/gen-src/test/interfaces/PersonLocalHome.java
 %%EXAMPLESDIR%%/target/gen-src/test/interfaces/PersonNamesForm.java
+%%EXAMPLESDIR%%/target/gen-src/test/interfaces/QueueBeanUtil.java
 %%EXAMPLESDIR%%/target/gen-src/test/interfaces/Stateful.java
 %%EXAMPLESDIR%%/target/gen-src/test/interfaces/StatefulHome.java
 %%EXAMPLESDIR%%/target/gen-src/test/interfaces/StatefulLocal.java
@@ -343,6 +414,8 @@
 %%EXAMPLESDIR%%/target/gen-src/test/jmx/JBossXMLExampleMBean.java
 %%EXAMPLESDIR%%/target/gen-src/test/jmx/SimpleJMX-doc.xml
 %%EXAMPLESDIR%%/target/gen-src/test/jmx/SimpleJMXMBean.java
+%%EXAMPLESDIR%%/target/gen-src/test/wsee/TestService.java
+%%EXAMPLESDIR%%/target/gen-src/test/wsee/TestSession.java
 %%EXAMPLESDIR%%/target/gen-src/views.properties
 %%EXAMPLESDIR%%/target/meta-inf/Schema.dbxmi
 %%EXAMPLESDIR%%/target/meta-inf/ejb-jar.xml
@@ -359,48 +432,68 @@
 %%EXAMPLESDIR%%/target/meta-inf/test/interfaces/soap-dds-TellerBean.xml
 %%EXAMPLESDIR%%/target/meta-inf/weblogic-cmp-rdbms-jar.xml
 %%EXAMPLESDIR%%/target/meta-inf/weblogic-ejb-jar.xml
+%%EXAMPLESDIR%%/target/meta-inf/wsee/ejb-jar.xml
+%%EXAMPLESDIR%%/target/meta-inf/wsee/jaxrpc-mapping.xml
+%%EXAMPLESDIR%%/target/meta-inf/wsee/test.wsdl
+%%EXAMPLESDIR%%/target/meta-inf/wsee/webservices.xml
+%%EXAMPLESDIR%%/target/web-inf/faces-config.xml
 %%EXAMPLESDIR%%/target/web-inf/jboss-web.xml
 %%EXAMPLESDIR%%/target/web-inf/jrun-web.xml
+%%EXAMPLESDIR%%/target/web-inf/spring/validation.xml
 %%EXAMPLESDIR%%/target/web-inf/struts-config.xml
 %%EXAMPLESDIR%%/target/web-inf/taglib.tld
+%%EXAMPLESDIR%%/target/web-inf/validation.xml
 %%EXAMPLESDIR%%/target/web-inf/web.xml
 %%EXAMPLESDIR%%/target/web-inf/weblogic.xml
-%%JAVAJARDIR%%/maven-xdoclet-plugin-1.2b4.jar
-%%JAVAJARDIR%%/xdoclet-1.2b4.jar
-%%JAVAJARDIR%%/xdoclet-apache-module-1.2b4.jar
-%%JAVAJARDIR%%/xdoclet-bea-module-1.2b4.jar
-%%JAVAJARDIR%%/xdoclet-borland-module-1.2b4.jar
-%%JAVAJARDIR%%/xdoclet-caucho-module-1.2b4.jar
-%%JAVAJARDIR%%/xdoclet-ejb-module-1.2b4.jar
-%%JAVAJARDIR%%/xdoclet-exolab-module-1.2b4.jar
-%%JAVAJARDIR%%/xdoclet-hibernate-module-1.2b4.jar
-%%JAVAJARDIR%%/xdoclet-hp-module-1.2b4.jar
-%%JAVAJARDIR%%/xdoclet-ibm-module-1.2b4.jar
-%%JAVAJARDIR%%/xdoclet-java-module-1.2b4.jar
-%%JAVAJARDIR%%/xdoclet-jboss-module-1.2b4.jar
-%%JAVAJARDIR%%/xdoclet-jdo-module-1.2b4.jar
-%%JAVAJARDIR%%/xdoclet-jmx-module-1.2b4.jar
-%%JAVAJARDIR%%/xdoclet-libelis-module-1.2b4.jar
-%%JAVAJARDIR%%/xdoclet-macromedia-module-1.2b4.jar
-%%JAVAJARDIR%%/xdoclet-mockobjects-module-1.2b4.jar
-%%JAVAJARDIR%%/xdoclet-mvcsoft-module-1.2b4.jar
-%%JAVAJARDIR%%/xdoclet-mx4j-module-1.2b4.jar
-%%JAVAJARDIR%%/xdoclet-objectweb-module-1.2b4.jar
-%%JAVAJARDIR%%/xdoclet-oracle-module-1.2b4.jar
-%%JAVAJARDIR%%/xdoclet-orion-module-1.2b4.jar
-%%JAVAJARDIR%%/xdoclet-pramati-module-1.2b4.jar
-%%JAVAJARDIR%%/xdoclet-solarmetric-module-1.2b4.jar
-%%JAVAJARDIR%%/xdoclet-sun-module-1.2b4.jar
-%%JAVAJARDIR%%/xdoclet-sybase-module-1.2b4.jar
-%%JAVAJARDIR%%/xdoclet-tjdo-module-1.2b4.jar
-%%JAVAJARDIR%%/xdoclet-web-module-1.2b4.jar
-%%JAVAJARDIR%%/xdoclet-webwork-module-1.2b4.jar
-%%JAVAJARDIR%%/xdoclet-xdoclet-module-1.2b4.jar
+%%EXAMPLESDIR%%/target/web-inf/ws4ee/web.xml
+%%JAVAJARDIR%%/maven-xdoclet-plugin-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-apache-module-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-bea-module-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-borland-module-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-caucho-module-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-de-locale-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-ejb-module-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-exolab-module-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-fr_FR-locale-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-hibernate-module-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-hp-module-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-ibm-module-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-java-module-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-jboss-module-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-jdo-module-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-jmx-module-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-jsf-module-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-libelis-module-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-macromedia-module-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-mockobjects-module-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-mvcsoft-module-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-mx4j-module-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-objectweb-module-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-openejb-module-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-oracle-module-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-orion-module-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-portlet-module-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-pramati-module-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-pt_BR-locale-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-solarmetric-module-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-spring-module-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-sun-module-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-sybase-module-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-tjdo-module-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-web-module-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-webwork-module-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-wsee-module-1.2.3.jar
+%%JAVAJARDIR%%/xdoclet-xdoclet-module-1.2.3.jar
 %%JAVAJARDIR%%/xjavadoc-%%XJAVADOC_VER%%.jar
+@dirrm %%EXAMPLESDIR%%/target/web-inf/ws4ee
+@dirrm %%EXAMPLESDIR%%/target/web-inf/spring
 @dirrm %%EXAMPLESDIR%%/target/web-inf
+@dirrm %%EXAMPLESDIR%%/target/meta-inf/wsee
 @dirrm %%EXAMPLESDIR%%/target/meta-inf/test/interfaces
 @dirrm %%EXAMPLESDIR%%/target/meta-inf/test
 @dirrm %%EXAMPLESDIR%%/target/meta-inf
+@dirrm %%EXAMPLESDIR%%/target/gen-src/test/wsee
 @dirrm %%EXAMPLESDIR%%/target/gen-src/test/jmx
 @dirrm %%EXAMPLESDIR%%/target/gen-src/test/javabean
 @dirrm %%EXAMPLESDIR%%/target/gen-src/test/interfaces
@@ -408,9 +501,13 @@
 @dirrm %%EXAMPLESDIR%%/target/gen-src/test/ejb/cmr
 @dirrm %%EXAMPLESDIR%%/target/gen-src/test/ejb
 @dirrm %%EXAMPLESDIR%%/target/gen-src/test/dao
+@dirrm %%EXAMPLESDIR%%/target/gen-src/test/bea/cmr
+@dirrm %%EXAMPLESDIR%%/target/gen-src/test/bea
 @dirrm %%EXAMPLESDIR%%/target/gen-src/test
 @dirrm %%EXAMPLESDIR%%/target/gen-src
+@dirrm %%EXAMPLESDIR%%/target/classes/test/wsee
 @dirrm %%EXAMPLESDIR%%/target/classes/test/web
+@dirrm %%EXAMPLESDIR%%/target/classes/test/jsf
 @dirrm %%EXAMPLESDIR%%/target/classes/test/jmx
 @dirrm %%EXAMPLESDIR%%/target/classes/test/jdo
 @dirrm %%EXAMPLESDIR%%/target/classes/test/javabean
@@ -420,12 +517,16 @@
 @dirrm %%EXAMPLESDIR%%/target/classes/test/ejb/cmr
 @dirrm %%EXAMPLESDIR%%/target/classes/test/ejb
 @dirrm %%EXAMPLESDIR%%/target/classes/test/dao
+@dirrm %%EXAMPLESDIR%%/target/classes/test/bea/cmr
+@dirrm %%EXAMPLESDIR%%/target/classes/test/bea
 @dirrm %%EXAMPLESDIR%%/target/classes/test
 @dirrm %%EXAMPLESDIR%%/target/classes
 @dirrm %%EXAMPLESDIR%%/target
 @dirrm %%EXAMPLESDIR%%/src/web
 @dirrm %%EXAMPLESDIR%%/src/merge
+@dirrm %%EXAMPLESDIR%%/src/java/test/wsee
 @dirrm %%EXAMPLESDIR%%/src/java/test/web
+@dirrm %%EXAMPLESDIR%%/src/java/test/jsf
 @dirrm %%EXAMPLESDIR%%/src/java/test/jmx
 @dirrm %%EXAMPLESDIR%%/src/java/test/jdo
 @dirrm %%EXAMPLESDIR%%/src/java/test/javabean
@@ -435,6 +536,8 @@
 @dirrm %%EXAMPLESDIR%%/src/java/test/ejb/cmr
 @dirrm %%EXAMPLESDIR%%/src/java/test/ejb
 @dirrm %%EXAMPLESDIR%%/src/java/test/dao
+@dirrm %%EXAMPLESDIR%%/src/java/test/bea/cmr
+@dirrm %%EXAMPLESDIR%%/src/java/test/bea
 @dirrm %%EXAMPLESDIR%%/src/java/test
 @dirrm %%EXAMPLESDIR%%/src/java
 @dirrm %%EXAMPLESDIR%%/src