Update to version 1.4.5.

PR:		25216
Submitted by:	maintainer

3 files changed, 206 insertions, 200 deletions

diff --git a/java/orion/Makefile b/java/orion/Makefile
index 3462216b1996..1dcda7483a04 100644
--- a/java/orion/Makefile
+++ b/java/orion/Makefile
@@ -6,23 +6,24 @@
 #
 
 PORTNAME=	orion
-PORTVERSION=	1.4.0
+PORTVERSION=	1.4.5
 CATEGORIES=	java www
-MASTER_SITES=	ftp://ftp.sunet.se/pub/database/utils/orionserver/
+MASTER_SITES=	ftp://ftp.sunet.se/pub/database/utils/orionserver/ \
+		http://www.jollem.com/
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	ernst@jollem.com
 
-RUN_DEPENDS=	${JAVADIR}/bin/java:${PORTSDIR}/java/jdk12-beta
+RUN_DEPENDS=	${LOCALBASE}/linux-jdk1.3.0/bin/java:${PORTSDIR}/java/linux-jdk13
 
 USE_ZIP=	YES
 NO_BUILD=	YES
 PLIST_SUB=	ORIONSUBDIR=${DISTNAME}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-JDK_VERSION=	1.2.2
-JAVADIR=	${PREFIX}/jdk${JDK_VERSION}
 ORION_DESTDIR=	${PREFIX}/${DISTNAME}
+ORION_LINKDIR=	${PREFIX}/${PORTNAME}
+PORTTITLE=	Orion Server
 RECURSIVE_CP=	${CP} -R
 
 .include <bsd.port.pre.mk>
@@ -30,5 +31,9 @@ RECURSIVE_CP=	${CP} -R
 do-install:
 	@${MKDIR} ${ORION_DESTDIR}
 	@${RECURSIVE_CP} ${WRKSRC}/* ${ORION_DESTDIR}
+	@${LN} -sf ${ORION_DESTDIR} ${ORION_LINKDIR}
+
+post-install:
+	@echo "${PORTTITLE} has been installed in ${ORION_LINKDIR} -> ${ORION_DESTDIR}."
 
 .include <bsd.port.post.mk>
diff --git a/java/orion/distinfo b/java/orion/distinfo
index 627860b395ba..cda402d8eb54 100644
--- a/java/orion/distinfo
+++ b/java/orion/distinfo
@@ -1 +1 @@
-MD5 (orion1.4.0.zip) = f86c2550a10511cb4444fa43374c06ed
+MD5 (orion1.4.5.zip) = efdcae8bdcdf6a8bc94ab4982a8192a2
diff --git a/java/orion/pkg-plist b/java/orion/pkg-plist
index 401604e3c2e2..d40ea582cab6 100644
--- a/java/orion/pkg-plist
+++ b/java/orion/pkg-plist
@@ -1,43 +1,132 @@
+orion
+%%ORIONSUBDIR%%/Copyright.txt
+%%ORIONSUBDIR%%/Readme.txt
+%%ORIONSUBDIR%%/activation.jar
+%%ORIONSUBDIR%%/admin.jar
+%%ORIONSUBDIR%%/applicationlauncher.jar
+%%ORIONSUBDIR%%/applications/atm-install.txt
+%%ORIONSUBDIR%%/applications/atm.ear
+%%ORIONSUBDIR%%/applications/estore-bugs.txt
+%%ORIONSUBDIR%%/applications/estore-install.txt
+%%ORIONSUBDIR%%/applications/estore-orionadapter.jar
+%%ORIONSUBDIR%%/applications/estore-patched.ear
+%%ORIONSUBDIR%%/applications/news-install.txt
+%%ORIONSUBDIR%%/applications/news.ear
+%%ORIONSUBDIR%%/assemblerlauncher.jar
+%%ORIONSUBDIR%%/autoupdate.jar
+%%ORIONSUBDIR%%/autoupdate.properties
+%%ORIONSUBDIR%%/changes.txt
+%%ORIONSUBDIR%%/clientassembler.jar
+%%ORIONSUBDIR%%/config/application.xml
+%%ORIONSUBDIR%%/config/data-sources.xml
 %%ORIONSUBDIR%%/config/database-schemas/hypersonic.xml
 %%ORIONSUBDIR%%/config/database-schemas/ms-access.xml
+%%ORIONSUBDIR%%/config/database-schemas/ms-sql.xml
 %%ORIONSUBDIR%%/config/database-schemas/oracle.xml
 %%ORIONSUBDIR%%/config/database-schemas/postgresql.xml
 %%ORIONSUBDIR%%/config/database-schemas/sybase.xml
-%%ORIONSUBDIR%%/config/database-schemas/ms-sql.xml
-%%ORIONSUBDIR%%/config/data-sources.xml
 %%ORIONSUBDIR%%/config/default-web-site.xml
 %%ORIONSUBDIR%%/config/global-web-application.xml
 %%ORIONSUBDIR%%/config/jms.xml
 %%ORIONSUBDIR%%/config/mime.types
 %%ORIONSUBDIR%%/config/principals.xml
 %%ORIONSUBDIR%%/config/rmi.xml
-%%ORIONSUBDIR%%/config/application.xml
 %%ORIONSUBDIR%%/config/server.xml
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/BBoardServlet.class
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/BBoardServlet.java
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/ConfigServlet.class
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/ConfigServlet.java
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/CookieExample.class
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/CookieExample.java
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/Counter.class
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/Counter.java
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/DateServlet.class
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/DateServlet.java
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/FingerServlet.class
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/FingerServlet.java
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/HelloWorldExample.class
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/HelloWorldExample.java
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/HelloWorldServlet.class
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/HelloWorldServlet.java
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/LinkCheckerServlet.class
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/LinkCheckerServlet.java
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/LocalStrings.properties
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/ParameterBean.class
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/ParameterBean.java
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/RedirectServlet.class
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/RedirectServlet.java
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/RequestHeaderExample.class
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/RequestHeaderExample.java
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/RequestInfoExample.class
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/RequestInfoExample.java
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/RequestParamExample.class
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/RequestParamExample.java
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/SessionExample.class
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/SessionExample.java
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/SessionServlet.class
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/SessionServlet.java
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/SimpleServlet.class
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/SimpleServlet.java
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/SnoopServlet.class
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/SnoopServlet.java
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/SurveyServlet.class
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/SurveyServlet.java
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/ToJSPServlet.class
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/ToJSPServlet.java
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/URLInfo.class
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/UpperCaseFilter.class
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/UpperCaseFilter.java
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/cal/Entries.class
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/cal/Entries.java
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/cal/Entry.class
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/cal/Entry.java
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/cal/JspCalendar.class
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/cal/JspCalendar.java
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/cal/TableBean.class
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/cal/TableBean.java
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/checkbox/CheckTest.class
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/checkbox/CheckTest.java
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/colors/ColorGameBean.class
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/colors/ColorGameBean.java
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/dates/JspCalendar.class
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/dates/JspCalendar.java
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/error/Smart.class
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/error/Smart.java
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/num/NumberGuessBean.class
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/num/NumberGuessBean.java
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/sessions/DummyCart.class
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/sessions/DummyCart.java
+%%ORIONSUBDIR%%/default-web-app/WEB-INF/web.xml
+%%ORIONSUBDIR%%/default-web-app/examples/cal/Entries.txt
+%%ORIONSUBDIR%%/default-web-app/examples/cal/Entry.txt
+%%ORIONSUBDIR%%/default-web-app/examples/cal/JspCalendar.txt
 %%ORIONSUBDIR%%/default-web-app/examples/cal/TableBean.txt
+%%ORIONSUBDIR%%/default-web-app/examples/cal/cal1.jsp
 %%ORIONSUBDIR%%/default-web-app/examples/cal/cal1.txt
 %%ORIONSUBDIR%%/default-web-app/examples/cal/cal2.jsp
 %%ORIONSUBDIR%%/default-web-app/examples/cal/cal2.txt
 %%ORIONSUBDIR%%/default-web-app/examples/cal/calendar.html
-%%ORIONSUBDIR%%/default-web-app/examples/cal/Entries.txt
-%%ORIONSUBDIR%%/default-web-app/examples/cal/Entry.txt
-%%ORIONSUBDIR%%/default-web-app/examples/cal/JspCalendar.txt
 %%ORIONSUBDIR%%/default-web-app/examples/cal/login.html
-%%ORIONSUBDIR%%/default-web-app/examples/cal/cal1.jsp
 %%ORIONSUBDIR%%/default-web-app/examples/images/code.gif
 %%ORIONSUBDIR%%/default-web-app/examples/images/execute.gif
 %%ORIONSUBDIR%%/default-web-app/examples/images/return.gif
-%%ORIONSUBDIR%%/default-web-app/examples/jsp/include/foo.html
-%%ORIONSUBDIR%%/default-web-app/examples/jsp/include/foo.jsp
-%%ORIONSUBDIR%%/default-web-app/examples/jsp/include/inc.html
-%%ORIONSUBDIR%%/default-web-app/examples/jsp/include/include.jsp
-%%ORIONSUBDIR%%/default-web-app/examples/jsp/include/include.txt
+%%ORIONSUBDIR%%/default-web-app/examples/jsp/cal/Entries.txt
+%%ORIONSUBDIR%%/default-web-app/examples/jsp/cal/Entry.txt
+%%ORIONSUBDIR%%/default-web-app/examples/jsp/cal/JspCalendar.txt
+%%ORIONSUBDIR%%/default-web-app/examples/jsp/cal/TableBean.txt
+%%ORIONSUBDIR%%/default-web-app/examples/jsp/cal/cal1.jsp
+%%ORIONSUBDIR%%/default-web-app/examples/jsp/cal/cal1.txt
+%%ORIONSUBDIR%%/default-web-app/examples/jsp/cal/cal2.jsp
+%%ORIONSUBDIR%%/default-web-app/examples/jsp/cal/cal2.txt
+%%ORIONSUBDIR%%/default-web-app/examples/jsp/cal/calendar.html
+%%ORIONSUBDIR%%/default-web-app/examples/jsp/cal/login.html
+%%ORIONSUBDIR%%/default-web-app/examples/jsp/checkbox/CheckTest.html
 %%ORIONSUBDIR%%/default-web-app/examples/jsp/checkbox/check.html
 %%ORIONSUBDIR%%/default-web-app/examples/jsp/checkbox/checkresult.jsp
 %%ORIONSUBDIR%%/default-web-app/examples/jsp/checkbox/checkresult.txt
-%%ORIONSUBDIR%%/default-web-app/examples/jsp/checkbox/CheckTest.html
 %%ORIONSUBDIR%%/default-web-app/examples/jsp/checkbox/cresult.html
-%%ORIONSUBDIR%%/default-web-app/examples/jsp/colors/clr.html
 %%ORIONSUBDIR%%/default-web-app/examples/jsp/colors/ColorGameBean.html
+%%ORIONSUBDIR%%/default-web-app/examples/jsp/colors/clr.html
 %%ORIONSUBDIR%%/default-web-app/examples/jsp/colors/colors.html
 %%ORIONSUBDIR%%/default-web-app/examples/jsp/colors/colors.txt
 %%ORIONSUBDIR%%/default-web-app/examples/jsp/colors/colrs.jsp
@@ -54,19 +143,12 @@
 %%ORIONSUBDIR%%/default-web-app/examples/jsp/forward/fwd.html
 %%ORIONSUBDIR%%/default-web-app/examples/jsp/forward/one.jsp
 %%ORIONSUBDIR%%/default-web-app/examples/jsp/forward/two.html
-%%ORIONSUBDIR%%/default-web-app/examples/jsp/snp/snoop.html
-%%ORIONSUBDIR%%/default-web-app/examples/jsp/snp/snoop.jsp
-%%ORIONSUBDIR%%/default-web-app/examples/jsp/snp/snoop.txt
-%%ORIONSUBDIR%%/default-web-app/examples/jsp/cal/TableBean.txt
-%%ORIONSUBDIR%%/default-web-app/examples/jsp/cal/cal1.txt
-%%ORIONSUBDIR%%/default-web-app/examples/jsp/cal/cal2.jsp
-%%ORIONSUBDIR%%/default-web-app/examples/jsp/cal/cal2.txt
-%%ORIONSUBDIR%%/default-web-app/examples/jsp/cal/calendar.html
-%%ORIONSUBDIR%%/default-web-app/examples/jsp/cal/Entries.txt
-%%ORIONSUBDIR%%/default-web-app/examples/jsp/cal/Entry.txt
-%%ORIONSUBDIR%%/default-web-app/examples/jsp/cal/JspCalendar.txt
-%%ORIONSUBDIR%%/default-web-app/examples/jsp/cal/login.html
-%%ORIONSUBDIR%%/default-web-app/examples/jsp/cal/cal1.jsp
+%%ORIONSUBDIR%%/default-web-app/examples/jsp/include/foo.html
+%%ORIONSUBDIR%%/default-web-app/examples/jsp/include/foo.jsp
+%%ORIONSUBDIR%%/default-web-app/examples/jsp/include/inc.html
+%%ORIONSUBDIR%%/default-web-app/examples/jsp/include/include.jsp
+%%ORIONSUBDIR%%/default-web-app/examples/jsp/include/include.txt
+%%ORIONSUBDIR%%/default-web-app/examples/jsp/index.html
 %%ORIONSUBDIR%%/default-web-app/examples/jsp/jsptoserv/hello.jsp
 %%ORIONSUBDIR%%/default-web-app/examples/jsp/jsptoserv/jsptoservlet.jsp
 %%ORIONSUBDIR%%/default-web-app/examples/jsp/jsptoserv/jts.html
@@ -80,19 +162,21 @@
 %%ORIONSUBDIR%%/default-web-app/examples/jsp/plugin/plugin.html
 %%ORIONSUBDIR%%/default-web-app/examples/jsp/plugin/plugin.jsp
 %%ORIONSUBDIR%%/default-web-app/examples/jsp/plugin/plugin.txt
+%%ORIONSUBDIR%%/default-web-app/examples/jsp/sessions/DummyCart.html
 %%ORIONSUBDIR%%/default-web-app/examples/jsp/sessions/carts.html
 %%ORIONSUBDIR%%/default-web-app/examples/jsp/sessions/carts.jsp
 %%ORIONSUBDIR%%/default-web-app/examples/jsp/sessions/carts.txt
 %%ORIONSUBDIR%%/default-web-app/examples/jsp/sessions/crt.html
-%%ORIONSUBDIR%%/default-web-app/examples/jsp/sessions/DummyCart.html
+%%ORIONSUBDIR%%/default-web-app/examples/jsp/snp/snoop.html
+%%ORIONSUBDIR%%/default-web-app/examples/jsp/snp/snoop.jsp
+%%ORIONSUBDIR%%/default-web-app/examples/jsp/snp/snoop.txt
 %%ORIONSUBDIR%%/default-web-app/examples/jsp/taglib/loop/META-INF/taglib.tld
-%%ORIONSUBDIR%%/default-web-app/examples/jsp/taglib/loop/taglib/LoopTag.class
-%%ORIONSUBDIR%%/default-web-app/examples/jsp/taglib/loop/taglib/LoopTag.java
 %%ORIONSUBDIR%%/default-web-app/examples/jsp/taglib/loop/index.html
 %%ORIONSUBDIR%%/default-web-app/examples/jsp/taglib/loop/looptag.jsp
 %%ORIONSUBDIR%%/default-web-app/examples/jsp/taglib/loop/looptag.jsp.txt
 %%ORIONSUBDIR%%/default-web-app/examples/jsp/taglib/loop/looptags.jar
-%%ORIONSUBDIR%%/default-web-app/examples/jsp/index.html
+%%ORIONSUBDIR%%/default-web-app/examples/jsp/taglib/loop/taglib/LoopTag.class
+%%ORIONSUBDIR%%/default-web-app/examples/jsp/taglib/loop/taglib/LoopTag.java
 %%ORIONSUBDIR%%/default-web-app/examples/perl/helloworld.pl
 %%ORIONSUBDIR%%/default-web-app/examples/perl/post.html
 %%ORIONSUBDIR%%/default-web-app/examples/perl/post.pl
@@ -105,83 +189,9 @@
 %%ORIONSUBDIR%%/default-web-app/examples/xsl/doc.jsp
 %%ORIONSUBDIR%%/default-web-app/examples/xsl/doc.xml
 %%ORIONSUBDIR%%/default-web-app/examples/xsl/doc.xsl
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/checkbox/CheckTest.class
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/checkbox/CheckTest.java
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/sessions/DummyCart.class
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/sessions/DummyCart.java
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/error/Smart.class
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/error/Smart.java
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/num/NumberGuessBean.class
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/num/NumberGuessBean.java
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/colors/ColorGameBean.class
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/colors/ColorGameBean.java
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/dates/JspCalendar.class
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/dates/JspCalendar.java
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/cal/TableBean.java
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/cal/Entries.java
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/cal/Entry.class
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/cal/Entry.java
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/cal/JspCalendar.class
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/cal/JspCalendar.java
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/cal/TableBean.class
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/cal/Entries.class
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/ParameterBean.java
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/RequestHeaderExample.class
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/RequestHeaderExample.java
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/RequestInfoExample.class
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/RequestInfoExample.java
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/RequestParamExample.class
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/RequestParamExample.java
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/SessionExample.class
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/SessionExample.java
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/ToJSPServlet.class
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/ToJSPServlet.java
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/BBoardServlet.class
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/BBoardServlet.java
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/ConfigServlet.class
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/ConfigServlet.java
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/Counter.class
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/Counter.java
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/DateServlet.class
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/DateServlet.java
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/FingerServlet.class
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/FingerServlet.java
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/HelloWorldServlet.class
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/HelloWorldServlet.java
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/LinkCheckerServlet.class
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/LinkCheckerServlet.java
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/RedirectServlet.class
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/RedirectServlet.java
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/SessionServlet.class
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/SessionServlet.java
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/SimpleServlet.class
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/SimpleServlet.java
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/SnoopServlet.class
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/SnoopServlet.java
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/SurveyServlet.class
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/SurveyServlet.java
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/UpperCaseFilter.class
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/UpperCaseFilter.java
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/URLInfo.class
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/CookieExample.class
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/CookieExample.java
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/HelloWorldExample.class
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/HelloWorldExample.java
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/LocalStrings.properties
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/ParameterBean.class
-%%ORIONSUBDIR%%/default-web-app/WEB-INF/web.xml
 %%ORIONSUBDIR%%/default-web-app/index.html
-%%ORIONSUBDIR%%/applications/estore-patched.ear
-%%ORIONSUBDIR%%/applications/news-install.txt
-%%ORIONSUBDIR%%/applications/news.ear
-%%ORIONSUBDIR%%/applications/atm-install.txt
-%%ORIONSUBDIR%%/applications/estore-bugs.txt
-%%ORIONSUBDIR%%/applications/estore-install.txt
-%%ORIONSUBDIR%%/applications/estore-orionadapter.jar
-%%ORIONSUBDIR%%/applications/atm.ear
-%%ORIONSUBDIR%%/demo/ejb/cart/META-INF/application-client.xml
-%%ORIONSUBDIR%%/demo/ejb/cart/META-INF/ejb-jar.xml
-%%ORIONSUBDIR%%/demo/ejb/cart/META-INF/MANIFEST.MF
+%%ORIONSUBDIR%%/demo/ejb/META-INF/application.xml
+%%ORIONSUBDIR%%/demo/ejb/cart/Cart.class
 %%ORIONSUBDIR%%/demo/ejb/cart/Cart.java
 %%ORIONSUBDIR%%/demo/ejb/cart/CartClient.class
 %%ORIONSUBDIR%%/demo/ejb/cart/CartClient.java
@@ -189,19 +199,19 @@
 %%ORIONSUBDIR%%/demo/ejb/cart/CartEJB.java
 %%ORIONSUBDIR%%/demo/ejb/cart/CartHome.class
 %%ORIONSUBDIR%%/demo/ejb/cart/CartHome.java
-%%ORIONSUBDIR%%/demo/ejb/cart/jndi.properties
+%%ORIONSUBDIR%%/demo/ejb/cart/META-INF/MANIFEST.MF
+%%ORIONSUBDIR%%/demo/ejb/cart/META-INF/application-client.xml
+%%ORIONSUBDIR%%/demo/ejb/cart/META-INF/ejb-jar.xml
 %%ORIONSUBDIR%%/demo/ejb/cart/NotInCartException.class
 %%ORIONSUBDIR%%/demo/ejb/cart/NotInCartException.java
-%%ORIONSUBDIR%%/demo/ejb/cart/Cart.class
+%%ORIONSUBDIR%%/demo/ejb/cart/jndi.properties
 %%ORIONSUBDIR%%/demo/ejb/cart/orion-cart.jar
-%%ORIONSUBDIR%%/demo/ejb/META-INF/application.xml
+%%ORIONSUBDIR%%/demo/ejb/install.txt
+%%ORIONSUBDIR%%/demo/ejb/product/META-INF/MANIFEST.MF
 %%ORIONSUBDIR%%/demo/ejb/product/META-INF/application-client.xml
 %%ORIONSUBDIR%%/demo/ejb/product/META-INF/ejb-jar.xml
-%%ORIONSUBDIR%%/demo/ejb/product/META-INF/MANIFEST.MF
-%%ORIONSUBDIR%%/demo/ejb/product/orion-product.jar
 %%ORIONSUBDIR%%/demo/ejb/product/Product.class
 %%ORIONSUBDIR%%/demo/ejb/product/Product.java
-%%ORIONSUBDIR%%/demo/ejb/product/product.skeleton
 %%ORIONSUBDIR%%/demo/ejb/product/ProductClient.class
 %%ORIONSUBDIR%%/demo/ejb/product/ProductClient.java
 %%ORIONSUBDIR%%/demo/ejb/product/ProductEJB.class
@@ -209,29 +219,40 @@
 %%ORIONSUBDIR%%/demo/ejb/product/ProductHome.class
 %%ORIONSUBDIR%%/demo/ejb/product/ProductHome.java
 %%ORIONSUBDIR%%/demo/ejb/product/ProductServlet.class
-%%ORIONSUBDIR%%/demo/ejb/product/jndi.properties
 %%ORIONSUBDIR%%/demo/ejb/product/ProductServlet.java
+%%ORIONSUBDIR%%/demo/ejb/product/jndi.properties
+%%ORIONSUBDIR%%/demo/ejb/product/orion-product.jar
+%%ORIONSUBDIR%%/demo/ejb/product/product.skeleton
 %%ORIONSUBDIR%%/demo/ejb/usermanager/META-INF/ejb-jar.xml
-%%ORIONSUBDIR%%/demo/ejb/install.txt
-%%ORIONSUBDIR%%/demo/jms/coffeemaker/META-INF/application-client.xml
-%%ORIONSUBDIR%%/demo/jms/coffeemaker/META-INF/MANIFEST.MF
-%%ORIONSUBDIR%%/demo/jms/coffeemaker/META-INF/orion-application-client.xml
+%%ORIONSUBDIR%%/demo/jms/coffeemaker.jar
 %%ORIONSUBDIR%%/demo/jms/coffeemaker/CoffeeMachine.class
 %%ORIONSUBDIR%%/demo/jms/coffeemaker/CoffeeMachine.java
 %%ORIONSUBDIR%%/demo/jms/coffeemaker/CoffeeMaker.class
 %%ORIONSUBDIR%%/demo/jms/coffeemaker/CoffeeMaker.java
+%%ORIONSUBDIR%%/demo/jms/coffeemaker/META-INF/MANIFEST.MF
+%%ORIONSUBDIR%%/demo/jms/coffeemaker/META-INF/application-client.xml
+%%ORIONSUBDIR%%/demo/jms/coffeemaker/META-INF/orion-application-client.xml
 %%ORIONSUBDIR%%/demo/jms/coffeemaker/jndi.properties
-%%ORIONSUBDIR%%/demo/jms/jmschat/META-INF/application-client.xml
-%%ORIONSUBDIR%%/demo/jms/jmschat/META-INF/MANIFEST.MF
-%%ORIONSUBDIR%%/demo/jms/jmschat/META-INF/orion-application-client.xml
+%%ORIONSUBDIR%%/demo/jms/jmschat.jar
 %%ORIONSUBDIR%%/demo/jms/jmschat/JMSChat$1.class
 %%ORIONSUBDIR%%/demo/jms/jmschat/JMSChat.class
 %%ORIONSUBDIR%%/demo/jms/jmschat/JMSChat.java
+%%ORIONSUBDIR%%/demo/jms/jmschat/META-INF/MANIFEST.MF
+%%ORIONSUBDIR%%/demo/jms/jmschat/META-INF/application-client.xml
+%%ORIONSUBDIR%%/demo/jms/jmschat/META-INF/orion-application-client.xml
 %%ORIONSUBDIR%%/demo/jms/jmschat/jndi.properties
-%%ORIONSUBDIR%%/demo/jms/coffeemaker.jar
-%%ORIONSUBDIR%%/demo/jms/jmschat.jar
 %%ORIONSUBDIR%%/demo/jms/jmsdemo-readme.txt
-%%ORIONSUBDIR%%/demo/news-app/news-ejb-source/com/evermind/ejb/NewsView.java
+%%ORIONSUBDIR%%/demo/messagelogger.ear
+%%ORIONSUBDIR%%/demo/news-app/META-INF/application.xml
+%%ORIONSUBDIR%%/demo/news-app/counter.jar
+%%ORIONSUBDIR%%/demo/news-app/news-client-source/META-INF/MANIFEST.MF
+%%ORIONSUBDIR%%/demo/news-app/news-client-source/META-INF/application-client.xml
+%%ORIONSUBDIR%%/demo/news-app/news-client-source/com/evermind/ejb/NewsClient.class
+%%ORIONSUBDIR%%/demo/news-app/news-client-source/com/evermind/ejb/NewsClient.java
+%%ORIONSUBDIR%%/demo/news-app/news-client-source/com/evermind/ejb/NewsItemClient.class
+%%ORIONSUBDIR%%/demo/news-app/news-client.jar
+%%ORIONSUBDIR%%/demo/news-app/news-ejb-source/META-INF/ejb-jar.xml
+%%ORIONSUBDIR%%/demo/news-app/news-ejb-source/com/evermind/ejb/NewsItem.class
 %%ORIONSUBDIR%%/demo/news-app/news-ejb-source/com/evermind/ejb/NewsItem.java
 %%ORIONSUBDIR%%/demo/news-app/news-ejb-source/com/evermind/ejb/NewsItemClient.class
 %%ORIONSUBDIR%%/demo/news-app/news-ejb-source/com/evermind/ejb/NewsItemEJB.class
@@ -247,24 +268,22 @@
 %%ORIONSUBDIR%%/demo/news-app/news-ejb-source/com/evermind/ejb/NewsSessionHome.class
 %%ORIONSUBDIR%%/demo/news-app/news-ejb-source/com/evermind/ejb/NewsSessionHome.java
 %%ORIONSUBDIR%%/demo/news-app/news-ejb-source/com/evermind/ejb/NewsView.class
-%%ORIONSUBDIR%%/demo/news-app/news-ejb-source/com/evermind/ejb/NewsItem.class
-%%ORIONSUBDIR%%/demo/news-app/news-ejb-source/META-INF/ejb-jar.xml
-%%ORIONSUBDIR%%/demo/news-app/news-client-source/com/evermind/ejb/NewsClient.class
-%%ORIONSUBDIR%%/demo/news-app/news-client-source/com/evermind/ejb/NewsClient.java
-%%ORIONSUBDIR%%/demo/news-app/news-client-source/com/evermind/ejb/NewsItemClient.class
-%%ORIONSUBDIR%%/demo/news-app/news-client-source/META-INF/application-client.xml
-%%ORIONSUBDIR%%/demo/news-app/news-client-source/META-INF/MANIFEST.MF
-%%ORIONSUBDIR%%/demo/news-app/news-web/admin/editnews.jsp
-%%ORIONSUBDIR%%/demo/news-app/news-web/admin/editnews_done.jsp
+%%ORIONSUBDIR%%/demo/news-app/news-ejb-source/com/evermind/ejb/NewsView.java
+%%ORIONSUBDIR%%/demo/news-app/news-ejb.jar
+%%ORIONSUBDIR%%/demo/news-app/news-web.war
 %%ORIONSUBDIR%%/demo/news-app/news-web/WEB-INF/lib/ejbtags.jar
 %%ORIONSUBDIR%%/demo/news-app/news-web/WEB-INF/lib/utiltags.jar
 %%ORIONSUBDIR%%/demo/news-app/news-web/WEB-INF/web.xml
+%%ORIONSUBDIR%%/demo/news-app/news-web/addnews.jsp
+%%ORIONSUBDIR%%/demo/news-app/news-web/addnews_done.jsp
+%%ORIONSUBDIR%%/demo/news-app/news-web/admin/editnews.jsp
+%%ORIONSUBDIR%%/demo/news-app/news-web/admin/editnews_done.jsp
 %%ORIONSUBDIR%%/demo/news-app/news-web/border.html
 %%ORIONSUBDIR%%/demo/news-app/news-web/checks.jsp
 %%ORIONSUBDIR%%/demo/news-app/news-web/index.html
 %%ORIONSUBDIR%%/demo/news-app/news-web/initviews.jsp
 %%ORIONSUBDIR%%/demo/news-app/news-web/login-error.html
-%%ORIONSUBDIR%%/demo/news-app/news-web/addnews.jsp
+%%ORIONSUBDIR%%/demo/news-app/news-web/login.html
 %%ORIONSUBDIR%%/demo/news-app/news-web/loginbox.jsp
 %%ORIONSUBDIR%%/demo/news-app/news-web/logout.jsp
 %%ORIONSUBDIR%%/demo/news-app/news-web/news-body.jsp
@@ -272,65 +291,58 @@
 %%ORIONSUBDIR%%/demo/news-app/news-web/newsdetail.jsp
 %%ORIONSUBDIR%%/demo/news-app/news-web/newssearch.jsp
 %%ORIONSUBDIR%%/demo/news-app/news-web/usertest.jsp
-%%ORIONSUBDIR%%/demo/news-app/news-web/login.html
-%%ORIONSUBDIR%%/demo/news-app/news-web/addnews_done.jsp
-%%ORIONSUBDIR%%/demo/news-app/META-INF/application.xml
-%%ORIONSUBDIR%%/demo/news-app/news-web.war
-%%ORIONSUBDIR%%/demo/news-app/news-client.jar
-%%ORIONSUBDIR%%/demo/news-app/news-ejb.jar
-%%ORIONSUBDIR%%/demo/news-app/counter.jar
 %%ORIONSUBDIR%%/demo/rmi/RMIApp.class
 %%ORIONSUBDIR%%/demo/rmi/RMIApp.java
 %%ORIONSUBDIR%%/demo/ssl/ssl-user-registration.jsp
-%%ORIONSUBDIR%%/demo/messagelogger.ear
+%%ORIONSUBDIR%%/earassembler.jar
+%%ORIONSUBDIR%%/ejb.jar
+%%ORIONSUBDIR%%/ejbassembler.jar
+%%ORIONSUBDIR%%/ejbmaker.jar
+%%ORIONSUBDIR%%/jaxp.jar
+%%ORIONSUBDIR%%/jcert.jar
+%%ORIONSUBDIR%%/jdbc.jar
+%%ORIONSUBDIR%%/jndi.jar
+%%ORIONSUBDIR%%/jnet.jar
+%%ORIONSUBDIR%%/jsse.jar
+%%ORIONSUBDIR%%/jta.jar
 %%ORIONSUBDIR%%/lib/hsql.jar
 %%ORIONSUBDIR%%/loadbalancer.jar
-%%ORIONSUBDIR%%/jta.jar
-%%ORIONSUBDIR%%/jsse.jar
-%%ORIONSUBDIR%%/jnet.jar
-%%ORIONSUBDIR%%/jndi.jar
-%%ORIONSUBDIR%%/jdbc.jar
-%%ORIONSUBDIR%%/jcert.jar
-%%ORIONSUBDIR%%/jaxp.jar
-%%ORIONSUBDIR%%/ejbmaker.jar
-%%ORIONSUBDIR%%/ejbassembler.jar
-%%ORIONSUBDIR%%/ejb.jar
-%%ORIONSUBDIR%%/earassembler.jar
-%%ORIONSUBDIR%%/clientassembler.jar
-%%ORIONSUBDIR%%/changes.txt
-%%ORIONSUBDIR%%/autoupdate.properties
-%%ORIONSUBDIR%%/autoupdate.jar
-%%ORIONSUBDIR%%/assemblerlauncher.jar
-%%ORIONSUBDIR%%/applicationlauncher.jar
-%%ORIONSUBDIR%%/admin.jar
-%%ORIONSUBDIR%%/activation.jar
-%%ORIONSUBDIR%%/Readme.txt
-%%ORIONSUBDIR%%/xerces.jar
-%%ORIONSUBDIR%%/Copyright.txt
-%%ORIONSUBDIR%%/xalan.jar
-%%ORIONSUBDIR%%/webappassembler.jar
-%%ORIONSUBDIR%%/taglibassembler.jar
-%%ORIONSUBDIR%%/parser.jar
-%%ORIONSUBDIR%%/orionconsole.jar
-%%ORIONSUBDIR%%/orion.jar
 %%ORIONSUBDIR%%/mail.jar
+%%ORIONSUBDIR%%/orion.jar
+%%ORIONSUBDIR%%/orionconsole.jar
+%%ORIONSUBDIR%%/parser.jar
+%%ORIONSUBDIR%%/taglibassembler.jar
+%%ORIONSUBDIR%%/webappassembler.jar
+%%ORIONSUBDIR%%/xalan.jar
+%%ORIONSUBDIR%%/xerces.jar
+@dirrm %%ORIONSUBDIR%%/applications
 @dirrm %%ORIONSUBDIR%%/config/database-schemas
 @dirrm %%ORIONSUBDIR%%/config
+@dirrm %%ORIONSUBDIR%%/database
+@dirrm %%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/cal
+@dirrm %%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/checkbox
+@dirrm %%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/colors
+@dirrm %%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/dates
+@dirrm %%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/error
+@dirrm %%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/num
+@dirrm %%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/sessions
+@dirrm %%ORIONSUBDIR%%/default-web-app/WEB-INF/classes
+@dirrm %%ORIONSUBDIR%%/default-web-app/WEB-INF
 @dirrm %%ORIONSUBDIR%%/default-web-app/examples/cal
 @dirrm %%ORIONSUBDIR%%/default-web-app/examples/images
-@dirrm %%ORIONSUBDIR%%/default-web-app/examples/jsp/include
+@dirrm %%ORIONSUBDIR%%/default-web-app/examples/jsp/cal
 @dirrm %%ORIONSUBDIR%%/default-web-app/examples/jsp/checkbox
 @dirrm %%ORIONSUBDIR%%/default-web-app/examples/jsp/colors
 @dirrm %%ORIONSUBDIR%%/default-web-app/examples/jsp/dates
 @dirrm %%ORIONSUBDIR%%/default-web-app/examples/jsp/error
 @dirrm %%ORIONSUBDIR%%/default-web-app/examples/jsp/forward
-@dirrm %%ORIONSUBDIR%%/default-web-app/examples/jsp/snp
-@dirrm %%ORIONSUBDIR%%/default-web-app/examples/jsp/cal
+@dirrm %%ORIONSUBDIR%%/default-web-app/examples/jsp/include
 @dirrm %%ORIONSUBDIR%%/default-web-app/examples/jsp/jsptoserv
 @dirrm %%ORIONSUBDIR%%/default-web-app/examples/jsp/num
 @dirrm %%ORIONSUBDIR%%/default-web-app/examples/jsp/plugin/applet
 @dirrm %%ORIONSUBDIR%%/default-web-app/examples/jsp/plugin
 @dirrm %%ORIONSUBDIR%%/default-web-app/examples/jsp/sessions
+@dirrm %%ORIONSUBDIR%%/default-web-app/examples/jsp/snp
 @dirrm %%ORIONSUBDIR%%/default-web-app/examples/jsp/taglib/loop/META-INF
 @dirrm %%ORIONSUBDIR%%/default-web-app/examples/jsp/taglib/loop/taglib
 @dirrm %%ORIONSUBDIR%%/default-web-app/examples/jsp/taglib/loop
@@ -340,21 +352,10 @@
 @dirrm %%ORIONSUBDIR%%/default-web-app/examples/ssi
 @dirrm %%ORIONSUBDIR%%/default-web-app/examples/xsl
 @dirrm %%ORIONSUBDIR%%/default-web-app/examples
-@dirrm %%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/checkbox
-@dirrm %%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/sessions
-@dirrm %%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/error
-@dirrm %%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/num
-@dirrm %%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/colors
-@dirrm %%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/dates
-@dirrm %%ORIONSUBDIR%%/default-web-app/WEB-INF/classes/cal
-@dirrm %%ORIONSUBDIR%%/default-web-app/WEB-INF/classes
-@dirrm %%ORIONSUBDIR%%/default-web-app/WEB-INF
 @dirrm %%ORIONSUBDIR%%/default-web-app
-@dirrm %%ORIONSUBDIR%%/applications
-@dirrm %%ORIONSUBDIR%%/database
+@dirrm %%ORIONSUBDIR%%/demo/ejb/META-INF
 @dirrm %%ORIONSUBDIR%%/demo/ejb/cart/META-INF
 @dirrm %%ORIONSUBDIR%%/demo/ejb/cart
-@dirrm %%ORIONSUBDIR%%/demo/ejb/META-INF
 @dirrm %%ORIONSUBDIR%%/demo/ejb/product/META-INF
 @dirrm %%ORIONSUBDIR%%/demo/ejb/product
 @dirrm %%ORIONSUBDIR%%/demo/ejb/usermanager/META-INF
@@ -365,22 +366,22 @@
 @dirrm %%ORIONSUBDIR%%/demo/jms/jmschat/META-INF
 @dirrm %%ORIONSUBDIR%%/demo/jms/jmschat
 @dirrm %%ORIONSUBDIR%%/demo/jms
-@dirrm %%ORIONSUBDIR%%/demo/news-app/news-ejb-source/com/evermind/ejb
-@dirrm %%ORIONSUBDIR%%/demo/news-app/news-ejb-source/com/evermind
-@dirrm %%ORIONSUBDIR%%/demo/news-app/news-ejb-source/com
-@dirrm %%ORIONSUBDIR%%/demo/news-app/news-ejb-source/META-INF
-@dirrm %%ORIONSUBDIR%%/demo/news-app/news-ejb-source
+@dirrm %%ORIONSUBDIR%%/demo/news-app/META-INF
+@dirrm %%ORIONSUBDIR%%/demo/news-app/news-client-source/META-INF
 @dirrm %%ORIONSUBDIR%%/demo/news-app/news-client-source/com/evermind/ejb
 @dirrm %%ORIONSUBDIR%%/demo/news-app/news-client-source/com/evermind
 @dirrm %%ORIONSUBDIR%%/demo/news-app/news-client-source/com
-@dirrm %%ORIONSUBDIR%%/demo/news-app/news-client-source/META-INF
 @dirrm %%ORIONSUBDIR%%/demo/news-app/news-client-source
-@dirrm %%ORIONSUBDIR%%/demo/news-app/news-web/admin
+@dirrm %%ORIONSUBDIR%%/demo/news-app/news-ejb-source/META-INF
+@dirrm %%ORIONSUBDIR%%/demo/news-app/news-ejb-source/com/evermind/ejb
+@dirrm %%ORIONSUBDIR%%/demo/news-app/news-ejb-source/com/evermind
+@dirrm %%ORIONSUBDIR%%/demo/news-app/news-ejb-source/com
+@dirrm %%ORIONSUBDIR%%/demo/news-app/news-ejb-source
 @dirrm %%ORIONSUBDIR%%/demo/news-app/news-web/WEB-INF/classes
 @dirrm %%ORIONSUBDIR%%/demo/news-app/news-web/WEB-INF/lib
 @dirrm %%ORIONSUBDIR%%/demo/news-app/news-web/WEB-INF
+@dirrm %%ORIONSUBDIR%%/demo/news-app/news-web/admin
 @dirrm %%ORIONSUBDIR%%/demo/news-app/news-web
-@dirrm %%ORIONSUBDIR%%/demo/news-app/META-INF
 @dirrm %%ORIONSUBDIR%%/demo/news-app
 @dirrm %%ORIONSUBDIR%%/demo/rmi
 @dirrm %%ORIONSUBDIR%%/demo/ssl
@@ -389,4 +390,4 @@
 @dirrm %%ORIONSUBDIR%%/log
 @dirrm %%ORIONSUBDIR%%/persistence/ejb
 @dirrm %%ORIONSUBDIR%%/persistence
-@dirrm %%ORIONSUBDIR%%/
+@dirrm %%ORIONSUBDIR%%