Menu
▾
▴
[Andromdaplugins-cvs] CVS update: cartridges/andromda-ejb3/src/changes changes.xml
|
From: Vance K. <va...@us...> - 2006-07-10 05:29:38
|
User: vancek
Date: 06/07/09 22:29:37
Modified: andromda-ejb3/src/main/resources/META-INF/andromda
metafacades.xml
andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3ManageableEntityAttributeFacadeLogicImpl.java
EJB3EntityAttributeFacadeLogicImpl.java
andromda-ejb3/src/changes changes.xml
Log:
reset EJB3ManageableEntityAttributeFacade metafacade mapping to use context element
refactored getTemporalType in EJB3EntityAttributeFacade and removed overriding instance in EJB3ManageableEntityAttributeFacade
Revision Changes Path
1.25 +4 -1 cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/metafacades.xml
Index: metafacades.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/metafacades.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -w -r1.24 -r1.25
--- metafacades.xml 26 Jun 2006 06:46:07 -0000 1.24
+++ metafacades.xml 10 Jul 2006 05:29:36 -0000 1.25
@@ -41,6 +41,7 @@
<property reference="persistenceContainerName"/>
<property reference="persistenceContextUnitName"/>
<property reference="securityRealm"/>
+ <property reference="manageableRolesAllowed"/>
<property reference="allowDefaultServiceException"/>
<property reference="compositionDefinesEagerLoading"/>
<property reference="jndiNamePrefix"/>
@@ -63,7 +64,9 @@
</metafacade>
<metafacade class="org.andromda.cartridges.ejb3.metafacades.EJB3ManageableEntityAttributeFacadeLogicImpl">
<mapping>
- <property name="owner.manageable"/>
+ <context>
+ org.andromda.cartridges.ejb3.metafacades.EJB3ManageableEntityFacade
+ </context>
</mapping>
</metafacade>
<metafacade class="org.andromda.cartridges.ejb3.metafacades.EJB3ManageableEntityAssociationEndFacadeLogicImpl">
1.5 +0 -18 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3ManageableEntityAttributeFacadeLogicImpl.java
Index: EJB3ManageableEntityAttributeFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3ManageableEntityAttributeFacadeLogicImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- EJB3ManageableEntityAttributeFacadeLogicImpl.java 26 Jun 2006 14:40:34 -0000 1.4
+++ EJB3ManageableEntityAttributeFacadeLogicImpl.java 10 Jul 2006 05:29:36 -0000 1.5
@@ -13,26 +13,8 @@
public class EJB3ManageableEntityAttributeFacadeLogicImpl
extends EJB3ManageableEntityAttributeFacadeLogic
{
- /**
- * The property that stores the defuult temporal type for date based attributes
- */
- public static final String ENTITY_DEFAULT_TEMPORAL_TYPE = "entityDefaultTemporalType";
-
public EJB3ManageableEntityAttributeFacadeLogicImpl (Object metaObject, String context)
{
super (metaObject, context);
}
-
- /**
- * @see org.andromda.cartridges.ejb3.metafacades.EJB3ManageableEntityAttributeFacadeLogic#getTemporalType()
- */
- public String getTemporalType()
- {
- String temporalType = super.getTemporalType();
- if (StringUtils.isBlank(temporalType))
- {
- temporalType = String.valueOf(this.getConfiguredProperty(ENTITY_DEFAULT_TEMPORAL_TYPE));
- }
- return temporalType;
- }
}
\ No newline at end of file
1.16 +15 -1 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.15
retrieving revision 1.16
diff -u -w -r1.15 -r1.16
--- EJB3EntityAttributeFacadeLogicImpl.java 26 Jun 2006 14:40:34 -0000 1.15
+++ EJB3EntityAttributeFacadeLogicImpl.java 10 Jul 2006 05:29:36 -0000 1.16
@@ -40,6 +40,11 @@
*/
public static final String DEFAULT_ENUM_LITERAL_COLUMN_LENGTH = "entityDefaultEnumLiteralColumnLength";
+ /**
+ * The property that stores the defuult temporal type for date based attributes
+ */
+ public static final String ENTITY_DEFAULT_TEMPORAL_TYPE = "entityDefaultTemporalType";
+
// ---------------- constructor -------------------------------
public EJB3EntityAttributeFacadeLogicImpl (Object metaObject, String context)
@@ -467,7 +472,16 @@
*/
protected String handleGetTemporalType()
{
- return (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_PERSISTENCE_TEMPORAL_TYPE);
+ String temporalType = null;
+ if (this.getType().isDateType())
+ {
+ temporalType = (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_PERSISTENCE_TEMPORAL_TYPE);
+ if (StringUtils.isBlank(temporalType))
+ {
+ temporalType = String.valueOf(this.getConfiguredProperty(ENTITY_DEFAULT_TEMPORAL_TYPE));
+ }
+ }
+ return temporalType;
}
/**
1.18 +6 -0 cartridges/andromda-ejb3/src/changes/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/changes/changes.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -w -r1.17 -r1.18
--- changes.xml 4 Jul 2006 07:47:07 -0000 1.17
+++ changes.xml 10 Jul 2006 05:29:37 -0000 1.18
@@ -217,6 +217,12 @@
JIRA EJB-38 - The query in the DAO base class for finder methods with argument enum type has to set
the enum class as the parameter for the querty, not the value (name or ordinal).
</action>
+ <action dev="vancek" type="fix">
+ Reset EJB3ManageableEntityAttributeFacade metafacade mapping in metafacades.xml from using property element
+ to use context element. Otherwise, manageable entity attributes would map to EJB3EntityAttributeFacade.
+ This resulted in getTemporalType being refactored in EJB3EntityAttributeFacade and the overriding instance
+ in EJB3ManageableEntityAttributeFacade to be removed.
+ </action>
</release>
</body>
</document>
\ No newline at end of file
|
