Update of
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-ejb/src/test/java/org/xdoclet/plugin/ejb/descriptor/expected
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14214/plugin-ejb/src/test/java/org/xdoclet/plugin/ejb/descriptor/expected
Modified Files:
ejb-jar-v20.xml ejb-jar-v11.xml ejb-jar-v21.xml
Log Message:
* Various refactorings
* Completed ValueObjectPlugin
Index: ejb-jar-v20.xml
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-ejb/src/test/java/org/xdoclet/plugin/ejb/descriptor/expected/ejb-jar-v20.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ejb-jar-v20.xml 11 Oct 2005 09:22:26 -0000 1.7
--- ejb-jar-v20.xml 13 Dec 2005 03:45:22 -0000 1.8
***************
*** 112,115 ****
--- 112,160 ----
<!--Define your extra finders in a file called
ejb-finders-ClientBean.xml and place it in your merge directory.-->
</entity>
+ <entity id="entity_CompanyClient">
+ <description>This is part of the common test application for all
ejb-related</description>
+ <ejb-name>CompanyClient</ejb-name>
+ <home>org.xdoclet.testapp.ejb.interfaces.CompanyClientRemoteHome</home>
+ <remote>org.xdoclet.testapp.ejb.interfaces.CompanyClientRemote</remote>
+
<local-home>org.xdoclet.testapp.ejb.interfaces.CompanyClientLocalHome</local-home>
+ <local>org.xdoclet.testapp.ejb.interfaces.CompanyClientLocal</local>
+ <ejb-class>org.xdoclet.testapp.ejb.beans.CompanyClientBean</ejb-class>
+ <persistence-type>Container</persistence-type>
+
<prim-key-class>org.xdoclet.testapp.ejb.util.CompanyClientPK</prim-key-class>
+ <reentrant>False</reentrant>
+ <cmp-version>2.x</cmp-version>
+ <abstract-schema-name>CompanyClient</abstract-schema-name>
+ <cmp-field id="CMPAttribute_5">
+ <description>Version number for soft locking</description>
+ <field-name>version</field-name>
+ </cmp-field>
+ <cmp-field id="CMPAttribute_6">
+ <description/>
+ <field-name>companyNumber</field-name>
+ </cmp-field>
+ <cmp-field id="CMPAttribute_7">
+ <description/>
+ <field-name>companyName</field-name>
+ </cmp-field>
+ <cmp-field id="CMPAttribute_8">
+ <description/>
+ <field-name>companyFiscalNumber</field-name>
+ </cmp-field>
+ <cmp-field id="CMPAttribute_9">
+ <description/>
+ <field-name>companyOwnerName</field-name>
+ </cmp-field>
+ <cmp-field id="CMPAttribute_10">
+ <description/>
+ <field-name>identityNumber</field-name>
+ </cmp-field>
+ <!--Define your Ejb env entries in a file called
ejb-env-entries-CompanyClientBean.xml and place it in your merge directory.
Overrides @ejb.env-entry's-->
+ <!--Define your Ejb refs entries in a file called
ejb-ejbrefs-CompanyClientBean.xml and place it in your merge directory.-->
+ <!--Define your Ejb security role refs entries in a file called
ejb-sec-rolerefs-CompanyClientBean.xml and place it in your merge directory.
Overrides @ejb.security-role-ref's-->
+ <!--Define your resource references in a file called
ejb-resourcerefs-CompanyClientBean.xml and place it in your merge directory.
Overrides @ejb.resource-ref's-->
+ <!--Define your resource env references in a file called
ejb-resource-env-refs-CompanyClientBean.xml and place it in your merge
directory. Overrides @ejb.resource-env-ref's-->
+ <!--Define your destination references in a file called
ejb-destinationrefs-CompanyClientBean.xml and place it in your merge directory.
Overrides @ejb.destination-ref's-->
+ <!--Define your extra finders in a file called
ejb-finders-CompanyClientBean.xml and place it in your merge directory.-->
+ </entity>
<session id="session_Transfer">
<description>This is part of the common test application for all
ejb-related</description>
***************
*** 233,255 ****
<relationships id="Relationships_1">
<ejb-relation id="EJBRelation_1">
! <ejb-relation-name>user-accounts</ejb-relation-name>
<ejb-relationship-role id="EJBRelationshipRole_1">
<ejb-relationship-role-name>admin</ejb-relationship-role-name>
! <multiplicity>Many</multiplicity>
<relationship-role-source id="RoleSource_1">
! <ejb-name>Account</ejb-name>
</relationship-role-source>
<cmr-field id="CMRField_1">
! <cmr-field-name>owners</cmr-field-name>
<cmr-field-type>java.util.Collection</cmr-field-type>
</cmr-field>
</ejb-relationship-role>
<ejb-relationship-role id="EJBRelationshipRole_2">
- <ejb-relationship-role-name>user</ejb-relationship-role-name>
<multiplicity>Many</multiplicity>
<relationship-role-source id="RoleSource_2">
! <ejb-name>Client</ejb-name>
</relationship-role-source>
<cmr-field id="CMRField_2">
<cmr-field-name>accounts</cmr-field-name>
<cmr-field-type>java.util.Collection</cmr-field-type>
--- 278,360 ----
<relationships id="Relationships_1">
<ejb-relation id="EJBRelation_1">
! <ejb-relation-name>all-accounts-Client</ejb-relation-name>
<ejb-relationship-role id="EJBRelationshipRole_1">
<ejb-relationship-role-name>admin</ejb-relationship-role-name>
! <multiplicity>One</multiplicity>
<relationship-role-source id="RoleSource_1">
! <ejb-name>Client</ejb-name>
</relationship-role-source>
<cmr-field id="CMRField_1">
! <cmr-field-name>allAccounts</cmr-field-name>
<cmr-field-type>java.util.Collection</cmr-field-type>
</cmr-field>
</ejb-relationship-role>
<ejb-relationship-role id="EJBRelationshipRole_2">
<multiplicity>Many</multiplicity>
<relationship-role-source id="RoleSource_2">
! <ejb-name>Account</ejb-name>
! </relationship-role-source>
! </ejb-relationship-role>
! </ejb-relation>
! <ejb-relation id="EJBRelation_2">
! <ejb-relation-name>all-accounts-CompanyClient</ejb-relation-name>
! <ejb-relationship-role id="EJBRelationshipRole_3">
! <ejb-relationship-role-name>admin</ejb-relationship-role-name>
! <multiplicity>One</multiplicity>
! <relationship-role-source id="RoleSource_3">
! <ejb-name>CompanyClient</ejb-name>
</relationship-role-source>
<cmr-field id="CMRField_2">
+ <cmr-field-name>allAccounts</cmr-field-name>
+ <cmr-field-type>java.util.Collection</cmr-field-type>
+ </cmr-field>
+ </ejb-relationship-role>
+ <ejb-relationship-role id="EJBRelationshipRole_4">
+ <multiplicity>Many</multiplicity>
+ <relationship-role-source id="RoleSource_4">
+ <ejb-name>Account</ejb-name>
+ </relationship-role-source>
+ </ejb-relationship-role>
+ </ejb-relation>
+ <ejb-relation id="EJBRelation_3">
+ <ejb-relation-name>company-main-account</ejb-relation-name>
+ <ejb-relationship-role id="EJBRelationshipRole_5">
+ <ejb-relationship-role-name>anyrole1</ejb-relationship-role-name>
+ <multiplicity>One</multiplicity>
+ <relationship-role-source id="RoleSource_5">
+ <ejb-name>CompanyClient</ejb-name>
+ </relationship-role-source>
+ <cmr-field id="CMRField_3">
+ <cmr-field-name>primaryAccount</cmr-field-name>
+ </cmr-field>
+ </ejb-relationship-role>
+ <ejb-relationship-role id="EJBRelationshipRole_6">
+ <ejb-relationship-role-name>anyrole2</ejb-relationship-role-name>
+ <multiplicity>One</multiplicity>
+ <relationship-role-source id="RoleSource_6">
+ <ejb-name>Account</ejb-name>
+ </relationship-role-source>
+ </ejb-relationship-role>
+ </ejb-relation>
+ <ejb-relation id="EJBRelation_4">
+ <ejb-relation-name>user-accounts</ejb-relation-name>
+ <ejb-relationship-role id="EJBRelationshipRole_7">
+ <ejb-relationship-role-name>admin</ejb-relationship-role-name>
+ <multiplicity>Many</multiplicity>
+ <relationship-role-source id="RoleSource_7">
+ <ejb-name>Account</ejb-name>
+ </relationship-role-source>
+ <cmr-field id="CMRField_4">
+ <cmr-field-name>owners</cmr-field-name>
+ <cmr-field-type>java.util.Collection</cmr-field-type>
+ </cmr-field>
+ </ejb-relationship-role>
+ <ejb-relationship-role id="EJBRelationshipRole_8">
+ <ejb-relationship-role-name>user</ejb-relationship-role-name>
+ <multiplicity>Many</multiplicity>
+ <relationship-role-source id="RoleSource_8">
+ <ejb-name>Client</ejb-name>
+ </relationship-role-source>
+ <cmr-field id="CMRField_5">
<cmr-field-name>accounts</cmr-field-name>
<cmr-field-type>java.util.Collection</cmr-field-type>
***************
*** 339,345 ****
<method-intf>Remote</method-intf>
<method-name>getOwners</method-name>
- <method-params>
- <method-param>int</method-param>
- </method-params>
</method>
</method-permission>
--- 444,447 ----
***************
*** 352,358 ****
<method-intf>Local</method-intf>
<method-name>getOwners</method-name>
- <method-params>
- <method-param>int</method-param>
- </method-params>
</method>
</method-permission>
--- 454,457 ----
Index: ejb-jar-v21.xml
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-ejb/src/test/java/org/xdoclet/plugin/ejb/descriptor/expected/ejb-jar-v21.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ejb-jar-v21.xml 11 Oct 2005 09:22:26 -0000 1.7
--- ejb-jar-v21.xml 13 Dec 2005 03:45:22 -0000 1.8
***************
*** 111,114 ****
--- 111,159 ----
<!--Define your extra finders in a file called
ejb-finders-ClientBean.xml and place it in your merge directory.-->
</entity>
+ <entity id="entity_CompanyClient">
+ <description>This is part of the common test application for all
ejb-related</description>
+ <ejb-name>CompanyClient</ejb-name>
+ <home>org.xdoclet.testapp.ejb.interfaces.CompanyClientRemoteHome</home>
+ <remote>org.xdoclet.testapp.ejb.interfaces.CompanyClientRemote</remote>
+
<local-home>org.xdoclet.testapp.ejb.interfaces.CompanyClientLocalHome</local-home>
+ <local>org.xdoclet.testapp.ejb.interfaces.CompanyClientLocal</local>
+ <ejb-class>org.xdoclet.testapp.ejb.beans.CompanyClientBean</ejb-class>
+ <persistence-type>Container</persistence-type>
+
<prim-key-class>org.xdoclet.testapp.ejb.util.CompanyClientPK</prim-key-class>
+ <reentrant>false</reentrant>
+ <cmp-version>2.x</cmp-version>
+ <abstract-schema-name>CompanyClient</abstract-schema-name>
+ <cmp-field id="CMPAttribute_5">
+ <description>Version number for soft locking</description>
+ <field-name>version</field-name>
+ </cmp-field>
+ <cmp-field id="CMPAttribute_6">
+ <description/>
+ <field-name>companyNumber</field-name>
+ </cmp-field>
+ <cmp-field id="CMPAttribute_7">
+ <description/>
+ <field-name>companyName</field-name>
+ </cmp-field>
+ <cmp-field id="CMPAttribute_8">
+ <description/>
+ <field-name>companyFiscalNumber</field-name>
+ </cmp-field>
+ <cmp-field id="CMPAttribute_9">
+ <description/>
+ <field-name>companyOwnerName</field-name>
+ </cmp-field>
+ <cmp-field id="CMPAttribute_10">
+ <description/>
+ <field-name>identityNumber</field-name>
+ </cmp-field>
+ <!--Define your Ejb env entries in a file called
ejb-env-entries-CompanyClientBean.xml and place it in your merge directory.
Overrides @ejb.env-entry's-->
+ <!--Define your Ejb refs entries in a file called
ejb-ejbrefs-CompanyClientBean.xml and place it in your merge directory.-->
+ <!--Define your resource references in a file called
ejb-resourcerefs-CompanyClientBean.xml and place it in your merge directory.
Overrides @ejb.resource-ref's-->
+ <!--Define your resource env references in a file called
ejb-resource-env-refs-CompanyClientBean.xml and place it in your merge
directory. Overrides @ejb.resource-env-ref's-->
+ <!--Define your Ejb destination refs entries in a file called
ejb-destinationrefs-CompanyClientBean.xml and place it in your merge directory.
Overrides @ejb.destination-ref's-->
+ <!--Define your Ejb security role refs entries in a file called
ejb-sec-rolerefs-CompanyClientBean.xml and place it in your merge directory.
Overrides @ejb.security-role-ref's-->
+ <!--Define your extra finders in a file called
ejb-finders-CompanyClientBean.xml and place it in your merge directory.-->
+ </entity>
<session id="session_Transfer">
<description>This is part of the common test application for all
ejb-related</description>
***************
*** 274,296 ****
<relationships id="Relationships_1">
<ejb-relation id="EJBRelation_1">
! <ejb-relation-name>user-accounts</ejb-relation-name>
<ejb-relationship-role id="EJBRelationshipRole_1">
<ejb-relationship-role-name>admin</ejb-relationship-role-name>
! <multiplicity>Many</multiplicity>
<relationship-role-source id="RoleSource_1">
! <ejb-name>Account</ejb-name>
</relationship-role-source>
<cmr-field id="CMRField_1">
! <cmr-field-name>owners</cmr-field-name>
<cmr-field-type>java.util.Collection</cmr-field-type>
</cmr-field>
</ejb-relationship-role>
<ejb-relationship-role id="EJBRelationshipRole_2">
- <ejb-relationship-role-name>user</ejb-relationship-role-name>
<multiplicity>Many</multiplicity>
<relationship-role-source id="RoleSource_2">
! <ejb-name>Client</ejb-name>
</relationship-role-source>
<cmr-field id="CMRField_2">
<cmr-field-name>accounts</cmr-field-name>
<cmr-field-type>java.util.Collection</cmr-field-type>
--- 319,401 ----
<relationships id="Relationships_1">
<ejb-relation id="EJBRelation_1">
! <ejb-relation-name>all-accounts-Client</ejb-relation-name>
<ejb-relationship-role id="EJBRelationshipRole_1">
<ejb-relationship-role-name>admin</ejb-relationship-role-name>
! <multiplicity>One</multiplicity>
<relationship-role-source id="RoleSource_1">
! <ejb-name>Client</ejb-name>
</relationship-role-source>
<cmr-field id="CMRField_1">
! <cmr-field-name>allAccounts</cmr-field-name>
<cmr-field-type>java.util.Collection</cmr-field-type>
</cmr-field>
</ejb-relationship-role>
<ejb-relationship-role id="EJBRelationshipRole_2">
<multiplicity>Many</multiplicity>
<relationship-role-source id="RoleSource_2">
! <ejb-name>Account</ejb-name>
! </relationship-role-source>
! </ejb-relationship-role>
! </ejb-relation>
! <ejb-relation id="EJBRelation_2">
! <ejb-relation-name>all-accounts-CompanyClient</ejb-relation-name>
! <ejb-relationship-role id="EJBRelationshipRole_3">
! <ejb-relationship-role-name>admin</ejb-relationship-role-name>
! <multiplicity>One</multiplicity>
! <relationship-role-source id="RoleSource_3">
! <ejb-name>CompanyClient</ejb-name>
</relationship-role-source>
<cmr-field id="CMRField_2">
+ <cmr-field-name>allAccounts</cmr-field-name>
+ <cmr-field-type>java.util.Collection</cmr-field-type>
+ </cmr-field>
+ </ejb-relationship-role>
+ <ejb-relationship-role id="EJBRelationshipRole_4">
+ <multiplicity>Many</multiplicity>
+ <relationship-role-source id="RoleSource_4">
+ <ejb-name>Account</ejb-name>
+ </relationship-role-source>
+ </ejb-relationship-role>
+ </ejb-relation>
+ <ejb-relation id="EJBRelation_3">
+ <ejb-relation-name>company-main-account</ejb-relation-name>
+ <ejb-relationship-role id="EJBRelationshipRole_5">
+ <ejb-relationship-role-name>anyrole1</ejb-relationship-role-name>
+ <multiplicity>One</multiplicity>
+ <relationship-role-source id="RoleSource_5">
+ <ejb-name>CompanyClient</ejb-name>
+ </relationship-role-source>
+ <cmr-field id="CMRField_3">
+ <cmr-field-name>primaryAccount</cmr-field-name>
+ </cmr-field>
+ </ejb-relationship-role>
+ <ejb-relationship-role id="EJBRelationshipRole_6">
+ <ejb-relationship-role-name>anyrole2</ejb-relationship-role-name>
+ <multiplicity>One</multiplicity>
+ <relationship-role-source id="RoleSource_6">
+ <ejb-name>Account</ejb-name>
+ </relationship-role-source>
+ </ejb-relationship-role>
+ </ejb-relation>
+ <ejb-relation id="EJBRelation_4">
+ <ejb-relation-name>user-accounts</ejb-relation-name>
+ <ejb-relationship-role id="EJBRelationshipRole_7">
+ <ejb-relationship-role-name>admin</ejb-relationship-role-name>
+ <multiplicity>Many</multiplicity>
+ <relationship-role-source id="RoleSource_7">
+ <ejb-name>Account</ejb-name>
+ </relationship-role-source>
+ <cmr-field id="CMRField_4">
+ <cmr-field-name>owners</cmr-field-name>
+ <cmr-field-type>java.util.Collection</cmr-field-type>
+ </cmr-field>
+ </ejb-relationship-role>
+ <ejb-relationship-role id="EJBRelationshipRole_8">
+ <ejb-relationship-role-name>user</ejb-relationship-role-name>
+ <multiplicity>Many</multiplicity>
+ <relationship-role-source id="RoleSource_8">
+ <ejb-name>Client</ejb-name>
+ </relationship-role-source>
+ <cmr-field id="CMRField_5">
<cmr-field-name>accounts</cmr-field-name>
<cmr-field-type>java.util.Collection</cmr-field-type>
***************
*** 380,386 ****
<method-intf>Remote</method-intf>
<method-name>getOwners</method-name>
- <method-params>
- <method-param>int</method-param>
- </method-params>
</method>
</method-permission>
--- 485,488 ----
***************
*** 393,399 ****
<method-intf>Local</method-intf>
<method-name>getOwners</method-name>
- <method-params>
- <method-param>int</method-param>
- </method-params>
</method>
</method-permission>
--- 495,498 ----
Index: ejb-jar-v11.xml
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-ejb/src/test/java/org/xdoclet/plugin/ejb/descriptor/expected/ejb-jar-v11.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ejb-jar-v11.xml 11 Oct 2005 09:22:26 -0000 1.7
--- ejb-jar-v11.xml 13 Dec 2005 03:45:22 -0000 1.8
***************
*** 51,54 ****
--- 51,90 ----
<!--Define your destination references in a file called
ejb-destinationrefs-ClientBean.xml and place it in your merge directory.
Overrides @ejb.destination-ref's-->
</entity>
+ <entity id="entity_CompanyClient">
+ <description>This is part of the common test application for all
ejb-related</description>
+ <ejb-name>CompanyClient</ejb-name>
+ <home>org.xdoclet.testapp.ejb.interfaces.CompanyClientRemoteHome</home>
+ <remote>org.xdoclet.testapp.ejb.interfaces.CompanyClientRemote</remote>
+ <ejb-class>org.xdoclet.testapp.ejb.beans.CompanyClientBean</ejb-class>
+ <persistence-type>Container</persistence-type>
+
<prim-key-class>org.xdoclet.testapp.ejb.util.CompanyClientPK</prim-key-class>
+ <reentrant>False</reentrant>
+ <cmp-field id="CMPAttribute_4">
+ <description/>
+ <field-name>companyNumber</field-name>
+ </cmp-field>
+ <cmp-field id="CMPAttribute_5">
+ <description/>
+ <field-name>companyName</field-name>
+ </cmp-field>
+ <cmp-field id="CMPAttribute_6">
+ <description/>
+ <field-name>companyFiscalNumber</field-name>
+ </cmp-field>
+ <cmp-field id="CMPAttribute_7">
+ <description/>
+ <field-name>companyOwnerName</field-name>
+ </cmp-field>
+ <cmp-field id="CMPAttribute_8">
+ <description/>
+ <field-name>identityNumber</field-name>
+ </cmp-field>
+ <!--Define your Ejb env entries in a file called
ejb-env-entries-CompanyClientBean.xml and place it in your merge directory.
Overrides @ejb.env-entry's-->
+ <!--Define your Ejb refs entries in a file called
ejb-ejbrefs-CompanyClientBean.xml and place it in your merge directory.-->
+ <!--Define your Ejb security role refs entries in a file called
ejb-sec-rolerefs-CompanyClientBean.xml and place it in your merge directory.
Overrides @ejb.security-role-ref's-->
+ <!--Define your resource references in a file called
ejb-resourcerefs-CompanyClientBean.xml and place it in your merge directory.
Overrides @ejb.resource-ref's-->
+ <!--Define your resource env references in a file called
ejb-resource-env-refs-CompanyClientBean.xml and place it in your merge
directory. Overrides @ejb.resource-env-ref's-->
+ <!--Define your destination references in a file called
ejb-destinationrefs-CompanyClientBean.xml and place it in your merge directory.
Overrides @ejb.destination-ref's-->
+ </entity>
<session id="session_Transfer">
<description>This is part of the common test application for all
ejb-related</description>
***************
*** 129,135 ****
<method-intf>Remote</method-intf>
<method-name>getOwners</method-name>
- <method-params>
- <method-param>int</method-param>
- </method-params>
</method>
</method-permission>
--- 165,168 ----
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
xdoclet-plugins-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xdoclet-plugins-commits
