Menu
▾
▴
andromdaplugins-cvs — Each commit to the project CVS repository posts a message to this mailing list.
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(6) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(178) |
Feb
(169) |
Mar
(286) |
Apr
(117) |
May
(98) |
Jun
(68) |
Jul
(63) |
Aug
(121) |
Sep
(88) |
Oct
(124) |
Nov
(2) |
Dec
(111) |
| 2007 |
Jan
(224) |
Feb
(69) |
Mar
(10) |
Apr
(72) |
May
(7) |
Jun
(21) |
Jul
(33) |
Aug
(35) |
Sep
(12) |
Oct
(22) |
Nov
(5) |
Dec
(6) |
| 2008 |
Jan
(2) |
Feb
(10) |
Mar
(39) |
Apr
(58) |
May
(34) |
Jun
(9) |
Jul
(27) |
Aug
(10) |
Sep
(3) |
Oct
|
Nov
|
Dec
|
|
From: Vance K. <va...@us...> - 2006-04-11 16:11:39
|
User: vancek
Date: 06/04/11 09:11:34
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3SessionFacadeLogicImpl.java
Log:
implemented handleGetServiceBaseName, handleGetFullyQualifiedServiceBaseName, handleIsWebServiceEnabled and handleIsWebServiceOperationExists
Revision Changes Path
1.16 +67 -0 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.15
retrieving revision 1.16
diff -u -w -r1.15 -r1.16
--- EJB3SessionFacadeLogicImpl.java 14 Mar 2006 06:24:52 -0000 1.15
+++ EJB3SessionFacadeLogicImpl.java 11 Apr 2006 16:11:34 -0000 1.16
@@ -11,7 +11,9 @@
import org.andromda.cartridges.ejb3.metafacades.EJB3OperationFacade;
import org.andromda.metafacades.uml.DependencyFacade;
import org.andromda.metafacades.uml.ModelElementFacade;
+import org.andromda.metafacades.uml.OperationFacade;
import org.andromda.metafacades.uml.Role;
+import org.andromda.metafacades.uml.UMLProfile;
import org.apache.commons.collections.Closure;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.Predicate;
@@ -61,6 +63,11 @@
private static final String SERVICE_DELEGATE_NAME_PATTERN = "serviceDelegateNamePattern";
/**
+ * The property which stores the pattern defining the service bean base class name.
+ */
+ private static final String SERVICE_BASE_NAME_PATTERN = "serviceBaseNamePattern";
+
+ /**
* The property which stores the pattern defining the default service bean
* exception class name.
*/
@@ -97,6 +104,11 @@
*/
public static final String SERVICE_ENABLE_CLUSTERING = "enableClustering";
+ /**
+ * The property that sets whether EJB 3.0 JSR 181 webservices is enabled
+ */
+ private static final String PROPERTY_WEBSERVICE_ENABLED = "webServiceEnabled";
+
// ---------------- constructor -------------------------------
public EJB3SessionFacadeLogicImpl (Object metaObject, String context)
@@ -398,6 +410,19 @@
}
/**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3SessionFacadeLogic#handleGetServiceBaseName()
+ */
+ protected String handleGetServiceBaseName()
+ {
+ String serviceBaseNamePattern =
+ (String)this.getConfiguredProperty(SERVICE_BASE_NAME_PATTERN);
+
+ return MessageFormat.format(
+ serviceBaseNamePattern,
+ new Object[] {StringUtils.trimToEmpty(this.getName())});
+ }
+
+ /**
* @see org.andromda.cartridges.ejb3.metafacades.EJB3SessionFacadeLogic#handleGetFullyQualifiedServiceName()
*/
protected String handleGetFullyQualifiedServiceName()
@@ -468,6 +493,17 @@
}
/**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3SessionFacadeLogic#handleGetFullyQualifiedServiceBaseName()
+ */
+ protected String handleGetFullyQualifiedServiceBaseName()
+ {
+ return EJB3MetafacadeUtils.getFullyQualifiedName(
+ this.getPackageName(),
+ this.getServiceBaseName(),
+ null);
+ }
+
+ /**
* @see org.andromda.cartridges.ejb3.metafacades.EJB3SessionFacadeLogic#handleGetPersistenceContextUnitName()
*/
protected String handleGetPersistenceContextUnitName()
@@ -937,4 +973,35 @@
{
return BooleanUtils.toBoolean(String.valueOf(this.getConfiguredProperty(SERVICE_ENABLE_CLUSTERING)));
}
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3SessionFacadeLogic#handleIsWebServiceEnabled()
+ */
+ protected boolean handleIsWebServiceEnabled()
+ {
+ return (this.hasStereotype(UMLProfile.STEREOTYPE_WEBSERVICE) || this.isWebServiceOperationExists()) &&
+ BooleanUtils.toBoolean(String.valueOf(this.getConfiguredProperty(PROPERTY_WEBSERVICE_ENABLED)));
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3SessionFacadeLogic#handleIsWebServiceOperationExists()
+ */
+ protected boolean handleIsWebServiceOperationExists()
+ {
+ return CollectionUtils.find(
+ this.getOperations(),
+ new Predicate()
+ {
+ public boolean evaluate(final Object object)
+ {
+ boolean isWebService = false;
+ final OperationFacade operation = (OperationFacade)object;
+ if (operation.hasStereotype(UMLProfile.STEREOTYPE_WEBSERVICE_OPERATION))
+ {
+ isWebService = true;
+ }
+ return isWebService;
+ }
+ }) != null;
+ }
}
\ No newline at end of file
|
|
From: Vance K. <va...@us...> - 2006-04-11 16:09:49
|
User: vancek
Date: 06/04/11 09:09:45
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3
EJB3ScriptHelper.java
Log:
implemented reversePackage static method
Revision Changes Path
1.8 +11 -0 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/EJB3ScriptHelper.java
Index: EJB3ScriptHelper.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/EJB3ScriptHelper.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- EJB3ScriptHelper.java 14 Mar 2006 06:21:13 -0000 1.7
+++ EJB3ScriptHelper.java 11 Apr 2006 16:09:44 -0000 1.8
@@ -129,4 +129,15 @@
}
return sb.toString();
}
+
+ /**
+ * Reverses the <code>packageName</code>.
+ *
+ * @param packageName the package name to reverse.
+ * @return the reversed package name.
+ */
+ public static String reversePackage(String packageName)
+ {
+ return StringUtils.reverseDelimited(packageName, EJB3Globals.NAMESPACE_DELIMITER);
+ }
}
|
|
From: Vance K. <va...@us...> - 2006-04-11 16:09:01
|
User: vancek
Date: 06/04/11 09:08:57
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3
EJB3Profile.java
Log:
declared TAGGEDVALUE_WEBSERVICE_PARAMETER_STYLE and TAGGEDVALUE_WEBSERVICE_OPERATION_ONEWAY constants
Revision Changes Path
1.22 +9 -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.21
retrieving revision 1.22
diff -u -w -r1.21 -r1.22
--- EJB3Profile.java 16 Mar 2006 15:29:20 -0000 1.21
+++ EJB3Profile.java 11 Apr 2006 16:08:57 -0000 1.22
@@ -502,4 +502,13 @@
*/
public static final String TAGGEDVALUE_EJB_USE_QUERY_CACHE = profile.get("USE_QUERY_CACHE");
+ /**
+ * Defines the webservice parameter style
+ */
+ public static final String TAGGEDVALUE_WEBSERVICE_PARAMETER_STYLE = profile.get("WEBSERVICE_PARAMETER_STYLE");
+
+ /**
+ * Defines the webservice method as oneway
+ */
+ public static final String TAGGEDVALUE_WEBSERVICE_OPERATION_ONEWAY = profile.get("WEBSERVICE_OPERATION_ONEWAY");
}
\ No newline at end of file
|
|
From: Vance K. <va...@us...> - 2006-04-11 16:07:58
|
User: vancek
Date: 06/04/11 09:07:51
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3
EJB3Globals.java
Log:
declared namespace delimiter constant
Revision Changes Path
1.8 +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.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- EJB3Globals.java 20 Feb 2006 05:18:09 -0000 1.7
+++ EJB3Globals.java 11 Apr 2006 16:07:50 -0000 1.8
@@ -198,4 +198,9 @@
* JMS message driven bean
*/
public static final String MDB_DESTINATION_TYPE_QUEUE = "javax.jms.Queue";
+
+ /**
+ * The namespace delimiter (seperates namespaces).
+ */
+ public static final char NAMESPACE_DELIMITER = '.';
}
|
|
From: Vance K. <va...@us...> - 2006-04-11 16:07:06
|
User: vancek
Date: 06/04/11 09:07:02
Modified: andromda-ejb3/src/main/resources/META-INF/andromda
profile.xml
Log:
defined TRANSIENT stereotype element again
added WEB_SERVICE and WEB_SERVICE_OPERATION stereotype elements
added WEBSERVICE_PARAMETER_STYLE and WEBSERVICE_OPERATION_ONEWAY tagged value elements
Revision Changes Path
1.26 +58 -1 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.25
retrieving revision 1.26
diff -u -w -r1.25 -r1.26
--- profile.xml 16 Mar 2006 15:27:40 -0000 1.25
+++ profile.xml 11 Apr 2006 16:07:01 -0000 1.26
@@ -73,6 +73,14 @@
<value>Version</value>
<appliedOnElement>Entity attribute</appliedOnElement>
</element>
+ <element name="TRANSIENT">
+ <documentation>
+ Identifies an entity attribute as a transient
+ attribute which is non persistent.
+ </documentation>
+ <value>Transient</value>
+ <appliedOnElement>Entity attribute</appliedOnElement>
+ </element>
<element name="PERSISTENCE_CONTEXT">
<documentation>
Identifies a persistence context used to express a dependency
@@ -292,7 +300,6 @@
Stateful Session Bean Operation
</appliedOnElement>
</element>
-
<element name="PRE_PERSIST">
<documentation>
Specifies that the associated operation is a lifecycle
@@ -380,6 +387,25 @@
Entity Bean Operation
</appliedOnElement>
</element>
+ <element name="WEB_SERVICE">
+ <documentation>
+ Exposes ALL methods of the session bean
+ as a web service.
+ </documentation>
+ <value>WebService</value>
+ <appliedOnElement>class</appliedOnElement>
+ </element>
+ <element name="WEB_SERVICE_OPERATION">
+ <documentation>
+ This is used in conjunction with the <![CDATA[<<Service>>]]> stereotype.
+ Adds the method to the list of allowed methods
+ which will be exposed as a web service. You <strong>MUST</strong>
+ place this stereotype on an operation if you want it exposed
+ as a web service (unless you add the <![CDATA[<<WebService>>]]> stereotype to your class).
+ </documentation>
+ <value>WebServiceOperation</value>
+ <appliedOnElement>Service operation</appliedOnElement>
+ </element>
</elementGroup>
<elementGroup name="Tagged Values">
<element name="ATTRIBUTE_PERSISTENCE_OPTIONAL">
@@ -1251,6 +1277,37 @@
<value>false</value>
</allowedValues>
</element>
+ <element name="WEBSERVICE_PARAMETER_STYLE">
+ <documentation>
+ Specifies the method parameters represent
+ the entire message body or are elements
+ wrapped inside a top-level element named
+ after the webservice operation.
+ </documentation>
+ <value>@andromda.webservice.parameter.style</value>
+ <appliedOnElement>Service and WebService</appliedOnElement>
+ <allowedValues>
+ <value>wrapped</value>
+ <value>bare</value>
+ </allowedValues>
+ </element>
+ <element name="WEBSERVICE_OPERATION_ONEWAY">
+ <documentation>
+ Specifies the method has only an input message
+ and no output. A oneway method returns the thread
+ of control to the calling application prior to
+ executing the actual business method. Do not
+ model on operations that have a return value
+ or holder parameters or declare any
+ checked exceptions.
+ </documentation>
+ <value>@andromda.webservice.operation.oneway</value>
+ <appliedOnElement>WebService Operation</appliedOnElement>
+ <allowedValues>
+ <value>true</value>
+ <value>false</value>
+ </allowedValues>
+ </element>
</elementGroup>
</elements>
</profile>
\ No newline at end of file
|
|
From: Vance K. <va...@us...> - 2006-04-11 16:04:33
|
User: vancek
Date: 06/04/11 09:04:28
Modified: andromda-ejb3/src/main/resources/META-INF/andromda
namespace.xml
Log:
added serviceBaseNamePattern and webServiceInterfaceNamePattern to name pattern group
added WebService Property group
Revision Changes Path
1.20 +106 -0 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.19
retrieving revision 1.20
diff -u -w -r1.19 -r1.20
--- namespace.xml 20 Mar 2006 08:46:07 -0000 1.19
+++ namespace.xml 11 Apr 2006 16:04:28 -0000 1.20
@@ -412,6 +412,13 @@
bean delegate class name.
</documentation>
</property>
+ <property name="serviceBaseNamePattern">
+ <default>{0}Base</default>
+ <documentation>
+ The pattern to use when constructing the service
+ bean base class name.
+ </documentation>
+ </property>
<property name="serviceImplementationOperationNamePattern">
<default>handle{0}</default>
<documentation>
@@ -520,6 +527,14 @@
Collection.
</documentation>
</property>
+ <property name="webServiceInterfaceNamePattern">
+ <default>{0}WSInterface</default>
+ <documentation>
+ The pattern to use when defining the web
+ service interface name when exposing
+ session bean operations as web services.
+ </documentation>
+ </property>
</propertyGroup>
<propertyGroup name="MDB Properties">
<property name="messageDrivenDestinationType">
@@ -737,6 +752,97 @@
</documentation>
</property>
</propertyGroup>
+ <propertyGroup name="WebService Properties">
+ <property name="webServiceDefaultStyle">
+ <default>rpc</default>
+ <documentation>
+ The default style given all web services (if not defined seperately
+ on each web service). Possible choices are:
+ <ul>
+ <li>rpc</li>
+ <li>document</li>
+ </ul>
+ </documentation>
+ </property>
+ <property name="webServiceDefaultUse">
+ <default>literal</default>
+ <documentation>
+ The default use given all web services (if not defined seperately
+ on each web service). Possible choices are:
+ <ul>
+ <li>literal</li>
+ <li>encoded</li>
+ </ul>
+ </documentation>
+ </property>
+ <property name="webServiceDefaultParameterStyle">
+ <default>wrapped</default>
+ <documentation>
+ The default parameter encoding style for a
+ webservice operation. Possible choices are:
+ <ul>
+ <li>wrapped</li>
+ <li>bare</li>
+ </ul>
+ </documentation>
+ </property>
+ <property name="webServiceQualifiedNameLocalPartPattern">
+ <default>{0}</default>
+ <documentation>
+ The pattern to use when a qualified name local part
+ is created. {0} represents the name of the classifier
+ (Service).
+ </documentation>
+ </property>
+ <property name="webServiceEnabled">
+ <documentation>
+ Specifies whether to use the JSR 181 web services
+ standards to expose web service operations in the
+ EJB3 cartridge.
+ If set to false, use the webservice cartridge
+ provided by AndroMDA/Axis. Possible choices are:
+ <ul>
+ <li>true</li>
+ <li>false</li>
+ </ul>
+ </documentation>
+ </property>
+ <property name="webServiceNamespacePattern">
+ <default>http://{0}/{1}</default>
+ <documentation>
+ The pattern to use when a namespace is created.
+ <em>{0}</em> represents the package name of the classifier (i.e.
+ <em>ws.{0}</em> would prefix all your type and service
+ namespaces with <em>ws.</em>).
+ </documentation>
+ </property>
+ <property name="webServiceReverseNamespace">
+ <default>false</default>
+ <documentation>
+ Whether or not to reverse the ordering of the namespace.
+ The namespace is typically determined by the package
+ name of the service or type, this allows you to reverse the package
+ name. (i.e. org.andromda.samples would become
+ <em>samples.andromda.org</em> if this was set to <code>true</code>).
+ Possible value are:
+ <ul>
+ <li>true</li>
+ <li>false</li>
+ </ul>
+ </documentation>
+ </property>
+ <property name="webServiceContextRoot">
+ <documentation>
+ The context root for the web service.
+ </documentation>
+ </property>
+ <property name="webServiceUrlPattern">
+ <documentation>
+ The URL pattern appended to the context
+ root for the web service.
+ </documentation>
+ </property>
+ </propertyGroup>
<propertyGroup name="Other Properties">
<property name="persistenceContainerName">
<default>jboss</default>
|
|
From: Vance K. <va...@us...> - 2006-04-11 16:02:49
|
User: vancek
Date: 06/04/11 09:02:48
Modified: andromda-ejb3/src/main/resources/META-INF/andromda
metafacades.xml
Log:
added EJB3WebServiceFacadeLogicImpl and EJB3WebServiceOperationFacadeLogicImpl metafacades
replaced mapping context element for EJB3SessionOperationFacadeLoginImpl and EJB3MessageDrivenOperationFacadeLoginImpl metafacades with a mapping property
Revision Changes Path
1.21 +67 -32 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.20
retrieving revision 1.21
diff -u -w -r1.20 -r1.21
--- metafacades.xml 20 Mar 2006 08:44:45 -0000 1.20
+++ metafacades.xml 11 Apr 2006 16:02:48 -0000 1.21
@@ -9,6 +9,22 @@
<property reference="entityCompositePrimaryKeyNamePattern"/>
<property reference="labelCollectionNamePattern"/>
<property reference="labelSingleNamePattern"/>
+ <property reference="serviceNamePattern"/>
+ <property reference="serviceLocalInterfaceNamePattern"/>
+ <property reference="serviceRemoteInterfaceName"/>
+ <property reference="serviceImplementationNamePattern"/>
+ <property reference="serviceListenerNamePattern"/>
+ <property reference="serviceDelegateNamePattern"/>
+ <property reference="serviceBaseNamePattern"/>
+ <property reference="defaultServiceExceptionNamePattern"/>
+ <property reference="webServiceEnabled"/>
+ <property reference="webServiceInterfaceNamePattern"/>
+ <property reference="webServiceDefaultStyle"/>
+ <property reference="webServiceDefaultUse"/>
+ <property reference="webServiceDefaultParameterStyle"/>
+ <property reference="webServiceQualifiedNameLocalPartPattern"/>
+ <property reference="webServiceReverseNamespace"/>
+ <property reference="webServiceNamespacePattern"/>
<property reference="entityDefaultCascade"/>
<property reference="hibernateEnableCache"/>
<property reference="hibernateEntityCache"/>
@@ -28,6 +44,7 @@
<property reference="allowDefaultServiceException"/>
<property reference="compositionDefinesEagerLoading"/>
<property reference="jndiNamePrefix"/>
+
<!-- Manageable Entity Metafacades -->
<metafacade class="org.andromda.cartridges.ejb3.metafacades.EJB3ManageableEntityFacadeLogicImpl" contextRoot="true">
<mapping>
@@ -52,7 +69,33 @@
</context>
</mapping>
</metafacade>
- <!-- Entity EJB Metafacades -->
+
+ <!-- WebService Metafacades -->
+ <metafacade class="org.andromda.cartridges.ejb3.metafacades.EJB3WebServiceFacadeLogicImpl" contextRoot="true">
+ <mapping>
+ <stereotype>SERVICE</stereotype>
+ <stereotype>WEBSERVICE</stereotype>
+ </mapping>
+ </metafacade>
+ <metafacade class="org.andromda.cartridges.ejb3.metafacades.EJB3WebServiceFacadeLogicImpl" contextRoot="true">
+ <mapping>
+ <stereotype>SERVICE</stereotype>
+ </mapping>
+ </metafacade>
+ <metafacade class="org.andromda.cartridges.ejb3.metafacades.EJB3WebServiceOperationFacadeLogicImpl">
+ <mapping>
+ <stereotype>WEBSERVICE_OPERATION</stereotype>
+ </mapping>
+ <property reference="serviceImplementationOperationNamePattern"/>
+ </metafacade>
+ <metafacade class="org.andromda.cartridges.ejb3.metafacades.EJB3WebServiceOperationFacadeLogicImpl">
+ <mapping>
+ <property name="owner.eJB3WebServiceFacadeMetaType"/>
+ </mapping>
+ <property reference="serviceImplementationOperationNamePattern"/>
+ </metafacade>
+
+ <!-- Entity Metafacades -->
<metafacade class="org.andromda.cartridges.ejb3.metafacades.EJB3OperationFacadeLogicImpl">
<mapping>
<context>
@@ -121,26 +164,18 @@
<property reference="entityDefaultGeneratorInitialValue"/>
<property reference="entityDefaultGeneratorAllocationSize"/>
</metafacade>
+
<!-- Session EJB Metafacades -->
- <metafacade class="org.andromda.cartridges.ejb3.metafacades.EJB3SessionOperationFacadeLogicImpl">
+ <metafacade class="org.andromda.cartridges.ejb3.metafacades.EJB3SessionFacadeLogicImpl" contextRoot="true">
<mapping>
- <context>
- org.andromda.cartridges.ejb3.metafacades.EJB3SessionFacade
- </context>
+ <stereotype>SERVICE</stereotype>
</mapping>
- <property reference="serviceImplementationOperationNamePattern"/>
</metafacade>
- <metafacade class="org.andromda.cartridges.ejb3.metafacades.EJB3SessionFacadeLogicImpl" contextRoot="true">
+ <metafacade class="org.andromda.cartridges.ejb3.metafacades.EJB3SessionOperationFacadeLogicImpl">
<mapping>
- <stereotype>SERVICE</stereotype>
+ <property name="owner.eJB3SessionFacadeMetaType"/>
</mapping>
- <property reference="serviceNamePattern"/>
- <property reference="serviceLocalInterfaceNamePattern"/>
- <property reference="serviceRemoteInterfaceName"/>
- <property reference="serviceImplementationNamePattern"/>
- <property reference="serviceListenerNamePattern"/>
- <property reference="serviceDelegateNamePattern"/>
- <property reference="defaultServiceExceptionNamePattern"/>
+ <property reference="serviceImplementationOperationNamePattern"/>
</metafacade>
<metafacade class="org.andromda.cartridges.ejb3.metafacades.EJB3SessionAttributeFacadeLogicImpl">
<mapping>
@@ -149,6 +184,7 @@
</context>
</mapping>
</metafacade>
+
<!-- Message Driven EJB Metafacades -->
<metafacade class="org.andromda.cartridges.ejb3.metafacades.EJB3MessageDrivenFacadeLogicImpl" contextRoot="true">
<mapping>
@@ -161,11 +197,10 @@
</metafacade>
<metafacade class="org.andromda.cartridges.ejb3.metafacades.EJB3MessageDrivenOperationFacadeLogicImpl">
<mapping>
- <context>
- org.andromda.cartridges.ejb3.metafacades.EJB3MessageDrivenFacade
- </context>
+ <property name="eJB3MessageDrivenFacadeMetaType"/>
</mapping>
</metafacade>
+
<!-- Common Metafacades -->
<metafacade class="org.andromda.cartridges.ejb3.metafacades.EJB3InterceptorFacadeLogicImpl" contextRoot="true">
<mapping>
|
|
From: Vance K. <va...@us...> - 2006-04-11 15:56:59
|
User: vancek
Date: 06/04/11 08:56:57
Modified: andromda-ejb3/src/main/resources/META-INF/andromda
cartridge.xml
Log:
added WebServiceInterface.vsl
renamed SessionBean.vsl to SessionBeanBase.vsl
Revision Changes Path
1.21 +17 -1 cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/cartridge.xml
Index: cartridge.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/cartridge.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -w -r1.20 -r1.21
--- cartridge.xml 20 Mar 2006 08:44:45 -0000 1.20
+++ cartridge.xml 11 Apr 2006 15:56:57 -0000 1.21
@@ -40,6 +40,8 @@
<property reference="jndiNamePrefix"/>
<property reference="securityRealm"/>
<property reference="enableClustering"/>
+ <property reference="webServiceContextRoot"/>
+ <property reference="webServiceUrlPattern"/>
<!-- Entity Bean Templates -->
@@ -127,7 +129,7 @@
<!-- Session Bean Templates -->
<template
- path="templates/ejb3/SessionBean.vsl"
+ path="templates/ejb3/SessionBeanBase.vsl"
outputPattern="$generatedFile"
outlet="session-beans"
overwrite="true">
@@ -221,6 +223,20 @@
</template>
<template
+ path="templates/ejb3/WebServiceInterface.vsl"
+ outputPattern="$generatedFile"
+ outlet="services"
+ overwrite="true">
+ <modelElements variable="service">
+ <modelElement>
+ <type name="org.andromda.cartridges.ejb3.metafacades.EJB3WebServiceFacade">
+ <property name="webServiceEnabled"/>
+ </type>
+ </modelElement>
+ </modelElements>
+ </template>
+
+ <template
path="templates/ejb3/DefaultServiceException.vsl"
outputPattern="$generatedFile"
outlet="commons"
|
|
From: Vance K. <va...@us...> - 2006-04-11 15:56:12
|
User: vancek
Date: 06/04/11 08:56:05
Modified: andromda-ejb3/src/main/resources/templates/ejb3/crud
ManageableServiceLocator.vsl
Log:
used service name in jndi name variable rather than fully qualified service name
added method to get the local interface
Revision Changes Path
1.3 +22 -4 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/crud/ManageableServiceLocator.vsl
Index: ManageableServiceLocator.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/crud/ManageableServiceLocator.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- ManageableServiceLocator.vsl 14 Mar 2006 06:08:36 -0000 1.2
+++ ManageableServiceLocator.vsl 11 Apr 2006 15:56:04 -0000 1.3
@@ -107,20 +107,20 @@
public final $manageable.fullyQualifiedManageableServiceName get${manageable.manageableServiceName}()
throws javax.naming.NamingException
{
- return this.get${manageable.manageableServiceName}(null);
+ return this.get${manageable.manageableServiceName}Remote(null);
}
/**
- * Gets an instance of {@link $manageable.fullyQualifiedManageableServiceName}.
+ * Get the remote interface for {@link $manageable.fullyQualifiedManageableServiceName}.
*
* @param env the Context environment properties. Null represents no properties.
* @throws javax.naming.NamingException failure to lookup remote manageable service interface.
*/
- public final $manageable.fullyQualifiedManageableServiceName get${manageable.manageableServiceName}(java.util.Properties env)
+ public final $manageable.fullyQualifiedManageableServiceName get${manageable.manageableServiceName}Remote(java.util.Properties env)
throws javax.naming.NamingException
{
#**##if ($stringUtils.isNotBlank($manageable.jndiNamePrefix))
-#* *##set ($jndiName = "${manageable.jndiNamePrefix}/${manageable.fullyQualifiedManageableServiceName}/remote")
+#* *##set ($jndiName = "${manageable.jndiNamePrefix}/${manageable.manageableServiceName}/remote")
#**##else
#* *##set ($jndiName = "${manageable.manageableServiceName}/remote")
#**##end
@@ -128,7 +128,25 @@
getContext(env).lookup("${jndiName}");
}
+ /**
+ * Get the local interface for {@link $manageable.fullyQualifiedManageableServiceName}.
+ *
+ * @param env the Context environment properties. Null represents no properties.
+ * @throws javax.naming.NamingException failure to lookup remote manageable service interface.
+ */
+ public final $manageable.fullyQualifiedManageableServiceName get${manageable.manageableServiceName}Local(java.util.Properties env)
+ throws javax.naming.NamingException
+ {
+#**##if ($stringUtils.isNotBlank($manageable.jndiNamePrefix))
+#* *##set ($jndiName = "${manageable.jndiNamePrefix}/${manageable.manageableServiceName}/local")
+#**##else
+#* *##set ($jndiName = "${manageable.manageableServiceName}/local")
+#**##end
+ return ($manageable.fullyQualifiedManageableServiceName)
+ getContext(env).lookup("${jndiName}");
+ }
#end
+
/**
* Gets an instance of the given service.
*
|
|
From: Vance K. <va...@us...> - 2006-04-11 15:54:11
|
User: vancek
Date: 06/04/11 08:54:08
Modified: andromda-ejb3/src/main/resources/templates/ejb3/config/jboss
jboss-app.xml.vsl
Log:
used xmlEncoding
Revision Changes Path
1.2 +1 -1 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/config/jboss/jboss-app.xml.vsl
Index: jboss-app.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/config/jboss/jboss-app.xml.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- jboss-app.xml.vsl 14 Mar 2006 06:13:49 -0000 1.1
+++ jboss-app.xml.vsl 11 Apr 2006 15:54:08 -0000 1.2
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="${xmlEncoding}"?>
<!DOCTYPE jboss-app
PUBLIC '-//JBoss//DTD J2EE Application 1.3V2//EN'
'http://www.jboss.org/j2ee/dtd/jboss-app_4_0.dtd'>
|
|
From: Vance K. <va...@us...> - 2006-04-11 15:53:52
|
User: vancek
Date: 06/04/11 08:53:45
Modified: andromda-ejb3/src/main/resources/templates/ejb3/config/jboss
jboss.xml.vsl
Log:
added xml namespace/schema properties to jboss root element
reverted back to using bean names rather than fully qualified names for ejb-name element
destination-jndi-name element for message-driven moved below configuration-name
Revision Changes Path
1.2 +10 -8 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/config/jboss/jboss.xml.vsl
Index: jboss.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/config/jboss/jboss.xml.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- jboss.xml.vsl 14 Mar 2006 06:14:11 -0000 1.1
+++ jboss.xml.vsl 11 Apr 2006 15:53:45 -0000 1.2
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="${xmlEncoding}"?>
-<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
-
-<jboss>
+<jboss
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+ version="3.0">
#foreach ($service in $services)
#**##if ($service.securityEnabled && !$generatedFile)
@@ -17,7 +19,7 @@
#foreach ($service in $services)
<session>
- <ejb-name>${service.fullyQualifiedServiceName}</ejb-name>
+ <ejb-name>${service.serviceName}</ejb-name>
#**##if ($service.viewTypeRemote && $stringUtils.isNotBlank($service.jndiNameRemote))
<jndi-name>${service.jndiNameRemote}</jndi-name>
#**##end
@@ -29,17 +31,17 @@
#end
#foreach ($manageable in $manageables)
<session>
- <ejb-name>${manageable.fullyQualifiedManageableServiceName}</ejb-name>
+ <ejb-name>${manageable.manageableServiceName}</ejb-name>
</session>
#end
#foreach ($mdb in $mdbs)
<message-driven>
- <ejb-name>${mdb.fullyQualifiedMessageDrivenName}</ejb-name>
- <destination-jndi-name>${mdb.destination}</destination-jndi-name>
+ <ejb-name>${mdb.messageDrivenName}</ejb-name>
#**##if ($stringUtils.isNotBlank($mdb.containerConfiguration))
<configuration-name>${mdb.containerConfiguration}</configuration-name>
#**##end
+ <destination-jndi-name>${mdb.destination}</destination-jndi-name>
</message-driven>
#end
|
|
From: Vance K. <va...@us...> - 2006-04-11 15:52:06
|
User: vancek
Date: 06/04/11 08:51:59
Modified: andromda-ejb3/src/main/resources/templates/ejb3/config/jboss
ejb3-entity-cache-service.xml.vsl
Log:
used xmlEncoding variable
Revision Changes Path
1.3 +1 -1 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/config/jboss/ejb3-entity-cache-service.xml.vsl
Index: ejb3-entity-cache-service.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/config/jboss/ejb3-entity-cache-service.xml.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- ejb3-entity-cache-service.xml.vsl 20 Mar 2006 08:16:46 -0000 1.2
+++ ejb3-entity-cache-service.xml.vsl 11 Apr 2006 15:51:59 -0000 1.3
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="${xmlEncoding}"?>
<server>
<!-- ==================================================================== -->
|
|
From: Vance K. <va...@us...> - 2006-04-11 15:50:08
|
User: vancek
Date: 06/04/11 08:50:04
Modified: andromda-ejb3/src/main/resources/templates/ejb3/config
persistence.xml.vsl
Log:
added xml namespace/schema properties for persistence root element, but commented for time being
Revision Changes Path
1.2 +9 -0 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/config/persistence.xml.vsl
Index: persistence.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/config/persistence.xml.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- persistence.xml.vsl 14 Mar 2006 06:12:34 -0000 1.1
+++ persistence.xml.vsl 11 Apr 2006 15:50:03 -0000 1.2
@@ -4,6 +4,15 @@
Generated by: persistence.xml.vsl in andromda-ejb3-cartridge.
-->
<persistence>
+
+<!--
+<persistence
+ xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
+ http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
+ version="1.0">
+-->
<persistence-unit name="${entityManagerName}">
#if ($stringUtils.isNotBlank($entityManagerJTADataSource))
<jta-data-source>${entityManagerJTADataSource}</jta-data-source>
|
|
From: Vance K. <va...@us...> - 2006-04-11 15:48:57
|
User: vancek
Date: 06/04/11 08:48:56
Modified: andromda-ejb3/src/main/resources/templates/ejb3/config
ejb-jar.xml.vsl
Log:
added xml namesapce/schema properties to ejb-jar root element
reverted back to using bean names for ejb-name element
fixed message-driven bean activation-config elements
Revision Changes Path
1.3 +41 -29 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/config/ejb-jar.xml.vsl
Index: ejb-jar.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/config/ejb-jar.xml.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- ejb-jar.xml.vsl 16 Mar 2006 02:09:32 -0000 1.2
+++ ejb-jar.xml.vsl 11 Apr 2006 15:48:56 -0000 1.3
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="${xmlEncoding}"?>
-<!--
-<!DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN"
- "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
--->
-<ejb-jar version="3.0">
+<ejb-jar
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"
+ version="3.0">
<description><![CDATA[No Description.]]></description>
<display-name>Generated by AndroMDA EJB3 Cartridge</display-name>
@@ -17,14 +18,14 @@
$service.getDocumentation(" ", 64, false)
]]>
</description>
- <ejb-name>${service.fullyQualifiedServiceName}</ejb-name>
+ <ejb-name>${service.serviceName}</ejb-name>
#**##if ($service.viewTypeRemote)
<remote>${service.fullyQualifiedServiceRemoteInterfaceName}</remote>
#**##end
#**##if ($service.viewTypeLocal)
<local>${service.fullyQualifiedServiceLocalInterfaceName}</local>
#**##end
- <ejb-class>${service.fullyQualifiedServiceImplementationName}</ejb-class>
+ <ejb-class>${service.fullyQualifiedServiceName}</ejb-class>
<session-type>${service.type}</session-type>
<transaction-type>Container</transaction-type>
#**##foreach($envEntry in $service.getEnvironmentEntries(true))
@@ -44,7 +45,7 @@
$manageable.getDocumentation(" ", 64, false)
]]>
</description>
- <ejb-name>${manageable.fullyQualifiedManageableServiceName}</ejb-name>
+ <ejb-name>${manageable.manageableServiceName}</ejb-name>
<remote>${manageable.fullyQualifiedManageableServiceName}</remote>
<ejb-class>${manageable.fullyQualifiedManageableServiceBaseName}</ejb-class>
<session-type>Stateless</session-type>
@@ -59,23 +60,32 @@
$mdb.getDocumentation(" ", 64, false)
]]>
</description>
- <ejb-name>${mdb.fullyQualifiedMessageDrivenName}</ejb-name>
+ <ejb-name>${mdb.messageDrivenName}</ejb-name>
<ejb-class>${mdb.fullyQualifiedMessageDrivenImplementationName}</ejb-class>
<transaction-type>Container</transaction-type>
-#**##if ($stringUtils.isNotBlank($mdb.messageSelector))
- <message-selector>
- <![CDATA[${mdb.messageSelector}]]>
- </message-selector>
-#**##end
+ <message-destination-type>${mdb.destinationType}</message-destination-type>
+#**##if ($mdb.transactionManagementBean || $stringUtils.isNotBlank($mdb.messageSelector) || $mdb.destinationTypeTopic)
+ <activation-config>
#**##if ($mdb.transactionManagementBean)
- <acknowledge-mode>${mdb.acknowledgeMode}</acknowledge-mode>
+ <activation-config-property>
+ <activation-config-property-name>acknowledgeMode</activation-config-property-name>
+ <activation-config-property-value>${mdb.acknowledgeMode}</activation-config-property-value>
+ </activation-config-property>
+#* *##end
+#* *##if ($stringUtils.isNotBlank($mdb.messageSelector))
+ <activation-config-property>
+ <activation-config-property-name>messageSelector</activation-config-property-name>
+ <activation-config-property-value><![CDATA[${mdb.messageSelector}]]></activation-config-property-value>
+ </activation-config-property>
#**##end
- <message-driven-destination>
- <destination-type>${mdb.destinationType}</destination-type>
#**##if ($mdb.destinationTypeTopic)
- <subscription-durability>${mdb.subscriptionDurability}</subscription-durability>
+ <activation-config-property>
+ <activation-config-property-name>subscriptionDurability</activation-config-property-name>
+ <activation-config-property-value>${mdb.subscriptionDurability}</activation-config-property-value>
+ </activation-config-property>
+#* *##end
+ </activation-config>
#**##end
- </message-driven-destination>
#**##if ($stringUtils.isNotBlank($mdb.runAs))
<security-identity>
<run-as>
@@ -118,7 +128,7 @@
#**##set ($interceptors = $service.interceptorReferences)
#**##if ($collectionUtils.size($interceptors) >= 1 || $service.listenerEnabled)
<interceptor-binding>
- <ejb-name>${service.fullyQualifiedServiceName}</ejb-name>
+ <ejb-name>${service.serviceName}</ejb-name>
#* *##if ($service.listenerEnabled)
<interceptor-class>${service.fullyQualifiedServiceListenerName}</interceptor-class>
#* *##end
@@ -139,10 +149,11 @@
#* *##set ($interceptors = $operation.interceptorReferences)
#* *##if ($collectionUtils.size($interceptors) >= 1)
<interceptor-binding>
- <ejb-name>${service.fullyQualifiedServiceName}</ejb-name>
+ <ejb-name>${service.serviceName}</ejb-name>
#* *##foreach ($interceptor in $interceptors)
<interceptor-class>${interceptor.fullyQualifiedName}</interceptor-class>
#* *##end
+ <method>
<method-name>${operation.name}</method-name>
#* *##if (!$operation.arguments.empty)
<method-params>
@@ -151,6 +162,7 @@
#* *##end
</method-params>
#* *##end
+ </method>
#* *##if ($operation.excludeClassInterceptors)
<exclude-class-interceptors/>
#* *##end
@@ -168,7 +180,7 @@
#**##set ($interceptors = $mdb.interceptorReferences)
#**##if ($collectionUtils.size($interceptors) >= 1 || $mdb.listenerEnabled)
<interceptor-binding>
- <ejb-name>${mdb.fullyQualifiedMessageDrivenName}</ejb-name>
+ <ejb-name>${mdb.messageDrivenName}</ejb-name>
#* *##if ($mdb.listenerEnabled)
<interceptor-class>${mdb.fullyQualifiedMessageDrivenListenerName}</interceptor-class>
#* *##end
|
|
From: Vance K. <va...@us...> - 2006-04-11 15:45:16
|
User: vancek
Date: 06/04/11 08:45:14
Added: andromda-ejb3/src/main/resources/templates/ejb3
WebServiceInterface.vsl
Log:
initial revision - web service interface for exposing ejb3 session bean webservices using jsr181
Revision Changes Path
1.1 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/WebServiceInterface.vsl
Index: WebServiceInterface.vsl
===================================================================
// license-header java merge-point
/* Autogenerated by AndroMDA (WebServiceInterface.vsl) - do not edit */
#if ($stringUtils.isNotBlank($service.packageName))
package $service.packageName;
#end
#set ($generatedFile = "${stringUtils.replace($service.fullyQualifiedWebServiceInterfaceName,'.','/')}.java")
/**
* Web service interface for the ${service.serviceName} session bean.
*
*/
@javax.jws.WebService(targetNamespace = "${service.namespace}", serviceName = "${service.qName}")
@javax.jws.soap.SOAPBinding(style = javax.jws.soap.SOAPBinding.Style.${stringUtils.upperCase($service.style)}, use = javax.jws.soap.SOAPBinding.Use.${stringUtils.upperCase($service.use)}, parameterStyle = javax.jws.soap.SOAPBinding.ParameterStyle.${stringUtils.upperCase($service.parameterStyle)})
#if ($stringUtils.equals(${persistenceContainerName}, "jboss"))
@org.jboss.ws.annotation.PortComponent(contextRoot = "${webServiceContextRoot}", urlPattern="${webServiceUrlPattern}/${service.qName}/*")
#end
public interface ${service.webServiceInterfaceName}
extends java.rmi.Remote
{
#set ($operations = $service.businessOperations)
#if (!$operations.empty)
#**##foreach ($operation in $operations)
##
## Only expose methods that are not lifecycle callbacks
## Only expose public methods with remote view type accessability
## Operation must be exposed as a web-service operation (<<WebService>> on class or <<WebServiceOperation>> on operation)
## All operations throw java.rmi.RemoteException
##
#* *##if (!$operation.lifecycleCallback && ($operation.visibility == "public") && ($operation.viewTypeRemote || $operation.viewTypeBoth) && ($operation.exposed))
@javax.jws.WebMethod(operationName = "${stringUtils.capitalize($operation.name)}")
#* *##if ($operation.oneway)
@javax.jws.Oneway
#* *##end
public $operation.returnType.fullyQualifiedName $operation.annotatedSignature#if ($operation.exceptionsPresent) $operation.throwsClause, java.rmi.RemoteException#else throws java.rmi.RemoteException#end;
#* *##end
#**##end
#end
}
|
|
From: Vance K. <va...@us...> - 2006-04-11 15:44:25
|
User: vancek
Date: 06/04/11 08:44:24
Modified: andromda-ejb3/src/main/resources/templates/ejb3
SessionListener.vsl
Log:
changed package locations for PostConstruct and PreDestroy to javax.annotation
Revision Changes Path
1.6 +2 -2 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionListener.vsl
Index: SessionListener.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionListener.vsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- SessionListener.vsl 9 Mar 2006 04:32:03 -0000 1.5
+++ SessionListener.vsl 11 Apr 2006 15:44:24 -0000 1.6
@@ -19,7 +19,7 @@
// empty constructor
}
- @javax.ejb.PostConstruct
+ @javax.annotation.PostConstruct
public void postConstruct(javax.ejb.InvocationContext ctx)
{
try
@@ -33,7 +33,7 @@
}
}
- @javax.ejb.PreDestroy
+ @javax.annotation.PreDestroy
public void preDestroy(javax.ejb.InvocationContext ctx)
{
try
|
|
From: Vance K. <va...@us...> - 2006-04-11 15:43:36
|
User: vancek
Date: 06/04/11 08:43:34
Modified: andromda-ejb3/src/main/resources/templates/ejb3
SessionBeanImpl.vsl
Log:
fixed constructor naming - impl class name is now the bean name
Revision Changes Path
1.11 +19 -6 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionBeanImpl.vsl
Index: SessionBeanImpl.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionBeanImpl.vsl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- SessionBeanImpl.vsl 14 Mar 2006 06:11:49 -0000 1.10
+++ SessionBeanImpl.vsl 11 Apr 2006 15:43:34 -0000 1.11
@@ -2,18 +2,31 @@
#if ($stringUtils.isNotBlank($service.packageName))
package $service.packageName;
#end
-#set ($generatedFile = "${stringUtils.replace($service.fullyQualifiedServiceImplementationName,'.','/')}.java")
+#set ($generatedFile = "${stringUtils.replace($service.fullyQualifiedServiceName,'.','/')}.java")
/**
* @see ${service.fullyQualifiedServiceName}
*/
-public class ${service.serviceImplementationName}
- extends ${service.fullyQualifiedServiceName}
+/**
+ * Do not specify the javax.ejb.${service.type} annotation
+ * Instead, define the session bean in the ejb-jar.xml descriptor
+ * @javax.ejb.${service.type}
+ */
+#if ($service.webServiceEnabled)
+@javax.jws.WebService(endpointInterface = "${service.fullyQualifiedWebServiceInterfaceName}")
+#else
+/**
+ * Uncomment to enable webservices for ${service.serviceName}
+ *@javax.jws.WebService(endpointInterface = "${service.fullyQualifiedWebServiceInterfaceName}")
+ */
+#end
+public class ${service.serviceName}
+ extends ${service.fullyQualifiedServiceBaseName}
{
// --------------- Constructors ---------------
## Default create method with no arguments.
- public ${service.serviceImplementationName}()
+ public ${service.serviceName}()
{
super();
}
@@ -23,7 +36,7 @@
$operation.getDocumentation(" * ")
*
*/
- public ${service.serviceImplementationName}($operation.typedArgumentList)
+ public ${service.serviceName}($operation.typedArgumentList)
{
// implementation
}
@@ -38,7 +51,7 @@
* @param $attribute.name Value for the ${attribute.name} property
#**##end
*/
- public ${service.serviceImplementationName}(${service.getAttributesAsList($allAttributes, true, true)})
+ public ${service.serviceName}(${service.getAttributesAsList($allAttributes, true, true)})
{
#**##if(!$allAttributes.empty)
super($service.getAttributesAsList($allAttributes, false, true));
|
|
From: Vance K. <va...@us...> - 2006-04-11 15:41:50
|
User: vancek
Date: 06/04/11 08:41:49
Added: andromda-ejb3/src/main/resources/templates/ejb3
SessionBeanBase.vsl
Log:
initial revision - abstract root/base session bean class
Revision Changes Path
1.1 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionBeanBase.vsl
Index: SessionBeanBase.vsl
===================================================================
// license-header java merge-point
/* Autogenerated by AndroMDA (SessionBean.vsl) - do not edit */
#parse("templates/ejb3/Globals.vm")
#if ($stringUtils.isNotBlank($service.packageName))
package $service.packageName;
#end
#set ($generatedFile = "${stringUtils.replace($service.fullyQualifiedServiceBaseName,'.','/')}.java")
/**
* Autogenerated EJB session bean base class ${service.serviceName}.
#if ($service.stateful)
*
* ${service.serviceName} is a stateful session bean and implements Serializable to maintain
* state when bean instance not in use.
#end
*
$service.getDocumentation(" * ")
*/
#if ($service.transactionManagement)
@javax.ejb.TransactionManagement(javax.ejb.TransactionManagementType.${service.transactionManagement})
#end
#if (!$service.transactionManagementBean)
#**##if ($service.transactionType)
@javax.ejb.TransactionAttribute(javax.ejb.TransactionAttributeType.${service.transactionType})
#**##end
#end
#if ($stringUtils.isNotBlank($service.securityRealm))
#**##if ($service.persistenceContainerJboss)
@org.jboss.annotation.security.SecurityDomain("${service.securityRealm}")
#**##end
#end
#if ($service.runAs)
@javax.annotation.security.RunAs("${service.runAs}")
#end
#if ($service.jndiNameRemote)
#**##if ($service.persistenceContainerJboss)
@org.jboss.annotation.ejb.RemoteBinding(jndiBinding = "${service.jndiNameRemote}")
#**##end
#end
#if ($service.jndiNameLocal)
#**##if ($service.persistenceContainerJboss)
@org.jboss.annotation.ejb.LocalBinding(jndiBinding = "${service.jndiNameLocal}")
#**##end
#end
#if ($service.viewTypeLocal)
@javax.ejb.Local({${service.fullyQualifiedServiceLocalInterfaceName}.class})
#end
#if ($service.viewTypeRemote)
@javax.ejb.Remote({${service.fullyQualifiedServiceRemoteInterfaceName}.class})
#end
#if ($service.clusteringEnabled)
@org.jboss.annotation.ejb.Clustered
#end
#set ($interceptors = $service.interceptorReferences)
#if ($collectionUtils.size($interceptors) >= 1 || $service.listenerEnabled)
#**##if ($service.listenerEnabled)
#* *##set ($lifecycleCallback = "${service.fullyQualifiedServiceListenerName}.class")
#**##else
#* *##set ($lifecycleCallback = "")
#**##end
// Lifecycle callback listeners and interceptors are defined in ejb-jar.xml
// @javax.ejb.Interceptors({$transform.getInterceptorsAsList(${interceptors}, ${lifecycleCallback})})
#end
#if ($service.excludeDefaultInterceptors)
// @javax.ejb.ExcludeDefaultInterceptors
#end
public abstract class ${service.serviceBaseName}
#if($service.generalization)
extends ${service.generalization.fullyQualifiedServiceName}
#end
implements#if ($service.viewTypeLocal) ${service.fullyQualifiedServiceLocalInterfaceName}#if ($service.viewTypeRemote),#end#end#if ($service.viewTypeRemote) ${service.fullyQualifiedServiceRemoteInterfaceName}#end#if ($service.stateful), java.io.Serializable#end
{
// ------ Session Context Injection ------
@javax.annotation.Resource
protected javax.ejb.SessionContext context;
#if ($service.transactionManagementBean)
// ---------- User Transaction Injection ---------
@javax.annotation.Resource
protected javax.transaction.UserTransaction userTrans;
#end
// ------ Persistence Context Definitions --------
#set ($argExists = false)
/**
* Inject persistence context #if ($service.persistenceContextUnitName)${service.persistenceContextUnitName}#end
*/
@javax.persistence.PersistenceContext#if ($service.persistenceContextUnitName || $service.persistenceContextType)(#end#if ($service.persistenceContextUnitName)unitName = "${service.persistenceContextUnitName}"#set ($argExists = true)#end#if ($service.persistenceContextType)#if ($argExists),#end type = javax.persistence.PersistenceContextType.${service.persistenceContextType}#end#if ($service.persistenceContextUnitName || $service.persistenceContextType))#end
protected javax.persistence.EntityManager emanager;
#foreach ($persistenceContext in $service.persistenceContextReferences)
#**##set ($argExists = false)
/**
* Inject persistence context #if ($persistenceContext.unitName)${persistenceContext.unitName}#end
*/
@javax.persistence.PersistenceContext#if ($persistenceContext.unitName || $persistenceContext.contextType)(#end#if ($persistenceContext.unitName)unitName = "${persistenceContext.unitName}"#set ($argExists = true)#end#if ($persistenceContext.contextType)#if ($argExists),#end type = javax.persistence.PersistenceContextType.${persistenceContext.contextType}#end#if ($persistenceContext.unitName || $persistenceContext.contextType))#end
protected javax.persistence.EntityManager $stringUtils.uncapitalize(${persistenceContext.name});
#end
#set ($references = $service.serviceReferences)
#if (!$references.empty)
// ------ EJB Injection Definitions --------
#**##foreach ($dependency in $references)
#* *##set ($reference = $dependency.targetElement)
/**
* Inject session EJB ${reference.name}
*/
@javax.annotation.EJB
protected ${reference.fullyQualifiedServiceRemoteInterfaceName} $stringUtils.uncapitalize(${reference.name});
#**##end
#end
#set ($mdbReferences = $service.messageDrivenReferences)
#if (!$mdbReferences.empty)
// ------ Message Driven EJB Injection Definitions --------
#**##foreach ($dependency in $mdbReferences)
#* *##set ($reference = $dependency.targetElement)
#* *##if ($reference.destinationTypeQueue)
#* *##if (!$queueConnectionFactoryDefined)
@javax.annotation.Resource(mappedName = "java:/JmsXA")
protected javax.jms.QueueConnectionFactory queueFactory;
#* *##set ($queueConnectionFactoryDefined = true)
#* *##end
#* *##elseif ($reference.destinationTypeTopic)
#* *##if (!$topicConnectionFactoryDefined)
@javax.annotation.Resource(mappedName = "java:/JmsXA")
protected javax.jms.TopicConnectionFactory topicFactory;
#* *##set ($topicConnectionFactoryDefined = true)
#* *##end
#* *##end
/**
* Inject ${reference.destinationType}
*/
@javax.annotation.Resource(mappedName = "${reference.destination}")
## NOTE: CHANGE TO USE mappedName
protected javax.jms.Destination $stringUtils.uncapitalize(${reference.name});
#**##end
#end
#set ($constants = $service.getConstants(true))
#if (!$constants.empty)
// ----------- Constant Definitions -----------
#**##foreach($constant in $constants)
private static final $constant.type.fullyQualifiedName $constant.name = $constant.defaultValue;
#**##end
#end
#set ($instanceAttributes = $service.instanceAttributes)
#if(!$instanceAttributes.empty)
// --------- Attribute Definitions ------------
#**##foreach ($attribute in $instanceAttributes)
/**
* The $attribute.name property
*/
protected $attribute.type.fullyQualifiedName $attribute.name;
#**##end
#end
#set ($envEntries = $service.getEnvironmentEntries(true))
#if (!$envEntries.empty)
// ---------- Env Entry Injection -----------
#**##foreach ($envEntry in $envEntries)
/**
* The $envEntry.name resource injection
*/
@javax.annotation.Resource(name = "${envEntry.name}")
protected $envEntry.type.fullyQualifiedName $envEntry.name;
#**##end
#end
// --------------- Constructors ---------------
## Default create method with no arguments.
public ${service.serviceBaseName}()
{
super();
}
## Autogenerated create method with all attributes. Only present for stateful beans.
#set ($allAttributes = $service.allInstanceAttributes)
#if (!$allAttributes.empty)
/**
* Constructor with all attribute values.
#**##set ($inheritedAttributes = $service.inheritedInstanceAttributes)
#**##foreach($attribute in $allAttributes)
* @param $attribute.name Value for the ${attribute.name} property
#**##end
*/
public ${service.serviceBaseName}($service.getAttributesAsList($allAttributes, true, true))
{
#**##if(!$inheritedAttributes.empty)
super($service.getAttributesAsList($inheritedAttributes, false, true));
#**##end
#**##foreach ($attribute in $service.instanceAttributes)
## Don't use a setter here - we may have none if the attribute is marked readonly
this.$attribute.name = $attribute.name;
#**##end
}
#end
#if (!$constants.empty)
// --------- Accessors for Constants ----------
#**##foreach($constant in $constants)
#* *##if ($constant.visibility == "public")
/**
* Get the <code>$constant.name</code> constant
$constant.getDocumentation(" * ")
*/
$constant.visibility $constant.type.fullyQualifiedName ${constant.getterName}()
{
return $constant.name;
}
#* *##end
#**##end
#end
#if(!$instanceAttributes.empty)
// ------- Accessors for Attributes ----------
#**##foreach ($attribute in $instanceAttributes)
#* *##set ($visibility = $attribute.visibility)
#* *##if ($visibility == "public")
/**
* Get the ${attribute.name} property
$attribute.getDocumentation(" * ")
*/
#* *##if (!$service.transactionManagementBean)
#* *##if ($attribute.transactionType)
@javax.ejb.TransactionAttribute(javax.ejb.TransactionAttributeType.${attribute.transactionType})
#* *##end
#* *##end
$visibility $attribute.type.fullyQualifiedName ${attribute.getterName}()
{
return $attribute.name;
}
## Only generate a setter if the attribute is not read-only
#* *##if (!$attribute.readOnly)
/**
* Set the $attribute.name property
* @param value the new value
*/
#* *##if (!$service.transactionManagementBean)
#* *##if ($attribute.transactionType)
@javax.ejb.TransactionAttribute(javax.ejb.TransactionAttributeType.${attribute.transactionType})
#* *##end
#* *##end
$visibility void ${attribute.setterName}($attribute.type.fullyQualifiedName value)
{
this.$attribute.name = value;
}
#* *##end
#* *##end
#**##end
#end
#set ($operations = $service.businessOperations)
#if (!$operations.empty)
// -------- Business Methods --------------
#**##foreach ($operation in $operations)
##
## Check that operation is NOT a lifecycle callback
##
#* *##if (!$operation.lifecycleCallback)
/**
$operation.getDocumentation(" * ")
*/
#* *##if (!$service.transactionManagementBean)
#* *##if ($operation.transactionType)
@javax.ejb.TransactionAttribute(javax.ejb.TransactionAttributeType.${operation.transactionType})
#* *##end
#* *##end
#* *##if ($service.securityEnabled)
#* *##if ($stringUtils.isBlank(${operation.rolesAllowed}))
#* *##if ($operation.denyAll)
@javax.annotation.security.DenyAll
#* *##else
@javax.annotation.security.PermitAll
#* *##end
#* *##else
@javax.annotation.security.RolesAllowed({${operation.rolesAllowed}})
#* *##end
#* *##end
#* *##if ($operation.flushMode)
@javax.persistence.FlushMode(javax.persistence.FlushModeType.${operation.flushMode})
#* *##end
#* *##if ($operation.timeoutCallback)
@javax.ejb.Timeout
#* *##end
#* *##set ($interceptors = $operation.interceptorReferences)
#* *##if ($collectionUtils.size($interceptors) >= 1)
// Interceptors are defined in ejb-jar.xml
// @javax.ejb.Interceptors({$transform.getInterceptorsAsList(${interceptors}, "")})
#* *##end
#* *##if ($operation.excludeDefaultInterceptors)
// Interceptor default exclusions are defined in ejb-jar.xml
// @javax.ejb.ExcludeDefaultInterceptors
#* *##end
#* *##if ($operation.excludeClassInterceptors)
// Interceptor class exclusions are defined in ejb-jar.xm
// @javax.ejb.ExcludeClassInterceptors
#* *##end
$operation.visibility $operation.returnType.fullyQualifiedName $operation.signature
#* *##if ($operation.exceptionsPresent)
$operation.throwsClause
#* *##end
{
#* *##if ($requiredCheckEnabled)
#* *##foreach ($argument in $operation.arguments)
#* *##if ($argument.required && !$argument.type.primitive)
if ($argument.name == null)
{
throw new IllegalArgumentException(
"${service.fullyQualifiedServiceName}.${operation.signature} - '${argument.name}' can not be null");
}
#* *##end
#* *##end
#* *##end
#* *##if ($operation.constraintsPresent)
this.$operation.preconditionCall;
#* *##end
try
{
#* *##set ($call = "this.${operation.implementationCall};")
#* *##if ($operation.returnTypePresent)
return $call
#* *##else
$call
#* *##end
}
#* *##foreach($exception in $operation.exceptions)
catch ($exception.fullyQualifiedName ex)
{
throw ex;
}
#* *##end
#* *##if ($service.allowDefaultServiceException)
catch (Throwable th)
{
throw new ${service.fullyQualifiedDefaultExceptionName}(
"Error performing '${service.fullyQualifiedName}.${operation.signature}' --> " + th,
th);
}
#* *##end
}
#* *##if ($operation.constraintsPresent)
/**
* Performs any precondition checks for {@link #${operation.call}}.
*/
private void $operation.preconditionSignature
{
#renderPreconditions($operation)
}
#* *##end
/**
* Performs the core logic for {@link #${operation.getSignature(false)}}
*/
protected abstract $operation.returnType.fullyQualifiedName $operation.implementationSignature
throws java.lang.Exception;
#* *##end
#**##end
#end
#if (!$operations.empty)
// -------- Lifecycle Callbacks --------------
#**##foreach ($operation in $operations)
#* *##if ($operation.lifecycleCallback)
/**
$operation.getDocumentation(" * ")
*/
#* *##if ($operation.postConstruct)
@javax.annotation.PostConstruct
#* *##elseif ($operation.preDestroy)
@javax.annotation.PreDestroy
#* *##end
#* *##if ($service.stateful)
#* *##if ($operation.postActivate)
@javax.ejb.PostActivate
#* *##elseif ($operation.prePassivate)
@javax.ejb.PrePassivate
#* *##end
#* *##end
$operation.visibility void ${operation.name}()
{
this.handle${stringUtils.capitalize(${operation.name})}();
}
/**
* Performs the core logic for {@link #${operation.name}()}
*/
protected abstract $operation.returnType.fullyQualifiedName handle${stringUtils.capitalize(${operation.name})}();
#* *##end
#**##end
#end
#if ($service.stateful)
// ------------ Remove Method ------------
/**
* Remove lifecycle method
*/
@javax.ejb.Remove
public void remove() {
handleRemove();
}
/**
* Performs the core logic for {@link #remove())
*/
protected abstract void handleRemove();
#end
}
|
|
From: Vance K. <va...@us...> - 2006-04-11 15:41:09
|
User: vancek
Date: 06/04/11 08:41:05
Modified: andromda-ejb3/src/main/resources/templates/ejb3
ServiceLocator.vsl
Log:
reverted back the jndi name to use the service name rather than the fully qualified service name
Revision Changes Path
1.7 +6 -6 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/ServiceLocator.vsl
Index: ServiceLocator.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/ServiceLocator.vsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- ServiceLocator.vsl 14 Mar 2006 06:08:36 -0000 1.6
+++ ServiceLocator.vsl 11 Apr 2006 15:41:05 -0000 1.7
@@ -100,7 +100,7 @@
#foreach ($service in $services)
#**##if ($service.viewTypeRemote)
/**
- * Gets an instance of {@link ${service.fullyQualifiedServiceRemoteInterfaceName}}.
+ * Gets the remote interface {@link ${service.fullyQualifiedServiceRemoteInterfaceName}}.
*
* @param env the Context environment properties. Null represents no properties.
* @throws javax.naming.NamingException failure to lookup remote service interface.
@@ -112,9 +112,9 @@
#* *##set ($jndiName = "${service.jndiNameRemote}")
#* *##else
#* *##if ($stringUtils.isNotBlank($service.jndiNamePrefix))
-#* *##set ($jndiName = "${service.jndiNamePrefix}/${service.fullyQualifiedServiceName}/remote")
+#* *##set ($jndiName = "${service.jndiNamePrefix}/${service.serviceName}/remote")
#* *##else
-#* *##set ($jndiName = "${service.fullyQualifiedServiceName}/remote")
+#* *##set ($jndiName = "${service.serviceName}/remote")
#* *##end
#* *##end
return (${service.fullyQualifiedServiceRemoteInterfaceName})
@@ -124,7 +124,7 @@
#**##end
#**##if ($service.viewTypeLocal)
/**
- * Gets an instance of {@link ${service.fullyQualifiedServiceLocalInterfaceName}}.
+ * Gets the local interface {@link ${service.fullyQualifiedServiceLocalInterfaceName}}.
*
* @param env the Context environment properties. Null represents no properties.
* @throws javax.naming.NamingException failure to lookup local service interface.
@@ -136,9 +136,9 @@
#* *##set ($jndiName = "${service.jndiNameLocal}")
#* *##else
#* *##if ($stringUtils.isNotBlank($service.jndiNamePrefix))
-#* *##set ($jndiName = "${service.jndiNamePrefix}/${service.fullyQualifiedServiceName}/local")
+#* *##set ($jndiName = "${service.jndiNamePrefix}/${service.serviceName}/local")
#* *##else
-#* *##set ($jndiName = "${service.fullyQualifidServiceName}/local")
+#* *##set ($jndiName = "${service.serviceName}/local")
#* *##end
#* *##end
return (${service.fullyQualifiedServiceLocalInterfaceName})
|
|
From: Vance K. <va...@us...> - 2006-04-11 15:39:59
|
User: vancek Date: 06/04/11 08:39:55 Modified: andromda-ejb3/src/main/resources/templates/ejb3 Entity.vsl Log: fixed comment spacing Revision Changes Path 1.16 +1 -1 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/Entity.vsl Index: Entity.vsl =================================================================== RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/Entity.vsl,v retrieving revision 1.15 retrieving revision 1.16 diff -u -w -r1.15 -r1.16 |
|
From: Eric C. <ecr...@us...> - 2006-04-09 18:02:16
|
User: ecrutchfield
Date: 06/04/09 11:02:13
Modified: andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/mda/conf
andromda.xml.vsl
Log:
fixed bad tag
Revision Changes Path
1.7 +1 -1 plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/mda/conf/andromda.xml.vsl
Index: andromda.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/mda/conf/andromda.xml.vsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- andromda.xml.vsl 9 Apr 2006 14:03:37 -0000 1.6
+++ andromda.xml.vsl 9 Apr 2006 18:02:12 -0000 1.7
@@ -54,7 +54,7 @@
<property name="entityPropertyNameMask">none</property>
<property name="parameterNameMask">none</property>
<property name="defaultIdentifierType">datatype::long</property>
- <property name="toDoTag">TODO:</property>>
+ <property name="toDoTag">TODO:</property>
<property name="commonAssemblyName">${applicationPackage}.common</property>
#if (${transactionPersistenceType} != "none")
<property name="coreAssemblyName">${applicationPackage}.core</property>
|
|
From: Eric C. <ecr...@us...> - 2006-04-09 16:00:58
|
User: ecrutchfield Date: 06/04/09 09:00:55 Modified: andromda-nspring .classpath Log: fixed src/java path Revision Changes Path 1.2 +1 -1 cartridges/andromda-nspring/.classpath Index: .classpath =================================================================== RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/.classpath,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 --- .classpath 8 Mar 2006 04:18:48 -0000 1.1 +++ .classpath 9 Apr 2006 16:00:55 -0000 1.2 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/java"/> + <classpathentry kind="src" path="src/main/java"/> <classpathentry kind="src" path="target/src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="src" path="/andromda3"/> |
User: ecrutchfield
Date: 06/04/09 07:32:41
Modified: andromda-nhibernate/src/main/resources/templates/nhibernate
NHibernateEntityImplManual.vsl
NHibernateEmbeddedValueImpl.vsl
NHibernateEntity.vsl NHibernateEntityImpl.vsl
Log:
updated to use .Net comment style and new $toDoTag property
Revision Changes Path
1.2 +1 -1 cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEntityImplManual.vsl
Index: NHibernateEntityImplManual.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEntityImplManual.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- NHibernateEntityImplManual.vsl 8 Mar 2006 04:15:24 -0000 1.1
+++ NHibernateEntityImplManual.vsl 9 Apr 2006 14:32:40 -0000 1.2
@@ -27,7 +27,7 @@
#if (!$abstract)
{
- //TODO: implement $operation.visibility $operation.returnType.fullyQualifiedName $operation.signature
+ //${toDoTag} implement $operation.visibility $operation.returnType.fullyQualifiedName $operation.signature
#if ($operation.returnTypePresent)
return $operation.returnType.javaNullString;
#else
1.2 +3 -3 cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEmbeddedValueImpl.vsl
Index: NHibernateEmbeddedValueImpl.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEmbeddedValueImpl.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- NHibernateEmbeddedValueImpl.vsl 8 Mar 2006 04:15:24 -0000 1.1
+++ NHibernateEmbeddedValueImpl.vsl 9 Apr 2006 14:32:40 -0000 1.2
@@ -12,18 +12,18 @@
{
#end
/// <summary>
- /// @see $embeddedValue.fullyQualifiedName
+ /// <see cref="$embeddedValue.fullyQualifiedName"/>
/// </summary>
public#if ($embeddedValue.abstract) abstract#end class $embeddedValue.implementationName
: $embeddedValue.fullyQualifiedName
{
#foreach ($operation in $embeddedValue.operations)
/// <summary>
- /// @see ${embeddedValue.fullyQualifiedName}#${operation.getSignature(false)}
+ /// <see cref="${embeddedValue.fullyQualifiedName}.${operation.getSignature(false)}"/>
/// </summary>
$operation.visibility override $operation.returnType.fullyQualifiedName $operation.signature
{
- //TODO: implement $operation.visibility $operation.returnType.fullyQualifiedName $operation.signature
+ //${toDoTag} implement $operation.visibility $operation.returnType.fullyQualifiedName $operation.signature
#if ($operation.returnTypePresent)
return $operation.returnType.javaNullString;
#else
1.2 +22 -14 cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEntity.vsl
Index: NHibernateEntity.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEntity.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- NHibernateEntity.vsl 8 Mar 2006 04:15:24 -0000 1.1
+++ NHibernateEntity.vsl 9 Apr 2006 14:32:40 -0000 1.2
@@ -39,7 +39,7 @@
}
#end
- // ----- Attributes and Associations -----
+ #region Attributes and Associations -----
## **** Generate attribute ****
#foreach ( $attribute in $entity.attributes )
#set ($typeName = $attribute.type.fullyQualifiedName)
@@ -59,8 +59,9 @@
#end
#end
#end
+ #endregion
- // ----- Accessors -----
+ #region Accessors
## **** Generate accessors for attributes ****
#foreach ( $attribute in $entity.attributes )
#set ($typeName = $attribute.type.fullyQualifiedName)
@@ -92,7 +93,9 @@
#end
#end
- // ----- Abstract Methods -----
+ #endregion
+
+ #region Abstract Methods
#foreach ($operation in $entity.businessOperations)
#set ($returnType = $operation.returnType)
#set ($signature = $operation.signature)
@@ -102,7 +105,9 @@
$operation.visibility abstract $returnType.fullyQualifiedName $signature;
#end
- // ----- Helper Methods -----
+ #endregion
+
+ #region Overriden Methods
#if ($generateEntityEqualsAndHashCode.equalsIgnoreCase('true'))
#set ($identifiers = $entity.getIdentifiers(false))
/// <summary>
@@ -112,7 +117,7 @@
/// but since it extends the <code>$entity.generalization.fullyQualifiedEntityImplementationName</code> class
/// it will simply delegate the call up there.
///
- /// @see $entity.generalization.fullyQualifiedEntityName#Equals(Object)
+ /// <see cref="$entity.generalization.fullyQualifiedEntityName#Equals(Object)"/>
#else
/// and is not extending any other entity,
/// so this method will only return <code>true</code> if the argument reference and <code>this</code>
@@ -124,7 +129,7 @@
/// equal the identifiers of the argument entity. The <code>equals</code> method of the parent entity
/// will also need to return <code>true</code>. Returns <code>false</code> otherwise.
///
- /// @see $entity.generalization.fullyQualifiedEntityName#Equals(Object)
+ /// <see cref="$entity.generalization.fullyQualifiedEntityName#Equals(Object)"/>
#else
/// Returns <code>true</code> if the argument is a $entity.entityName instance and all identifiers for this entity
/// equal the identifiers of the argument entity. Returns <code>false</code> otherwise.
@@ -140,7 +145,7 @@
/// but since it extends the <code>$entity.generalization.fullyQualifiedEntityImplementationName</code> class
/// it will simply delegate the call up there.
///
- /// @see $entity.generalization.fullyQualifiedEntityName#GetHashCode()
+ /// <see cref="$entity.generalization.fullyQualifiedEntityName#GetHashCode()"/>
#else
/// and is not extending any other entity,
/// so this method will only take the identifiers of this entity into account when calculating the hash code.
@@ -149,7 +154,7 @@
#if ($entity.generalization)
/// Returns a hash code based on this entity's identifiers and the hash code of the parent entity.
///
- /// @see $entity.generalization.fullyQualifiedEntityName#GetHashCode()
+ /// <see cref="$entity.generalization.fullyQualifiedEntityName#GetHashCode()"/>
#else
/// Returns a hash code based on this entity's identifiers.
#end
@@ -172,43 +177,46 @@
#end
return sb.ToString();
}
+ #endregion
#end
#if (!$entity.abstract && ($visualStudioVersion != "2003"))
#set ($concreteBaseClass = $entity.generalization && !$entity.generalization.abstract)
+ #region Factory
/// <summary>
- /// Constructs new instances of {@link ${entity.fullyQualifiedName}}.
+ /// Constructs new instances of <seealso cref="${entity.fullyQualifiedName}"/>.
/// </summary>
public static#if ($concreteBaseClass) new#end class Factory
{
/// <summary>
- /// Constructs a new instance of {@link ${entity.fullyQualifiedName}}.
+ /// Constructs a new instance of <seealso cref="${entity.fullyQualifiedName}"/>.
/// </summary>
public static $entity.fullyQualifiedName newInstance()
{
return new ${entity.fullyQualifiedEntityImplementationName}();
}
}
-
+ #endregion
#end
// HibernateEntity.vsl merge-point
}
#if (!$entity.abstract && ($visualStudioVersion == "2003"))
#set ($concreteBaseClass = $entity.generalization && !$entity.generalization.abstract)
-
+ #region Factory
/// <summary>
- /// Constructs new instances of {@link ${entity.fullyQualifiedName}}.
+ /// Constructs new instances of <seealso cref="${entity.fullyQualifiedName}"/>.
/// </summary>
public class ${entity.Name}Factory
{
/// <summary>
- /// Constructs a new instance of {@link ${entity.fullyQualifiedName}}.
+ /// Constructs a new instance of <seealso cref="${entity.fullyQualifiedName}"/>.
/// </summary>
public static $entity.fullyQualifiedName newInstance()
{
return new ${entity.fullyQualifiedEntityImplementationName}();
}
}
+ #endregion
#end
#if ($stringUtils.isNotBlank($entity.packageName))
}
1.2 +1 -1 cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEntityImpl.vsl
Index: NHibernateEntityImpl.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEntityImpl.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- NHibernateEntityImpl.vsl 8 Mar 2006 04:15:24 -0000 1.1
+++ NHibernateEntityImpl.vsl 9 Apr 2006 14:32:40 -0000 1.2
@@ -12,7 +12,7 @@
{
#end
/// <summary>
- /// @see $entity.fullyQualifiedEntityName
+ /// <see cref="$entity.fullyQualifiedEntityName"/>
/// </summary>
[Serializable]
public#if ($entity.abstract) abstract#end class $entity.entityImplementationName
|
|
From: Eric C. <ecr...@us...> - 2006-04-09 14:03:41
|
User: ecrutchfield
Date: 06/04/09 07:03:40
Modified: andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/mda/conf
andromda.xml.vsl
Log:
added toDoTag property to the Default namespace
Revision Changes Path
1.6 +1 -0 plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/mda/conf/andromda.xml.vsl
Index: andromda.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/mda/conf/andromda.xml.vsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- andromda.xml.vsl 17 Mar 2006 05:57:10 -0000 1.5
+++ andromda.xml.vsl 9 Apr 2006 14:03:37 -0000 1.6
@@ -54,6 +54,7 @@
<property name="entityPropertyNameMask">none</property>
<property name="parameterNameMask">none</property>
<property name="defaultIdentifierType">datatype::long</property>
+ <property name="toDoTag">TODO:</property>>
<property name="commonAssemblyName">${applicationPackage}.common</property>
#if (${transactionPersistenceType} != "none")
<property name="coreAssemblyName">${applicationPackage}.core</property>
|
User: ecrutchfield
Date: 06/04/09 06:49:14
Modified: andromda-nspring/src/main/resources/templates/nspring
NSpringHibernateDaoImplManual.vsl
NSpringHibernateDaoBase.vsl
NSpringHibernateDaoImpl.vsl NSpringDaoInterface.vsl
Log:
convert comments to .Net style
Revision Changes Path
1.2 +9 -12 cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringHibernateDaoImplManual.vsl
Index: NSpringHibernateDaoImplManual.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringHibernateDaoImplManual.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- NSpringHibernateDaoImplManual.vsl 8 Mar 2006 04:18:42 -0000 1.1
+++ NSpringHibernateDaoImplManual.vsl 9 Apr 2006 13:49:12 -0000 1.2
@@ -2,7 +2,7 @@
// Name: ${entity.daoImplementationName}.cs
// license-header cs merge-point
//
-// This is only generated once! It will never be overwritten.
+// This is only generated once by NSpringHibernateDaoImplManual.vsl! It will never be overwritten.
// You can (and have to!) safely modify it by hand.
using System;
@@ -13,7 +13,7 @@
#end
#set ($superclass = $entity.generalization)
/// <summary>
- /// @see $entity.fullyQualifiedName
+ /// <see cref="$entity.fullyQualifiedName"/>
/// </summary>
public class $entity.daoImplementationName : $entity.fullyQualifiedDaoBaseName
{
@@ -22,38 +22,35 @@
#set ($returnObject = "returnValue")
#set ($signature = $operation.implementationSignature)
/// <summary>
- /// @see ${entity.fullyQualifiedDaoName}#${operation.getSignature(false)}
+ /// <see cref="${entity.fullyQualifiedDaoName.operation.getSignature(false)}"/>
/// </summary>
protected override $returnType.fullyQualifiedName $signature
-#if ($operation.exceptionsPresent)
- throws $operation.exceptionList
-#end
{
- //@todo implement $operation.visibility $returnType.fullyQualifiedName $signature
+ //${toDoTag} implement $operation.visibility $returnType.fullyQualifiedName $signature
#if ($operation.returnTypePresent)
return $operation.returnType.javaNullString;
#else
- throw new InvalidOperationException("${entity.fullyQualifiedName}.${signature} Not implemented!");
+ throw new NotImplementedException("${entity.fullyQualifiedName}.${signature} Not implemented!");
#end
}
#end
#foreach ($valueObjectRef in $entity.valueObjectReferences)
/// <summary>
- /// @see ${entity.fullyQualifiedDaoName}#${valueObjectRef.transformationMethodName}($entity.fullyQualifiedName)
+ /// <see cref="${entity.fullyQualifiedDaoName.valueObjectRef.transformationMethodName}($entity.fullyQualifiedName)"/>
/// </summary>
public override $valueObjectRef.targetElement.fullyQualifiedName ${valueObjectRef.transformationMethodName}($entity.fullyQualifiedName entity)
{
- // put your implementation here
+ //${toDoTag} put your implementation here
return null;
}
/// <summary>
- /// @see ${entity.fullyQualifiedDaoName}#${valueObjectRef.transformationToEntityMethodName}($valueObjectRef.targetElement.fullyQualifiedName)
+ /// <see cref="${entity.fullyQualifiedDaoName.valueObjectRef.transformationToEntityMethodName}($valueObjectRef.targetElement.fullyQualifiedName)"/>
/// </summary>
public override $entity.fullyQualifiedEntityName ${valueObjectRef.transformationToEntityMethodName}($valueObjectRef.targetElement.fullyQualifiedName $stringUtils.uncapitalize($valueObjectRef.name))
{
- // put your implementation here
+ //${toDoTag} put your implementation here
return null;
}
1.3 +40 -42 cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringHibernateDaoBase.vsl
Index: NSpringHibernateDaoBase.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringHibernateDaoBase.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- NSpringHibernateDaoBase.vsl 25 Mar 2006 03:48:53 -0000 1.2
+++ NSpringHibernateDaoBase.vsl 9 Apr 2006 13:49:12 -0000 1.3
@@ -42,7 +42,7 @@
/// objects of type <code>$entity.fullyQualifiedEntityName</code>.
/// </p>
///
- /// @see $entity.fullyQualifiedEntityName
+ /// <see cref="$entity.fullyQualifiedEntityName"/>
/// </summary>
public abstract class $entity.daoBaseName
#if($superEntity)
@@ -79,7 +79,7 @@
#set ($identifier = $entity.identifiers.iterator().next())
#set ($argumentName = $stringUtils.uncapitalize($entity.name))
/// <summary>
- /// @see ${entity.fullyQualifiedDaoName}#Load(int, $identifier.type.fullyQualifiedName)
+ /// <see cref="${entity.fullyQualifiedDaoName}.Load(int, $identifier.type.fullyQualifiedName)"/>
/// </summary>
public $inheritanceModifierAllEntityMethod Object Load(int transform, $identifier.type.fullyQualifiedName $identifier.name)
{
@@ -98,7 +98,7 @@
}
/// <summary>
- /// @see ${entity.fullyQualifiedDaoName}#Load($identifier.type.fullyQualifiedName)
+ /// <see cref="${entity.fullyQualifiedDaoName}.Load($identifier.type.fullyQualifiedName)"/>
/// </summary>
public $inheritanceModifierAllEntityMethod $entity.root.fullyQualifiedEntityName Load($identifier.type.fullyQualifiedName $identifier.name)
{
@@ -106,7 +106,7 @@
}
/// <summary>
- /// @see ${entity.fullyQualifiedDaoName}#LoadAll()
+ /// <see cref="${entity.fullyQualifiedDaoName}.LoadAll()"/>
/// </summary>
public $inheritanceModifierAllEntityMethod System.Collections.IList LoadAll()
{
@@ -114,7 +114,7 @@
}
/// <summary>
- /// @see ${entity.fullyQualifiedDaoName}#LoadAll(int)
+ /// <see cref="${entity.fullyQualifiedDaoName}.LoadAll(int)" />
/// </summary>
public $inheritanceModifierAllEntityMethod System.Collections.IList LoadAll(int transform)
{
@@ -126,7 +126,7 @@
## Only add these methods if the entity isn't abstract
#if (!$entity.abstract)
/// <summary>
- /// @see ${entity.fullyQualifiedDaoName}#Create($entity.fullyQualifiedEntityName)
+ /// <see cref="${entity.fullyQualifiedDaoName}.Create($entity.fullyQualifiedEntityName)"/>
/// </summary>
public virtual $entity.root.fullyQualifiedEntityName Create($entity.fullyQualifiedEntityName $argumentName)
{
@@ -134,7 +134,7 @@
}
/// <summary>
- /// @see ${entity.fullyQualifiedDaoName}#Create(int transform, $entity.fullyQualifiedEntityName)
+ /// <see cref="${entity.fullyQualifiedDaoName}.Create(int transform, $entity.fullyQualifiedEntityName)"/>
/// </summary>
public virtual Object Create(int transform, $entity.fullyQualifiedName $argumentName)
{
@@ -148,7 +148,7 @@
}
/// <summary>
- /// @see ${entity.fullyQualifiedDaoName}#Create(System.Collections.ICollection)
+ /// <see cref="${entity.fullyQualifiedDaoName}.Create(System.Collections.ICollection)"/>
/// </summary>
public $inheritanceModifierConcreteEntityMethod System.Collections.ICollection Create(System.Collections.ICollection entities)
{
@@ -156,7 +156,7 @@
}
/// <summary>
- /// @see ${entity.fullyQualifiedDaoName}#Create(int, System.Collections.ICollection)
+ /// <see cref="${entity.fullyQualifiedDaoName}.Create(int, System.Collections.ICollection)"/>
/// </summary>
public $inheritanceModifierConcreteEntityMethod System.Collections.ICollection Create(int transform, System.Collections.ICollection entities)
{
@@ -179,7 +179,7 @@
#set ($attributes = $entity.getAttributes(true,false))
#if (!$attributes.empty)
/// <summary>
- /// @see ${entity.root.fullyQualifiedDaoName}#Create(${entity.getAttributeTypeList(true, false)})
+ /// <see cref="${entity.root.fullyQualifiedDaoName}.Create(${entity.getAttributeTypeList(true, false)})"/>
/// </summary>
public virtual $entity.root.fullyQualifiedEntityName Create(
#foreach($attribute in $attributes)
@@ -191,7 +191,7 @@
}
/// <summary>
- /// @see ${entity.root.fullyQualifiedDaoName}#Create(int, ${entity.getAttributeTypeList(true, false)})
+ /// <see cref="${entity.root.fullyQualifiedDaoName}.Create(int, ${entity.getAttributeTypeList(true, false)})"/>
/// </summary>
public virtual Object Create(
int transform,
@@ -211,7 +211,7 @@
#set ($requiredProperties = $entity.getRequiredProperties(true,false))
#if (!$requiredProperties.empty && $entity.getRequiredAttributes(true,false).size() != $requiredProperties.size())
/// <summary>
- /// @see ${entity.fullyQualifiedDaoName}#Create(${entity.getRequiredPropertyTypeList(true, false)})
+ /// <see cref="${entity.fullyQualifiedDaoName}.Create(${entity.getRequiredPropertyTypeList(true, false)})"/>
/// </summary>
public virtual $entity.root.fullyQualifiedEntityName Create(
#foreach($property in $requiredProperties)
@@ -223,7 +223,7 @@
}
/// <summary>
- /// @see ${entity.fullyQualifiedDaoName}#Create(int, ${entity.getRequiredPropertyTypeList(true, false)})
+ /// <see cref="${entity.fullyQualifiedDaoName}.Create(int, ${entity.getRequiredPropertyTypeList(true, false)})"/>
/// </summary>
public virtual Object Create(
int transform,
@@ -243,7 +243,7 @@
#end
#end
/// <summary>
- /// @see ${entity.fullyQualifiedDaoName}#Update($entity.fullyQualifiedEntityName)
+ /// <see cref="${entity.fullyQualifiedDaoName}.Update($entity.fullyQualifiedEntityName)"/>
/// </summary>
public virtual void Update($entity.fullyQualifiedEntityName $argumentName)
{
@@ -256,7 +256,7 @@
}
/// <summary>
- /// @see ${entity.fullyQualifiedDaoName}#Update(System.Collections.ICollection)
+ /// <see cref="${entity.fullyQualifiedDaoName}.Update(System.Collections.ICollection)"/>
/// </summary>
public $inheritanceModifierAllEntityMethod void Update(System.Collections.ICollection entities)
{
@@ -273,7 +273,7 @@
}
/// <summary>
- /// @see ${entity.fullyQualifiedDaoName}#Remove($entity.fullyQualifiedEntityName)
+ /// <see cref="${entity.fullyQualifiedDaoName}.Remove($entity.fullyQualifiedEntityName)"/>
/// </summary>
public virtual void Remove($entity.fullyQualifiedEntityName $argumentName)
{
@@ -286,7 +286,7 @@
}
/// <summary>
- /// @see ${entity.fullyQualifiedDaoName}#Remove($identifier.type.fullyQualifiedName)
+ /// <see cref="${entity.fullyQualifiedDaoName}.Remove($identifier.type.fullyQualifiedName)"/>
/// </summary>
public $inheritanceModifierAllEntityMethod void Remove($identifier.type.fullyQualifiedName $identifier.name)
{
@@ -312,7 +312,7 @@
}
/// <summary>
- /// @see ${entity.fullyQualifiedDaoName}#Remove(System.Collections.ICollection)
+ /// <see cref="${entity.fullyQualifiedDaoName}.Remove(System.Collections.ICollection)"/>
/// </summary>
public $inheritanceModifierAllEntityMethod void Remove(System.Collections.ICollection entities)
{
@@ -328,7 +328,7 @@
#foreach ($finder in $entity.getQueryOperations(true))
#set ($returnType = $finder.returnType.fullyQualifiedName)
/// <summary>
- /// @see ${entity.fullyQualifiedName}#$finder.getSignature(false)
+ /// <see cref="${entity.fullyQualifiedName}.$finder.getSignature(false)"/>
/// </summary>
$finder.visibility $returnType $finder.signature
#if ($finder.exceptionsPresent)
@@ -344,7 +344,7 @@
#if(!$finder.criteriaFinder)
/// <summary>
- /// @see ${entity.fullyQualifiedName}#${finder.name}(String#if(!$finder.arguments.empty), ${finder.argumentTypeNames}#end)
+ /// <see cref="${entity.fullyQualifiedName}.${finder.name}(String#if(!$finder.arguments.empty), ${finder.argumentTypeNames}#end)"/>
/// </summary>
$finder.visibility $returnType ${finder.name}(String queryString#if(!$finder.arguments.empty), ${finder.getTypedArgumentList()}#end)
#if ($finder.exceptionsPresent)
@@ -362,7 +362,7 @@
#set ($returnType = "Object")
#end
/// <summary>
- /// @see ${entity.fullyQualifiedName}#${finder.name}(int#if(!$finder.arguments.empty), ${finder.argumentTypeNames}#end)
+ /// <see cref="${entity.fullyQualifiedName}.${finder.name}(int#if(!$finder.arguments.empty), ${finder.argumentTypeNames}#end)"/>
/// </summary>
$finder.visibility $returnType ${finder.name}(int transform#if(!$finder.arguments.empty), ${finder.getTypedArgumentList()}#end)
#if ($finder.exceptionsPresent)
@@ -373,7 +373,7 @@
}
/// <summary>
- /// @see ${entity.fullyQualifiedName}#${finder.name}(int, String#if(!$finder.arguments.empty), ${finder.argumentTypeNames}#end)
+ /// <see cref="${entity.fullyQualifiedName}.${finder.name}(int, String#if(!$finder.arguments.empty), ${finder.argumentTypeNames}#end)"/>
/// </summary>
$finder.visibility $returnType ${finder.name}(int transform, String queryString#if(!$finder.arguments.empty), ${finder.getTypedArgumentList()}#end)
#if ($finder.exceptionsPresent)
@@ -428,7 +428,7 @@
}
#else
/// <summary>
- /// @see ${entity.fullyQualifiedName}#${finder.name}(int, String#if(!$finder.arguments.empty), ${finder.argumentTypeNames}#end)
+ /// <see cref="${entity.fullyQualifiedName}.${finder.name}(int, String#if(!$finder.arguments.empty), ${finder.argumentTypeNames}#end)"/>
/// </summary>
$finder.visibility $returnType ${finder.name}(int transform#if(!$finder.arguments.empty), ${finder.getTypedArgumentList()}#end)
#if ($finder.exceptionsPresent)
@@ -491,7 +491,7 @@
#set ($returnType = $operation.returnType)
#set ($signature = $operation.signature)
/// <summary>
- /// @see ${entity.fullyQualifiedDaoName}#${operation.getSignature(false)}
+ /// <see cref="${entity.fullyQualifiedDaoName}.${operation.getSignature(false)}"/>
/// </summary>
$operation.visibility $returnType.fullyQualifiedName ${operation.name}(${operation.getTypedArgumentList()})
#if ($operation.exceptionsPresent)
@@ -518,7 +518,7 @@
}
/// <summary>
- /// Performs the core logic for {@link #${operation.getSignature(false)}}
+ /// Performs the core logic for <seealso cref="#${operation.getSignature(false)}"/>
/// </summary>
protected abstract $operation.returnType.fullyQualifiedName $operation.implementationSignature;
@@ -527,26 +527,25 @@
/// Allows transformation of entities into value objects
/// (or something else for that matter), when the <code>transform</code>
/// flag is set to one of the constants defined in <code>$entity.fullyQualifiedDaoName</code>, please note
- /// that the {@link #$daoNoTransformationEnumName} constant denotes no transformation, so the entity itself
+ /// that the <seealso cref="#$daoNoTransformationEnumName"/> constant denotes no transformation, so the entity itself
/// will be returned.
#if (!$entity.valueObjectReferences.empty)
/// <p/>
/// This method will return instances of these types:
/// <ul>
- /// <li>{@link $entity.fullyQualifiedName} - {@link #$daoNoTransformationEnumName}</li>
+ /// <li><seealso cref="$entity.fullyQualifiedName"/> - <seealso cref="#$daoNoTransformationEnumName"/></li>
#foreach ($valueObjectRef in $entity.valueObjectReferences)
#set ($targetElement = $valueObjectRef.targetElement)
- /// <li>{@link $targetElement.fullyQualifiedName} - {@link ${valueObjectRef.transformationConstantName}}</li>
+ /// <li><seealso cref="$targetElement.fullyQualifiedName"/> - <seealso cref="${valueObjectRef.transformationConstantName}"/></li>
#end
/// </ul>
#end
///
- /// If the integer argument value is unknown {@link #${entity.daoNoTransformationConstantName}} is assumed.
+ /// If the integer argument value is unknown <seealso cref="${entity.daoNoTransformationConstantName}"/> is assumed.
///
- /// @param transform one of the constants declared in {@link $entity.fullyQualifiedDaoName}
- /// @param entity an entity that was found
- /// @return the transformed entity (i.e. new value object, etc)
- /// @see #TransformEntities(int,System.Collections.ICollection)
+ /// <param name="transform">one of the constants declared in <seealso cref="$entity.fullyQualifiedDaoName"/></param>
+ /// <param name="entity">an entity that was found</param>
+ /// <returns>the transformed entity (i.e. new value object, etc) <see cref="#TransformEntities(int,System.Collections.ICollection)"/></returns>
/// </summary>
protected Object TransformEntity(int transform, $entity.fullyQualifiedName entity)
{
@@ -584,14 +583,13 @@
/// <summary>
/// Transforms a collection of entities using the
- /// {@link #TransformEntity(int,$entity.fullyQualifiedName)} method.
+ /// <seealso cref="#TransformEntity(int,$entity.fullyQualifiedName)"/> method.
/// <p/>
/// This method is to be used internally only.
///
- /// @param transform one of the constants declared in <code>$entity.fullyQualifiedDaoName</code>
- /// @param entities the collection of entities to transform
- /// @return a new list containing the transformed entities
- /// @see #TransformEntity(int,$entity.fullyQualifiedName)
+ /// <param name="transform">one of the constants declared in <code>$entity.fullyQualifiedDaoName</code></param>
+ /// <param name="entities">the collection of entities to transform</param>
+ /// <returns>a new list containing the transformed entities <see cref="#TransformEntity(int,$entity.fullyQualifiedName)"/></returns>
/// </summary>
protected $inheritanceModifierAllEntityMethod System.Collections.IList TransformEntities(int transform, System.Collections.ICollection entities)
{
@@ -616,7 +614,7 @@
#foreach ($valueObjectRef in $entity.valueObjectReferences)
/// <summary>
- /// @see ${entity.fullyQualifiedDaoName}#${valueObjectRef.transformationToListMethodName}(System.Collections.ICollection)
+ /// <see cref="${entity.fullyQualifiedDaoName}.${valueObjectRef.transformationToListMethodName}(System.Collections.ICollection)"/>
/// </summary>
public System.Collections.IList ${valueObjectRef.transformationToListMethodName}(System.Collections.ICollection entities)
{
@@ -634,8 +632,8 @@
/// <summary>
/// Base implementation for transforming the results of a report query into a value object. This
/// implementation exists for convenience reasons only. It needs only be overridden in the
- /// {@link $entity.daoImplementationName} class if you intend to use reporting queries.
- /// @see ${entity.fullyQualifiedDaoName}#${valueObjectRef.transformationMethodName}($entity.fullyQualifiedName)
+ /// <seealso cref="$entity.daoImplementationName"/> class if you intend to use reporting queries.
+ /// <see cref="${entity.fullyQualifiedDaoName}.${valueObjectRef.transformationMethodName}($entity.fullyQualifiedName)"/>
/// </summary>
protected $valueObjectRef.targetElement.fullyQualifiedName ${valueObjectRef.transformationMethodName}(Object[] row)
{
@@ -643,7 +641,7 @@
}
/// <summary>
- /// @see ${entity.fullyQualifiedDaoName}#${valueObjectRef.transformationToEntityListMethodName}(System.Collections.ICollection)
+ /// <see cref="${entity.fullyQualifiedDaoName}.${valueObjectRef.transformationToEntityListMethodName}(System.Collections.ICollection)"/>
/// </summary>
public System.Collections.IList ${valueObjectRef.transformationToEntityListMethodName}(System.Collections.ICollection instances)
{
1.2 +1 -1 cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringHibernateDaoImpl.vsl
Index: NSpringHibernateDaoImpl.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringHibernateDaoImpl.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- NSpringHibernateDaoImpl.vsl 8 Mar 2006 04:18:42 -0000 1.1
+++ NSpringHibernateDaoImpl.vsl 9 Apr 2006 13:49:12 -0000 1.2
@@ -13,7 +13,7 @@
#end
#set ($superclass = $entity.generalization)
/// <summary>
- /// @see $entity.fullyQualifiedName
+ /// <see cref="$entity.fullyQualifiedName"/>
/// </summary>
public class $entity.daoImplementationName : $entity.fullyQualifiedDaoBaseName
{
1.2 +26 -27 cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringDaoInterface.vsl
Index: NSpringDaoInterface.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringDaoInterface.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- NSpringDaoInterface.vsl 8 Mar 2006 04:18:42 -0000 1.1
+++ NSpringDaoInterface.vsl 9 Apr 2006 13:49:12 -0000 1.2
@@ -32,14 +32,14 @@
#end
#foreach ($valueObjectRef in $entity.valueObjectReferences)
- // Transform into objects of type {@link $valueObjectRef.targetElement.fullyQualifiedName}.
+ // Transform into objects of type <seealso cref="$valueObjectRef.targetElement.fullyQualifiedName"/>.
$valueObjectRef.transformationConstantName = $valueObjectRef.transformationConstantValue#if($velocityCount != $entity.valueObjectReferences.size()),#end
#end
}
/// <summary>
- /// @see $entity.fullyQualifiedEntityName
+ /// <see cref="$entity.fullyQualifiedEntityName"/>
/// </summary>
public interface $entity.daoName
#if($superEntity)
@@ -50,22 +50,22 @@
{
#foreach ($valueObjectRef in $entity.valueObjectReferences)
/// <summary>
- /// Converts this DAO's entity to an object of type {@link $valueObjectRef.targetElement.fullyQualifiedName}.
+ /// Converts this DAO's entity to an object of type <seealso cref="$valueObjectRef.targetElement.fullyQualifiedName"/>.
/// </summary>
$valueObjectRef.targetElement.fullyQualifiedName ${valueObjectRef.transformationMethodName}($entity.fullyQualifiedEntityName entity);
/// <summary>
- /// Converts this DAO's entity collection to a list of instances of type {@link $valueObjectRef.targetElement.fullyQualifiedName}.
+ /// Converts this DAO's entity collection to a list of instances of type <seealso cref="$valueObjectRef.targetElement.fullyQualifiedName"/>.
/// </summary>
System.Collections.IList ${valueObjectRef.transformationToListMethodName}(System.Collections.ICollection entities);
/// <summary>
- /// Converts an instance of type {@link $valueObjectRef.targetElement.fullyQualifiedName} to this DAO's entity.
+ /// Converts an instance of type <seealso cref="$valueObjectRef.targetElement.fullyQualifiedName"/> to this DAO's entity.
/// </summary>
$entity.fullyQualifiedEntityName ${valueObjectRef.transformationToEntityMethodName}($valueObjectRef.targetElement.fullyQualifiedName $stringUtils.uncapitalize($valueObjectRef.name));
/// <summary>
- /// Converts a collection of instances of type {@link $valueObjectRef.targetElement.fullyQualifiedName} to this DAO's entity list.
+ /// Converts a collection of instances of type <seealso cref="$valueObjectRef.targetElement.fullyQualifiedName"/> to this DAO's entity list.
/// </summary>
System.Collections.IList ${valueObjectRef.transformationToEntityListMethodName}(System.Collections.ICollection instances);
@@ -80,7 +80,7 @@
/// <summary>
/// <p>
- /// Does the same thing as {@link #Load($identifier.type.fullyQualifiedName)} with an
+ /// Does the same thing as <seealso cref="#Load($identifier.type.fullyQualifiedName)"/> with an
/// additional flag called <code>transform</code>. If this flag is set to <code>$daoNoTransformationEnumName</code> then
/// the returned entity will <strong>NOT</strong> be transformed. If this flag is any of the other constants
/// defined in this class then the result <strong>WILL BE</strong> passed through an operation which can
@@ -88,21 +88,21 @@
/// not occur.
/// </p>
///
- /// @param $identifier.name the identifier of the entity to load.
- /// @return either the entity or the object transformed from the entity.
+ /// <param name="$identifier.name">the identifier of the entity to load.</param>
+ /// <returns>either the entity or the object transformed from the entity.</returns>
/// </summary>
Object Load(int transform, $identifier.type.fullyQualifiedName $identifier.name);
/// <summary>
- /// Loads all entities of type {@link ${entity.fullyQualifiedEntityName}}.
+ /// Loads all entities of type <seealso cref="${entity.fullyQualifiedEntityName}"/>.
///
- /// @return the loaded entities.
+ /// <returns>the loaded entities.</returns>
/// </summary>
System.Collections.IList LoadAll();
/// <summary>
/// <p>
- /// Does the same thing as {@link #LoadAll()} with an
+ /// Does the same thing as <seealso cref="#LoadAll()"/> with an
/// additional flag called <code>transform</code>. If this flag is set to <code>$daoNoTransformationEnumName</code> then
/// the returned entity will <strong>NOT</strong> be transformed. If this flag is any of the other constants
/// defined here then the result <strong>WILL BE</strong> passed through an operation which can optionally
@@ -110,8 +110,8 @@
/// not occur.
/// </p>
///
- /// @param transform the flag indicating what transformation to use.
- /// @return the loaded entities.
+ /// <param name="transform">the flag indicating what transformation to use.</param>
+ /// <returns>the loaded entities.</returns>
/// </summary>
System.Collections.IList LoadAll(int transform);
@@ -125,7 +125,7 @@
/// <summary>
/// <p>
- /// Does the same thing as {@link #Create($entity.fullyQualifiedEntityName)} with an
+ /// Does the same thing as <seealso cref="#Create($entity.fullyQualifiedEntityName)"/> with an
/// additional flag called <code>transform</code>. If this flag is set to <code>$daoNoTransformationEnumName</code> then
/// the returned entity will <strong>NOT</strong> be transformed. If this flag is any of the other constants
/// defined here then the result <strong>WILL BE</strong> passed through an operation which can optionally
@@ -140,16 +140,15 @@
/// Creates a new instance of $entity.fullyQualifiedEntityName and adds
/// from the passed in <code>entities</code> collection
///
- /// @param entities the collection of $entity.fullyQualifiedEntityName
- /// instances to create.
+ /// <param name="entities">the collection of $entity.fullyQualifiedEntityName instances to create.</param>
///
- /// @return the created instances.
+ /// <returns>the created instances.</returns>
/// </summary>
System.Collections.ICollection Create(System.Collections.ICollection entities);
/// <summary>
/// <p>
- /// Does the same thing as {@link #Create($entity.fullyQualifiedEntityName)} with an
+ /// Does the same thing as <seealso cref="#Create($entity.fullyQualifiedEntityName)"/> with an
/// additional flag called <code>transform</code>. If this flag is set to <code>$daoNoTransformationEnumName</code> then
/// the returned entity will <strong>NOT</strong> be transformed. If this flag is any of the other constants
/// defined here then the result <strong>WILL BE</strong> passed through an operation which can optionally
@@ -178,7 +177,7 @@
/// <summary>
/// <p>
- /// Does the same thing as {@link #Create($entity.getAttributeTypeList(true,false))} with an
+ /// Does the same thing as <seealso cref="#Create($entity.getAttributeTypeList(true,false))"/> with an
/// additional flag called <code>transform</code>. If this flag is set to <code>$daoNoTransformationEnumName</code> then
/// the returned entity will <strong>NOT</strong> be transformed. If this flag is any of the other constants
/// defined here then the result <strong>WILL BE</strong> passed through an operation which can optionally
@@ -211,7 +210,7 @@
/// <summary>
/// <p>
- /// Does the same thing as {@link #Create($entity.getRequiredAttributeTypeList(true,false))} with an
+ /// Does the same thing as <seealso cref="#Create($entity.getRequiredAttributeTypeList(true,false))"/> with an
/// additional flag called <code>transform</code>. If this flag is set to <code>$daoNoTransformationEnumName</code> then
/// the returned entity will <strong>NOT</strong be transformed. If this flag is any of the other constants
/// defined here then the result <strong>WILL BE</strong> passed through an operation which can optionally
@@ -274,9 +273,9 @@
#if(!$operation.criteriaFinder)
/// <summary>
/// <p>
- /// Does the same thing as {@link #${operation.getSignature(false)}} with an
+ /// Does the same thing as <seealso cref="#${operation.getSignature(false)}"/> with an
/// additional argument called <code>queryString</code>. This <code>queryString</code>
- /// argument allows you to override the query string defined in {@link #${operation.getSignature(false)}}.
+ /// argument allows you to override the query string defined in <seealso cref="#${operation.getSignature(false)}"/>.
/// </p>
/// </summary>
#if ($operation.exceptionsPresent)
@@ -291,7 +290,7 @@
#end
/// <summary>
/// <p>
- /// Does the same thing as {@link #${operation.getSignature(false)}} with an
+ /// Does the same thing as <seealso cref="#${operation.getSignature(false)}"/> with an
/// additional flag called <code>transform</code>. If this flag is set to <code>$daoNoTransformationEnumName</code> then
/// finder results will <strong>NOT</strong> be transformed during retrieval.
/// If this flag is any of the other constants defined here
@@ -309,9 +308,9 @@
/// <summary>
/// <p>
- /// Does the same thing as {@link #${operation.name}(boolean#if(!$operation.arguments.empty), ${operation.argumentTypeNames}#end)} with an
+ /// Does the same thing as <seealso cref="#${operation.name}(boolean#if(!$operation.arguments.empty), ${operation.argumentTypeNames}#end)"/> with an
/// additional argument called <code>queryString</code>. This <code>queryString</code>
- /// argument allows you to override the query string defined in {@link #${operation.name}(int#if(!$operation.arguments.empty), ${operation.typedArgumentList}#end)}.
+ /// argument allows you to override the query string defined in <seealso cref="#${operation.name}(int#if(!$operation.arguments.empty), ${operation.typedArgumentList}#end)"/>.
/// </p>
/// </summary>
#if ($operation.exceptionsPresent)
@@ -323,7 +322,7 @@
#else
/// <summary>
/// <p>
- /// Does the same thing as {@link #${operation.getSignature(false)}} with an
+ /// Does the same thing as <seealso cref="#${operation.getSignature(false)}"/> with an
/// additional flag called <code>transform</code>. If this flag is set to <code>$daoNoTransformationEnumName</code> then
/// finder results will <strong>NOT</strong> be transformed during retrieval.
/// If this flag is any of the other constants defined here
|
