Menu
▾
▴
andromdaplugins-cvs — Each commit to the project CVS repository posts a message to this mailing list.
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(6) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(178) |
Feb
(169) |
Mar
(286) |
Apr
(117) |
May
(98) |
Jun
(68) |
Jul
(63) |
Aug
(121) |
Sep
(88) |
Oct
(124) |
Nov
(2) |
Dec
(111) |
| 2007 |
Jan
(224) |
Feb
(69) |
Mar
(10) |
Apr
(72) |
May
(7) |
Jun
(21) |
Jul
(33) |
Aug
(35) |
Sep
(12) |
Oct
(22) |
Nov
(5) |
Dec
(6) |
| 2008 |
Jan
(2) |
Feb
(10) |
Mar
(39) |
Apr
(58) |
May
(34) |
Jun
(9) |
Jul
(27) |
Aug
(10) |
Sep
(3) |
Oct
|
Nov
|
Dec
|
|
From: Vance K. <va...@us...> - 2006-01-22 06:25:22
|
User: vancek Date: 06/01/21 22:25:16 Modified: andromda-ejb3/src/main/uml EJB3MetafacadeModel.xml.zip Log: added getEnvironmentEntries to EJB3MessageDrivenFacade Revision Changes Path 1.7 +148 -146 cartridges/andromda-ejb3/src/main/uml/EJB3MetafacadeModel.xml.zip <<Binary file>> |
|
From: Vance K. <va...@us...> - 2006-01-22 06:24:49
|
User: vancek
Date: 06/01/21 22:24:43
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3MessageDrivenFacadeLogicImpl.java
Log:
added getEnvironmentEntries method
Revision Changes Path
1.3 +8 -0 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3MessageDrivenFacadeLogicImpl.java
Index: EJB3MessageDrivenFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3MessageDrivenFacadeLogicImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- EJB3MessageDrivenFacadeLogicImpl.java 17 Jan 2006 03:53:55 -0000 1.2
+++ EJB3MessageDrivenFacadeLogicImpl.java 22 Jan 2006 06:24:43 -0000 1.3
@@ -318,4 +318,12 @@
return typeTopic;
}
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3MessageDrivenFacadeLogic#handleGetEnvironmentEntries(boolean)
+ */
+ protected Collection handleGetEnvironmentEntries(boolean follow)
+ {
+ return EJB3MetafacadeUtils.getEnvironmentEntries(this, follow);
+ }
+
}
\ No newline at end of file
|
|
From: Vance K. <va...@us...> - 2006-01-22 06:23:38
|
User: vancek
Date: 06/01/21 22:23:33
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3
EJB3Profile.java
Log:
moved STEREOTYPE_ENV_ENTRY value to profile
Revision Changes Path
1.6 +3 -3 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/EJB3Profile.java
Index: EJB3Profile.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/EJB3Profile.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- EJB3Profile.java 18 Jan 2006 09:15:21 -0000 1.5
+++ EJB3Profile.java 22 Jan 2006 06:23:33 -0000 1.6
@@ -47,10 +47,10 @@
public static final String STEREOTYPE_SELECT_METHOD = "SelectMethod";
/**
- * Specifies the environment entry stereotype - used in EJB2.x
- * This may be deprecated in future releases.
+ * Specifies the environment entry stereotype used on static variables
+ * to permit Resource injection.
*/
- public static final String STEREOTYPE_ENV_ENTRY = "EnvEntry";
+ public static final String STEREOTYPE_ENV_ENTRY = profile.get("ENV_ENTRY");
/**
* Specifies the version stereotype - optimistic lock value of an attribute of an entity.
|
|
From: Vance K. <va...@us...> - 2006-01-22 06:22:52
|
User: vancek
Date: 06/01/21 22:22:46
Modified: andromda-ejb3/src/main/resources/META-INF/andromda
profile.xml
Log:
added EnvEntry stereotype element definition
Revision Changes Path
1.6 +11 -0 cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/profile.xml
Index: profile.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/profile.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- profile.xml 18 Jan 2006 08:59:37 -0000 1.5
+++ profile.xml 22 Jan 2006 06:22:46 -0000 1.6
@@ -193,6 +193,17 @@
Entity
</appliedOnElement>
</element>
+ <element name="ENV_ENTRY">
+ <documentation>
+ Used to specify an environment entry which is defined
+ in the ejb-jar.xml descriptor and can be injected
+ in a bean.
+ </documentation>
+ <value>EnvEntry</value>
+ <appliedOnElement>
+ Attribute
+ </appliedOnElement>
+ </element>
</elementGroup>
<elementGroup name="Tagged Values">
<element name="ATTRIBUTE_PERSISTENCE_OPTIONAL">
|
|
From: Vance K. <va...@us...> - 2006-01-22 06:22:01
|
User: vancek
Date: 06/01/21 22:21:55
Modified: andromda-ejb3/src/main/resources/templates/ejb3
SessionBean.vsl MessageDrivenBean.vsl
Log:
add environment entry Resource injections - not available until JBoss RC4
Revision Changes Path
1.9 +21 -2 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionBean.vsl
Index: SessionBean.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionBean.vsl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- SessionBean.vsl 21 Jan 2006 03:43:02 -0000 1.8
+++ SessionBean.vsl 22 Jan 2006 06:21:55 -0000 1.9
@@ -160,8 +160,27 @@
// ------------ Attributes ------------------
#**##foreach ($attribute in $instanceAttributes)
- /** The $attribute.name property */
- private $attribute.type.fullyQualifiedName $attribute.name;
+ /**
+ * The $attribute.name property
+ */
+ protected $attribute.type.fullyQualifiedName $attribute.name;
+
+#**##end
+#end
+#set ($envEntries = $service.getEnvironmentEntries(true))
+#if (!$envEntries.empty)
+
+ // ---------- Env Entry Injection -----------
+ // NOTE: environment entry resource injection is not
+ // available spec compliant until RC4
+
+#**##foreach ($envEntry in $envEntries)
+ /**
+ * The $envEntry.name resource injection
+ */
+ @javax.annotation.Resource
+ protected $envEntry.type.fullyQualifiedName $envEntry.name;
+
#**##end
#end
1.6 +15 -0 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/MessageDrivenBean.vsl
Index: MessageDrivenBean.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/MessageDrivenBean.vsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- MessageDrivenBean.vsl 21 Jan 2006 03:41:53 -0000 1.5
+++ MessageDrivenBean.vsl 22 Jan 2006 06:21:55 -0000 1.6
@@ -82,6 +82,21 @@
*/
@javax.annotation.EJB
protected ${reference.fullyQualifiedServiceRemoteInterfaceName} $stringUtils.uncapitalize(${reference.name});
+
+#**##end
+#end
+#set ($envEntries = $mdb.getEnvironmentEntries(true))
+#if (!$envEntries.empty)
+
+ // ---------- Env Entry Injection -----------
+
+#**##foreach ($envEntry in $envEntries)
+ /**
+ * The $envEntry.name resource injection
+ */
+ @javax.annotation.Resource
+ protected $envEntry.type.fullyQualifiedName $envEntry.name;
+
#**##end
#end
|
|
From: Vance K. <va...@us...> - 2006-01-22 06:20:54
|
User: vancek
Date: 06/01/21 22:20:49
Modified: andromda-ejb3/src/main/resources/templates/ejb3
ejb-jar.xml.vsl
Log:
add env-entry elements to session and message-driven elements for Resource injection
Revision Changes Path
1.4 +14 -0 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/ejb-jar.xml.vsl
Index: ejb-jar.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/ejb-jar.xml.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- ejb-jar.xml.vsl 20 Jan 2006 17:08:16 -0000 1.3
+++ ejb-jar.xml.vsl 22 Jan 2006 06:20:49 -0000 1.4
@@ -26,6 +26,13 @@
<ejb-class>${service.fullyQualifiedServiceImplementationName}</ejb-class>
<session-type>${service.type}</session-type>
<transaction-type>Container</transaction-type>
+#**##foreach($envEntry in $service.getEnvironmentEntries(true))
+ <env-entry>
+ <env-entry-name>${envEntry.name}</env-entry-name>
+ <env-entry-type>#if ($envEntry.type.primitive)${envEntry.type.wrapperName}#else${envEntry.type.fullyQualifiedName}#end</env-entry-type>
+ <env-entry-value>${envEntry.defaultValue}</env-entry-value>
+ </env-entry>
+#**##end
</session>
#end
@@ -60,6 +67,13 @@
</run-as>
</security-identity>
#**##end
+#**##foreach($envEntry in $mdb.getEnvironmentEntries(true))
+ <env-entry>
+ <env-entry-name>${envEntry.name}</env-entry-name>
+ <env-entry-type>#if ($envEntry.type.primitive)${envEntry.type.wrapperName}#else${envEntry.type.fullyQualifiedName}#end</env-entry-type>
+ <env-entry-value>${envEntry.defaultValue}</env-entry-value>
+ </env-entry>
+#**##end
</message-driven>
#end
</enterprise-beans>
|
|
From: Vance K. <va...@us...> - 2006-01-21 03:43:10
|
User: vancek
Date: 06/01/20 19:43:02
Modified: andromda-ejb3/src/main/resources/templates/ejb3
SessionBean.vsl
Log:
fixed EJB injection - type is remote interface not bean class
Revision Changes Path
1.8 +1 -1 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionBean.vsl
Index: SessionBean.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionBean.vsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- SessionBean.vsl 20 Jan 2006 17:15:27 -0000 1.7
+++ SessionBean.vsl 21 Jan 2006 03:43:02 -0000 1.8
@@ -112,7 +112,7 @@
* Inject session EJB ${reference.name}
*/
@javax.annotation.EJB
- protected ${reference.fullyQualifiedServiceName} $stringUtils.uncapitalize(${reference.name});
+ protected ${reference.fullyQualifiedServiceRemoteInterfaceName} $stringUtils.uncapitalize(${reference.name});
#**##end
#end
#set ($mdbReferences = $service.messageDrivenReferences)
|
|
From: Vance K. <va...@us...> - 2006-01-21 03:42:01
|
User: vancek
Date: 06/01/20 19:41:55
Modified: andromda-ejb3/src/main/resources/templates/ejb3
MessageDrivenBean.vsl
Log:
no longer implements MessageListener is abstract base MDB class, fixed EJB injection type to be remote interface
Revision Changes Path
1.5 +1 -2 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/MessageDrivenBean.vsl
Index: MessageDrivenBean.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/MessageDrivenBean.vsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- MessageDrivenBean.vsl 20 Jan 2006 17:13:36 -0000 1.4
+++ MessageDrivenBean.vsl 21 Jan 2006 03:41:53 -0000 1.5
@@ -49,7 +49,6 @@
@javax.annotation.security.RunAs("${mdb.runAs}")
#end
public abstract class ${mdb.messageDrivenName}
- implements javax.jms.MessageListener
{
// ------ Message Driven Context Injection ------
@@ -82,7 +81,7 @@
* Inject session EJB ${reference.name};
*/
@javax.annotation.EJB
- protected ${reference.fullyQualifiedServiceName} $stringUtils.uncapitalize(${reference.name});
+ protected ${reference.fullyQualifiedServiceRemoteInterfaceName} $stringUtils.uncapitalize(${reference.name});
#**##end
#end
|
|
From: Vance K. <va...@us...> - 2006-01-20 17:21:32
|
User: vancek Date: 06/01/20 09:21:23 Modified: andromda-ejb3/src/main/uml EJB3MetafacadeModel.xml.zip Log: added embeddableSuperclassGeneralizationExists EJB3EntityFacade Revision Changes Path 1.6 +146 -145 cartridges/andromda-ejb3/src/main/uml/EJB3MetafacadeModel.xml.zip <<Binary file>> |
|
From: Vance K. <va...@us...> - 2006-01-20 17:20:07
|
User: vancek
Date: 06/01/20 09:19:59
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3EntityFacadeLogicImpl.java
Log:
requiresGeneralizationMapping no longer checks for super entity not being an embeddable superclass. added embeddableSuperclassGeneralizationExists to check for super entity being an ebeddable superclass.
Revision Changes Path
1.6 +12 -1 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java
Index: EJB3EntityFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- EJB3EntityFacadeLogicImpl.java 18 Jan 2006 09:21:39 -0000 1.5
+++ EJB3EntityFacadeLogicImpl.java 20 Jan 2006 17:19:58 -0000 1.6
@@ -832,7 +832,10 @@
*/
protected boolean handleIsRequiresGeneralizationMapping()
{
- return (this.getSuperEntity() != null && !this.getSuperEntity().isEmbeddableSuperclass());
+ return (this.getSuperEntity() != null &&
+ (this.getSuperEntity().isInheritanceSingleTable() ||
+ this.getSuperEntity().isInheritanceTablePerClass() ||
+ this.getSuperEntity().isInheritanceJoined()));
}
/**
@@ -867,6 +870,14 @@
}
/**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleIsEmbeddableSuperclassGeneralizationExists()
+ */
+ protected boolean handleIsEmbeddableSuperclassGeneralizationExists()
+ {
+ return (this.getSuperEntity() != null && this.getSuperEntity().isEmbeddableSuperclass());
+ }
+
+ /**
* @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#
* handleGetAttributesAsList(java.util.Collection, boolean, boolean)
*/
|
|
From: Vance K. <va...@us...> - 2006-01-20 17:17:42
|
User: vancek
Date: 06/01/20 09:17:26
Modified: andromda-ejb3/src/main/resources/META-INF/andromda
cartridge.xml
Log:
added 'mdbs' variable containing collection of EJB3MessageDrivenFacades to ejb-jar.xml.vsl and jboss.xml.vsl
Revision Changes Path
1.9 +10 -4 cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/cartridge.xml
Index: cartridge.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/cartridge.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- cartridge.xml 19 Jan 2006 06:49:38 -0000 1.8
+++ cartridge.xml 20 Jan 2006 17:17:26 -0000 1.9
@@ -195,10 +195,13 @@
overwrite="true"
outputToSingleFile="true"
outputOnEmptyElements="false">
- <modelElements variable="services">
- <modelElement>
+ <modelElements>
+ <modelElement variable="services">
<type name="org.andromda.cartridges.ejb3.metafacades.EJB3SessionFacade"/>
</modelElement>
+ <modelElement variable="mdbs">
+ <type name="org.andromda.cartridges.ejb3.metafacades.EJB3MessageDrivenFacade"/>
+ </modelElement>
</modelElements>
</template>
@@ -209,10 +212,13 @@
overwrite="true"
outputToSingleFile="true"
outputOnEmptyElements="false">
- <modelElements variable="services">
- <modelElement>
+ <modelElements>
+ <modelElement variable="services">
<type name="org.andromda.cartridges.ejb3.metafacades.EJB3SessionFacade"/>
</modelElement>
+ <modelElement variable="mdbs">
+ <type name="org.andromda.cartridges.ejb3.metafacades.EJB3MessageDrivenFacade"/>
+ </modelElement>
</modelElements>
</template>
|
|
From: Vance K. <va...@us...> - 2006-01-20 17:15:43
|
User: vancek
Date: 06/01/20 09:15:29
Modified: andromda-ejb3/src/main/resources/templates/ejb3
SessionBean.vsl
Log:
Resource annotation now uses mappedName parameter for ConnectionFactory, Queue and Topics
Revision Changes Path
1.7 +5 -7 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionBean.vsl
Index: SessionBean.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionBean.vsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- SessionBean.vsl 18 Jan 2006 09:38:04 -0000 1.6
+++ SessionBean.vsl 20 Jan 2006 17:15:27 -0000 1.7
@@ -124,16 +124,14 @@
#* *##set ($reference = $dependency.targetElement)
#* *##if ($reference.destinationTypeQueue)
#* *##if (!$queueConnectionFactoryDefined)
-## NOTE: CHANGE TO USE mappedName
- @javax.annotation.Resource(name = "ConnectionFactory", type = javax.jms.QueueConnectionFactory.class)
+ @javax.annotation.Resource(mappedName = "ConnectionFactory")
protected javax.jms.QueueConnectionFactory queueFactory;
#* *##set ($queueConnectionFactoryDefined = true)
#* *##end
#* *##elseif ($reference.destinationTypeTopic)
#* *##if (!$topicConnectionFactoryDefined)
-## NOTE: CHANGE TO USE mappedName
- @javax.annotation.Resource(name = "ConnectionFactory", type = javax.jms.TopicConnectionFactory.class)
+ @javax.annotation.Resource(mappedName = "ConnectionFactory")
protected javax.jms.TopicConnectionFactory topicFactory;
#* *##set ($topicConnectionFactoryDefined = true)
@@ -142,9 +140,9 @@
/**
* Inject ${reference.destinationType}
*/
- @javax.annotation.Resource(name = "${reference.destination}", type = #if ($reference.destinationTypeQueue)javax.jms.Queue.class#elseif ($reference.destinationTypeTopic)javax.jms.Topic.class#end)
+ @javax.annotation.Resource(mappedName = "${reference.destination}")
## NOTE: CHANGE TO USE mappedName
- protected #if ($reference.destinationTypeQueue)javax.jms.Queue#elseif ($reference.destinationTypeTopic)javax.jms.Topic#end $stringUtils.uncapitalize(${reference.name});
+ protected javax.jms.Destination $stringUtils.uncapitalize(${reference.name});
#**##end
#end
#set ($constants = $service.getConstants(true))
|
|
From: Vance K. <va...@us...> - 2006-01-20 17:14:25
|
User: vancek
Date: 06/01/20 09:14:19
Modified: andromda-ejb3/src/main/resources/templates/ejb3
MessageDrivenBeanImpl.vsl
Log:
class implements MessageListener
Revision Changes Path
1.3 +1 -1 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/MessageDrivenBeanImpl.vsl
Index: MessageDrivenBeanImpl.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/MessageDrivenBeanImpl.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- MessageDrivenBeanImpl.vsl 17 Jan 2006 03:08:17 -0000 1.2
+++ MessageDrivenBeanImpl.vsl 20 Jan 2006 17:14:19 -0000 1.3
@@ -9,7 +9,6 @@
*/
public class ${mdb.messageDrivenImplementationName}
extends ${mdb.fullyQualifiedMessageDrivenName}
- implements javax.jms.MessageListener
{
@@ -29,6 +28,7 @@
{
// Implementation
}
+
#set ($operations = $mdb.operations)
#if (!$operations.empty)
|
|
From: Vance K. <va...@us...> - 2006-01-20 17:13:44
|
User: vancek
Date: 06/01/20 09:13:36
Modified: andromda-ejb3/src/main/resources/templates/ejb3
MessageDrivenBean.vsl
Log:
commented MessageDriven annotation - use deployment descriptor instead
Revision Changes Path
1.4 +22 -12 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/MessageDrivenBean.vsl
Index: MessageDrivenBean.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/MessageDrivenBean.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- MessageDrivenBean.vsl 17 Jan 2006 03:08:17 -0000 1.3
+++ MessageDrivenBean.vsl 20 Jan 2006 17:13:36 -0000 1.4
@@ -10,24 +10,32 @@
*
$mdb.getDocumentation(" * ")
*/
-...@ja...ssageDriven(activateConfig =
-{
- @javax.ejb.ActivationConfigProperty(propertyName="destinationType", propertyValue="${mdb.destinationType}"),
- @javax.ejb.ActivationConfigProperty(propertyName="destination", propertyValue="${mdb.destination}")#if ($mdb.acknowledgeMode || $mdb.messageSelector || $mdb.subscriptionDurability),#end
+/**
+ * The MessageDriven annotation is now fully configured in ejb-jar.xml
+ * This allows to set the class name to the MDB implementation class
+ * The annotation is commented to avoid multiple registration with the
+ * container.
+ *
+ * javax.ejb.MessageDriven(activateConfig =
+ *{
+ * @javax.ejb.ActivationConfigProperty(propertyName="destinationType", propertyValue="${mdb.destinationType}"),
+ * @javax.ejb.ActivationConfigProperty(propertyName="destination", propertyValue="${mdb.destination}")#if ($mdb.acknowledgeMode || $mdb.messageSelector || $mdb.subscriptionDurability),#end
+ *
#if ($mdb.acknowledgeMode)
- @javax.ejb.ActivationConfigProperty(propertyName="acknowledgeMode", propertyValue="${mdb.acknowledgeMode}")#if ($mdb.messageSelector || $mdb.subscriptionDurability),#end
-
+ * @javax.ejb.ActivationConfigProperty(propertyName="acknowledgeMode", propertyValue="${mdb.acknowledgeMode}")#if ($mdb.messageSelector || $mdb.subscriptionDurability),#end
+ *
#end
#if ($mdb.messageSelector)
- @javax.ejb.ActivationConfigProperty(propertyName="messageSelector", propertyValue="${mdb.messageSelector}")#if ($mdb.subscriptionDurability),#end
-
+ * @javax.ejb.ActivationConfigProperty(propertyName="messageSelector", propertyValue="${mdb.messageSelector}")#if ($mdb.subscriptionDurability),#end
+ *
#end
#if ($mdb.subscriptionDurability)
- @javax.ejb.ActivationConfigProperty(propertyName="subscriptionDurability", propertyValue="${mdb.subscriptionDurability}")
+ * @javax.ejb.ActivationConfigProperty(propertyName="subscriptionDurability", propertyValue="${mdb.subscriptionDurability}")
#end
-}
-)
+ *}
+ *)
+ */
@javax.ejb.CallbackListener(${mdb.fullyQualifiedMessageDrivenListenerName}.class)
#if ($mdb.transactionManagement)
@javax.ejb.TransactionManagement(javax.ejb.TransactionManagementType.${mdb.transactionManagement})
@@ -84,6 +92,8 @@
{
// Empty implementation
}
+
+
#set ($operations = $mdb.operations)
#if (!$operations.empty)
|
|
From: Vance K. <va...@us...> - 2006-01-20 17:10:55
|
User: vancek
Date: 06/01/20 09:10:49
Modified: andromda-ejb3/src/main/resources/templates/ejb3
ServiceLocator.vsl
Log:
fixed comment
Revision Changes Path
1.2 +1 -1 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/ServiceLocator.vsl
Index: ServiceLocator.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/ServiceLocator.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- ServiceLocator.vsl 10 Jan 2006 08:09:58 -0000 1.1
+++ ServiceLocator.vsl 20 Jan 2006 17:10:49 -0000 1.2
@@ -98,7 +98,7 @@
#foreach ($service in $services)
/**
- * Gets an instance of {@link $service.fullyQualifiedServiceRemoteName}.
+ * Gets an instance of {@link ${service.fullyQualifiedServiceRemoteInterfaceName}}.
*
* @param env the Context environment properties. Null represents no properties.
* @throws javax.naming.NamingException failure to lookup remote service interface.
|
|
From: Vance K. <va...@us...> - 2006-01-20 17:10:23
|
User: vancek
Date: 06/01/20 09:10:18
Modified: andromda-ejb3/src/main/resources/templates/ejb3
EntityEmbeddable.vsl
Log:
fixed embeddable superclass hierarchy implementation, fixed inheritance mapping hierarchy implementation
Revision Changes Path
1.4 +20 -14 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EntityEmbeddable.vsl
Index: EntityEmbeddable.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EntityEmbeddable.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- EntityEmbeddable.vsl 19 Jan 2006 06:48:40 -0000 1.3
+++ EntityEmbeddable.vsl 20 Jan 2006 17:10:17 -0000 1.4
@@ -11,7 +11,7 @@
## 2. an abstract class
##
##
-#if (!$entity.requiresGeneralizationMapping)
+#if (!$entity.requiresGeneralizationMapping && !$entity.embeddableSuperclass)
#**##set ($generatedFile = "${stringUtils.replace($entity.fullyQualifiedEntityEmbeddableName,'.','/')}.java")
#else
#**##set ($generatedFile = "${stringUtils.replace($entity.fullyQualifiedEntityName,'.','/')}.java")
@@ -19,10 +19,10 @@
#set ($identifier = $entity.identifiers.iterator().next())
/**
- * Autogenerated POJO EJB #if (!$entity.requiresGeneralizationMapping) super#end class for ${entity.entityName} containing the
+ * Autogenerated POJO EJB#if (!$entity.requiresGeneralizationMapping || $entity.embeddableSuperclass) embeddable super#end class for ${entity.entityName} containing the
* bulk of the entity implementation.
*
- * This is#if (!$entity.requiresGeneralizationMapping) an embeddable super class and#end autogenerated by AndroMDA using the EJB3
+ * This is#if (!$entity.requiresGeneralizationMapping || $entity.embeddableSuperclass) an embeddable super class and#end autogenerated by AndroMDA using the EJB3
* cartridge.
*
* DO NOT MODIFY this class.
@@ -30,7 +30,7 @@
$entity.getDocumentation(" * ")
*
*/
-#if (!$entity.requiresGeneralizationMapping)
+#if (!$entity.requiresGeneralizationMapping || $entity.embeddableSuperclass)
@javax.persistence.EmbeddableSuperclass#if ($entity.accessType)(access = javax.persistence.AccessType.${entity.accessType})#end
#else
@@ -39,20 +39,26 @@
#end
@javax.persistence.EntityListener(${entity.fullyQualifiedEntityListenerName}.class)
## Include the Table annotation for a base class in inheritence hierarchy
-## if but not the inheriting classes.
-#if (!$entity.requiresGeneralizationMapping)
+## but not in the subclasses.
+## If a class is manually specified as an embeddable superclass, add
+## the Table annotation to the subclass.
+#if (!$entity.requiresGeneralizationMapping && !$entity.embeddableSuperclass)
@javax.persistence.Table(name = "${entity.tableName}")
#end
-#if ($entity.requiresSpecializationMapping)
+## Only include the inheritance related annotations for inheritance mapping
+## that doesn't involve embeddable superclass hierarchy.
+#if ($entity.requiresSpecializationMapping && !$entity.embeddableSuperclass)
@javax.persistence.Inheritance(strategy = javax.persistence.InheritanceType.${entity.inheritanceStrategy}, discriminatorType = javax.persistence.DiscriminatorType.${entity.discriminatorType}#if ($entity.discriminatorValue), discriminatorValue = "${entity.discriminatorValue}"#end)
#**##if ($entity.inheritanceSingleTable || $entity.inheritanceJoined)
@javax.persistence.DiscriminatorColumn(name = "${entity.discriminatorColumn}"#if ($entity.discriminatorColumnDefinition), columnDefinition = "${entity.discriminatorColumnDefinition}"#end#if ($entity.discriminatorLength > 0), length = ${entity.discriminatorLength}#end)
#**##end
-#elseif ($entity.requiresGeneralizationMapping)
+#elseif ($entity.requiresGeneralizationMapping && !$entity.embeddableSuperclassGeneralizationExists)
+## Only include the inheritance annotation for subclasses if the super class
+## is NOT an embeddable superclass.
@javax.persistence.Inheritance#if ($entity.discriminatorValue)(discriminatorValue = "${entity.discriminatorValue}")#end
#end
-public#if (!$entity.requiresGeneralizationMapping) abstract class ${entity.entityEmbeddableName}#else class ${entity.entityName}#end
+public#if (!$entity.requiresGeneralizationMapping && !$entity.embeddableSuperclass) abstract class ${entity.entityEmbeddableName}#else class ${entity.entityName}#end
#if($entity.generalization)
extends ${entity.generalization.fullyQualifiedName}
@@ -110,7 +116,7 @@
/**
* Default empty constructor
*/
- public #if (!$entity.requiresGeneralizationMapping)${entity.entityEmbeddableName}#else${entity.entityName}#end()
+ public #if (!$entity.requiresGeneralizationMapping && !$entity.embeddableSuperclass)${entity.entityEmbeddableName}#else${entity.entityName}#end()
{
// default null constructor
}
@@ -128,7 +134,7 @@
* @param $attribute.name Value for the ${attribute.name} property
#end
*/
- public #if (!$entity.requiresGeneralizationMapping)${entity.entityEmbeddableName}#else${entity.entityName}#end($entity.getAttributesAsList($allAttributes, true, true, false))
+ public #if (!$entity.requiresGeneralizationMapping && !$entity.embeddableSuperclass)${entity.entityEmbeddableName}#else${entity.entityName}#end($entity.getAttributesAsList($allAttributes, true, true, false))
{
#if(!$inheritedAttributes.empty)
super($entity.getAttributesAsList($inheritedAttributes, false, true, false));
@@ -150,7 +156,7 @@
* @param $relation.otherEnd.name Value for the ${relation.otherEnd.name} relation role
#* *##end
*/
- public #if (!$entity.requiresGeneralizationMapping)${entity.entityEmbeddableName}#else${entity.entityName}#end($entity.getAttributesAsList($allAttributes, true, true, false)#if(!$allAttributes.empty), #end#foreach ($relation in $relations)#if ($relation.one2Many || $relation.many2Many)${relation.relationType}<${relation.otherEnd.type.name}> $relation.otherEnd.name#else${relation.relationType} $relation.otherEnd.name#end#if($velocityCount != $relations.size()), #end#end)
+ public #if (!$entity.requiresGeneralizationMapping && !$entity.embeddableSuperclass)${entity.entityEmbeddableName}#else${entity.entityName}#end($entity.getAttributesAsList($allAttributes, true, true, false)#if(!$allAttributes.empty), #end#foreach ($relation in $relations)#if ($relation.one2Many || $relation.many2Many)${relation.relationType}<${relation.otherEnd.type.name}> $relation.otherEnd.name#else${relation.relationType} $relation.otherEnd.name#end#if($velocityCount != $relations.size()), #end#end)
{
// Call suitable class constructor
this($entity.getAttributesAsList($allAttributes, false, true, false));
@@ -172,7 +178,7 @@
* @param $attribute Value for the $attribute property
#**##end
*/
- public #if (!$entity.requiresGeneralizationMapping)${entity.entityEmbeddableName}#else${entity.entityName}#end(${operation.typedArgumentList})
+ public #if (!$entity.requiresGeneralizationMapping && !$entity.embeddableSuperclass)${entity.entityEmbeddableName}#else${entity.entityName}#end(${operation.typedArgumentList})
{
#**##foreach($attribute in $opArguments)
this.${attribute} = $attribute;
@@ -186,7 +192,7 @@
*
* @param pk Composite primary key
*/
- public #if (!$entity.requiresGeneralizationMapping)${entity.entityEmbeddableName}#else${entity.entityName}#end(${entity.fullyQualifiedEntityCompositePrimaryKeyName} pk)
+ public #if (!$entity.requiresGeneralizationMapping && !$entity.embeddableSuperclass)${entity.entityEmbeddableName}#else${entity.entityName}#end(${entity.fullyQualifiedEntityCompositePrimaryKeyName} pk)
{
this.pk = pk;
}
|
|
From: Vance K. <va...@us...> - 2006-01-20 17:08:22
|
User: vancek
Date: 06/01/20 09:08:16
Modified: andromda-ejb3/src/main/resources/templates/ejb3
jboss.xml.vsl ejb-jar.xml.vsl
Log:
added message-driven elements primarily for setting ejb-class to the MDB implementation class
Revision Changes Path
1.3 +7 -0 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/jboss.xml.vsl
Index: jboss.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/jboss.xml.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- jboss.xml.vsl 18 Jan 2006 08:43:20 -0000 1.2
+++ jboss.xml.vsl 20 Jan 2006 17:08:16 -0000 1.3
@@ -18,6 +18,13 @@
</session>
#end
+#foreach ($mdb in $mdbs)
+ <message-driven>
+ <ejb-name>${mdb.messageDrivenName}</ejb-name>
+ <destination-jndi-name>${mdb.destination}</destination-jndi-name>
+ </message-driven>
+
+#end
</enterprise-beans>
</jboss>
\ No newline at end of file
1.3 +34 -1 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/ejb-jar.xml.vsl
Index: ejb-jar.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/ejb-jar.xml.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- ejb-jar.xml.vsl 18 Jan 2006 08:43:20 -0000 1.2
+++ ejb-jar.xml.vsl 20 Jan 2006 17:08:16 -0000 1.3
@@ -16,7 +16,7 @@
$service.getDocumentation(" ", 64, false)
]]>
</description>
- <ejb-name>$service.serviceName</ejb-name>
+ <ejb-name>${service.serviceName}</ejb-name>
#**##if ($service.viewTypeRemote)
<remote>${service.fullyQualifiedServiceRemoteInterfaceName}</remote>
#**##end
@@ -29,6 +29,39 @@
</session>
#end
+#foreach ($mdb in $mdbs)
+ <message-driven>
+ <description>
+ <![CDATA[
+ $mdb.getDocumentation(" ", 64, false)
+ ]]>
+ </description>
+ <ejb-name>${mdb.messageDrivenName}</ejb-name>
+ <ejb-class>${mdb.fullyQualifiedMessageDrivenImplementationName}</ejb-class>
+ <transaction-type>Container</transaction-type>
+#**##if ($stringUtils.isNotBlank($mdb.messageSelector))
+ <message-selector>
+ <![CDATA[${mdb.messageSelector}]]>
+ </message-selector>
+#**##end
+#**##if ($mdb.transactionManagementBean)
+ <acknowledge-mode>${mdb.acknowledgeMode}</acknowledge-mode>
+#**##end
+ <message-driven-destination>
+ <destination-type>${mdb.destinationType}</destination-type>
+#**##if ($mdb.destinationTypeTopic)
+ <subscription-durability>${mdb.subscriptionDurability}</subscription-durability>
+#**##end
+ </message-driven-destination>
+#**##if ($stringUtils.isNotBlank($mdb.runAs))
+ <security-identity>
+ <run-as>
+ <role-name>${mdb.runAs}</role-name>
+ </run-as>
+ </security-identity>
+#**##end
+ </message-driven>
+#end
</enterprise-beans>
<assembly-descriptor>
|
|
From: Vance K. <va...@us...> - 2006-01-19 06:49:44
|
User: vancek
Date: 06/01/18 22:49:38
Modified: andromda-ejb3/src/main/resources/META-INF/andromda
cartridge.xml
Log:
add requiresGeneralizationMapping to false condition for creation of Entity.vsl
Revision Changes Path
1.8 +4 -2 cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/cartridge.xml
Index: cartridge.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/cartridge.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- cartridge.xml 18 Jan 2006 08:49:51 -0000 1.7
+++ cartridge.xml 19 Jan 2006 06:49:38 -0000 1.8
@@ -35,8 +35,9 @@
</template>
<!--
- Do not generated the entity implementation class if marked
- to be an embeddable super class
+ Do not generate the entity implementation class if marked
+ to be an embeddable super class OR is a subclass of an
+ entity inheritance hierarchy.
-->
<template
path="templates/ejb3/Entity.vsl"
@@ -47,6 +48,7 @@
<modelElement>
<type name="org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacade">
<property name="embeddableSuperclass">false</property>
+ <property name="requiresGeneralizationMapping">false</property>
</type>
</modelElement>
</modelElements>
|
|
From: Vance K. <va...@us...> - 2006-01-19 06:48:46
|
User: vancek
Date: 06/01/18 22:48:40
Modified: andromda-ejb3/src/main/resources/templates/ejb3
EntityEmbeddable.vsl
Log:
based on the entity inheritance hierarchy:
adjust generatedFile
switch EmbeddableSuperclass / Entity annotations
switch class/consturctor names accordingly
include generic finders accordingly
Revision Changes Path
1.3 +53 -20 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EntityEmbeddable.vsl
Index: EntityEmbeddable.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EntityEmbeddable.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- EntityEmbeddable.vsl 18 Jan 2006 08:48:42 -0000 1.2
+++ EntityEmbeddable.vsl 19 Jan 2006 06:48:40 -0000 1.3
@@ -3,14 +3,26 @@
#if ($stringUtils.isNotBlank($entity.packageName))
package $entity.packageName;
#end
-#set ($generatedFile = "${stringUtils.replace($entity.fullyQualifiedEntityEmbeddableName,'.','/')}.java")
+##
+## If the entity is in the middle of an inheritance hierarchy
+## it cannot be:
+##
+## 1. an embeddable superclass
+## 2. an abstract class
+##
+##
+#if (!$entity.requiresGeneralizationMapping)
+#**##set ($generatedFile = "${stringUtils.replace($entity.fullyQualifiedEntityEmbeddableName,'.','/')}.java")
+#else
+#**##set ($generatedFile = "${stringUtils.replace($entity.fullyQualifiedEntityName,'.','/')}.java")
+#end
#set ($identifier = $entity.identifiers.iterator().next())
/**
- * Autogenerated POJO EJB3 super class for ${entity.entityName} containing the
+ * Autogenerated POJO EJB #if (!$entity.requiresGeneralizationMapping) super#end class for ${entity.entityName} containing the
* bulk of the entity implementation.
*
- * This is an embeddable super class and autogenerated by AndroMDA using the EJB3
+ * This is#if (!$entity.requiresGeneralizationMapping) an embeddable super class and#end autogenerated by AndroMDA using the EJB3
* cartridge.
*
* DO NOT MODIFY this class.
@@ -18,11 +30,19 @@
$entity.getDocumentation(" * ")
*
*/
-
+#if (!$entity.requiresGeneralizationMapping)
@javax.persistence.EmbeddableSuperclass#if ($entity.accessType)(access = javax.persistence.AccessType.${entity.accessType})#end
+#else
+...@ja...rsistence.Entity#if ($entity.accessType)(access = javax.persistence.AccessType.${entity.accessType})#end
+
+#end
@javax.persistence.EntityListener(${entity.fullyQualifiedEntityListenerName}.class)
+## Include the Table annotation for a base class in inheritence hierarchy
+## if but not the inheriting classes.
+#if (!$entity.requiresGeneralizationMapping)
@javax.persistence.Table(name = "${entity.tableName}")
+#end
#if ($entity.requiresSpecializationMapping)
@javax.persistence.Inheritance(strategy = javax.persistence.InheritanceType.${entity.inheritanceStrategy}, discriminatorType = javax.persistence.DiscriminatorType.${entity.discriminatorType}#if ($entity.discriminatorValue), discriminatorValue = "${entity.discriminatorValue}"#end)
#**##if ($entity.inheritanceSingleTable || $entity.inheritanceJoined)
@@ -32,7 +52,8 @@
@javax.persistence.Inheritance#if ($entity.discriminatorValue)(discriminatorValue = "${entity.discriminatorValue}")#end
#end
-public abstract class ${entity.entityEmbeddableName}
+public#if (!$entity.requiresGeneralizationMapping) abstract class ${entity.entityEmbeddableName}#else class ${entity.entityName}#end
+
#if($entity.generalization)
extends ${entity.generalization.fullyQualifiedName}
#end
@@ -89,7 +110,7 @@
/**
* Default empty constructor
*/
- public ${entity.entityEmbeddableName}()
+ public #if (!$entity.requiresGeneralizationMapping)${entity.entityEmbeddableName}#else${entity.entityName}#end()
{
// default null constructor
}
@@ -107,7 +128,7 @@
* @param $attribute.name Value for the ${attribute.name} property
#end
*/
- public ${entity.entityEmbeddableName}($entity.getAttributesAsList($allAttributes, true, true, false))
+ public #if (!$entity.requiresGeneralizationMapping)${entity.entityEmbeddableName}#else${entity.entityName}#end($entity.getAttributesAsList($allAttributes, true, true, false))
{
#if(!$inheritedAttributes.empty)
super($entity.getAttributesAsList($inheritedAttributes, false, true, false));
@@ -129,7 +150,7 @@
* @param $relation.otherEnd.name Value for the ${relation.otherEnd.name} relation role
#* *##end
*/
- public ${entity.entityEmbeddableName}($entity.getAttributesAsList($allAttributes, true, true, false)#if(!$allAttributes.empty), #end#foreach ($relation in $relations)#if ($relation.one2Many || $relation.many2Many)${relation.relationType}<${relation.otherEnd.type.name}> $relation.otherEnd.name#else${relation.relationType} $relation.otherEnd.name#end#if($velocityCount != $relations.size()), #end#end)
+ public #if (!$entity.requiresGeneralizationMapping)${entity.entityEmbeddableName}#else${entity.entityName}#end($entity.getAttributesAsList($allAttributes, true, true, false)#if(!$allAttributes.empty), #end#foreach ($relation in $relations)#if ($relation.one2Many || $relation.many2Many)${relation.relationType}<${relation.otherEnd.type.name}> $relation.otherEnd.name#else${relation.relationType} $relation.otherEnd.name#end#if($velocityCount != $relations.size()), #end#end)
{
// Call suitable class constructor
this($entity.getAttributesAsList($allAttributes, false, true, false));
@@ -151,7 +172,7 @@
* @param $attribute Value for the $attribute property
#**##end
*/
- public ${entity.entityEmbeddableName}(${operation.typedArgumentList})
+ public #if (!$entity.requiresGeneralizationMapping)${entity.entityEmbeddableName}#else${entity.entityName}#end(${operation.typedArgumentList})
{
#**##foreach($attribute in $opArguments)
this.${attribute} = $attribute;
@@ -165,7 +186,7 @@
*
* @param pk Composite primary key
*/
- public ${entity.entityEmbeddableName}(${entity.fullyQualifiedEntityCompositePrimaryKeyName} pk)
+ public #if (!$entity.requiresGeneralizationMapping)${entity.entityEmbeddableName}#else${entity.entityName}#end(${entity.fullyQualifiedEntityCompositePrimaryKeyName} pk)
{
this.pk = pk;
}
@@ -411,17 +432,29 @@
// ----------- Generic Finder Methods --------------
+## Do not include the findAll finder for inheriting classes when the
+## inheritance strategy is single table. This is defined in the base
+## class.
+#**##if (($entity.inheritanceSingleTable && !$entity.requiresGeneralizationMapping) || !$entity.inheritanceSingleTable)
/**
* Returns the collection of all ${entity.name}s.
*
* @param em javax.persistence.EntityManager
* @return all available ${entity.name} objects
*/
- public static java.util.Collection<${entity.name}> findAll(javax.persistence.EntityManager em)
+## For inheriting classes, replace findAll with findAll${entity.name}s
+ public static java.util.Collection<${entity.name}> findAll#if ($entity.requiresGeneralizationMapping)$stringUtils.capitalize(${entity.name})s#end(javax.persistence.EntityManager em)
{
return em.createQuery("FROM ${entity.tableName} AS $stringUtils.uncapitalize(${entity.name})").getResultList();
}
-#**##if (!$entity.compositePrimaryKeyPresent)
+#**##end
+## Only include the findByPrimaryKey method if not an inheriting class.
+## Classes that inherit from a base class use the primary key identifier
+## of the base class. The inheritence relationship is reflected in the
+## queries, so queries based on the base/root class are polymorphic.
+## Do not include the findByPrimaryKey if this bean has a composite
+## primary key class.
+#**##if (!$entity.compositePrimaryKeyPresent && !$entity.requiresGeneralizationMapping)
#**##foreach ($attribute in $entity.getIdentifiers(false))
#* *##set ($identifierName = $attribute.name)
#* *##set ($identifierType = $attribute.type.fullyQualifiedName)
|
|
From: Vance K. <va...@us...> - 2006-01-18 09:38:14
|
User: vancek
Date: 06/01/18 01:38:07
Modified: andromda-ejb3/src/main/resources/templates/ejb3
SessionBean.vsl
Log:
removed @javax.ejb.Stateless/@javax.ejb.Stateful annotation - cause double up of session bean registration and failure to associate remote interface. now regisration is done via ejb-jar.xml descriptor. added @javax.ejb.Timeout annotation for session beans to register the callback with the Timer Service.
Revision Changes Path
1.6 +8 -1 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionBean.vsl
Index: SessionBean.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionBean.vsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- SessionBean.vsl 17 Jan 2006 03:13:48 -0000 1.5
+++ SessionBean.vsl 18 Jan 2006 09:38:04 -0000 1.6
@@ -10,7 +10,11 @@
*
$service.getDocumentation(" * ")
*/
-@javax.ejb.${service.type}
+/**
+ * Do not specify the javax.ejb.${service.type} annotation
+ * Instead, define the session bean in the ejb-jar.xml descriptor
+ * javax.ejb.${service.type}
+ */
#if ($service.transactionManagement)
@javax.ejb.TransactionManagement(javax.ejb.TransactionManagementType.${service.transactionManagement})
#end
@@ -278,6 +282,9 @@
#* *##if ($operation.flushMode)
@javax.persistence.FlushMode(javax.persistence.FlushModeType.${operation.flushMode})
#* *##end
+#* *##if ($operation.timeoutCallback)
+ @javax.ejb.Timeout
+#* *##end
#* *##set ($returnType = $operation.returnType.fullyQualifiedName)
#* *##if ($operation.exceptionsPresent)
$visibility abstract $returnType $operation.signature $operation.throwsClause;
|
|
From: Vance K. <va...@us...> - 2006-01-18 09:25:13
|
User: vancek Date: 06/01/18 01:25:08 Modified: andromda-ejb3/src/main/uml EJB3MetafacadeModel.xml.zip Log: added composite primary key and timeout components Revision Changes Path 1.5 +146 -133 cartridges/andromda-ejb3/src/main/uml/EJB3MetafacadeModel.xml.zip <<Binary file>> |
|
From: Vance K. <va...@us...> - 2006-01-18 09:24:04
|
User: vancek
Date: 06/01/18 01:23:55
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3SessionOperationFacadeLogicImpl.java
Log:
added isTimeoutCallback lookup timeout callback tagged value for session bean operation
Revision Changes Path
1.6 +11 -0 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3SessionOperationFacadeLogicImpl.java
Index: EJB3SessionOperationFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3SessionOperationFacadeLogicImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- EJB3SessionOperationFacadeLogicImpl.java 17 Jan 2006 04:07:16 -0000 1.5
+++ EJB3SessionOperationFacadeLogicImpl.java 18 Jan 2006 09:23:55 -0000 1.6
@@ -265,4 +265,15 @@
return allRoles;
}
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3SessionOperationFacadeLogic#handleIsTimeoutCallback()
+ */
+ protected boolean handleIsTimeoutCallback()
+ {
+ boolean isTimeout = false;
+ isTimeout = BooleanUtils.toBoolean(
+ (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_SERVICE_TIMER_TIMEOUT));
+ return isTimeout;
+ }
+
}
\ No newline at end of file
|
|
From: Vance K. <va...@us...> - 2006-01-18 09:22:30
|
User: vancek
Date: 06/01/18 01:22:21
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3SessionFacadeLogicImpl.java
Log:
added getPersistenceContextUnitName
Revision Changes Path
1.6 +13 -1 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3SessionFacadeLogicImpl.java
Index: EJB3SessionFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3SessionFacadeLogicImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- EJB3SessionFacadeLogicImpl.java 17 Jan 2006 04:06:20 -0000 1.5
+++ EJB3SessionFacadeLogicImpl.java 18 Jan 2006 09:22:21 -0000 1.6
@@ -59,6 +59,12 @@
*/
private static final String SERVICE_DELEGATE_NAME_PATTERN = "serviceDelegateNamePattern";
+ /**
+ * The property which stores the persistence context unit name associated with the default
+ * Entity Manager.
+ */
+ private static final String PERSISTENCE_CONTEXT_UNIT_NAME = "persistenceContextUnitName";
+
// ---------------- constructor -------------------------------
@@ -414,7 +420,13 @@
*/
protected String handleGetPersistenceContextUnitName()
{
- return (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_EJB_PERSISTENCE_CONTEXT_UNIT_NAME);
+ String unitName = (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_EJB_PERSISTENCE_CONTEXT_UNIT_NAME);
+ if (StringUtils.isBlank(unitName))
+ {
+ unitName = StringUtils.trimToEmpty(
+ ObjectUtils.toString(this.getConfiguredProperty(PERSISTENCE_CONTEXT_UNIT_NAME)));
+ }
+ return unitName;
}
/**
|
|
From: Vance K. <va...@us...> - 2006-01-18 09:21:45
|
User: vancek
Date: 06/01/18 01:21:39
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3EntityFacadeLogicImpl.java
Log:
added isCompositePrimaryKeyPresent, added getEntityCompositePrimaryKeyName, added getFullyQualifiedEntityCompositePrimaryKeyName, updated getAttributesAsList with extra arg (includeCompPKAttr) to filter identifier attributes of entity bean with composite primary key
Revision Changes Path
1.5 +59 -4 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java
Index: EJB3EntityFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- EJB3EntityFacadeLogicImpl.java 17 Jan 2006 04:08:12 -0000 1.4
+++ EJB3EntityFacadeLogicImpl.java 18 Jan 2006 09:21:39 -0000 1.5
@@ -139,7 +139,13 @@
public static final String ENTITY_EMBEDDABLE_NAME_PATTERN = "entityEmbeddableNamePattern";
/**
- * The p0roperty that stores the generic finders option
+ * The property that stores the pattern defining the entity
+ * composite primary key class name.
+ */
+ private static final String ENTITY_COMPOSITE_PRIMARY_KEY_NAME_PATTERN = "entityCompositePrimaryKeyNamePattern";
+
+ /**
+ * The poroperty that stores the generic finders option
*/
private static final String ENTITY_GENERIC_FINDERS = "entityGenericFinders";
@@ -152,6 +158,9 @@
// --------------- methods ---------------------
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacade#getIdentifiers()
+ */
public Collection handleGetIdentifiers()
{
Collection identifiers = new ArrayList();
@@ -509,6 +518,19 @@
}
/**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleGetEntityCompositePrimaryKeyName()
+ */
+ protected String handleGetEntityCompositePrimaryKeyName()
+ {
+ String compPKPattern =
+ String.valueOf(this.getConfiguredProperty(ENTITY_COMPOSITE_PRIMARY_KEY_NAME_PATTERN));
+
+ return MessageFormat.format(
+ compPKPattern,
+ new Object[] {StringUtils.trimToEmpty(this.getName())});
+ }
+
+ /**
* @see org.andromda.metafacades.uml.EntityFacade#getEntityListenerName()
*/
protected String handleGetEntityListenerName()
@@ -546,6 +568,17 @@
}
/**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleGetFullyQualifiedEntityCompositePrimaryKeyName()
+ */
+ protected String handleGetFullyQualifiedEntityCompositePrimaryKeyName()
+ {
+ return EJB3MetafacadeUtils.getFullyQualifiedName(
+ this.getPackageName(),
+ this.getEntityCompositePrimaryKeyName(),
+ null);
+ }
+
+ /**
* @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleGetEntityImplementationName()
*/
protected String handleGetEntityImplementationName()
@@ -837,7 +870,11 @@
* @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#
* handleGetAttributesAsList(java.util.Collection, boolean, boolean)
*/
- protected String handleGetAttributesAsList(Collection attributes, boolean includeTypes, boolean includeNames)
+ protected String handleGetAttributesAsList(
+ Collection attributes,
+ boolean includeTypes,
+ boolean includeNames,
+ boolean includeCompPKAttr)
{
if (!includeNames && !includeTypes || attributes == null)
{
@@ -849,9 +886,14 @@
for (final Iterator it = attributes.iterator(); it.hasNext();)
{
- //AttributeFacade attr = (AttributeFacade)it.next();
EJB3EntityAttributeFacade attr = (EJB3EntityAttributeFacade)it.next();
- if (!attr.isVersion())
+ /**
+ * Do not include attributes that are assigned for optimistic lock value for version or
+ * identifier attributes for entities with a composite primary key .
+ */
+ boolean isCompositePK = this.isCompositePrimaryKeyPresent();
+ if (!attr.isVersion() &&
+ ((isCompositePK && (!attr.isIdentifier() || includeCompPKAttr)) || !isCompositePK))
{
sb.append(separator);
separator = ", ";
@@ -877,4 +919,17 @@
{
return BooleanUtils.toBoolean(String.valueOf(this.getConfiguredProperty(ENTITY_GENERIC_FINDERS)));
}
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleIsCompositePrimaryKeyPresent()
+ */
+ protected boolean handleIsCompositePrimaryKeyPresent()
+ {
+ boolean isCompositePK = false;
+ if (this.getIdentifiers().size() > 1)
+ {
+ isCompositePK = true;
+ }
+ return isCompositePK;
+ }
}
\ No newline at end of file
|
|
From: Vance K. <va...@us...> - 2006-01-18 09:19:17
|
User: vancek
Date: 06/01/18 01:19:11
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3EntityAttributeFacadeLogicImpl.java
Log:
fixed getGeneratorType to default to NONE for Date, Time and String types, renamed isSequenceGeneratorType to isGeneratorTypeSequence, renamed isTableGeneratorType to isGeneratorTypeTable
Revision Changes Path
1.4 +42 -35 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityAttributeFacadeLogicImpl.java
Index: EJB3EntityAttributeFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityAttributeFacadeLogicImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- EJB3EntityAttributeFacadeLogicImpl.java 6 Jan 2006 13:56:17 -0000 1.3
+++ EJB3EntityAttributeFacadeLogicImpl.java 18 Jan 2006 09:19:11 -0000 1.4
@@ -105,16 +105,55 @@
String genType = (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_PERSISTENCE_GENERATOR_TYPE);
if (StringUtils.isBlank(genType))
{
+ if (this.getType().isStringType() || this.getType().isDateType() || this.getType().isTimeType())
+ {
+ genType = EJB3Globals.GENERATOR_TYPE_NONE;
+ }
+ else
+ {
genType = String.valueOf(this.getConfiguredProperty(EJB3Globals.ENTITY_DEFAULT_GENERATOR_TYPE));
if (StringUtils.isBlank(genType))
{
genType = EJB3Globals.GENERATOR_TYPE_AUTO;
}
}
+ }
return genType;
}
/**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityAttributeFacadeLogic#handleIsSequenceGeneratorType()
+ */
+ protected boolean handleIsGeneratorTypeSequence()
+ {
+ boolean isSequence = false;
+ if (StringUtils.isNotBlank(this.getGeneratorType()))
+ {
+ if (this.getGeneratorType().equalsIgnoreCase(EJB3Globals.GENERATOR_TYPE_SEQUENCE))
+ {
+ isSequence = true;
+ }
+ }
+ return isSequence;
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityAttributeFacadeLogic#handleIsTableGeneratorType()
+ */
+ protected boolean handleIsGeneratorTypeTable()
+ {
+ boolean isTable = false;
+ if (StringUtils.isNotBlank(this.getGeneratorType()))
+ {
+ if (this.getGeneratorType().equalsIgnoreCase(EJB3Globals.GENERATOR_TYPE_TABLE))
+ {
+ isTable = true;
+ }
+ }
+ return isTable;
+ }
+
+ /**
* @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityAttributeFacadeLogic#handleGetGeneratorName()
*/
protected String handleGetGeneratorName()
@@ -146,38 +185,6 @@
}
/**
- * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityAttributeFacadeLogic#handleIsSequenceGeneratorType()
- */
- protected boolean handleIsSequenceGeneratorType()
- {
- boolean isSequence = false;
- if (StringUtils.isNotBlank(this.getGeneratorType()))
- {
- if (this.getGeneratorType().equalsIgnoreCase(EJB3Globals.GENERATOR_TYPE_SEQUENCE))
- {
- isSequence = true;
- }
- }
- return isSequence;
- }
-
- /**
- * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityAttributeFacadeLogic#handleIsTableGeneratorType()
- */
- protected boolean handleIsTableGeneratorType()
- {
- boolean isTable = false;
- if (StringUtils.isNotBlank(this.getGeneratorType()))
- {
- if (this.getGeneratorType().equalsIgnoreCase(EJB3Globals.GENERATOR_TYPE_TABLE))
- {
- isTable = true;
- }
- }
- return isTable;
- }
-
- /**
* @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityAttributeFacadeLogic#handleGetGeneratorInitialValue()
*/
protected int handleGetGeneratorInitialValue()
|
