Modified: james/server/trunk/src/site/resources/eclipse-model/model.uml URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/resources/eclipse-model/model.uml?rev=1026626&r1=1026625&r2=1026626&view=diff ============================================================================== --- james/server/trunk/src/site/resources/eclipse-model/model.uml (original) +++ james/server/trunk/src/site/resources/eclipse-model/model.uml Sat Oct 23 15:15:13 2010 @@ -1,22 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> -<uml:Model xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1"; xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML"; xmi:id="_NjUDEb_5Ed-sK5i6ADV8Gw" name="model"> - <packagedElement xmi:type="uml:Package" xmi:id="__M5i4cATEd-WluVYiXTpAQ" name="org.apache.james:server" clientDependency="_JWyo8Mf0Ed-X3fnr8lVXtA"> - <packagedElement xmi:type="uml:Class" xmi:id="_xHaZcMAUEd-WluVYiXTpAQ" name="apache-james-imapserver" clientDependency="_qtDy4MAZEd-WluVYiXTpAQ"/> - <packagedElement xmi:type="uml:Class" xmi:id="_3Yq8IMAUEd-WluVYiXTpAQ" name="apache-james-pop3server" clientDependency="_pPnkgMAZEd-WluVYiXTpAQ"/> - <packagedElement xmi:type="uml:Class" xmi:id="_6gxVgMAUEd-WluVYiXTpAQ" name="apache-james-smtpserver" clientDependency="_nIrtMMAZEd-WluVYiXTpAQ"/> - <packagedElement xmi:type="uml:Class" xmi:id="_-xVy0MAUEd-WluVYiXTpAQ" name="apache-james-lmtpserver" clientDependency="_oiGXMMAZEd-WluVYiXTpAQ"/> - <packagedElement xmi:type="uml:Class" xmi:id="_BnlnMMAVEd-WluVYiXTpAQ" name="apache-james-remotemanager" clientDependency="_wTnLsMAZEd-WluVYiXTpAQ"/> - <packagedElement xmi:type="uml:Class" xmi:id="_HNtiMMAVEd-WluVYiXTpAQ" name="apache-james-netty-socket"/> +<uml:Model xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1"; xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML"; xmi:id="_NjUDEb_5Ed-sK5i6ADV8Gw" name=""> + <packagedElement xmi:type="uml:Package" xmi:id="__M5i4cATEd-WluVYiXTpAQ" name="org.apache.james:server" clientDependency="_JWyo8Mf0Ed-X3fnr8lVXtA _bqficN3wEd-czIlYaY4R-w _1jHHMN6pEd-8rJnRk1et1w"> + <packagedElement xmi:type="uml:Class" xmi:id="_xHaZcMAUEd-WluVYiXTpAQ" name="james-server-imapserver" clientDependency="_qtDy4MAZEd-WluVYiXTpAQ"/> + <packagedElement xmi:type="uml:Class" xmi:id="_3Yq8IMAUEd-WluVYiXTpAQ" name="james-server-pop3server" clientDependency="_pPnkgMAZEd-WluVYiXTpAQ"/> + <packagedElement xmi:type="uml:Class" xmi:id="_6gxVgMAUEd-WluVYiXTpAQ" name="james-server-smtpserver" clientDependency="_nIrtMMAZEd-WluVYiXTpAQ"/> + <packagedElement xmi:type="uml:Class" xmi:id="_-xVy0MAUEd-WluVYiXTpAQ" name="james-server-lmtpserver" clientDependency="_oiGXMMAZEd-WluVYiXTpAQ"/> + <packagedElement xmi:type="uml:Class" xmi:id="_BnlnMMAVEd-WluVYiXTpAQ" name="james-server-remotemanager" clientDependency="_wTnLsMAZEd-WluVYiXTpAQ"/> + <packagedElement xmi:type="uml:Class" xmi:id="_HNtiMMAVEd-WluVYiXTpAQ" name="james-server-netty-socket"/> <packagedElement xmi:type="uml:Dependency" xmi:id="_nIrtMMAZEd-WluVYiXTpAQ" name="" supplier="_HNtiMMAVEd-WluVYiXTpAQ" client="_6gxVgMAUEd-WluVYiXTpAQ"/> <packagedElement xmi:type="uml:Dependency" xmi:id="_oiGXMMAZEd-WluVYiXTpAQ" name="" supplier="_6gxVgMAUEd-WluVYiXTpAQ" client="_-xVy0MAUEd-WluVYiXTpAQ"/> <packagedElement xmi:type="uml:Dependency" xmi:id="_pPnkgMAZEd-WluVYiXTpAQ" name="" supplier="_HNtiMMAVEd-WluVYiXTpAQ" client="_3Yq8IMAUEd-WluVYiXTpAQ"/> <packagedElement xmi:type="uml:Dependency" xmi:id="_qtDy4MAZEd-WluVYiXTpAQ" name="" supplier="_HNtiMMAVEd-WluVYiXTpAQ" client="_xHaZcMAUEd-WluVYiXTpAQ"/> <packagedElement xmi:type="uml:Dependency" xmi:id="_wTnLsMAZEd-WluVYiXTpAQ" name="" supplier="_HNtiMMAVEd-WluVYiXTpAQ" client="_BnlnMMAVEd-WluVYiXTpAQ"/> <packagedElement xmi:type="uml:Dependency" xmi:id="_xJHH8MAnEd-L8aSZjXXFeg" name="Dependency0" supplier="_kt2mUMAVEd-WluVYiXTpAQ"/> - <packagedElement xmi:type="uml:Dependency" xmi:id="_JWyo8Mf0Ed-X3fnr8lVXtA" name="" supplier="_NymLgMAVEd-WluVYiXTpAQ" client="__M5i4cATEd-WluVYiXTpAQ"/> - <packagedElement xmi:type="uml:Class" xmi:id="_-5iAAcjcEd-QlIjuzT4_zg" name="apache-james-fetchmail"/> + <packagedElement xmi:type="uml:Dependency" xmi:id="_JWyo8Mf0Ed-X3fnr8lVXtA" name="smtp" supplier="_NymLgMAVEd-WluVYiXTpAQ" client="__M5i4cATEd-WluVYiXTpAQ"/> + <packagedElement xmi:type="uml:Class" xmi:id="_-5iAAcjcEd-QlIjuzT4_zg" name="james-server-fetchmail"/> + <packagedElement xmi:type="uml:Dependency" xmi:id="_bqficN3wEd-czIlYaY4R-w" name="imap" supplier="_unsowN3vEd-czIlYaY4R-w" client="__M5i4cATEd-WluVYiXTpAQ"/> + <packagedElement xmi:type="uml:Dependency" xmi:id="_1jHHMN6pEd-8rJnRk1et1w" name="pop3" supplier="_T7k2UMf0Ed-X3fnr8lVXtA" client="__M5i4cATEd-WluVYiXTpAQ"/> </packagedElement> - <packagedElement xmi:type="uml:Package" xmi:id="_fpEd0MAVEd-WluVYiXTpAQ" name="org.apache.james:spool" clientDependency="_eoQbcMf0Ed-X3fnr8lVXtA"> + <packagedElement xmi:type="uml:Package" xmi:id="_fpEd0MAVEd-WluVYiXTpAQ" name="org.apache.james:spool" clientDependency="_eoQbcMf0Ed-X3fnr8lVXtA _xN88cNxGEd-N1OA8aAXF5g"> <packagedElement xmi:type="uml:Interface" xmi:id="_icMswMAVEd-WluVYiXTpAQ" name="apache-james-queue-api"/> <packagedElement xmi:type="uml:Class" xmi:id="_kt2mUMAVEd-WluVYiXTpAQ" name="apache-james-mailetcontainer-library" clientDependency="_b0LIgMAYEd-WluVYiXTpAQ _kx_sgMYVEd-0uL9oK6f20Q _mnt4AMYVEd-0uL9oK6f20Q _E2hi4MjdEd-QlIjuzT4_zg _BEeYIMjeEd-OV4AexWz_7A"> <interfaceRealization xmi:id="_kx_sgMYVEd-0uL9oK6f20Q" name="" supplier="_pXtGUMAVEd-WluVYiXTpAQ" client="_kt2mUMAVEd-WluVYiXTpAQ" contract="_pXtGUMAVEd-WluVYiXTpAQ"/> @@ -27,7 +29,7 @@ <packagedElement xmi:type="uml:Class" xmi:id="_eI5RkMYVEd-0uL9oK6f20Q" name="apache-james-queue-activemq" clientDependency="_gG7rkMYVEd-0uL9oK6f20Q _h9tBgNeQEd-UHbij1eT1HA"/> <packagedElement xmi:type="uml:Dependency" xmi:id="_mnt4AMYVEd-0uL9oK6f20Q" name="" supplier="_eI5RkMYVEd-0uL9oK6f20Q" client="_kt2mUMAVEd-WluVYiXTpAQ"/> <packagedElement xmi:type="uml:Dependency" xmi:id="_nNoBcMYVEd-0uL9oK6f20Q" name="" supplier="_icMswMAVEd-WluVYiXTpAQ" client="_pXtGUMAVEd-WluVYiXTpAQ"/> - <packagedElement xmi:type="uml:Dependency" xmi:id="_eoQbcMf0Ed-X3fnr8lVXtA" name="" supplier="_T7k2UMf0Ed-X3fnr8lVXtA" client="_fpEd0MAVEd-WluVYiXTpAQ"/> + <packagedElement xmi:type="uml:Dependency" xmi:id="_eoQbcMf0Ed-X3fnr8lVXtA" name="store" supplier="_T7k2UMf0Ed-X3fnr8lVXtA" client="_fpEd0MAVEd-WluVYiXTpAQ"/> <packagedElement xmi:type="uml:Class" xmi:id="_H-oUYci-Ed-xaab8H-rxHg" name="apache-james-mailetcontainer-camel"/> <packagedElement xmi:type="uml:Dependency" xmi:id="_E2hi4MjdEd-QlIjuzT4_zg" name="" supplier="_H-oUYci-Ed-xaab8H-rxHg" client="_kt2mUMAVEd-WluVYiXTpAQ"/> <packagedElement xmi:type="uml:Dependency" xmi:id="_BEeYIMjeEd-OV4AexWz_7A" name="" supplier="_H-oUYci-Ed-xaab8H-rxHg" client="_kt2mUMAVEd-WluVYiXTpAQ"/> @@ -37,38 +39,35 @@ <packagedElement xmi:type="uml:Dependency" xmi:id="_h9tBgNeQEd-UHbij1eT1HA" name="" supplier="_dXay4deQEd-UHbij1eT1HA" client="_eI5RkMYVEd-0uL9oK6f20Q"/> </packagedElement> <packagedElement xmi:type="uml:Package" xmi:id="_ExWYAMAWEd-WluVYiXTpAQ" name="org.apache.james:container"> - <ownedComment xmi:id="_lqIxgMCbEd-pZodWjM_71w"> - <body>Depends on *all* projects</body> - </ownedComment> - <packagedElement xmi:type="uml:Class" xmi:id="_GE0LAMAWEd-WluVYiXTpAQ" name="james-server-spring-deployment" clientDependency="_Re9ywMAZEd-WluVYiXTpAQ"/> - <packagedElement xmi:type="uml:Class" xmi:id="_HbZjcMAWEd-WluVYiXTpAQ" name="james-server-spring-common"/> - <packagedElement xmi:type="uml:Dependency" xmi:id="_Re9ywMAZEd-WluVYiXTpAQ" name="" supplier="_HbZjcMAWEd-WluVYiXTpAQ" client="_GE0LAMAWEd-WluVYiXTpAQ"/> + <packagedElement xmi:type="uml:Class" xmi:id="_GE0LAMAWEd-WluVYiXTpAQ" name="james-server-container-spring"/> + <packagedElement xmi:type="uml:Class" xmi:id="_VHPZQN0eEd-ItbRJUWlV9g" name="james-server-container-guice"/> + <packagedElement xmi:type="uml:Class" xmi:id="_Cdf6IN0iEd-ItbRJUWlV9g" name="james-server-container-karaf"/> </packagedElement> - <packagedElement xmi:type="uml:Package" xmi:id="_JxEaUMAWEd-WluVYiXTpAQ" name="org.apache.james:common"> + <packagedElement xmi:type="uml:Package" xmi:id="_JxEaUMAWEd-WluVYiXTpAQ" name="org.apache.james:util"> <packagedElement xmi:type="uml:Class" xmi:id="_lyj5sMAXEd-WluVYiXTpAQ" name="james-server-util" clientDependency="_tKKcMMmVEd-yMK1kB0eGWA"/> <packagedElement xmi:type="uml:Realization" xmi:id="_USIqsMApEd-AndjfSa6Oug" name="Realization0"/> <packagedElement xmi:type="uml:Realization" xmi:id="_VERSQMApEd-AndjfSa6Oug" name=""/> <packagedElement xmi:type="uml:Dependency" xmi:id="_tKKcMMmVEd-yMK1kB0eGWA" name="" client="_lyj5sMAXEd-WluVYiXTpAQ"/> </packagedElement> - <packagedElement xmi:type="uml:Package" xmi:id="_cRNUsMAWEd-WluVYiXTpAQ" name="org.apache.james:store-user"> - <packagedElement xmi:type="uml:Class" xmi:id="_stzqAMAWEd-WluVYiXTpAQ" name="apache-james-user-library" clientDependency="_lujuAMAYEd-WluVYiXTpAQ" isAbstract="true"> + <packagedElement xmi:type="uml:Package" xmi:id="_cRNUsMAWEd-WluVYiXTpAQ" name="org.apache.james:user"> + <packagedElement xmi:type="uml:Class" xmi:id="_stzqAMAWEd-WluVYiXTpAQ" name="james-server-user-library" clientDependency="_lujuAMAYEd-WluVYiXTpAQ" isAbstract="true"> <interfaceRealization xmi:id="_lujuAMAYEd-WluVYiXTpAQ" name="" supplier="_TRcH4MAXEd-WluVYiXTpAQ" client="_stzqAMAWEd-WluVYiXTpAQ" contract="_TRcH4MAXEd-WluVYiXTpAQ"/> </packagedElement> - <packagedElement xmi:type="uml:Class" xmi:id="_QA2g4MAXEd-WluVYiXTpAQ" name="apache-james-user-jpa"> + <packagedElement xmi:type="uml:Class" xmi:id="_QA2g4MAXEd-WluVYiXTpAQ" name="james-server-user-jpa"> <generalization xmi:id="_x0VNAMAYEd-WluVYiXTpAQ" general="_stzqAMAWEd-WluVYiXTpAQ"/> </packagedElement> - <packagedElement xmi:type="uml:Interface" xmi:id="_TRcH4MAXEd-WluVYiXTpAQ" name="apache-james-user-api"/> - <packagedElement xmi:type="uml:Class" xmi:id="_VG-tMMAXEd-WluVYiXTpAQ" name="apache-james-user-jcr"> + <packagedElement xmi:type="uml:Interface" xmi:id="_TRcH4MAXEd-WluVYiXTpAQ" name="james-server-user-api"/> + <packagedElement xmi:type="uml:Class" xmi:id="_VG-tMMAXEd-WluVYiXTpAQ" name="james-server-user-jcr"> <generalization xmi:id="_yZOp0MAYEd-WluVYiXTpAQ" general="_stzqAMAWEd-WluVYiXTpAQ"/> </packagedElement> - <packagedElement xmi:type="uml:Class" xmi:id="_WCViMMAXEd-WluVYiXTpAQ" name="apache-james-user-ldap"> + <packagedElement xmi:type="uml:Class" xmi:id="_WCViMMAXEd-WluVYiXTpAQ" name="james-server-user-ldap"> <generalization xmi:id="_yzHwgMAYEd-WluVYiXTpAQ" general="_stzqAMAWEd-WluVYiXTpAQ"/> </packagedElement> - <packagedElement xmi:type="uml:Class" xmi:id="_W10NkMAXEd-WluVYiXTpAQ" name="apache-james-user-file"> + <packagedElement xmi:type="uml:Class" xmi:id="_W10NkMAXEd-WluVYiXTpAQ" name="james-server-user-file"> <generalization xmi:id="_z7H6YMAYEd-WluVYiXTpAQ" general="_stzqAMAWEd-WluVYiXTpAQ"/> </packagedElement> </packagedElement> - <packagedElement xmi:type="uml:Package" xmi:id="_gKaa4MAWEd-WluVYiXTpAQ" name="org.apache.james:store-mailbox"> + <packagedElement xmi:type="uml:Package" xmi:id="_gKaa4MAWEd-WluVYiXTpAQ" name="org.apache.james:mailbox"> <packagedElement xmi:type="uml:Interface" xmi:id="_ucy7YMAWEd-WluVYiXTpAQ" name="apache-james-mailbox-api"/> <packagedElement xmi:type="uml:Class" xmi:id="_aTVdUMAXEd-WluVYiXTpAQ" name="apache-james-mailbox-maildir"> <generalization xmi:id="_vX-fUMAYEd-WluVYiXTpAQ" general="_cBuRwMAXEd-WluVYiXTpAQ"/> @@ -92,83 +91,87 @@ </packagedElement> <packagedElement xmi:type="uml:Class" xmi:id="_S2ftwMAWEd-WluVYiXTpAQ" name="apache-james-mailbox-adapter"/> </packagedElement> - <packagedElement xmi:type="uml:Package" xmi:id="_p0ukEMAWEd-WluVYiXTpAQ" name="org.apache.james:store-domain"> - <packagedElement xmi:type="uml:Class" xmi:id="_viILwMAWEd-WluVYiXTpAQ" name="apache-james-domain-library" clientDependency="_m48dgMAYEd-WluVYiXTpAQ" isAbstract="true"> + <packagedElement xmi:type="uml:Package" xmi:id="_p0ukEMAWEd-WluVYiXTpAQ" name="org.apache.james:domainlist"> + <packagedElement xmi:type="uml:Class" xmi:id="_viILwMAWEd-WluVYiXTpAQ" name="apache-james-domainlist-library" clientDependency="_m48dgMAYEd-WluVYiXTpAQ" isAbstract="true"> <interfaceRealization xmi:id="_m48dgMAYEd-WluVYiXTpAQ" name="" supplier="_yntcoMAWEd-WluVYiXTpAQ" client="_viILwMAWEd-WluVYiXTpAQ" contract="_yntcoMAWEd-WluVYiXTpAQ"/> </packagedElement> - <packagedElement xmi:type="uml:Interface" xmi:id="_yntcoMAWEd-WluVYiXTpAQ" name="apache-james-domain-api"/> + <packagedElement xmi:type="uml:Interface" xmi:id="_yntcoMAWEd-WluVYiXTpAQ" name="apache-james-domainlist-api"/> <packagedElement xmi:type="uml:Class" xmi:id="_8Hw2kMAWEd-WluVYiXTpAQ" name="apache-james-domain-xml"> <generalization xmi:id="_2ZRX0MAYEd-WluVYiXTpAQ" general="_viILwMAWEd-WluVYiXTpAQ"/> </packagedElement> - <packagedElement xmi:type="uml:Class" xmi:id="_AaZwcMAXEd-WluVYiXTpAQ" name="apache-james-domain-jdbc"> + <packagedElement xmi:type="uml:Class" xmi:id="_AaZwcMAXEd-WluVYiXTpAQ" name="apache-james-domainlist-jdbc"> <ownedComment xmi:id="_AjCIAMAXEd-WluVYiXTpAQ"> <body>apache-james-domain-xml</body> </ownedComment> <generalization xmi:id="_1PfFQMAYEd-WluVYiXTpAQ" general="_viILwMAWEd-WluVYiXTpAQ"/> </packagedElement> - <packagedElement xmi:type="uml:Class" xmi:id="_DScUkMAXEd-WluVYiXTpAQ" name="apache-james-domain-jpa"> + <packagedElement xmi:type="uml:Class" xmi:id="_DScUkMAXEd-WluVYiXTpAQ" name="apache-james-domainlist-jpa"> <generalization xmi:id="_1q2yoMAYEd-WluVYiXTpAQ" general="_viILwMAWEd-WluVYiXTpAQ"/> </packagedElement> - <packagedElement xmi:type="uml:Class" xmi:id="_JR2SQMAXEd-WluVYiXTpAQ" name="apache-james-domain-jcr"> - <generalization xmi:id="_2EJcYMAYEd-WluVYiXTpAQ" general="_viILwMAWEd-WluVYiXTpAQ"/> - </packagedElement> + <packagedElement xmi:type="uml:Class" xmi:id="_JR2SQMAXEd-WluVYiXTpAQ" name="apache-james-domainlist-jcr"/> </packagedElement> <packagedElement xmi:type="uml:Package" xmi:id="_NymLgMAVEd-WluVYiXTpAQ" name="org.apache.james:protocols" clientDependency="_KbrNYMf0Ed-X3fnr8lVXtA"> - <packagedElement xmi:type="uml:Class" xmi:id="_PSHdgMAVEd-WluVYiXTpAQ" name="apache-james-imap-message"/> - <packagedElement xmi:type="uml:Class" xmi:id="_Qr1CcMAVEd-WluVYiXTpAQ" name="apache-james-imap-processor" clientDependency="_i_2PkMAZEd-WluVYiXTpAQ"/> <packagedElement xmi:type="uml:Interface" xmi:id="_W8MNQMAVEd-WluVYiXTpAQ" name="apache-james-protocols-api"/> <packagedElement xmi:type="uml:Class" xmi:id="_ZcIacMAVEd-WluVYiXTpAQ" name="apache-james-protocols-impl" clientDependency="_53smgMAYEd-WluVYiXTpAQ"/> <packagedElement xmi:type="uml:Class" xmi:id="_bXBZ0MAVEd-WluVYiXTpAQ" name="apache-james-protocols-smtp"> <generalization xmi:id="_mw4PUMhrEd-Ccvwwtqu0Xg" general="_ZcIacMAVEd-WluVYiXTpAQ"/> </packagedElement> <packagedElement xmi:type="uml:Realization" xmi:id="_53smgMAYEd-WluVYiXTpAQ" name="" supplier="_W8MNQMAVEd-WluVYiXTpAQ" client="_ZcIacMAVEd-WluVYiXTpAQ"/> - <packagedElement xmi:type="uml:Dependency" xmi:id="_i_2PkMAZEd-WluVYiXTpAQ" name="" supplier="_PSHdgMAVEd-WluVYiXTpAQ" client="_Qr1CcMAVEd-WluVYiXTpAQ"/> - <packagedElement xmi:type="uml:Dependency" xmi:id="_KbrNYMf0Ed-X3fnr8lVXtA" name="" supplier="_Ug5OUMJsEd-pX-A_WLl6ww" client="_NymLgMAVEd-WluVYiXTpAQ"/> - <packagedElement xmi:type="uml:Class" xmi:id="_gslhMcmVEd-yMK1kB0eGWA" name="apache-james-imap-api"/> + <packagedElement xmi:type="uml:Dependency" xmi:id="_KbrNYMf0Ed-X3fnr8lVXtA" name="queue" supplier="_Ug5OUMJsEd-pX-A_WLl6ww" client="_NymLgMAVEd-WluVYiXTpAQ"/> </packagedElement> <packagedElement xmi:type="uml:Package" xmi:id="_9iB14cCqEd-WEaNtwquejw" name="org.apache.james:migrator"> <packagedElement xmi:type="uml:Class" xmi:id="__4R7kMCqEd-WEaNtwquejw" name="apache-james-mailbox-jpa-migrator"/> - <packagedElement xmi:type="uml:Class" xmi:id="_i4ydoMjSEd--__0NVxZPfA" name="apache-james-mail-migrator"/> + <packagedElement xmi:type="uml:Class" xmi:id="_i4ydoMjSEd--__0NVxZPfA" name="james-server-mail-migrator"/> </packagedElement> - <packagedElement xmi:type="uml:Package" xmi:id="_Ug5OUMJsEd-pX-A_WLl6ww" name="org.apache.james:core" clientDependency="_xN88cNxGEd-N1OA8aAXF5g _BS0HMNxHEd-N1OA8aAXF5g"> + <packagedElement xmi:type="uml:Package" xmi:id="_Ug5OUMJsEd-pX-A_WLl6ww" name="org.apache.james:core" clientDependency="_BS0HMNxHEd-N1OA8aAXF5g"> <packagedElement xmi:type="uml:Class" xmi:id="_nLpAwMJtEd-pX-A_WLl6ww" name="james-server-core-library" clientDependency="_yc8V4MJtEd-pX-A_WLl6ww"/> <packagedElement xmi:type="uml:Interface" xmi:id="_s2u7UMJtEd-pX-A_WLl6ww" name="james-server-core-api"/> <packagedElement xmi:type="uml:Realization" xmi:id="_yc8V4MJtEd-pX-A_WLl6ww" name="" supplier="_s2u7UMJtEd-pX-A_WLl6ww" client="_nLpAwMJtEd-pX-A_WLl6ww"/> - <packagedElement xmi:type="uml:Dependency" xmi:id="_xN88cNxGEd-N1OA8aAXF5g" name="" supplier="_fpEd0MAVEd-WluVYiXTpAQ" client="_Ug5OUMJsEd-pX-A_WLl6ww"/> + <packagedElement xmi:type="uml:Dependency" xmi:id="_xN88cNxGEd-N1OA8aAXF5g" name="dequeue" supplier="_Ug5OUMJsEd-pX-A_WLl6ww" client="_fpEd0MAVEd-WluVYiXTpAQ"/> <packagedElement xmi:type="uml:Class" xmi:id="_8L9iINxGEd-N1OA8aAXF5g" name="james-server-core-function"> <generalization xmi:id="_-xh2MNxGEd-N1OA8aAXF5g" general="_nLpAwMJtEd-pX-A_WLl6ww"/> </packagedElement> <packagedElement xmi:type="uml:Dependency" xmi:id="_BS0HMNxHEd-N1OA8aAXF5g" name="" supplier="_fpEd0MAVEd-WluVYiXTpAQ" client="_Ug5OUMJsEd-pX-A_WLl6ww"/> </packagedElement> <packagedElement xmi:type="uml:Package" xmi:id="_YTIcUcLZEd-Gba43PojZng" name="org.apache.james:dnsservice"> - <packagedElement xmi:type="uml:Interface" xmi:id="_anUFcMLZEd-Gba43PojZng" name="apache-james-dnsservice-api"/> - <packagedElement xmi:type="uml:Class" xmi:id="_cLvFkMLZEd-Gba43PojZng" name="apache-james-dnsservice-dnsjava" clientDependency="_iBKA0MLZEd-Gba43PojZng"> + <packagedElement xmi:type="uml:Interface" xmi:id="_anUFcMLZEd-Gba43PojZng" name="james-server-dnsservice-api"/> + <packagedElement xmi:type="uml:Class" xmi:id="_cLvFkMLZEd-Gba43PojZng" name="james-server-dnsservice-dnsjava" clientDependency="_iBKA0MLZEd-Gba43PojZng"> <interfaceRealization xmi:id="_iBKA0MLZEd-Gba43PojZng" name="" supplier="_anUFcMLZEd-Gba43PojZng" client="_cLvFkMLZEd-Gba43PojZng" contract="_anUFcMLZEd-Gba43PojZng"/> </packagedElement> </packagedElement> - <packagedElement xmi:type="uml:Package" xmi:id="_U5gmUcYUEd-0uL9oK6f20Q" name="org.apache.james:store-mail"> - <packagedElement xmi:type="uml:Interface" xmi:id="_ZKtVwMYUEd-0uL9oK6f20Q" name="apache-james-mail-api"/> - <packagedElement xmi:type="uml:Class" xmi:id="_b9wsMMYUEd-0uL9oK6f20Q" name="apache-james-mail-library" clientDependency="_j3iE0MYUEd-0uL9oK6f20Q" isAbstract="true"> + <packagedElement xmi:type="uml:Package" xmi:id="_U5gmUcYUEd-0uL9oK6f20Q" name="org.apache.james:mail"> + <packagedElement xmi:type="uml:Interface" xmi:id="_ZKtVwMYUEd-0uL9oK6f20Q" name="james-server-mail-api"/> + <packagedElement xmi:type="uml:Class" xmi:id="_b9wsMMYUEd-0uL9oK6f20Q" name="james-server-mail-library" clientDependency="_j3iE0MYUEd-0uL9oK6f20Q" isAbstract="true"> <interfaceRealization xmi:id="_j3iE0MYUEd-0uL9oK6f20Q" name="" supplier="_ZKtVwMYUEd-0uL9oK6f20Q" client="_b9wsMMYUEd-0uL9oK6f20Q" contract="_ZKtVwMYUEd-0uL9oK6f20Q"/> </packagedElement> - <packagedElement xmi:type="uml:Class" xmi:id="_fMEbQMYUEd-0uL9oK6f20Q" name="apache-james-mail-file"> + <packagedElement xmi:type="uml:Class" xmi:id="_fMEbQMYUEd-0uL9oK6f20Q" name="james-server-mail-file"> <generalization xmi:id="_lXDW0MYUEd-0uL9oK6f20Q" general="_b9wsMMYUEd-0uL9oK6f20Q"/> </packagedElement> - <packagedElement xmi:type="uml:Class" xmi:id="_gCOnMMYUEd-0uL9oK6f20Q" name="apache-james-mail-jdbc"> + <packagedElement xmi:type="uml:Class" xmi:id="_gCOnMMYUEd-0uL9oK6f20Q" name="james-server-mail-jdbc"> <generalization xmi:id="_mCFQ0MYUEd-0uL9oK6f20Q" general="_b9wsMMYUEd-0uL9oK6f20Q"/> </packagedElement> - <packagedElement xmi:type="uml:Class" xmi:id="_hE5lIMYUEd-0uL9oK6f20Q" name="apache-james-mail-jcr"> + <packagedElement xmi:type="uml:Class" xmi:id="_hE5lIMYUEd-0uL9oK6f20Q" name="james-server-mail-jcr"> <generalization xmi:id="_mYbUQMYUEd-0uL9oK6f20Q" general="_b9wsMMYUEd-0uL9oK6f20Q"/> </packagedElement> </packagedElement> <packagedElement xmi:type="uml:Package" xmi:id="_T7k2UMf0Ed-X3fnr8lVXtA" name="org.apache.james:store" clientDependency="_fnfD0Mf0Ed-X3fnr8lVXtA _gJj2IMf0Ed-X3fnr8lVXtA _gw_CgMf0Ed-X3fnr8lVXtA _jjN5kMf0Ed-X3fnr8lVXtA"> - <packagedElement xmi:type="uml:Dependency" xmi:id="_fnfD0Mf0Ed-X3fnr8lVXtA" name="" supplier="_cRNUsMAWEd-WluVYiXTpAQ" client="_T7k2UMf0Ed-X3fnr8lVXtA"/> - <packagedElement xmi:type="uml:Dependency" xmi:id="_gJj2IMf0Ed-X3fnr8lVXtA" name="" supplier="_p0ukEMAWEd-WluVYiXTpAQ" client="_T7k2UMf0Ed-X3fnr8lVXtA"/> - <packagedElement xmi:type="uml:Dependency" xmi:id="_gw_CgMf0Ed-X3fnr8lVXtA" name="" supplier="_U5gmUcYUEd-0uL9oK6f20Q" client="_T7k2UMf0Ed-X3fnr8lVXtA"/> - <packagedElement xmi:type="uml:Dependency" xmi:id="_jjN5kMf0Ed-X3fnr8lVXtA" name="" supplier="_gKaa4MAWEd-WluVYiXTpAQ" client="_T7k2UMf0Ed-X3fnr8lVXtA"/> + <packagedElement xmi:type="uml:Dependency" xmi:id="_fnfD0Mf0Ed-X3fnr8lVXtA" name="crudq" supplier="_cRNUsMAWEd-WluVYiXTpAQ" client="_T7k2UMf0Ed-X3fnr8lVXtA"/> + <packagedElement xmi:type="uml:Dependency" xmi:id="_gJj2IMf0Ed-X3fnr8lVXtA" name="crudq" supplier="_p0ukEMAWEd-WluVYiXTpAQ" client="_T7k2UMf0Ed-X3fnr8lVXtA"/> + <packagedElement xmi:type="uml:Dependency" xmi:id="_gw_CgMf0Ed-X3fnr8lVXtA" name="crudq" supplier="_U5gmUcYUEd-0uL9oK6f20Q" client="_T7k2UMf0Ed-X3fnr8lVXtA"/> + <packagedElement xmi:type="uml:Dependency" xmi:id="_jjN5kMf0Ed-X3fnr8lVXtA" name="crudq" supplier="_gKaa4MAWEd-WluVYiXTpAQ" client="_T7k2UMf0Ed-X3fnr8lVXtA"/> </packagedElement> - <packagedElement xmi:type="uml:Package" xmi:id="_9eCicMAVEd-WluVYiXTpAQ" name="org.apache.james:test" clientDependency="_yBkNYMA8Ed-Q38p49WvbJg"> + <packagedElement xmi:type="uml:Package" xmi:id="_9eCicMAVEd-WluVYiXTpAQ" name="org.apache.james:test" clientDependency="_VBJP4N3wEd-czIlYaY4R-w"> <packagedElement xmi:type="uml:Class" xmi:id="__C6OgMAVEd-WluVYiXTpAQ" name="apache-james-imap-protocol-tester"/> - <packagedElement xmi:type="uml:Dependency" xmi:id="_yBkNYMA8Ed-Q38p49WvbJg" name="" supplier="_NymLgMAVEd-WluVYiXTpAQ" client="_9eCicMAVEd-WluVYiXTpAQ"/> + <packagedElement xmi:type="uml:Dependency" xmi:id="_VBJP4N3wEd-czIlYaY4R-w" name="test-imap" supplier="_unsowN3vEd-czIlYaY4R-w" client="_9eCicMAVEd-WluVYiXTpAQ"/> + </packagedElement> + <packagedElement xmi:type="uml:Package" xmi:id="_unsowN3vEd-czIlYaY4R-w" name="org.apache.james:imap" clientDependency="_zshYEN3wEd-czIlYaY4R-w"> + <packagedElement xmi:type="uml:Class" xmi:id="_DN1mUN3wEd-czIlYaY4R-w" name="apache-james-imap-processor" clientDependency="_wSUS4N5wEd-g4awTgzMqtQ _xqF-IN5wEd-g4awTgzMqtQ"> + <interfaceRealization xmi:id="_wSUS4N5wEd-g4awTgzMqtQ" name="" supplier="_rDIRMN5wEd-g4awTgzMqtQ" client="_DN1mUN3wEd-czIlYaY4R-w" contract="_rDIRMN5wEd-g4awTgzMqtQ"/> + </packagedElement> + <packagedElement xmi:type="uml:Class" xmi:id="_D_rS8N3wEd-czIlYaY4R-w" name="apache-james-imap-message" clientDependency="_tsITwN5wEd-g4awTgzMqtQ"/> + <packagedElement xmi:type="uml:Dependency" xmi:id="_zshYEN3wEd-czIlYaY4R-w" name="process" supplier="_T7k2UMf0Ed-X3fnr8lVXtA" client="_unsowN3vEd-czIlYaY4R-w"/> + <packagedElement xmi:type="uml:Interface" xmi:id="_rDIRMN5wEd-g4awTgzMqtQ" name="apache-james-imap-api"/> + <packagedElement xmi:type="uml:Realization" xmi:id="_tsITwN5wEd-g4awTgzMqtQ" name="" supplier="_rDIRMN5wEd-g4awTgzMqtQ" client="_D_rS8N3wEd-czIlYaY4R-w"/> + <packagedElement xmi:type="uml:Dependency" xmi:id="_xqF-IN5wEd-g4awTgzMqtQ" name="" supplier="_D_rS8N3wEd-czIlYaY4R-w" client="_DN1mUN3wEd-czIlYaY4R-w"/> </packagedElement> </uml:Model>
Added: james/server/trunk/src/site/resources/images/jmx_management/jmx_user.png URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/resources/images/jmx_management/jmx_user.png?rev=1026626&view=auto ============================================================================== Binary file - no diff available. Propchange: james/server/trunk/src/site/resources/images/jmx_management/jmx_user.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: james/server/trunk/src/site/resources/images/uml/org.apache.james_package.png URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/resources/images/uml/org.apache.james_package.png?rev=1026626&view=auto ============================================================================== Binary file - no diff available. Propchange: james/server/trunk/src/site/resources/images/uml/org.apache.james_package.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: james/server/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/site.xml?rev=1026626&r1=1026625&r2=1026626&view=diff ============================================================================== --- james/server/trunk/src/site/site.xml (original) +++ james/server/trunk/src/site/site.xml Sat Oct 23 15:15:13 2010 @@ -17,7 +17,13 @@ specific language governing permissions and limitations under the License. --> -<project name="James Server"> +<project name="Server"> + + <skin> + <groupId>org.apache.james</groupId> + <artifactId>maven-skin</artifactId> + <version>1.6-SNAPSHOT</version> + </skin> <bannerLeft> <name>James Server</name> @@ -31,12 +37,6 @@ <href>http://www.apache.org/index.html</href> </bannerRight> - <skin> - <groupId>org.apache.james</groupId> - <artifactId>maven-skin</artifactId> - <version>1.6-SNAPSHOT</version> - </skin> - <body> <menu name="Overview"> @@ -50,17 +50,9 @@ <menu name="Concepts"> <item name="Summary" href="/concept_summary.html" /> + <item name="Mailet Container" href="/concept_mailetcontainer.html" /> <item name="Stores" href="/concept_stores.html" /> - <item name="Mailet Container" href="/concept_mailetcontainer.html" collapse="true" > - <item name="Mailet Site" href="http://james.apache.org/mailet/index.html"/> - <item name="Mailet API" href="http://james.apache.org/mailet/api/index.html"/> - <item name="Mailet Toolkit" href="http://james.apache.org/mailet/base/index.html"/> - <item name="Mailet Crypto" href="http://james.apache.org/mailet/crypto/index.html"/> - <item name="Mailet Sieve" href="http://james.apache.org/mailet/standard/index.html"/> - <item name="Mailet Standard" href="http://james.apache.org/mailet/standard/index.html"/> - <item name="Mailet Docs" href="http://james.apache.org/mailet/maven-mailetdocs-plugin/index.html"/> - <item name="Server Mailets" href="/james-server-mailets-function/mailet-report.html"/> - </item> + <item name="SMTP Hook" href="/concept_smtp_hjhooks.html" /> <item name="Queue Priority" href="/concept_queue_priority.html" /> </menu> @@ -104,7 +96,7 @@ <item name="Develop a Mailet" href="/dev_custom_mailet.html" /> <item name="Develop a Matcher" href="/dev_custom_matcher.html" /> <item name="Extend James" href="/dev_extend.html" /> - <item name="Javadoc" href="./apidocs/index.html" /> + <item name="Javadoc" href="/apidocs/index.html" /> </menu> ${reports} Modified: james/server/trunk/src/site/xdoc/concept_mailetcontainer.xml URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/concept_mailetcontainer.xml?rev=1026626&r1=1026625&r2=1026626&view=diff ============================================================================== --- james/server/trunk/src/site/xdoc/concept_mailetcontainer.xml (original) +++ james/server/trunk/src/site/xdoc/concept_mailetcontainer.xml Sat Oct 23 15:15:13 2010 @@ -46,6 +46,17 @@ <p>The Mailet API is currently in its second revision. Although, the Mailet API is expected to undergo substantial changes in the near future, it is our aim that existing Mailets that abided purely by the prior Mailet API interfaces will continue to run with the revised specification.</p> + + <a href="http://james.apache.org/mailet/index.html";>Mailet Site</a> + <a href="http://james.apache.org/mailet/api/index.html";>Mailet API</a> + <a href="http://james.apache.org/mailet/base/index.html";>Mailet Toolkit</a> + <a href="http://james.apache.org/mailet/crypto/index.html";>Mailet Crypto</a> + <a href="http://james.apache.org/mailet/standard/index.html";>Mailet Sieve</a> + <a href="http://james.apache.org/mailet/standard/index.html";>Mailet Standard</a> + <a href="http://james.apache.org/mailet/maven-mailetdocs-plugin/index.html";>Mailet Docs</a> + <a href="/james-server-mailets-function/mailet-report.html">Server Mailets</a> + + <p>The Javadoc for the Mailet API can be found <a href="apidocs/index.html">here</a>.</p> <p>James bundles a number of Matchers and Mailets in its distribution. Descriptions of provided matchers Added: james/server/trunk/src/site/xdoc/concept_smtp_hooks.xml URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/concept_smtp_hooks.xml?rev=1026626&view=auto ============================================================================== --- james/server/trunk/src/site/xdoc/concept_smtp_hooks.xml (added) +++ james/server/trunk/src/site/xdoc/concept_smtp_hooks.xml Sat Oct 23 15:15:13 2010 @@ -0,0 +1,109 @@ +<?xml version="1.0"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<document> + + <properties> + <title>James Protocols - SMTP Hooks</title> + </properties> + +<body> + + The JAMES SMTP Server Component allows to easy write your own code which will get executed in the SMTP-Transaction. Thats a bit different then using a Mailet a.k.a Mailet-API. As +your code will get executed before the mail was even accepted. This can help you in many ways, most times its used for rejecting SPAM/Junk within the SMTP-Dialog. But it can be used for other +things too. Its up to you and your use case. + +But be aware as your code needs to get executed during the SMTP-Transaction it should not take to long to execute. As it will need to fit in before the timeout was hit which can be different +on every mailserver. But as a general rule as long as your code can get executed within 30 seconds it should be fine. + + <section name="James 3.0-M1"> + + +-===== Hooks =====- + +The JAMES SMTP Server comes with a few interfaces which helps you to "hook-in" a specific SMTP Command. That means your class which implements the given interface(s) will get +called after the SMTP-Command was parsed and depending on your implementation it will handle it. + +In detail the following hooks are supported: + + * AuthHook + Allows to hook in your code for authenticate users for sending mail via SMTP AUTH. You could for example query your own database table to see if a user should be allowed to + send mail with the given username and password + +* ConnectionHandler +Allows to hook in your code on a new connection. So you could just drop it or do something else + +* HeloHook +Allows to hook in your code in the HELO and EHLO commands. + +* MailHook +Allows to hook in your code in the MAIL command. Like checking the sender which was given with MAIL FROM: whate...@example + +* MailParametersHook +Allows to hook in given parameters in the EHLO command + +* JamesMessageHook +Allow to hook in your code after the email was received via the DATA command and was marked for queuing by the CLRF.CRLF sequence. This will get executed right before the message +will actual get queued. IMPORTANT: If you want to do heavy processing here and not want to reject the method based on a criteria you are most times better of to use the Mailet API! + + +* QuitHook +Allow to hook in your code in the QUIT command. + + +* RcptHook +Allows to hook in your code in the RCPT command. Like implementing a custom logic to check if the mail for a given recipient should get accepted or rejected + +* UnknownCmdHook +Allows to hook in your code on every unknown command. + + +* Return-Codes + Each of the above mention Hooks need to return a HookResult to tell the SMTPServer if the next registered Hook should get called or not. For this the HookReturnCode is used. + +-=======================- + + + + -===== Advanced implementations =====-- + What to do if the Hook API is not enough for you ? You want for example to write a code which handles a new command like "YOURCOOLCOMMAND: whate...@example". For this kind of needs + you should implement the CommandHandler interface. This gives you a lower-level API to handle this kind of tasks. If you want to support a custom Hook in your CommandHandler its the best + to just extend AbstractHookableCmdHandler. + + +-==== Things to remember ============- + Be aware that your implementation needs to be thread-safe as it will get used as singleton. If you need to store temporary informations within the SMTP Transaction/Session you should + use the SMTPSession.getState().put(...) and SMTPSession.getConnectionState().put(...) methods. + + For a more explanation see the apidocs for the protocols library which is used by JAMES SMTPServer + -===============================- + + +-===== How to get your implementation loaded after you wrote it =======- +Just create a jar file which contains your code and put it in /path/to/james/conf/lib/ folder. The jar will get picked up by the ClassLoader automatic then. After that open the +smtpserver.xml file and add your hook to the <handlers></handlers> block in the order you want to have it executed. So if you have 2 MailHook implementation make sure the first one +which is listed in smtpserver.xml is the one you want to call first. + + + + </section> + +</body> + +</document> Modified: james/server/trunk/src/site/xdoc/configuration_mailetcontainer.xml URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/configuration_mailetcontainer.xml?rev=1026626&r1=1026625&r2=1026626&view=diff ============================================================================== --- james/server/trunk/src/site/xdoc/configuration_mailetcontainer.xml (original) +++ james/server/trunk/src/site/xdoc/configuration_mailetcontainer.xml Sat Oct 23 15:15:13 2010 @@ -24,6 +24,7 @@ </properties> <body> + <section name="Mailet Container Configuration"> <p>The SpoolManager is controlled by a single configuration block in the config.xml. The spoolmanager tag defines the boundaries of the configuration block. The behavior of --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
