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: Walter M. <wal...@us...> - 2007-07-01 19:22:40
|
User: walterim
Date: 07/07/01 12:22:42
Modified: andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud
Controller.java.vsl
Log:
Using only not hidden parameters in the search
Revision Changes Path
1.7 +15 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/Controller.java.vsl
Index: Controller.java.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/Controller.java.vsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- Controller.java.vsl 4 Mar 2007 19:08:34 -0000 1.6
+++ Controller.java.vsl 1 Jul 2007 19:22:42 -0000 1.7
@@ -309,7 +309,21 @@
}
public void doSearch(${manageable.formBeanType} form) throws Exception {
- final java.util.List list = ${manageable.manageableServiceAccessorCall}.read(
+
+ final java.util.List list;
+ //if all search fields are null, call readAll()
+ if(
+#set ($and = '')
+#foreach ($member in $manageable.manageableMembers)
+#if(!$member.hidden)##não está funcionando($manageable.searchable($member))
+ ${and} form.getSearchForm().${member.getterName}() == null
+#set ($and = '&&')
+#end
+#end
+ )
+ list=${manageable.manageableServiceAccessorCall}.readAll();
+ else
+ list = ${manageable.manageableServiceAccessorCall}.read(
#set ($comma = '')
#foreach ($member in $manageable.manageableMembers)
#if(!$member.hidden)##não está funcionando($manageable.searchable($member))
|
|
From: Walter M. <wal...@us...> - 2007-07-01 19:21:25
|
User: walterim
Date: 07/07/01 12:21:28
Modified: andromda-jsf2/src/main/resources/templates/jsf2/messages
messages.properties.vsl
Log:
Download button message
Revision Changes Path
1.4 +1 -0 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/messages/messages.properties.vsl
Index: messages.properties.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/messages/messages.properties.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- messages.properties.vsl 11 Jan 2007 17:37:00 -0000 1.3
+++ messages.properties.vsl 1 Jul 2007 19:21:28 -0000 1.4
@@ -179,6 +179,7 @@
action.close=Close
action.search=Search
action.new=New
+action.download=Download
action.delete.access.key=d
action.load.access.key=l
|
|
From: Walter M. <wal...@us...> - 2007-07-01 19:17:48
|
User: walterim
Date: 07/07/01 12:17:49
Modified: andromda-jsf2/src/main/resources/templates/jsf2/configuration
faces-config.xml.vsl
Log:
Correct JSF-34
Revision Changes Path
1.10 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/faces-config.xml.vsl
Index: faces-config.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/faces-config.xml.vsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- faces-config.xml.vsl 21 Feb 2007 19:41:22 -0000 1.9
+++ faces-config.xml.vsl 1 Jul 2007 19:17:49 -0000 1.10
@@ -69,7 +69,7 @@
<managed-bean-scope>application</managed-bean-scope>
<managed-property>
<property-name>label</property-name>
- <value>$useCase.titleValue</value>
+ <value>$useCase.titleKey</value>
</managed-property>
<managed-property>
<property-name>viewId</property-name>
|
|
From: Walter M. <wal...@us...> - 2007-07-01 19:12:41
|
User: walterim
Date: 07/07/01 12:12:42
Modified: andromda-ejb3/src/main/resources/templates/ejb3/crud
ManageableServiceRemote.vsl
ManageableServiceBase.vsl
Log:
Support to JSF2 manageable entities.
Revision Changes Path
1.5 +3 -0 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/crud/ManageableServiceRemote.vsl
Index: ManageableServiceRemote.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/crud/ManageableServiceRemote.vsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- ManageableServiceRemote.vsl 8 Oct 2006 15:23:57 -0000 1.4
+++ ManageableServiceRemote.vsl 1 Jul 2007 19:12:42 -0000 1.5
@@ -21,6 +21,9 @@
#end
#if ($manageable.read)
+ public $manageable.fullyQualifiedEntityName readById($identifier.type.fullyQualifiedName $identifier.name)
+ throws ${manageable.fullyQualifiedManageableServiceReadExceptionName};
+
public java.util.List read($memberList)
throws ${manageable.fullyQualifiedManageableServiceReadExceptionName};
1.8 +18 -0 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/crud/ManageableServiceBase.vsl
Index: ManageableServiceBase.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/crud/ManageableServiceBase.vsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- ManageableServiceBase.vsl 8 Oct 2006 15:23:57 -0000 1.7
+++ ManageableServiceBase.vsl 1 Jul 2007 19:12:42 -0000 1.8
@@ -157,6 +157,24 @@
#end
#if ($manageable.read)
/**
+ * Entity read operation
+ *
+ * @return $manageable.fullyQualifiedEntityName
+ * @throws $manageable.fullyQualifiedManageableServiceReadExceptionName
+ */
+ public $manageable.fullyQualifiedEntityName readById($identifier.type.fullyQualifiedName $identifier.name)
+ throws ${manageable.fullyQualifiedManageableServiceReadExceptionName}
+ {
+ try{
+ return (${manageable.fullyQualifiedEntityName})emanager.find(${manageable.fullyQualifiedEntityName}.class, ${identifier.name});
+ }
+ catch (Exception ex)
+ {
+ throw new ${manageable.fullyQualifiedManageableServiceReadExceptionName}(ex);
+ }
+ }
+
+ /**
* Read operation
*
* @return java.util.List
|
|
From: Walter M. <wal...@us...> - 2007-07-01 19:11:57
|
User: walterim
Date: 07/07/01 12:11:59
Modified: andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades
JSFViewLogicImpl.java
Log:
Avoiding error when the transition does not have parameters.
Revision Changes Path
1.3 +3 -0 cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFViewLogicImpl.java
Index: JSFViewLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFViewLogicImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- JSFViewLogicImpl.java 4 Mar 2007 19:08:31 -0000 1.2
+++ JSFViewLogicImpl.java 1 Jul 2007 19:11:59 -0000 1.3
@@ -381,6 +381,9 @@
*/
protected boolean handleIsNeedsFileUpload()
{
+ if(this.getAllActionParameters().size() == 0)
+ return false;
+
for (final Iterator iterator = this.getAllActionParameters().iterator(); iterator.hasNext();)
{
final Object object = iterator.next();
|
|
From: Vance K. <va...@us...> - 2007-06-30 03:53:47
|
User: vancek
Date: 07/06/29 20:53:48
Modified: andromda-ejb3/src/site changes.xml
andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3AssociationFacadeLogicImpl.java
EJB3MetafacadeUtils.java
andromda-ejb3/src/test/expected cartridge-output.zip
andromda-ejb3/src/test/uml EJB3CartridgeTestModel.xml.zip
andromda-ejb3/src/main/resources/templates/ejb3
EntityEmbeddable.vsl
andromda-ejb3/src/site/axdoc howto.xml howto2.xml
Log:
ejb-50 - add join table for one-to-many unidirectional associations
Revision Changes Path
1.24 +17 -1 cartridges/andromda-ejb3/src/site/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/changes.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -w -r1.23 -r1.24
--- changes.xml 23 Jun 2007 09:07:35 -0000 1.23
+++ changes.xml 30 Jun 2007 03:53:47 -0000 1.24
@@ -484,11 +484,27 @@
<action dev="vancek" due-to="heapifyman" type="add">
JIRA EJB-56 - Add support for multiplicity on enumeration types.
</action>
- <action dev="vancek" tue-to="mrkanban" type="fix">
+ <action dev="vancek" due-to="mrkanban" type="fix">
When a child entity inherits from a mapped superclass and the child entity has an implementation, the
child mapped superclass did not extend the parent mapped superclass correctly. This was a side-effect of
applying EJB-53.
</action>
+ <action dev="vancek" due-to="darquerus " type="add">
+ JIRA EJB-59 - Add support for setting the join table for unidirectional one-to-many associations. Currently,
+ this exists for many-to-many associations using the JoinTable annotation.
+ Existing users must be aware that this will change the default behaviour of the cartridge for the join
+ table name. The EJB 3.0 spec defines the join table name with the owning side first and underscore
+ separated. AndroMDA (not the EJB3 cartridge) defines the inverse end first with a digit two (2) as the
+ separater and truncates the name by the specified length in the andromda.xml namespace property
+ maxSqlNameLength. Prior to this change (lack of a JoinTable annotation), the EJB 3.0 default name was
+ used for one-to-many associations and the AndroMDA naming convention was used for many-to-many associations.
+ We are now adopting the the EJB 3.0 naming convention for join table names for both association types.
+ To avoid recreation of join tables for existing many-to-many associations, you have the choice of specifying
+ the @andromda.persistence.table tagged value on the specific associations or setting the association name
+ to correspond to the join table. You should also define the namespace property
+ relationNameSeparator in the andromda.xml within the ejb3 namespace with a value of underscore (_) if you
+ wish to adopt this separator. The default separator will remain the AndroMDA default digit two.
+ </action>
</release>
</body>
</document>
\ No newline at end of file
1.5 +96 -4 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3AssociationFacadeLogicImpl.java
Index: EJB3AssociationFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3AssociationFacadeLogicImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- EJB3AssociationFacadeLogicImpl.java 17 Jan 2007 00:50:55 -0000 1.4
+++ EJB3AssociationFacadeLogicImpl.java 30 Jun 2007 03:53:47 -0000 1.5
@@ -1,5 +1,18 @@
package org.andromda.cartridges.ejb3.metafacades;
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.andromda.metafacades.uml.AssociationEndFacade;
+import org.andromda.metafacades.uml.Entity;
+import org.andromda.metafacades.uml.EntityMetafacadeUtils;
+import org.andromda.metafacades.uml.MetafacadeUtils;
+import org.andromda.metafacades.uml.ModelElementFacade;
+import org.andromda.metafacades.uml.UMLMetafacadeProperties;
+import org.andromda.metafacades.uml.UMLProfile;
+import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang.StringUtils;
+
/**
* MetafacadeLogic implementation for org.andromda.cartridges.ejb3.metafacades.EJB3AssociationFacade.
*
@@ -19,15 +32,94 @@
// --------------- methods ---------------------
/**
+ * Override to provide support for One-2-Many unidirectional associations as well as Many-2-Many.
+ *
* Returns the EJB3 cartridge specific table name for the association
*/
public String getTableName()
{
- String tableName = super.getTableName();
- if (getName().toLowerCase().startsWith(tableName.toLowerCase()))
+ String tableName = null;
+ final Collection ends = this.getAssociationEnds();
+ if (ends != null && !ends.isEmpty())
+ {
+ for (Iterator iterator = ends.iterator(); iterator.hasNext();)
{
- tableName = getRelationName().replaceAll("-", "_").toUpperCase();
+ final EJB3AssociationEndFacade end = (EJB3AssociationEndFacade)iterator.next();
+ if ((end.isMany2Many() && end.isOwning()) ||
+ (end.isOne2Many() && !end.isNavigable() && end.getOtherEnd().isNavigable()))
+ {
+ // prevent ClassCastException if the association isn't an
+ // Entity
+ if (Entity.class.isAssignableFrom(end.getType().getClass()))
+ {
+ final String prefixProperty = UMLMetafacadeProperties.TABLE_NAME_PREFIX;
+ final String tableNamePrefix =
+ this.isConfiguredProperty(prefixProperty)
+ ? ObjectUtils.toString(this.getConfiguredProperty(prefixProperty)) : null;
+ tableName =
+ EJB3MetafacadeUtils.getSqlNameFromTaggedValue(
+ tableNamePrefix,
+ this,
+ UMLProfile.TAGGEDVALUE_PERSISTENCE_TABLE,
+ ((Entity)end.getType()).getMaxSqlNameLength(),
+ null,
+ this.getConfiguredProperty(UMLMetafacadeProperties.SQL_NAME_SEPARATOR));
+ }
+ break;
+ }
}
+ }
+
+// if (StringUtils.isNotBlank(tableName) && getName().toLowerCase().startsWith(tableName.toLowerCase()))
+// {
+// tableName = getRelationName().replaceAll("-", "_").toUpperCase();
+// }
+
return tableName;
}
+
+ /**
+ * Override the default implementation to use the current getRelationName implementation
+ */
+ public String getName()
+ {
+ String name = (super.getName().equalsIgnoreCase(super.getRelationName()) ? null : super.getName());
+
+ // if the name isn't defined, use the this implementation of relation name
+ if (StringUtils.isEmpty(name))
+ {
+ name = this.getRelationName();
+ }
+ return name;
+ }
+
+ /**
+ * Override the default implementation to set the owning side name first followed by inverse side.
+ * If there is no owning side defined, then adopt the default logic of using alphabetical ordering.
+ */
+ public String getRelationName()
+ {
+ final Collection ends = this.getAssociationEnds();
+ final Iterator endIt = ends.iterator();
+ final EJB3AssociationEndFacade firstEnd = (EJB3AssociationEndFacade)endIt.next();
+ final EJB3AssociationEndFacade secondEnd = (EJB3AssociationEndFacade)endIt.next();
+ final String separator = String.valueOf(
+ this.getConfiguredProperty(UMLMetafacadeProperties.RELATION_NAME_SEPARATOR));
+
+ if (secondEnd.isOwning())
+ {
+ return secondEnd.getName() + separator + firstEnd.getName();
+ }
+ else if (firstEnd.isOwning())
+ {
+ return firstEnd.getName() + separator + secondEnd.getName();
+ }
+ else
+ {
+ return MetafacadeUtils.toRelationName(
+ firstEnd.getName(),
+ secondEnd.getName(),
+ separator);
+ }
+ }
}
\ No newline at end of file
1.11 +65 -0 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3MetafacadeUtils.java
Index: EJB3MetafacadeUtils.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3MetafacadeUtils.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- EJB3MetafacadeUtils.java 16 Apr 2007 14:09:41 -0000 1.10
+++ EJB3MetafacadeUtils.java 30 Jun 2007 03:53:47 -0000 1.11
@@ -5,6 +5,7 @@
import org.andromda.core.common.ExceptionUtils;
import org.andromda.metafacades.uml.AttributeFacade;
import org.andromda.metafacades.uml.ClassifierFacade;
+import org.andromda.metafacades.uml.EntityMetafacadeUtils;
import org.andromda.metafacades.uml.ModelElementFacade;
import org.andromda.metafacades.uml.OperationFacade;
import org.andromda.metafacades.uml.UMLProfile;
@@ -504,4 +505,68 @@
return buf.toString();
}
}
+
+ /**
+ * Gets the SQL name. (i.e. column name, table name, etc.). If it can't find
+ * the corresponding tagged value with the specified <code>name</code>,
+ * then it uses the element name by default and just returns that.
+ *
+ * @param prefix the optional prefix to add to the sql name (i.e. table name
+ * prefix, etc.).
+ * @param element from which to retrieve the SQL name.
+ * @param name the name of the tagged value.
+ * @param nameMaxLength if this is not null, then the name returned will be
+ * trimmed to this length (if it happens to be longer).
+ * @param suffix the optional suffix to add to the sql name (i.e. foreign
+ * key suffix, etc.)
+ * @param separator character used to separate words
+ * @return the SQL name as a String.
+ */
+ public static String getSqlNameFromTaggedValue(
+ String prefix,
+ final EJB3AssociationFacade element,
+ String name,
+ final Short nameMaxLength,
+ String suffix,
+ final Object separator)
+ {
+ if (element != null)
+ {
+ Object value = element.findTaggedValue(name);
+ StringBuffer buffer = new StringBuffer(StringUtils.trimToEmpty((String)value));
+ if (StringUtils.isEmpty(buffer.toString()))
+ {
+ // if we can't find the tagValue then use the
+ // element name for the name
+ buffer = new StringBuffer(
+ EntityMetafacadeUtils.toSqlName(
+ element.getName(),
+ separator));
+
+ suffix = StringUtils.trimToEmpty(suffix);
+ prefix = StringUtils.trimToEmpty(prefix);
+ if (nameMaxLength != null)
+ {
+ final short maxLength = (short)(nameMaxLength.shortValue() - suffix.length() - prefix.length());
+ buffer =
+ new StringBuffer(
+ EntityMetafacadeUtils.ensureMaximumNameLength(
+ buffer.toString(),
+ new Short(maxLength)));
+ }
+ if (StringUtils.isNotBlank(prefix))
+ {
+ buffer.insert(
+ 0,
+ prefix);
+ }
+ if (StringUtils.isNotBlank(suffix))
+ {
+ buffer.append(suffix);
+ }
+ }
+ name = buffer.toString();
+ }
+ return name;
+ }
}
\ No newline at end of file
1.14 +499 -492 cartridges/andromda-ejb3/src/test/expected/cartridge-output.zip
<<Binary file>>
1.9 +249 -258 cartridges/andromda-ejb3/src/test/uml/EJB3CartridgeTestModel.xml.zip
<<Binary file>>
1.54 +7 -0 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.53
retrieving revision 1.54
diff -u -w -r1.53 -r1.54
--- EntityEmbeddable.vsl 23 Jun 2007 09:07:36 -0000 1.53
+++ EntityEmbeddable.vsl 30 Jun 2007 03:53:48 -0000 1.54
@@ -628,6 +628,13 @@
#* *##else
@javax.persistence.OneToMany(#if ($target.cascadeType)cascade = {${target.cascadeType}}#set ($argExists = true)#end#if ($associationEnd.navigable)#if ($argExists) ,#end#**#mappedBy = "${associationEnd.name}"#set ($argExists = true)#end#if ($target.eager)#if ($argExists), #end#**#fetch = javax.persistence.FetchType.EAGER#end)
#* *##end
+##
+## Set the JointTable annotation to limit the association table name length.
+## This is only set if the relationship is unidirectional.
+##
+#* *##if (!$associationEnd.navigable && $target.navigable)
+ @javax.persistence.JoinTable(name = "${associationEnd.association.tableName}")
+#* *##end
#* *##if ($target.map)
@javax.persistence.MapKey#if ($target.hasTaggedValue("@andromda.persistence.collection.index"))(name = "${target.collectionIndexName}")#end
1.5 +1 -1 cartridges/andromda-ejb3/src/site/axdoc/howto.xml
Index: howto.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/axdoc/howto.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- howto.xml 4 Feb 2007 04:18:18 -0000 1.4
+++ howto.xml 30 Jun 2007 03:53:48 -0000 1.5
@@ -67,7 +67,7 @@
<li><a href="howto2.html#Cascading">Cascading</a></li>
<li><a href="howto2.html#Fetch_Type">Fetch Type</a></li>
<li><a href="howto2.html#Ordering_Collection_Valued_Association">Ordering Collection Valued Association</a></li>
- <li><a href="howto2.html#Join_Table_Many_To_Many">Join Table for Many-To-Many Relationship</a></li>
+ <li><a href="howto2.html#Join_Table_Many_To_Many_And_One_To_Many">Join Table for Many-To-Many and One-To-Many Relationships</a></li>
<li><a href="howto2.html#Aggregation_Composition">Aggregation and Composition</a></li>
<li><a href="howto2.html#Transient_Relationships">Transient Relationships</a></li>
<li><a href="howto2.html#Tips">Tips</a></li>
1.4 +20 -7 cartridges/andromda-ejb3/src/site/axdoc/howto2.xml
Index: howto2.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/axdoc/howto2.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- howto2.xml 7 May 2007 13:50:26 -0000 1.3
+++ howto2.xml 30 Jun 2007 03:53:48 -0000 1.4
@@ -264,18 +264,31 @@
</ul>
</p>
</subsection>
- <a name="Join_Table_Many_To_Many"/>
- <subsection name="Join Table for Many-To-Many Relationship">
+ <a name="Join_Table_Many_To_Many_And_One_To_Many"/>
+ <subsection name="Join Table for Many-To-Many and One-To-Many Relationship">
<p>
- For a Many-To-Many association, the <code>@javax.persistence.JoinTable</code> annotation
- is specified on the OWNING side of the association. This is determined by modelling the
+ For a Many-To-Many and now One-To-Many association, the <code>@javax.persistence.JoinTable</code>
+ annotation is specified on the OWNING side of the association. This is determined by modeling the
<code>owning</code> side as an aggregation or composition.
</p>
<p>
- The join table name is defined by default to be the table name of the primary table of owning
+ If there is no owning side defined, then the AndroMDA default convention of
+ an alphabetical name ordering is adopted.
+ </p>
+ <p>
+ The join table name is defined by default to be the table name of the primary table of the owning
side concatenated with the table name of the primary table of the inverse side.
- You can override the <code>name</code> property by modelling the
- <code>@andromda.persistence.table</code> tagged value on the assocation.
+ You can override the <code>name</code> property by modeling the
+ <code>@andromda.persistence.table</code> tagged value on the assocation or alternatively,
+ specify a name for the association.
+ </p>
+ <p>
+ The default relation name separator is adopted from the AndroMDA metafacade namespace layer.
+ You can simply change this in your application's andromda.xml by specifying the following
+ property in the <b>ejb3</b> namespace.
+<source language="java"><![CDATA[
+ <property name="relationNameSeparator">_</property>
+]]></source>
</p>
</subsection>
<a name="Aggregation_Composition"/>
|
|
From: Chad B. <cwb...@us...> - 2007-06-29 19:26:03
|
User: cwbrandon
Date: 07/06/29 12:25:29
Removed: andromda-jsf2/src/main/resources/resources/lib
trinidad-api-incubator-stable-06-nov-SNAPSHOT.jar
trinidad-impl-incubator-stable-06-nov-SNAPSHOT.jar
Log:
get rid of libraries since they've released 1.0.1
|
|
From: Chad B. <cwb...@us...> - 2007-06-29 15:17:11
|
User: cwbrandon
Date: 07/06/29 08:17:10
Modified: andromda-jsf2 pom.xml
Log:
remove unneeded dependencies
Revision Changes Path
1.6 +0 -13 cartridges/andromda-jsf2/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/pom.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- pom.xml 21 Feb 2007 10:11:42 -0000 1.5
+++ pom.xml 29 Jun 2007 15:17:10 -0000 1.6
@@ -18,19 +18,6 @@
<artifactId>${pom.artifactId}-components</artifactId>
<version>${pom.version}</version>
</dependency>
- <dependency>
- <groupId>org.andromda.cartridges</groupId>
- <artifactId>andromda-meta-cartridge</artifactId>
- <version>3.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.andromda.profiles.uml14</groupId>
- <artifactId>andromda-profile</artifactId>
- <version>3.2</version>
- <type>xml.zip</type>
- <scope>runtime</scope>
- </dependency>
</dependencies>
<build>
<plugins>
|
|
From: Vance K. <va...@us...> - 2007-06-26 12:11:34
|
User: vancek
Date: 07/06/26 05:11:36
Modified: andromda-ejb3/src/main/resources/META-INF/andromda
namespace.xml
Log:
Expand entityInheritanceStrategy docs
Revision Changes Path
1.41 +12 -4 cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/namespace.xml
Index: namespace.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/namespace.xml,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -w -r1.40 -r1.41
--- namespace.xml 14 Jun 2007 14:38:30 -0000 1.40
+++ namespace.xml 26 Jun 2007 12:11:35 -0000 1.41
@@ -816,12 +816,20 @@
</a>
tagged value, can be the following possible values:
<ul>
- <li>SINGLE_TABLE - table per hierarchy.</li>
<li>
- TABLE_PER_CLASS - table per class in
- hierarchy.
+ SINGLE_TABLE - A single table per class hierarchy. One table will have all
+ properties of every class in the hierarchy.
+ </li>
+ <li>
+ TABLE_PER_CLASS - A table per concrete class in the
+ hierarchy. Each class will have a table dedicated to it, with all of its
+ properties and the properties of its superclass mapped to this table.
+ </li>
+ <li>
+ JOINED - A table per subclass. Each class will have its own table. Each
+ table will have only the properties that are defined in that particular class.
+ These tables will not have properties of any superclass or subclass.
</li>
- <li>JOINED - Table per class.</li>
</ul>
</documentation>
</property>
|
|
From: Vance K. <va...@us...> - 2007-06-23 09:07:34
|
User: vancek
Date: 07/06/23 02:07:36
Modified: andromda-ejb3/src/site changes.xml
andromda-ejb3/src/test/expected cartridge-output.zip
andromda-ejb3/src/test/uml EJB3CartridgeTestModel.xml.zip
andromda-ejb3/src/main/resources/templates/ejb3
EntityEmbeddable.vsl
Log:
fix for child entity with an implementation extending a parent mapped superclass
Revision Changes Path
1.23 +5 -0 cartridges/andromda-ejb3/src/site/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/changes.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -w -r1.22 -r1.23
--- changes.xml 23 Jun 2007 08:06:44 -0000 1.22
+++ changes.xml 23 Jun 2007 09:07:35 -0000 1.23
@@ -484,6 +484,11 @@
<action dev="vancek" due-to="heapifyman" type="add">
JIRA EJB-56 - Add support for multiplicity on enumeration types.
</action>
+ <action dev="vancek" tue-to="mrkanban" type="fix">
+ When a child entity inherits from a mapped superclass and the child entity has an implementation, the
+ child mapped superclass did not extend the parent mapped superclass correctly. This was a side-effect of
+ applying EJB-53.
+ </action>
</release>
</body>
</document>
\ No newline at end of file
1.13 +505 -480 cartridges/andromda-ejb3/src/test/expected/cartridge-output.zip
<<Binary file>>
1.8 +259 -272 cartridges/andromda-ejb3/src/test/uml/EJB3CartridgeTestModel.xml.zip
<<Binary file>>
1.53 +1 -1 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.52
retrieving revision 1.53
diff -u -w -r1.52 -r1.53
--- EntityEmbeddable.vsl 14 Jun 2007 15:06:14 -0000 1.52
+++ EntityEmbeddable.vsl 23 Jun 2007 09:07:36 -0000 1.53
@@ -131,7 +131,7 @@
public#if ($entity.entityImplementationRequired) abstract class ${entity.entityEmbeddableName}#else#if($entity.abstract) abstract#end class ${entity.entityName}#end
#if($entity.requiresGeneralizationMapping)
-#**##if($entity.embeddableSuperclassGeneralizationExists && $entity.entityImplementationRequired)
+#**##if($entity.embeddableSuperclassGeneralizationExists && $entity.generalization.entityImplementationRequired)
extends ${entity.generalization.fullyQualifiedEntityEmbeddableName}
#**##else
extends ${entity.generalization.fullyQualifiedName}
|
|
From: Vance K. <va...@us...> - 2007-06-23 08:06:45
|
User: vancek
Date: 07/06/23 01:06:45
Modified: andromda-ejb3/src/site changes.xml
andromda-ejb3/src/test/expected cartridge-output.zip
andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3EntityAttributeFacadeLogicImpl.java
Log:
ejb-56 add support for multiplicity on enumeration types
Revision Changes Path
1.22 +3 -0 cartridges/andromda-ejb3/src/site/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/changes.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -w -r1.21 -r1.22
--- changes.xml 14 Jun 2007 15:06:08 -0000 1.21
+++ changes.xml 23 Jun 2007 08:06:44 -0000 1.22
@@ -481,6 +481,9 @@
JIRA EJB-55 - Fix optimistic locking - version attribute. Set the annotation on the getter and change
modifier on version attribute to public.
</action>
+ <action dev="vancek" due-to="heapifyman" type="add">
+ JIRA EJB-56 - Add support for multiplicity on enumeration types.
+ </action>
</release>
</body>
</document>
\ No newline at end of file
1.12 +480 -469 cartridges/andromda-ejb3/src/test/expected/cartridge-output.zip
<<Binary file>>
1.20 +2 -2 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.19
retrieving revision 1.20
diff -u -w -r1.19 -r1.20
--- EJB3EntityAttributeFacadeLogicImpl.java 13 Jun 2007 16:31:39 -0000 1.19
+++ EJB3EntityAttributeFacadeLogicImpl.java 23 Jun 2007 08:06:45 -0000 1.20
@@ -74,7 +74,7 @@
EJB3EntityFacade entity = (EJB3EntityFacade)this.getOwner();
/**
- * Excluse ONLY if single table inheritance exists
+ * Exclude ONLY if single table inheritance exists
*/
if (entity.isRequiresGeneralizationMapping() && entity.isInheritanceSingleTable()
&& !entity.isEmbeddableSuperclassGeneralizationExists())
@@ -449,7 +449,7 @@
}
if (!isOrdinal)
{
- definition = "VARCHAR(" + length + ") NOT NULL";
+ definition = "VARCHAR(" + length + ")";
}
}
return definition;
|
|
From: Vance K. <va...@us...> - 2007-06-19 15:58:31
|
User: vancek
Date: 07/06/19 08:58:33
Modified: profiles/uml-2.0/seam/src/main/uml
andromda-profile-seam.xml.zip
Log:
ejb-60 - fix problem with profile loading in MD - referencing seam profile 1.1-SNAPSHOT
Revision Changes Path
1.2 +123 -137 plugins/profiles/uml-2.0/seam/src/main/uml/andromda-profile-seam.xml.zip
<<Binary file>>
|
|
From: Vance K. <va...@us...> - 2007-06-19 15:33:51
|
User: vancek
Date: 07/06/19 08:33:43
Modified: andromda-seam/src/site changes.xml site.xml
Added: andromda-seam/src/site/axdoc startup.xml
Log:
improve docs & add getting started procedures
Revision Changes Path
1.3 +3 -0 cartridges/andromda-seam/src/site/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-seam/src/site/changes.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- changes.xml 20 May 2007 07:06:55 -0000 1.2
+++ changes.xml 19 Jun 2007 15:33:42 -0000 1.3
@@ -15,6 +15,9 @@
when you have SFSB seam components.
(Stateful session bean component should have a method marked @Remove @Destroy)
</action>
+ <action dev="vancek" due-to="" type="add">
+ Added startup.xml xdoc thanks to hermida.
+ </action>
</release>
</body>
</document>
\ No newline at end of file
1.2 +8 -0 cartridges/andromda-seam/src/site/site.xml
Index: site.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-seam/src/site/site.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- site.xml 12 Apr 2007 15:29:31 -0000 1.1
+++ site.xml 19 Jun 2007 15:33:42 -0000 1.2
@@ -15,6 +15,14 @@
<item name="Cartridges" href="http://galaxy.andromda.org/docs/andromda-cartridges/index.html"/>
<item name="AndroMDA" href="http://www.andromda.org"/>
</links>
+ <menu name="Overview">
+ <item name="Seam Cartridge" href="index.html"/>
+ <item name="Getting Started Guide" href="startup.html"/>
+ </menu>
+ <menu name="Model">
+ <item name="Profile" href="profile.html"/>
+ <item name="Namespace" href="namespace.html"/>
+ </menu>
${reports}
</body>
</project>
1.1 cartridges/andromda-seam/src/site/axdoc/startup.xml
Index: startup.xml
===================================================================
<?xml version="1.0" encoding="iso-8859-1" ?>
<document>
<properties>
<author email="lea...@fm...">Leandro Hermida</author>
<title>AndroMDA + EJB3 + Seam Step-by-Step Getting Started Guide</title>
</properties>
<body>
<section name="AndroMDA + EJB3 + Seam Step-by-Step Getting Started Guide">
<p>
This guide gives you a step-by-step guide to setting up AndroMDA with the EJB3 and Seam
cartridges and to start you on your first project. The commands I show are for installing
everything from your home directory on a Unix/Linux system using Bash as your shell.
I imagine that the steps would be similar on Windows.
</p>
<a name="Java JDK 5.0"/>
<subsection name="Java JDK 5.0">
<p>
Open a terminal and type:
</p>
<source><![CDATA[
[user@server ~]$ mkdir ~/java
[user@server ~]$ cd java
[user@server java]$ firefox http://java.sun.com/javase/downloads/index_jdk5.jsp
]]></source>
<p>
Scroll down the web page and click the button to download just <b>JDK 5.0 Update xx</b>
(presently xx = 12). Select the correct self-extracting file for your hardware and
OS (e.g. jdk-1_5_0_12-linux-i586.bin) and save this file into the <b>~/java</b> folder.
Back in the terminal:
</p>
<source><![CDATA[
[user@server java]$ chmod 744 jdk-1_5_0_12-linux-i586.bin
[user@server java]$ ./jdk-1_5_0_12-linux-i586.bin
]]></source>
<p>
The installer will unpack everything to the directory jdk1.5.0_12. After it finishes
type:
</p>
<source><![CDATA[
[user@server java]$ ln -s jdk1.5.0_12 current
]]></source>
<p>
Now in your favorite editor edit <b>~/.bash_profile</b> and add:
</p>
<source><![CDATA[
JAVA_HOME=$HOME/java/current
export JAVA_HOME
]]></source>
<p>
Also append <code>$JAVA_HOME/bin</code> to the front of the already existing <code>PATH</code>
definition. It should look something like:
</p>
<source><![CDATA[
PATH=$JAVA_HOME/bin:$PATH:$HOME/bin
export PATH
]]></source>
<p>
Source your updated <b>~/.bash_profile</b>:
</p>
<source><![CDATA[
[user@server ~]$ . ~/.bash_profile
]]></source>
</subsection>
<a name="JBoss AS 4.0.5 with EJB3 Profile via JEMS Installer"/>
<subsection name="JBoss AS 4.0.5 with EJB3 Profile via JEMS Installer">
<p>
In your terminal type:
</p>
<source><![CDATA[
[user@server ~]$ mkdir ~/jboss
[user@server ~]$ cd jboss
[user@server jboss]$ firefox http://labs.jboss.com/jemsinstaller/
]]></source>
<p>
Scroll down the web page and click the link to download <b>jems-installer-1.2.0.GA.jar</b>
Save this file into the <b>~/jboss</b> folder. Back in the terminal:
</p>
<source><![CDATA[
[user@server jboss]$ java -jar jems-installer-1.2.0.GA.jar
]]></source>
<p>
A graphical installer will start. When prompted for the installation path, adjust the
default value to <b>/path/to/your/home/jboss/jboss-4.0.5.GA</b>. When prompted for the
installation profile make sure to select <b>ejb3</b> or <b>ejb3-clustered</b>. Proceed
with the rest of the graphical installation. When it completes go back to the terminal
and type:
</p>
<source><![CDATA[
[user@server jboss]$ ln -s jboss-4.0.5.GA current
]]></source>
<p>
Edit <b>~/.bash_profile</b> again and add:
</p>
<source><![CDATA[
JBOSS_HOME=$HOME/jboss/current
export JBOSS_HOME
]]></source>
<p>
Source your updated <b>~/.bash_profile</b>:
</p>
<source><![CDATA[
[user@server ~]$ . ~/.bash_profile
]]></source>
</subsection>
<a name="JBoss Seam"/>
<subsection name="JBoss Seam">
<p>
In your terminal type:
</p>
<source><![CDATA[
[user@server ~]$ mkdir ~/jboss/seam
[user@server ~]$ cd jboss/seam
[user@server seam]$ firefox http://labs.jboss.com/jbossseam/download/
]]></source>
<p>
Click on the link to download JBoss Seam 1.2.1 GA and save the file in <b>~/jboss/seam</b>.
Back in the terminal type:
</p>
<source><![CDATA[
[user@server seam]$ unzip jboss-seam-1.2.1.GA.zip
[user@server seam]$ ln -s jboss-seam-1.2.1.GA current
[user@server seam]$ cd jboss-seam-1.2.1.GA
]]></source>
<p>
Edit the <b>build.properties</b> file to read:
</p>
<source><![CDATA[
#tomcat.home = C:\\Tomcat-5.5
jboss.home = /path/to/your/home/jboss/current
]]></source>
</subsection>
<a name="Maven2"/>
<subsection name="Maven2">
<p>
In your terminal type:
</p>
<source><![CDATA[
[user@server ~]$ mkdir ~/maven
[user@server ~]$ cd maven
[user@server maven]$ firefox http://archive.apache.org/dist/maven/binaries/
]]></source>
<p>
Scroll down and click to download the file <b>maven-2.0.5-bin.zip</b>. The latest maven 2.0.6
does not work when trying to build AndroMDA later. Back in your terminal type:
</p>
<source><![CDATA[
[user@server maven]$ unzip maven-2.0.5-bin.zip
[user@server maven]$ ln -s maven-2.0.5 current
]]></source>
<p>
Edit <b>~/.bash_profile</b> and add:
</p>
<source><![CDATA[
M2_HOME=$HOME/maven/current
export M2_HOME
M2_REPO=$HOME/.m2/repository
export M2_REPO
MAVEN_OPTS="-Xmx512m -Xms256m -XX:PermSize=128m -XX:MaxPermSize=256m"
export MAVEN_OPTS
]]></source>
<p>
Also append <code>$M2_HOME/bin</code> to the front your<code>PATH</code>
definition. It should look something like:
</p>
<source><![CDATA[
PATH=$JAVA_HOME/bin:$M2_HOME/bin:$PATH:$HOME/bin
export PATH
]]></source>
<p>
Source your updated <b>~/.bash_profile</b>:
</p>
<source><![CDATA[
[user@server ~]$ . ~/.bash_profile
]]></source>
<p>
Now we need to create the Maven repository. We do this automatically by creating a dummy
project. In the terminal type:
</p>
<source><![CDATA[
[user@server ~]$ mvn archetype:create -DgroupId=testproj -DartifactId=testproj
]]></source>
<p>
At the end of the process you should see <b>BUILD SUCCESSFUL</b>. Then remove the dummy
project:
</p>
<source><![CDATA[
[user@server ~]$ rm -rf testproj
]]></source>
</subsection>
<a name="AndroMDA"/>
<subsection name="AndroMDA">
<p>
From your home directory CVS checkout the latest 3.x-SNAPSHOT of AndroMDA:
</p>
<source><![CDATA[
[user@server ~]$ cvs -d:pserver:ano...@an...:/cvsroot/andromda login
When prompted for password hit <ENTER>
[user@server ~]$ cvs -z3 -d:pserver:ano...@an...:/cvsroot/andromda co -P -r V3_x_HEAD andromda-all
]]></source>
<p>
It will take a while to download everything. The directory <b>~/andromda-all</b> will be
created. When it finishes type:
</p>
<source><![CDATA[
[user@server ~]$ cd andromda-all
[user@server andromda-all]$ mvn -N antrun:run
]]></source>
<p>
At the end of the process you should see <b>BUILD SUCCESSFUL</b>. Then type:
</p>
<source><![CDATA[
[user@server andromda-all]$ mvn install
]]></source>
<p>
This will take a long time. At the end of the process you should see <b>BUILD SUCCESSFUL</b> again.
</p>
</subsection>
<a name="AndroMDA EJB3 and Seam Cartridges"/>
<subsection name="AndroMDA EJB3 and Seam Cartridges">
<p>
From your home directory CVS checkout the latest AndroMDA plugins:
</p>
<source><![CDATA[
[user@server ~]$ cvs -d:pserver:ano...@an...:/cvsroot/andromdaplugins login
When prompted for password hit <ENTER>
[user@server ~]$ cvs -z3 -d:pserver:ano...@an...:/cvsroot/andromdaplugins co -P andromda-plugins
]]></source>
<p>
The directory <b>~/andromda-plugins</b> will be created. Next type:
</p>
<source><![CDATA[
[user@server ~]$ cd andromda-plugins/cartridges/andromda-ejb3
[user@server andromda-ejb3]$ mvn install
]]></source>
<p>
At the end you should see <b>BUILD SUCCESSFUL</b>. Next:
</p>
<source><![CDATA[
[user@server ~]$ cd ~/andromda-plugins/cartridges/andromda-seam
]]></source>
<p>
Edit <b>pom.xml</b>. At the bottom of the file change <b>andromda3.root</b>
to the correct path:
</p>
<source><![CDATA[
<andromda3.root>/path/to/your/home/andromda-all</andromda3.root>
]]></source>
<p>
Back in the terminal type:
</p>
<source><![CDATA[
[user@server andromda-seam]$ mvn install
]]></source>
<p>
At the end you should see <b>BUILD SUCCESSFUL</b>.
</p>
</subsection>
<a name="AndroMDA Seam Profile"/>
<subsection name="AndroMDA Seam Profile">
<p>
From your home directory, go to the AndroMDA Seam profile directory for the UML version you are using
(uml-2.0 or uml-1.4) and build the profile project. For example:
</p>
<source><![CDATA[
[user@server ~]$ cd andromda-plugins/profiles/uml-2.0/seam
[user@server seam]$ mvn install
]]></source>
<p>
At the end you should see <b>BUILD SUCCESSFUL</b>. The profile will be placed in your Maven
repository, i.e.
<code>$M2_REPO/org/andromda/profiles/uml2/andromda-profile-seam/1.1-SNAPSHOT/andromda-profile-seam-1.1-SNAPSHOT.xml.zip</code>
</p>
</subsection>
<a name="Creating Your Project"/>
<subsection name="Creating Your Project">
<p>
Now you want to build your project scaffold using AndroMDApp. Below I show an example.
Your particular setup will be different but what is important is that you
do a <b>j2ee</b> project, <b>ejb3</b> persistence, <b>yes</b> to web user interface and
<b>jsf</b> for the interface technology. This will then bring up the Seam option. From the
terminal, type:
</p>
<source><![CDATA[
[user@server ~]$ mvn org.andromda.maven.plugins:andromdapp-maven-plugin:generate
[INFO] Scanning for projects...
[INFO] ----------------------------------------------------------------------------
[INFO] Building Maven Default Project
[INFO] task-segment: [org.andromda.maven.plugins:andromdapp-maven-plugin:generate] (aggregator-style)
[INFO] ----------------------------------------------------------------------------
[INFO] [andromdapp:generate]
log4j:WARN No appenders could be found for logger (org.apache.commons.digester.Digester).
log4j:WARN Please initialize the log4j system properly.
INFO [AndroMDA] discovered andromdapp type --> 'richclient'
INFO [AndroMDA] discovered andromdapp type --> 'j2ee'
Please choose the type of application to generate [richclient, j2ee]
j2ee
Please enter the location in which your new application will be created (i.e. f:/java/development):
/path/to/my/projects
Please enter your first and last name (i.e. Chad Brandon):
John Doe
Which kind of modeling tool will you use? [uml1.4, uml2, emf-uml2]:
uml2
Please enter the name of your J2EE project (i.e. Animal Quiz):
MyProject
Please enter an id for your J2EE project (i.e. animalquiz):
myproject
Please enter a version for your project (i.e. 1.0-SNAPSHOT):
0.1
Please enter the root package name for your J2EE project (i.e. org.andromda.samples.animalquiz):
com.company.myproject
Would you like an EAR or standalone WAR? [ear, war]:
ear
Please enter the type of transactional/persistence cartridge to use [hibernate, ejb, ejb3, spring, none]:
ejb3
Please enter the database backend for the persistence layer [hypersonic, mysql, oracle, db2, informix, mssql, pointbase, postgres, sybase, sabdb, progress, derby]:
mysql
Will your project need workflow engine capabilities? (it uses jBPM and Hibernate3)? [yes, no]:
yes
Will your project have a web user interface? [yes, no]:
yes
Would you like your web user interface to use JSF or Struts? [jsf, struts]:
jsf
Would you like to use Facelets or JSP as your view type for JSF? [facelets, jsp]:
facelets
Would you like to use the JBoss Seam application framework? [yes, no]:
yes
Would you like to be able to expose your services as web services? [yes, no]:
yes
Would you like to use the JSR181 (webservice defined by annotations) EJB3 cartridge specific implementation? [yes, no]:
yes
]]></source>
<p>
At the end you should see <b>BUILD SUCCESSFUL</b>.
</p>
</subsection>
<a name="Starting Your Modeling"/>
<subsection name="Starting Your Modeling">
<p>
The project scaffold created above will have a starter XMI file for your modeling.
This is located in <b>/path/to/my/projects/myproject/mda/src/main/uml/myproject.xml</b>.
Launch your UML modeling application (e.g. MagicDraw), go to File -> Open Project..., and
browse to this file. When the program initially loads this file it will ask you to
specify the path to your <b>maven2.repository</b>. Specify the full <b>$M2_REPO path</b>,
i.e. <b>/path/to/your/home/.m2/repository</b>. It will then load your project and
all of the requisite andromda core profiles.
</p>
<p>
Next you need to use the andromda-seam-profile built before. Go to File -> Use Module...,
first add a new module path:
<b>/path/to/your/home/.m2/repository/org/andromda/profiles/uml2/andromda-profile-seam/1.1-SNAPSHOT/</b>,
then select this path and pick the andromda-profile-seam-1.1-SNAPSHOT.xml.zip profile.
It will load this and you now have all of the necessary seam stereotypes and tagged values.
</p>
<p>
You project is now ready to start. Have fun!
</p>
</subsection>
</section>
</body>
</document>
|
|
From: Vance K. <va...@us...> - 2007-06-19 15:32:40
|
User: vancek
Date: 07/06/19 08:32:42
Modified: andromda-seam pom.xml
Log:
howto artifacts/images don't exist in cartridge yet
Revision Changes Path
1.4 +2 -0 cartridges/andromda-seam/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-seam/pom.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- pom.xml 12 Jun 2007 17:30:14 -0000 1.3
+++ pom.xml 19 Jun 2007 15:32:42 -0000 1.4
@@ -190,6 +190,7 @@
<version>2.1</version>
</dependency>
</dependencies>
+ <!--
<executions>
<execution>
<id>cartridge-howto-artifacts</id>
@@ -198,6 +199,7 @@
</goals>
</execution>
</executions>
+ -->
<configuration>
<howtoCartridgePicturesOutputDirectory>${pom.basedir}/target/site/images</howtoCartridgePicturesOutputDirectory>
</configuration>
|
|
From: Vance K. <va...@us...> - 2007-06-19 15:27:26
|
User: vancek Date: 07/06/19 08:27:27 Removed: andromda-ejb3/src/site/axdoc namespace.xml profile.xml Log: namespace and profile are dynamically generated |
|
From: Vance K. <va...@us...> - 2007-06-14 15:06:13
|
User: vancek
Date: 07/06/14 08:06:14
Modified: andromda-ejb3/src/site changes.xml
andromda-ejb3/src/test/expected cartridge-output.zip
andromda-ejb3/src/test/uml EJB3CartridgeTestModel.xml.zip
andromda-ejb3/src/main/resources/templates/ejb3
EntityEmbeddable.vsl
Log:
ejb-50 - fix optimistic locking on version attribute
Revision Changes Path
1.21 +4 -0 cartridges/andromda-ejb3/src/site/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/changes.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -w -r1.20 -r1.21
--- changes.xml 14 Jun 2007 14:38:28 -0000 1.20
+++ changes.xml 14 Jun 2007 15:06:08 -0000 1.21
@@ -477,6 +477,10 @@
<action dev="vancek" type="update">
Fix naming of the serviceRemoteInterfaceName property to serviceRemoteInterfaceNamePattern.
</action>
+ <action dev="vancek" due-to="dima" type="fix">
+ JIRA EJB-55 - Fix optimistic locking - version attribute. Set the annotation on the getter and change
+ modifier on version attribute to public.
+ </action>
</release>
</body>
</document>
\ No newline at end of file
1.11 +492 -472 cartridges/andromda-ejb3/src/test/expected/cartridge-output.zip
<<Binary file>>
1.7 +268 -313 cartridges/andromda-ejb3/src/test/uml/EJB3CartridgeTestModel.xml.zip
<<Binary file>>
1.52 +7 -7 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.51
retrieving revision 1.52
diff -u -w -r1.51 -r1.52
--- EntityEmbeddable.vsl 13 Jun 2007 16:31:35 -0000 1.51
+++ EntityEmbeddable.vsl 14 Jun 2007 15:06:14 -0000 1.52
@@ -190,16 +190,11 @@
#* *##set ($doAttribute = true)
#* *##end
#* *##if ($doAttribute)
-#* *##if (!$attribute.transient && $attribute.version)
-##
-## Add the Version annotation on the attribute itself
-##
- @javax.persistence.Version
-#* *##end
##
## Check for overriding LOB type
+## If the attribute is used in optimistic locking, make public, otherwise make private
##
- private #if ($stringUtils.isNotBlank($attribute.lobType))${attribute.lobType}#else${attribute.type.fullyQualifiedName}#end $attribute.name;
+ #if (!$attribute.transient && $attribute.version)public#else#**#private#end #if ($stringUtils.isNotBlank($attribute.lobType))${attribute.lobType}#else${attribute.type.fullyQualifiedName}#end $attribute.name;
#* *##end
#**##end
@@ -506,6 +501,11 @@
@org.hibernate.validator.Length(max = $attribute.columnLength)
#* *##end
#* *##end
+#* *##else
+##
+## Add the Version annotation on the attribute itself
+##
+ @javax.persistence.Version
#* *##end
##
## Override attribute type if attribute is a LOB and lob type is specified
|
|
From: Vance K. <va...@us...> - 2007-06-14 14:40:49
|
User: vancek
Date: 07/06/14 07:40:51
Modified: andromda-ejb3/src/main/resources/templates/ejb3
SessionLocal.vsl SessionRemote.vsl
andromda-ejb3/src/test/expected cartridge-output.zip
Log:
syntax formatting change
Revision Changes Path
1.9 +1 -0 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionLocal.vsl
Index: SessionLocal.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionLocal.vsl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- SessionLocal.vsl 16 Apr 2007 14:09:39 -0000 1.8
+++ SessionLocal.vsl 14 Jun 2007 14:40:47 -0000 1.9
@@ -20,6 +20,7 @@
@javax.ejb.Local
public interface ${service.serviceLocalInterfaceName}
extends ${service.serviceInterfaceName}#if($service.generalization), ${service.generalization.fullyQualifiedName}Local#end
+
{
#set ($operations = $service.businessOperations)
#if (!$operations.empty)
1.9 +1 -0 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionRemote.vsl
Index: SessionRemote.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionRemote.vsl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- SessionRemote.vsl 16 Apr 2007 14:09:37 -0000 1.8
+++ SessionRemote.vsl 14 Jun 2007 14:40:50 -0000 1.9
@@ -26,6 +26,7 @@
#end
public interface ${service.serviceRemoteInterfaceName}
extends ${service.serviceInterfaceName}#if ($service.generalization), ${service.generalization.fullyQualifiedName}Remote#end
+
{
#set ($operations = $service.businessOperations)
#if (!$operations.empty)
1.10 +462 -508 cartridges/andromda-ejb3/src/test/expected/cartridge-output.zip
<<Binary file>>
|
|
From: Vance K. <va...@us...> - 2007-06-14 14:38:30
|
User: vancek
Date: 07/06/14 07:38:32
Modified: andromda-ejb3/src/site changes.xml
andromda-ejb3/src/main/resources/META-INF/andromda
metafacades.xml namespace.xml
andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3SessionFacadeLogicImpl.java
Log:
renamed serviceRemoteInterfaceName namespace property to serviceRemoteInterfaceNamePattern
Revision Changes Path
1.20 +4 -1 cartridges/andromda-ejb3/src/site/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/changes.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -w -r1.19 -r1.20
--- changes.xml 13 Jun 2007 16:31:34 -0000 1.19
+++ changes.xml 14 Jun 2007 14:38:28 -0000 1.20
@@ -409,7 +409,7 @@
Seam.
</action>
<action dev="vancek" type="update">
- Session bean base or super classes now extend a super interface. Local and remote business interfaces
+ Session bean base classes now implement a super interface. Local and remote business interfaces
extend this super interface. Session bean implementations now extend the business interface(s).
This does introduce manual modification when refactoring a session bean's business interface.
The super interface contains common constants and attribute mutator definitions.
@@ -474,6 +474,9 @@
@GenericGenerator annotation. Modified the persistence profile (uml1.4 and 2.0) to support the necessary
tagged value.
</action>
+ <action dev="vancek" type="update">
+ Fix naming of the serviceRemoteInterfaceName property to serviceRemoteInterfaceNamePattern.
+ </action>
</release>
</body>
</document>
\ No newline at end of file
1.34 +1 -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.33
retrieving revision 1.34
diff -u -w -r1.33 -r1.34
--- metafacades.xml 25 Apr 2007 03:47:50 -0000 1.33
+++ metafacades.xml 14 Jun 2007 14:38:30 -0000 1.34
@@ -12,7 +12,7 @@
<property reference="serviceNamePattern"/>
<property reference="serviceInterfaceNamePattern"/>
<property reference="serviceLocalInterfaceNamePattern"/>
- <property reference="serviceRemoteInterfaceName"/>
+ <property reference="serviceRemoteInterfaceNamePattern"/>
<property reference="serviceImplementationNamePattern"/>
<property reference="serviceListenerNamePattern"/>
<property reference="serviceDelegateNamePattern"/>
1.40 +1 -1 cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/namespace.xml
Index: namespace.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/namespace.xml,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -w -r1.39 -r1.40
--- namespace.xml 25 Apr 2007 03:47:50 -0000 1.39
+++ namespace.xml 14 Jun 2007 14:38:30 -0000 1.40
@@ -477,7 +477,7 @@
bean local interface name.
</documentation>
</property>
- <property name="serviceRemoteInterfaceName">
+ <property name="serviceRemoteInterfaceNamePattern">
<default>{0}Remote</default>
<documentation>
The pattern to use when constructing the service
1.23 +1 -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.22
retrieving revision 1.23
diff -u -w -r1.22 -r1.23
--- EJB3SessionFacadeLogicImpl.java 16 Apr 2007 14:09:41 -0000 1.22
+++ EJB3SessionFacadeLogicImpl.java 14 Jun 2007 14:38:30 -0000 1.23
@@ -52,7 +52,7 @@
/**
* The property which stores the pattern defining the service bean remote interface name.
*/
- private static final String SERVICE_REMOTE_INTERFACE_NAME_PATTERN = "serviceRemoteInterfaceName";
+ private static final String SERVICE_REMOTE_INTERFACE_NAME_PATTERN = "serviceRemoteInterfaceNamePattern";
/**
* The property which stores the pattern defining the service bean listener callback name.
|
|
From: Vance K. <va...@us...> - 2007-06-13 16:32:17
|
User: vancek
Date: 07/06/13 09:32:12
Modified: andromda-ejb3 pom.xml
Log:
set compiler to 1.5
Revision Changes Path
1.19 +8 -0 cartridges/andromda-ejb3/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/pom.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -w -r1.18 -r1.19
--- pom.xml 12 Jun 2007 16:23:12 -0000 1.18
+++ pom.xml 13 Jun 2007 16:32:11 -0000 1.19
@@ -118,6 +118,14 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
|
|
From: Vance K. <va...@us...> - 2007-06-13 16:31:38
|
User: vancek
Date: 07/06/13 09:31:40
Modified: andromda-ejb3/src/site changes.xml
andromda-ejb3/src/main/resources/templates/ejb3
EntityEmbeddable.vsl
andromda-ejb3/src/main/uml EJB3MetafacadeModel.xml.zip
andromda-ejb3/src/main/resources/META-INF/andromda
profile.xml
andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3
EJB3Globals.java EJB3Profile.java
andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3EntityAttributeFacadeLogicImpl.java
Log:
ejb-50 - add hibernate uuid extension support
Revision Changes Path
1.19 +5 -0 cartridges/andromda-ejb3/src/site/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/changes.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -w -r1.18 -r1.19
--- changes.xml 12 Jun 2007 16:23:25 -0000 1.18
+++ changes.xml 13 Jun 2007 16:31:34 -0000 1.19
@@ -469,6 +469,11 @@
is explicity modelled. It is fine to apply this naming pattern when this is not explicitly modelled and
instance scoped operations exist on the entity and a mapped superclass is generated.
</action>
+ <action dev="vancek" due-to="daveangulo" type="add">
+ JIRA EJB-50 - Add UUID generic generator support as a Hibernate extension. This will render the
+ @GenericGenerator annotation. Modified the persistence profile (uml1.4 and 2.0) to support the necessary
+ tagged value.
+ </action>
</release>
</body>
</document>
\ No newline at end of file
1.51 +7 -0 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.50
retrieving revision 1.51
diff -u -w -r1.50 -r1.51
--- EntityEmbeddable.vsl 7 May 2007 13:32:32 -0000 1.50
+++ EntityEmbeddable.vsl 13 Jun 2007 16:31:35 -0000 1.51
@@ -416,9 +416,16 @@
@javax.persistence.TableGenerator(name = "${attribute.generatorName}"#if ($attribute.generatorTypeTable), table = "${attribute.generatorSourceName}"#end#if ($attribute.generatorPkColumnValue), pkColumnValue = "${attribute.generatorPkColumnValue}"#end#if ($attribute.generatorInitialValue), initialValue = ${attribute.generatorInitialValue}#end#if ($attribute.generatorAllocationSize), allocationSize = ${attribute.generatorAllocationSize}#end)
#* *##end
#* *##if (!$attribute.generatorTypeNone)
+#* *##if ($attribute.generatorTypeGeneric)
+ @javax.persistence.GeneratedValue(generator = "${attribute.generatorName}")
+#* *##else
@javax.persistence.GeneratedValue(strategy = javax.persistence.GenerationType.${attribute.generatorType}#if ($attribute.generatorTypeSequence || $attribute.generatorTypeTable), generator = "${attribute.generatorName}"#end)
#* *##end
#* *##end
+#* *##if ($attribute.generatorTypeGeneric && $hibernateExtensionEnabled)
+ @org.hibernate.annotations.GenericGenerator(name="${attribute.generatorName}", strategy = "${attribute.generatorGenericStrategy}")
+#* *##end
+#* *##end
#* *##if ($attribute.lob)
##
## Add if LOB type is specified - do not set LOB type as of PFD Spec - inferred from type.
1.57 +238 -239 cartridges/andromda-ejb3/src/main/uml/EJB3MetafacadeModel.xml.zip
<<Binary file>>
1.36 +14 -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.35
retrieving revision 1.36
diff -u -w -r1.35 -r1.36
--- profile.xml 29 Apr 2007 13:45:07 -0000 1.35
+++ profile.xml 13 Jun 2007 16:31:37 -0000 1.36
@@ -975,6 +975,7 @@
<value>SEQUENCE</value>
<value>IDENTITY</value>
<value>TABLE</value>
+ <value>GENERIC</value>
<value>NONE</value>
</allowedValues>
</element>
@@ -991,6 +992,19 @@
Entity Attribute
</appliedOnElement>
</element>
+ <element name="GENERATOR_GENERIC_STRATEGY">
+ <documentation>
+ Defines either a predefined Hibernate strategy
+ or a fully qualified class name for use in
+ id generation using persistence layer extensions.
+ </documentation>
+ <value>
+ @andromda.persistence.generator.genericStrategy
+ </value>
+ <appliedOnElement>
+ Entity Attribute
+ </appliedOnElement>
+ </element>
<element name="GENERATOR_SOURCE_NAME">
<documentation>
Specifies either the table name that stores the
1.16 +5 -0 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/EJB3Globals.java
Index: EJB3Globals.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/EJB3Globals.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -w -r1.15 -r1.16
--- EJB3Globals.java 25 Apr 2007 03:47:51 -0000 1.15
+++ EJB3Globals.java 13 Jun 2007 16:31:39 -0000 1.16
@@ -102,6 +102,11 @@
public static final String GENERATOR_TYPE_AUTO = "AUTO";
/**
+ * Represents the generic generator type
+ */
+ public static final String GENERATOR_TYPE_GENERIC = "GENERIC";
+
+ /**
* Represents the none generator type
*/
public static final String GENERATOR_TYPE_NONE = "NONE";
1.29 +6 -0 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.28
retrieving revision 1.29
diff -u -w -r1.28 -r1.29
--- EJB3Profile.java 29 Apr 2007 13:45:08 -0000 1.28
+++ EJB3Profile.java 13 Jun 2007 16:31:39 -0000 1.29
@@ -553,6 +553,12 @@
profile.get("GENERATOR_NAME");
/**
+ * The tagged value indicating the generator generic strategy.
+ */
+ public static final String TAGGEDVALUE_PERSISTENCE_GENERATOR_GENERIC_STRATEGY =
+ profile.get("GENERATOR_GENERIC_STRATEGY");
+
+ /**
* The tagged value indicating the generator source name.
*/
public static final String TAGGEDVALUE_PERSISTENCE_GENERATOR_SOURCE_NAME =
1.19 +24 -0 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.18
retrieving revision 1.19
diff -u -w -r1.18 -r1.19
--- EJB3EntityAttributeFacadeLogicImpl.java 17 Jan 2007 00:50:55 -0000 1.18
+++ EJB3EntityAttributeFacadeLogicImpl.java 13 Jun 2007 16:31:39 -0000 1.19
@@ -250,6 +250,22 @@
}
/**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityAttributeFacadeLogic#handleIsGeneratorTypeGeneric()
+ */
+ protected boolean handleIsGeneratorTypeGeneric()
+ {
+ boolean isGeneric = false;
+ if (StringUtils.isNotBlank(this.getGeneratorType()))
+ {
+ if (this.getGeneratorType().equalsIgnoreCase(EJB3Globals.GENERATOR_TYPE_GENERIC))
+ {
+ isGeneric = true;
+ }
+ }
+ return isGeneric;
+ }
+
+ /**
* @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityAttributeFacadeLogic#handleIsGeneratorTypeNone()
*/
protected boolean handleIsGeneratorTypeNone()
@@ -290,6 +306,14 @@
}
/**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityAttributeFacadeLogic#getGeneratorGenericStrategy()
+ */
+ protected String handleGetGeneratorGenericStrategy()
+ {
+ return (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_PERSISTENCE_GENERATOR_GENERIC_STRATEGY);
+ }
+
+ /**
* @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityAttributeFacadeLogic#handleGetGeneratorSourceName()
*/
protected String handleGetGeneratorSourceName()
|
|
From: Chad B. <cwb...@us...> - 2007-06-12 17:30:16
|
User: cwbrandon
Date: 07/06/12 10:30:15
Modified: andromda-seam pom.xml
Log:
fix andromda3.root location to be the one on the team server
Revision Changes Path
1.3 +1 -1 cartridges/andromda-seam/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-seam/pom.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- pom.xml 12 Jun 2007 16:23:27 -0000 1.2
+++ pom.xml 12 Jun 2007 17:30:14 -0000 1.3
@@ -297,7 +297,7 @@
</plugins>
</reporting>
<properties>
- <andromda3.root>D:/java/development/andromda-all</andromda3.root>
+ <andromda3.root>/var/andromda/builds/v3/andromda-all</andromda3.root>
<maven.test.skip>true</maven.test.skip>
<model.uri>jar:file:${pom.basedir}/src/main/uml/SeamMetafacadeModel.xml.zip!/SeamMetafacadeModel.xml</model.uri>
<test.model.uri>jar:file:${pom.basedir}/src/test/uml/SeamCartridgeTestModel.xml.zip!/SeamCartridgeTestModel.xml</test.model.uri>
|
|
From: Chad B. <cwb...@us...> - 2007-06-12 16:23:36
|
User: cwbrandon
Date: 07/06/12 09:23:36
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Solution
andromda.xml
andromda-aspdotnet pom.xml
andromda-nhibernate pom.xml
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker
pom.xml
andromda-aspdotnet/src/site site.xml
andromda-ejb3 pom.xml
andromda-nspring/src/main/uml SpringMetafacadeModel.xml.zip
andromda-aspdotnet/src/main/uml
AspDotNetMetafacadeModelv4.xml.zip
. pom.xml
andromda-database/src/main/uml
DatabaseMetafacadeModel.xml.zip
andromda-aspdotnet/src/test/uml
AspCartridgeTestModel1.xml.zip
andromda-semweb/src/main/uml SemWebMetafacadeModel.xml.zip
andromda-database pom.xml
andromda-ejb3/src/site changes.xml
andromda-jsf2/src/test/uml JSFCartridgeTestModel.xml.zip
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/mda/conf
andromda.xml
andromda-seam pom.xml
andromda-cs/src/test/uml CsCartridgeTestModel.xml.zip
andromda-cs/src/site site.xml
andromda-nhibernate/src/test/uml
HibernateCartridgeTestModel.xml.zip
andromda-semweb/src/test/uml
SemWebCartridgeTestModel.xml.zip
andromda-nspring/src/test/uml
NSpringCartridgeTestModel.xml.zip
andromda-aspdotnet/src/site/axdoc installation.xml
maven2/plugins/andromdanetapp pom.xml
andromda-cs pom.xml
samples/demo-ejb3 pom.xml
andromda-nspring pom.xml
andromda-jsf2/src/main/uml JSFMetafacadeModel.xml.zip
andromda-eclipse-rcp pom.xml
andromda-nhibernate/src/main/uml
HibernateMetafacadeModel.xml.zip
andromda-semweb pom.xml
andromda-nhibernate/src/test/expected cartridge-output.zip
andromda-eclipse-rcp/src/main/uml
EclipseRCPMetafacadeModel.xml.zip
Removed: andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate
EntityTwoImpl.cs EntityOne.cs EntityTwo.cs
EntityOneImpl.cs EntityOne.hbm.xml
EntityTwo.hbm.xml
. mvn-cc-build.xml
Log:
Fix build and update all to 3.3-SNAPSHOT (from 3.2-SNAPSHOT)
Revision Changes Path
1.2 +2 -2 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Solution
Index: andromda.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Solution Wizard Files/mda/conf/andromda.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- andromda.xml 22 Jan 2007 13:22:46 -0000 1.1
+++ andromda.xml 12 Jun 2007 16:23:05 -0000 1.2
@@ -43,9 +43,9 @@
<!-- You can specify your own mapping files to fine tune the generated code.
One primary use of this is to change the SqlMappings to generate unicode
support in the database. You can find the default mappings inside the
- andromda-maven-plugin-3.2-SNAPSHOT.jar file, in META-INF/andromda/mappings.
+ andromda-maven-plugin-3.3-SNAPSHOT.jar file, in META-INF/andromda/mappings.
This file usually resides in:
- {maven2.repository}/org/andromda/maven/plugins/andromda-maven-plugin/3.2-SNAPSHOT
+ {maven2.repository}/org/andromda/maven/plugins/andromda-maven-plugin/3.3-SNAPSHOT
Copy these mapping files into mda/conf/mappings and then uncomment the lines below.
-->
1.3 +10 -10 cartridges/andromda-aspdotnet/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-aspdotnet/pom.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- pom.xml 25 Sep 2006 19:37:00 -0000 1.2
+++ pom.xml 12 Jun 2007 16:23:06 -0000 1.3
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-meta-cartridge</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>
@@ -61,14 +61,14 @@
<dependency>
<groupId>org.andromda.translationlibraries</groupId>
<artifactId>andromda-ocl-query-library</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>
<plugin>
- <groupId>org.andromda.maven.site</groupId>
+ <groupId>org.andromda.maven.plugins.site</groupId>
<artifactId>andromda-site-plugin</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
<executions>
<execution>
<id>profile-transform</id>
@@ -91,7 +91,7 @@
<dependency>
<groupId>org.andromda.maven.site</groupId>
<artifactId>andromda-doxia-module-xdoc</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
</dependencies>
<configuration>
1.12 +7 -7 cartridges/andromda-nhibernate/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/pom.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- pom.xml 22 Jan 2007 03:29:47 -0000 1.11
+++ pom.xml 12 Jun 2007 16:23:07 -0000 1.12
@@ -48,27 +48,27 @@
<dependency>
<groupId>org.andromda</groupId>
<artifactId>andromda-core</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.metafacades</groupId>
<artifactId>andromda-metafacades-uml</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.metafacades</groupId>
<artifactId>andromda-metafacades-uml14</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-meta-cartridge</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.translationlibraries</groupId>
<artifactId>andromda-ocl-validation-library</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
@@ -95,7 +95,7 @@
<dependency>
<groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-meta-cartridge</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.andromda.translationlibraries</groupId>
<artifactId>andromda-ocl-query-library</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>
1.2 +6 -6 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/pom.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- pom.xml 28 Aug 2006 04:22:24 -0000 1.1
+++ pom.xml 12 Jun 2007 16:23:07 -0000 1.2
@@ -17,24 +17,24 @@
<dependency>
<groupId>org.andromda.profiles.uml14</groupId>
<artifactId>andromda-profile</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
<type>xml.zip</type>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.andromda.translationlibraries</groupId>
<artifactId>andromda-ocl-translation-core</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.translationlibraries</groupId>
<artifactId>andromda-ocl-validation-library</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.translationlibraries</groupId>
<artifactId>andromda-ocl-query-library</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
<!-- Project Cartridges -->
@@ -63,7 +63,7 @@
<plugin>
<groupId>org.andromda.maven.plugins</groupId>
<artifactId>andromda-multi-source-plugin</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
<executions>
<execution>
<goals>
@@ -80,7 +80,7 @@
<plugin>
<groupId>org.andromda.maven.plugins</groupId>
<artifactId>andromda-maven-plugin</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
1.2 +1 -1 cartridges/andromda-aspdotnet/src/site/site.xml
Index: site.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-aspdotnet/src/site/site.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- site.xml 17 Sep 2006 17:31:55 -0000 1.1
+++ site.xml 12 Jun 2007 16:23:07 -0000 1.2
@@ -3,7 +3,7 @@
<skin>
<groupId>org.andromda.maven.site</groupId>
<artifactId>andromda-site-skin</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</skin>
<bannerLeft>
<name></name>
1.18 +5 -5 cartridges/andromda-ejb3/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/pom.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -w -r1.17 -r1.18
1.4 +121 -111 cartridges/andromda-nspring/src/main/uml/SpringMetafacadeModel.xml.zip
<<Binary file>>
1.4 +119 -127 cartridges/andromda-aspdotnet/src/main/uml/AspDotNetMetafacadeModelv4.xml.zip
<<Binary file>>
1.13 +11 -20 plugins/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/pom.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- pom.xml 29 Aug 2006 04:02:17 -0000 1.12
+++ pom.xml 12 Jun 2007 16:23:15 -0000 1.13
@@ -87,33 +87,33 @@
<dependency>
<groupId>org.andromda</groupId>
<artifactId>andromda-core</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda</groupId>
<artifactId>andromda-utils</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.metafacades</groupId>
<artifactId>andromda-metafacades-uml</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-meta-cartridge</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.andromda.translationlibraries</groupId>
<artifactId>andromda-ocl-validation-library</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.profiles.uml14</groupId>
<artifactId>andromda-profile</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
<type>xml.zip</type>
<scope>runtime</scope>
</dependency>
@@ -137,7 +137,7 @@
<plugin>
<groupId>org.andromda.maven.plugins</groupId>
<artifactId>andromda-maven-plugin</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
<executions>
<execution>
<goals>
@@ -155,7 +155,7 @@
<extensions>true</extensions>
<groupId>org.andromda.maven.plugins</groupId>
<artifactId>andromda-cartridge-plugin</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
<executions>
<execution>
<goals>
@@ -167,15 +167,6 @@
</execution>
</executions>
</plugin>
- <!-- AMW Add JDK source/target since switching CC jdk to 1.5 -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
</plugins>
</pluginManagement>
</build>
1.3 +72 -71 cartridges/andromda-database/src/main/uml/DatabaseMetafacadeModel.xml.zip
<<Binary file>>
1.3 +162 -164 cartridges/andromda-aspdotnet/src/test/uml/AspCartridgeTestModel1.xml.zip
<<Binary file>>
1.2 +49 -50 cartridges/andromda-semweb/src/main/uml/SemWebMetafacadeModel.xml.zip
<<Binary file>>
1.4 +2 -2 cartridges/andromda-database/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-database/pom.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- pom.xml 13 Jun 2006 15:50:04 -0000 1.3
+++ pom.xml 12 Jun 2007 16:23:24 -0000 1.4
@@ -20,12 +20,12 @@
<dependency>
<groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-meta-cartridge</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.metafacades</groupId>
<artifactId>andromda-metafacades-uml</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
<type>xml.zip</type>
<scope>runtime</scope>
</dependency>
1.18 +1 -1 cartridges/andromda-ejb3/src/site/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/changes.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -w -r1.17 -r1.18
--- changes.xml 7 May 2007 13:32:30 -0000 1.17
+++ changes.xml 12 Jun 2007 16:23:25 -0000 1.18
@@ -324,7 +324,7 @@
Add javax.jms.MessageListener messaging-type to ejb-jar.xml for MDBs.
</action>
<action dev="vancek" type="update">
- Migrated dependency versions from 3.2-SNAPSHOT to 3.2, overriding dependencies in the pom.xml.
+ Migrated dependency versions from 3.3-SNAPSHOT to 3.2, overriding dependencies in the pom.xml.
NOTE: This can be removed once the andromda-plugins package is upgraded as a whole.
</action>
<action dev="vancek" type="update">
1.4 +318 -342 cartridges/andromda-jsf2/src/test/uml/JSFCartridgeTestModel.xml.zip
<<Binary file>>
1.2 +2 -2 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/mda/conf/andromda.xml
Index: andromda.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/mda/conf/andromda.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- andromda.xml 28 Aug 2006 04:22:25 -0000 1.1
+++ andromda.xml 12 Jun 2007 16:23:27 -0000 1.2
@@ -43,9 +43,9 @@
<!-- You can specify your own mapping files to fine tune the generated code.
One primary use of this is to change the SqlMappings to generate unicode
support in the database. You can find the default mappings inside the
- andromda-maven-plugin-3.2-SNAPSHOT.jar file, in META-INF/andromda/mappings.
+ andromda-maven-plugin-3.3-SNAPSHOT.jar file, in META-INF/andromda/mappings.
This file usually resides in:
- {maven2.repository}/org/andromda/maven/plugins/andromda-maven-plugin/3.2-SNAPSHOT
+ {maven2.repository}/org/andromda/maven/plugins/andromda-maven-plugin/3.3-SNAPSHOT
Copy these mapping files into mda/conf/mappings and then uncomment the lines below.
-->
1.2 +9 -9 cartridges/andromda-seam/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-seam/pom.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- pom.xml 12 Apr 2007 15:29:21 -0000 1.1
+++ pom.xml 12 Jun 2007 16:23:27 -0000 1.2
@@ -297,7 +297,7 @@
</plugins>
</reporting>
<properties>
- <andromda3.root>O:\\workspace3.2.1\\andromda-all</andromda3.root>
+ <andromda3.root>D:/java/development/andromda-all</andromda3.root>
<maven.test.skip>true</maven.test.skip>
<model.uri>jar:file:${pom.basedir}/src/main/uml/SeamMetafacadeModel.xml.zip!/SeamMetafacadeModel.xml</model.uri>
<test.model.uri>jar:file:${pom.basedir}/src/test/uml/SeamCartridgeTestModel.xml.zip!/SeamCartridgeTestModel.xml</test.model.uri>
1.5 +54 -69 cartridges/andromda-cs/src/test/uml/CsCartridgeTestModel.xml.zip
<<Binary file>>
1.3 +1 -1 cartridges/andromda-cs/src/site/site.xml
Index: site.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/site/site.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- site.xml 22 Jun 2006 20:27:04 -0000 1.2
+++ site.xml 12 Jun 2007 16:23:28 -0000 1.3
@@ -3,7 +3,7 @@
<skin>
<groupId>org.andromda.maven.site</groupId>
<artifactId>andromda-site-skin</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</skin>
<bannerLeft>
<name></name>
1.4 +50 -36 cartridges/andromda-nhibernate/src/test/uml/HibernateCartridgeTestModel.xml.zip
<<Binary file>>
1.2 +64 -53 cartridges/andromda-semweb/src/test/uml/SemWebCartridgeTestModel.xml.zip
<<Binary file>>
1.3 +46 -39 cartridges/andromda-nspring/src/test/uml/NSpringCartridgeTestModel.xml.zip
<<Binary file>>
1.2 +1 -1 cartridges/andromda-aspdotnet/src/site/axdoc/installation.xml
Index: installation.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-aspdotnet/src/site/axdoc/installation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- installation.xml 17 Sep 2006 17:31:53 -0000 1.1
+++ installation.xml 12 Jun 2007 16:23:30 -0000 1.2
@@ -44,7 +44,7 @@
scripts generated by the plugin. Install the plugin by following the steps below.
<ol>
<li>
- Download the <a href="http://team.andromda.org/maven2/org/andromda/maven/plugins/andromdapp-maven-plugin/3.2-SNAPSHOT/andromdapp-maven-plugin-install-3.2-SNAPSHOT.zip">AndroMDA plugin installer</a>.
+ Download the <a href="http://team.andromda.org/maven2/org/andromda/maven/plugins/andromdapp-maven-plugin/3.3-SNAPSHOT/andromdapp-maven-plugin-install-3.3-SNAPSHOT.zip">AndroMDA plugin installer</a>.
</li>
<li>
Unzip the contents of the installer into your Maven repository at C:\Documents and Settings\<strong>your user name</strong>\.m2\repository.
1.4 +6 -6 plugins/maven2/plugins/andromdanetapp/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/maven2/plugins/andromdanetapp/pom.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- pom.xml 14 Jun 2006 15:13:36 -0000 1.3
+++ pom.xml 12 Jun 2007 16:23:31 -0000 1.4
@@ -18,14 +18,14 @@
<inceptionYear>2005</inceptionYear>
<dependencies>
<dependency>
- <groupId>org.apache.maven.plugins</groupId>
+ <groupId>org.andromda.maven.plugins</groupId>
<artifactId>andromdapp-maven-plugin</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.andromdapp</groupId>
<artifactId>andromda-andromdapp-core</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.plugins.andromdapp.projects</groupId>
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.andromda.templateengines</groupId>
<artifactId>andromda-templateengine-velocity</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
1.12 +3 -3 cartridges/andromda-cs/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/pom.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- pom.xml 22 Jan 2007 03:29:47 -0000 1.11
+++ pom.xml 12 Jun 2007 16:23:32 -0000 1.12
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-meta-cartridge</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>
@@ -58,9 +58,9 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.andromda.maven.plugins</groupId>
+ <groupId>org.andromda.maven.plugins.site</groupId>
<artifactId>andromda-site-plugin</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
<executions>
<execution>
<id>profile-transform</id>
1.2 +9 -9 plugins/samples/demo-ejb3/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/samples/demo-ejb3/pom.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- pom.xml 6 Oct 2006 06:52:43 -0000 1.1
+++ pom.xml 12 Jun 2007 16:23:32 -0000 1.2
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.andromda.profiles.uml14</groupId>
<artifactId>andromda-profile</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
<type>xml.zip</type>
<scope>runtime</scope>
</dependency>
@@ -57,19 +57,19 @@
<dependency>
<groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-java-cartridge</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-bpm4struts-cartridge</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.andromda.translationlibraries</groupId>
<artifactId>andromda-ocl-query-library</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<!-- This dependency provides the ability to implement your
@@ -78,7 +78,7 @@
<dependency>
<groupId>org.andromda</groupId>
<artifactId>andromda-script-wrappers</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -324,7 +324,7 @@
<plugin>
<groupId>org.andromda.maven.plugins</groupId>
<artifactId>andromda-multi-source-plugin</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
<executions>
<execution>
<goals>
@@ -341,12 +341,12 @@
<plugin>
<groupId>org.andromda.maven.plugins</groupId>
<artifactId>andromda-maven-plugin</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</plugin>
<plugin>
<groupId>org.andromda.maven.plugins</groupId>
<artifactId>andromdapp-maven-plugin</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -515,7 +515,7 @@
<plugin>
<groupId>org.andromda.maven.plugins</groupId>
<artifactId>andromdapp-maven-plugin</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
<!-- provides the injection of the script wrapper support into the class files (this should only
be done when developing locally), uncomment this executions element to enable
<executions>
1.9 +8 -8 cartridges/andromda-nspring/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/pom.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- pom.xml 22 Jan 2007 03:29:47 -0000 1.8
+++ pom.xml 12 Jun 2007 16:23:33 -0000 1.9
@@ -40,27 +40,27 @@
<dependency>
<groupId>org.andromda</groupId>
<artifactId>andromda-core</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.metafacades</groupId>
<artifactId>andromda-metafacades-uml</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-meta-cartridge</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.translationlibraries</groupId>
<artifactId>andromda-ocl-validation-library</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda</groupId>
<artifactId>andromda-utils</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.andromda.translationlibraries</groupId>
<artifactId>andromda-ocl-query-library</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-meta-cartridge</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>
@@ -104,7 +104,7 @@
<dependency>
<groupId>org.andromda.translationlibraries</groupId>
<artifactId>andromda-ocl-query-library</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>
1.6 +185 -205 cartridges/andromda-jsf2/src/main/uml/JSFMetafacadeModel.xml.zip
<<Binary file>>
1.2 +2 -2 cartridges/andromda-eclipse-rcp/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-eclipse-rcp/pom.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- pom.xml 10 Jan 2007 21:23:37 -0000 1.1
+++ pom.xml 12 Jun 2007 16:23:34 -0000 1.2
@@ -20,12 +20,12 @@
<dependency>
<groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-meta-cartridge</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.metafacades</groupId>
<artifactId>andromda-metafacades-uml</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
<type>xml.zip</type>
<scope>runtime</scope>
</dependency>
1.3 +4 -3 cartridges/andromda-nhibernate/src/main/uml/HibernateMetafacadeModel.xml.zip
<<Binary file>>
1.3 +2 -2 cartridges/andromda-semweb/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-semweb/pom.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- pom.xml 10 Oct 2006 19:12:52 -0000 1.2
+++ pom.xml 12 Jun 2007 16:23:35 -0000 1.3
@@ -29,7 +29,7 @@
<dependency>
<groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-meta-cartridge</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.andromda.translationlibraries</groupId>
<artifactId>andromda-ocl-query-library</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>
1.8 +38 -34 cartridges/andromda-nhibernate/src/test/expected/cartridge-output.zip
<<Binary file>>
1.2 +75 -115 cartridges/andromda-eclipse-rcp/src/main/uml/EclipseRCPMetafacadeModel.xml.zip
<<Binary file>>
|
|
From: Leif J. <le...@us...> - 2007-06-10 20:27:14
|
User: leifj
Date: 07/06/10 13:27:17
Modified: andromda-jsf2/src/main/resources/templates/jsf2/controllers
Controller.java.vsl
Log:
fall back to using session if storing in the pageFlowScope doesn\t work
Revision Changes Path
1.2 +1 -0 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/Controller.java.vsl
Index: Controller.java.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/Controller.java.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- Controller.java.vsl 5 Dec 2006 19:39:27 -0000 1.1
+++ Controller.java.vsl 10 Jun 2007 20:27:17 -0000 1.2
@@ -61,6 +61,7 @@
{
#if (!$action.formFields.empty)
contextWrapper.getCurrentInstance().getPageFlowScope().put("$action.formKey", form);
+ this.getSession(false).setAttribute("$action.formKey",form);
// - add this temporary ADF context to the session so that we can retrieve from a view populator if required
this.getSession(false).setAttribute("$adfContextAttributeName", contextWrapper);
#end
|
|
From: Leif J. <le...@us...> - 2007-06-10 20:14:36
|
User: leifj
Date: 07/06/10 13:14:37
Modified: andromda-jsf2/src/main/resources/templates/jsf2/flow
ViewPopulator.java.vsl
Log:
fall back to using session if storing in the pageFlowScope doesn\t work
Revision Changes Path
1.3 +6 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/ViewPopulator.java.vsl
Index: ViewPopulator.java.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/ViewPopulator.java.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- ViewPopulator.java.vsl 11 Dec 2006 13:43:58 -0000 1.2
+++ ViewPopulator.java.vsl 10 Jun 2007 20:14:37 -0000 1.3
@@ -80,6 +80,11 @@
(${managedBeansPackage}.AdfFacesContextWrapper)session.getAttribute("$adfContextAttributeName");
adfContext = contextWrapper != null ? contextWrapper.getCurrentInstance() : null;
form = adfContext != null ? adfContext.getPageFlowScope().get("$view.formKey") : null;
+ if (form == null)
+ {
+ form = session.getAttribute("$view.formKey");
+ session.removeAttribute("$view.formKey");
+ }
#if ($formSerialization)
// - if the form is still null, see if we can get it from a serialized state
if (form == null)
@@ -96,7 +101,7 @@
else
{
// - remove the ADF context in the event that its present
- session.removeAttribute("AndroMDAADFContext");
+ session.removeAttribute("$adfContextAttributeName");
}
}
else
|
|
From: Leif J. <le...@us...> - 2007-06-10 20:11:37
|
User: leifj
Date: 07/06/10 13:11:40
Modified: andromda-jsf2/src/main/resources/templates/jsf2/flow
ActionForward.java.vsl
Log:
pass initial request parameters through
Revision Changes Path
1.2 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/ActionForward.java.vsl
Index: ActionForward.java.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/ActionForward.java.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- ActionForward.java.vsl 5 Dec 2006 19:39:29 -0000 1.1
+++ ActionForward.java.vsl 10 Jun 2007 20:11:40 -0000 1.2
@@ -48,7 +48,7 @@
#end
#if (!$useCase.allForwards.empty)
String forwardPath = ${managedBeansPackage}.UseCaseForwards.getPath(controller.${action.controllerAction}());
- response.sendRedirect(request.getContextPath() + forwardPath);
+ response.sendRedirect(request.getContextPath() + forwardPath + (request.getQueryString() != null ? "?"+request.getQueryString() : ""));
#else
controller.${action.controllerAction}();
#end
|
