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: Leif J. <le...@us...> - 2006-12-05 19:36:32
|
User: leifj Date: 06/12/05 11:36:27 cartridges/andromda-jsf2/components/src - New directory |
|
From: Leif J. <le...@us...> - 2006-12-05 19:36:31
|
User: leifj Date: 06/12/05 11:36:32 cartridges/andromda-jsf2/src - New directory |
|
From: Leif J. <le...@us...> - 2006-12-05 19:36:31
|
User: leifj Date: 06/12/05 11:36:28 cartridges/andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/component/html - New directory |
|
From: Leif J. <le...@us...> - 2006-12-05 19:36:31
|
User: leifj Date: 06/12/05 11:36:29 cartridges/andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/renderkit - New directory |
|
From: Leif J. <le...@us...> - 2006-12-05 19:36:31
|
User: leifj Date: 06/12/05 11:36:32 cartridges/andromda-jsf2/conf - New directory |
|
From: Leif J. <le...@us...> - 2006-12-05 19:36:30
|
User: leifj Date: 06/12/05 11:36:26 cartridges/andromda-jsf2 - New directory |
|
From: Leif J. <le...@us...> - 2006-12-05 19:36:30
|
User: leifj Date: 06/12/05 11:36:28 cartridges/andromda-jsf2/components/src/main/java/org/andromda/cartridges - New directory |
|
From: Leif J. <le...@us...> - 2006-12-05 19:36:30
|
User: leifj Date: 06/12/05 11:36:27 cartridges/andromda-jsf2/components/src/main/java/org - New directory |
|
From: Leif J. <le...@us...> - 2006-12-05 19:36:29
|
User: leifj Date: 06/12/05 11:36:29 cartridges/andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/utils - New directory |
|
From: Leif J. <le...@us...> - 2006-12-05 19:36:29
|
User: leifj Date: 06/12/05 11:36:30 cartridges/andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/validator - New directory |
|
From: Leif J. <le...@us...> - 2006-12-05 19:36:29
|
User: leifj Date: 06/12/05 11:36:29 cartridges/andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/taglib - New directory |
|
From: Leif J. <le...@us...> - 2006-12-05 19:36:29
|
User: leifj Date: 06/12/05 11:36:29 cartridges/andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/renderkit/html - New directory |
|
From: Leif J. <le...@us...> - 2006-12-05 19:36:29
|
User: leifj Date: 06/12/05 11:36:29 cartridges/andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/converters - New directory |
|
From: Leif J. <le...@us...> - 2006-12-05 19:36:29
|
User: leifj Date: 06/12/05 11:36:28 cartridges/andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/component - New directory |
|
From: Leif J. <le...@us...> - 2006-12-05 19:36:28
|
User: leifj Date: 06/12/05 11:36:28 cartridges/andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2 - New directory |
|
From: Leif J. <le...@us...> - 2006-12-05 19:36:28
|
User: leifj Date: 06/12/05 11:36:27 cartridges/andromda-jsf2/components - New directory |
|
From: Leif J. <le...@us...> - 2006-12-05 19:36:28
|
User: leifj Date: 06/12/05 11:36:27 cartridges/andromda-jsf2/components/src/main - New directory |
|
From: Leif J. <le...@us...> - 2006-12-05 19:36:28
|
User: leifj Date: 06/12/05 11:36:27 cartridges/andromda-jsf2/components/src/main/java/org/andromda - New directory |
|
From: Vance K. <va...@us...> - 2006-12-01 02:52:24
|
User: vancek
Date: 06/11/30 18:52:22
Modified: andromda-ejb3/src/main/resources/templates/ejb3/config
ejb-jar.xml.vsl
Log:
add javax.jms.MessageListener messaging-type to MDBs defined in ejb-jar.xml
Revision Changes Path
1.8 +1 -0 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.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- ejb-jar.xml.vsl 11 Aug 2006 15:11:39 -0000 1.7
+++ ejb-jar.xml.vsl 1 Dec 2006 02:52:22 -0000 1.8
@@ -81,6 +81,7 @@
</description>
<ejb-name>${mdb.messageDrivenName}</ejb-name>
<ejb-class>${mdb.fullyQualifiedMessageDrivenImplementationName}</ejb-class>
+ <messaging-type>javax.jms.MessageListener</messaging-type>
#**##if ($mdb.transactionManagementBean)
<transaction-type>Bean</transaction-type>
#**##else
|
|
From: Vance K. <va...@us...> - 2006-11-28 12:26:30
|
User: vancek
Date: 06/11/28 04:26:30
Modified: andromda-ejb3/src/main/resources/templates/ejb3
GlobalMacros.vm
Log:
prevent compareTo compare entity properties with Collection/List/Set types
Revision Changes Path
1.4 +1 -1 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/GlobalMacros.vm
Index: GlobalMacros.vm
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/GlobalMacros.vm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- GlobalMacros.vm 1 Jul 2006 10:13:01 -0000 1.3
+++ GlobalMacros.vm 28 Nov 2006 12:26:29 -0000 1.4
@@ -155,7 +155,7 @@
else
{
#* *##foreach ($attribute in $attributes)
-#* *##if (!$attribute.type.primitive && !$attribute.type.arrayType && !$attribute.lob && !$attribute.identifier && !$attribute.containsEmbeddedObject)
+#* *##if (!$attribute.type.primitive && !$attribute.type.arrayType && !$attribute.lob && !$attribute.identifier && !$attribute.containsEmbeddedObject && !$attribute.type.collectionType)
if (this.${attribute.getterName}() != null)
{
cmp = (cmp != 0 ? cmp : this.${attribute.getterName}().compareTo(o.${attribute.getterName}()));
|
|
From: Vance K. <va...@us...> - 2006-11-12 04:07:55
|
User: vancek
Date: 06/11/11 20:07:55
Modified: andromda-ejb3/src/main/resources/templates/ejb3
ServiceDelegate.vsl
andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3SessionOperationFacadeLogicImpl.java
Log:
JIRA EJB-46 - fix missing javax.ejb.Timer attribute on session bean timeout callback operations
Revision Changes Path
1.7 +4 -4 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/ServiceDelegate.vsl
Index: ServiceDelegate.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/ServiceDelegate.vsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- ServiceDelegate.vsl 1 Jul 2006 12:34:29 -0000 1.6
+++ ServiceDelegate.vsl 12 Nov 2006 04:07:54 -0000 1.7
@@ -77,18 +77,18 @@
switch (getViewType())
{
case LOCAL_VIEW_TYPE:
- #if ($operation.returnTypePresent)return #end#**#get${service.name}Local().${operation.name}(${operation.argumentNames});
+ #if ($operation.returnTypePresent)return #end#**#get${service.name}Local().${operation.call};
#if (!$operation.returnTypePresent)break;#end
case REMOTE_VIEW_TYPE:
default:
- #if ($operation.returnTypePresent)return #end#**#get${service.name}Remote().${operation.name}(${operation.argumentNames});
+ #if ($operation.returnTypePresent)return #end#**#get${service.name}Remote().${operation.call};
#if (!$operation.returnTypePresent)break;#end
}
#* *##elseif ($operation.viewTypeAbsoluteRemote)
- #if ($operation.returnTypePresent)return #end#**#get${service.name}Remote().${operation.name}(${operation.argumentNames});
+ #if ($operation.returnTypePresent)return #end#**#get${service.name}Remote().${operation.call};
#* *##elseif ($operation.viewTypeAbsoluteLocal)
- #if ($operation.returnTypePresent)return #end#**#get${service.name}Local().${operation.name}(${operation.argumentNames});
+ #if ($operation.returnTypePresent)return #end#**#get${service.name}Local().${operation.call};
#* *##end
}
#* *##if ($operation.exceptionsPresent)
1.15 +40 -0 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3SessionOperationFacadeLogicImpl.java
Index: EJB3SessionOperationFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3SessionOperationFacadeLogicImpl.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -r1.14 -r1.15
--- EJB3SessionOperationFacadeLogicImpl.java 11 Aug 2006 05:49:46 -0000 1.14
+++ EJB3SessionOperationFacadeLogicImpl.java 12 Nov 2006 04:07:54 -0000 1.15
@@ -191,6 +191,46 @@
}
/**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3SessionOperationFacadeLogic#getSignature()
+ *
+ * Override the default implementation to check for timer service and
+ * replace all attributes with javax.ejb.Timer attribute.
+ */
+ public String getSignature()
+ {
+ String signature = super.getSignature();
+ if (this.isTimeoutCallback())
+ {
+ final StringBuffer timeoutSignature = new StringBuffer(this.getName());
+ timeoutSignature.append("(");
+ timeoutSignature.append("javax.ejb.Timer timer");
+ timeoutSignature.append(")");
+ signature = timeoutSignature.toString();
+ }
+ return signature;
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3SessionOperationFacadeLogic#getCall()
+ *
+ * Override the default implmentation to check for timer service and
+ * add the javax.ejb.Timer attribute to the call.
+ */
+ public String getCall()
+ {
+ String call = super.getCall();
+ if (this.isTimeoutCallback())
+ {
+ final StringBuffer buffer = new StringBuffer(this.getName());
+ buffer.append("(");
+ buffer.append("timer");
+ buffer.append(")");
+ call = buffer.toString();
+ }
+ return call;
+ }
+
+ /**
* @see org.andromda.cartridges.ejb3.metafacades.EJB3SessionOperationFacadeLogic#handleGetTransactionType()
*/
protected String handleGetTransactionType()
|
User: cmicali
Date: 06/10/18 11:43:29
Modified: andromda-cs/src/test/expected cartridge-output.zip
andromda-cs/src/test/expected/org/andromda/cartridges/csharp
TestEnumeration.cs TestIntEnumeration.cs
TestStringEnumeration.cs TestSubInterface1.cs
TestSubInterface2.cs TestSubInterface3.cs
TestSuperInterface1.cs TestSuperInterface2.cs
andromda-nhibernate/src/test/expected cartridge-output.zip
andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate
EntityOne.cs EntityOne.hbm.xml EntityTwo.cs
EntityTwo.hbm.xml EntityTwoImpl.cs
andromda-nspring/src/test/expected cartridge-output.zip
andromda-nspring/src/test/expected/org/andromda/cartridges/nspring
IServiceOne.cs IServiceTwoNoStubs.cs
ServiceOneBase.cs ServiceOneImpl.cs
ServiceTwoNoStubsBase.cs ServiceTwoNoStubsImpl.cs
Log:
- Fixed breaking tests
Revision Changes Path
1.5 +20 -27 cartridges/andromda-cs/src/test/expected/cartridge-output.zip
<<Binary file>>
1.3 +2 -1 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestEnumeration.cs
Index: TestEnumeration.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestEnumeration.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- TestEnumeration.cs 15 Aug 2006 22:48:44 -0000 1.2
+++ TestEnumeration.cs 18 Oct 2006 18:43:19 -0000 1.3
@@ -20,5 +20,6 @@
TEST1 = 0,
TEST2 = 1203212
// Enumeration.vsl merge-point
+
}
}
1.2 +2 -1 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestIntEnumeration.cs
Index: TestIntEnumeration.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestIntEnumeration.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- TestIntEnumeration.cs 22 Jun 2006 20:28:27 -0000 1.1
+++ TestIntEnumeration.cs 18 Oct 2006 18:43:22 -0000 1.2
@@ -20,5 +20,6 @@
ATTRIBUTE_ONE = 12,
ATTRIBUTE_TWO = 14
// Enumeration.vsl merge-point
+
}
}
1.2 +2 -1 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestStringEnumeration.cs
Index: TestStringEnumeration.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestStringEnumeration.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- TestStringEnumeration.cs 15 Aug 2006 22:48:44 -0000 1.1
+++ TestStringEnumeration.cs 18 Oct 2006 18:43:22 -0000 1.2
@@ -20,5 +20,6 @@
Test1,
Test2
// Enumeration.vsl merge-point
+
}
}
1.2 +3 -0 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestSubInterface1.cs
Index: TestSubInterface1.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestSubInterface1.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- TestSubInterface1.cs 15 Aug 2006 22:48:44 -0000 1.1
+++ TestSubInterface1.cs 18 Oct 2006 18:43:22 -0000 1.2
@@ -22,5 +22,8 @@
// ----- Accessors -----
// ----- Operations -----
+
+ // Interface.vsl merge-point
+
}
}
1.2 +3 -0 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestSubInterface2.cs
Index: TestSubInterface2.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestSubInterface2.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- TestSubInterface2.cs 15 Aug 2006 22:48:45 -0000 1.1
+++ TestSubInterface2.cs 18 Oct 2006 18:43:22 -0000 1.2
@@ -22,5 +22,8 @@
// ----- Accessors -----
// ----- Operations -----
+
+ // Interface.vsl merge-point
+
}
}
1.2 +3 -0 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestSubInterface3.cs
Index: TestSubInterface3.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestSubInterface3.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- TestSubInterface3.cs 15 Aug 2006 22:48:45 -0000 1.1
+++ TestSubInterface3.cs 18 Oct 2006 18:43:24 -0000 1.2
@@ -27,5 +27,8 @@
/// </summary>
org.andromda.cartridges.csharp.TestSuperInterface2 operation31(float xx);
+
+ // Interface.vsl merge-point
+
}
}
1.2 +3 -0 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestSuperInterface1.cs
Index: TestSuperInterface1.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestSuperInterface1.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- TestSuperInterface1.cs 15 Aug 2006 22:48:45 -0000 1.1
+++ TestSuperInterface1.cs 18 Oct 2006 18:43:24 -0000 1.2
@@ -57,5 +57,8 @@
/// </summary>
void operation1(int i);
+
+ // Interface.vsl merge-point
+
}
}
1.2 +3 -0 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestSuperInterface2.cs
Index: TestSuperInterface2.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestSuperInterface2.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- TestSuperInterface2.cs 15 Aug 2006 22:48:45 -0000 1.1
+++ TestSuperInterface2.cs 18 Oct 2006 18:43:24 -0000 1.2
@@ -21,5 +21,8 @@
// ----- Accessors -----
// ----- Operations -----
+
+ // Interface.vsl merge-point
+
}
}
1.7 +24 -23 cartridges/andromda-nhibernate/src/test/expected/cartridge-output.zip
<<Binary file>>
1.6 +2 -2 cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate/EntityOne.cs
Index: EntityOne.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate/EntityOne.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- EntityOne.cs 2 Oct 2006 01:21:47 -0000 1.5
+++ EntityOne.cs 18 Oct 2006 18:43:26 -0000 1.6
@@ -2,7 +2,7 @@
// license-header cs merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: HibernateEntity.vsl in andromda-nhibernate-cartridge.
+// Generated by: NHibernateEntity.vsl in andromda-nhibernate-cartridge.
using System;
@@ -167,7 +167,7 @@
#endregion
- // HibernateEntity.vsl merge-point
+ // NHibernateEntity.vsl merge-point
}
}
1.3 +1 -1 cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate/EntityOne.hbm.xml
Index: EntityOne.hbm.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate/EntityOne.hbm.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- EntityOne.hbm.xml 17 Aug 2006 20:28:34 -0000 1.2
+++ EntityOne.hbm.xml 18 Oct 2006 18:43:26 -0000 1.3
@@ -45,5 +45,5 @@
</set>
</class>
-
+ <!-- NHibernate.hbm.xml.vsl merge-point -->
</hibernate-mapping>
\ No newline at end of file
1.6 +2 -2 cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate/EntityTwo.cs
Index: EntityTwo.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate/EntityTwo.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- EntityTwo.cs 2 Oct 2006 01:21:47 -0000 1.5
+++ EntityTwo.cs 18 Oct 2006 18:43:26 -0000 1.6
@@ -2,7 +2,7 @@
// license-header cs merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: HibernateEntity.vsl in andromda-nhibernate-cartridge.
+// Generated by: NHibernateEntity.vsl in andromda-nhibernate-cartridge.
using System;
@@ -140,7 +140,7 @@
#endregion
- // HibernateEntity.vsl merge-point
+ // NHibernateEntity.vsl merge-point
}
}
1.3 +1 -1 cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate/EntityTwo.hbm.xml
Index: EntityTwo.hbm.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate/EntityTwo.hbm.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- EntityTwo.hbm.xml 17 Aug 2006 20:28:34 -0000 1.2
+++ EntityTwo.hbm.xml 18 Oct 2006 18:43:27 -0000 1.3
@@ -34,5 +34,5 @@
</many-to-one>
</class>
-
+ <!-- NHibernate.hbm.xml.vsl merge-point -->
</hibernate-mapping>
\ No newline at end of file
1.2 +2 -1 cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate/EntityTwoImpl.cs
Index: EntityTwoImpl.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate/EntityTwoImpl.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- EntityTwoImpl.cs 15 Aug 2006 22:48:48 -0000 1.1
+++ EntityTwoImpl.cs 18 Oct 2006 18:43:27 -0000 1.2
@@ -2,7 +2,7 @@
// license-header cs merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: HibernateEntityImpl.vsl in andromda-nhibernate-cartridge.
+// Generated by: NHibernateEntityImpl.vsl in andromda-nhibernate-cartridge.
using System;
@@ -15,5 +15,6 @@
public class EntityTwoImpl
: org.andromda.cartridges.nhibernate.EntityTwo
{
+ // NHibernateEntityImpl.vsl merge-point
}
}
1.4 +41 -17 cartridges/andromda-nspring/src/test/expected/cartridge-output.zip
<<Binary file>>
1.2 +3 -0 cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/IServiceOne.cs
Index: IServiceOne.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/IServiceOne.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- IServiceOne.cs 15 Aug 2006 22:48:49 -0000 1.1
+++ IServiceOne.cs 18 Oct 2006 18:43:28 -0000 1.2
@@ -23,5 +23,8 @@
/// </summary>
datatype::long doSomethingElse(datatype::String param);
+
+ // NSpringServiceInterface.vsl merge-point
+
}
}
1.2 +3 -0 cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/IServiceTwoNoStubs.cs
Index: IServiceTwoNoStubs.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/IServiceTwoNoStubs.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- IServiceTwoNoStubs.cs 15 Aug 2006 22:48:49 -0000 1.1
+++ IServiceTwoNoStubs.cs 18 Oct 2006 18:43:28 -0000 1.2
@@ -23,5 +23,8 @@
/// </summary>
datatype::long doSomethingElse(datatype::String param);
+
+ // NSpringServiceInterface.vsl merge-point
+
}
}
1.3 +3 -0 cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/ServiceOneBase.cs
Index: ServiceOneBase.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/ServiceOneBase.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- ServiceOneBase.cs 2 Oct 2006 02:04:23 -0000 1.2
+++ ServiceOneBase.cs 18 Oct 2006 18:43:28 -0000 1.3
@@ -84,5 +84,8 @@
/// <summary>
protected abstract datatype::long HandleDoSomethingElse(datatype::String param);
+
+ // NSpringServiceBase.vsl merge-point
+
}
}
1.2 +3 -0 cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/ServiceOneImpl.cs
Index: ServiceOneImpl.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/ServiceOneImpl.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- ServiceOneImpl.cs 15 Aug 2006 22:48:49 -0000 1.1
+++ ServiceOneImpl.cs 18 Oct 2006 18:43:28 -0000 1.2
@@ -35,5 +35,8 @@
return null;
}
+
+ // NSpringServiceImpl.vsl merge-point
+
}
}
1.2 +3 -0 cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/ServiceTwoNoStubsBase.cs
Index: ServiceTwoNoStubsBase.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/ServiceTwoNoStubsBase.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- ServiceTwoNoStubsBase.cs 15 Aug 2006 22:48:49 -0000 1.1
+++ ServiceTwoNoStubsBase.cs 18 Oct 2006 18:43:28 -0000 1.2
@@ -48,5 +48,8 @@
/// <summary>
protected abstract datatype::long HandleDoSomethingElse(datatype::String param);
+
+ // NSpringServiceBase.vsl merge-point
+
}
}
1.2 +3 -0 cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/ServiceTwoNoStubsImpl.cs
Index: ServiceTwoNoStubsImpl.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/ServiceTwoNoStubsImpl.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- ServiceTwoNoStubsImpl.cs 15 Aug 2006 22:48:49 -0000 1.1
+++ ServiceTwoNoStubsImpl.cs 18 Oct 2006 18:43:28 -0000 1.2
@@ -35,5 +35,8 @@
return null;
}
+
+ // NSpringServiceImpl.vsl merge-point
+
}
}
|
|
From: Chris M. <cm...@us...> - 2006-10-18 12:44:47
|
User: cmicali
Date: 06/10/18 05:44:47
Modified: andromda-nspring/src/main/resources/templates/nspring
NSpringDaoFactory.vsl NSpringDaoInterface.vsl
NSpringHibernateDaoBase.vsl
NSpringHibernateDaoImpl.vsl NSpringServiceBase.vsl
NSpringServiceException.vsl NSpringServiceImpl.vsl
NSpringServiceInterface.vsl
Log:
- Fix for [NETCART-10]
- Added merge-points to templates
Revision Changes Path
1.4 +2 -0 cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringDaoFactory.vsl
Index: NSpringDaoFactory.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringDaoFactory.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- NSpringDaoFactory.vsl 15 Aug 2006 22:48:47 -0000 1.3
+++ NSpringDaoFactory.vsl 18 Oct 2006 12:44:45 -0000 1.4
@@ -32,5 +32,7 @@
}
#end
+ // NSpringDaoFactory.vsl merge-point
+
}
}
\ No newline at end of file
1.4 +1 -0 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.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- NSpringDaoInterface.vsl 15 Jun 2006 14:59:55 -0000 1.3
+++ NSpringDaoInterface.vsl 18 Oct 2006 12:44:45 -0000 1.4
@@ -348,6 +348,7 @@
#end
#end
+ // NSpringDaoInterface.vsl merge-point
}
#if ($stringUtils.isNotBlank($entity.packageName))
}
1.6 +3 -0 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.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- NSpringHibernateDaoBase.vsl 15 Aug 2006 22:48:47 -0000 1.5
+++ NSpringHibernateDaoBase.vsl 18 Oct 2006 12:44:45 -0000 1.6
@@ -647,6 +647,9 @@
}
#end
+
+ // NSpringHibernateDaoBase.vsl merge-point
+
}
#if ($stringUtils.isNotBlank($entity.packageName))
}
1.4 +5 -0 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.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- NSpringHibernateDaoImpl.vsl 15 Jun 2006 14:59:55 -0000 1.3
+++ NSpringHibernateDaoImpl.vsl 18 Oct 2006 12:44:46 -0000 1.4
@@ -63,6 +63,11 @@
}
#end
+#if (!$entity.daoImplementationRequired)
+
+ // NSpringHibernateDaoImpl.vsl merge-point
+
+#end
}
#if ($stringUtils.isNotBlank($entity.packageName))
}
1.3 +3 -0 cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringServiceBase.vsl
Index: NSpringServiceBase.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringServiceBase.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- NSpringServiceBase.vsl 2 Oct 2006 01:21:47 -0000 1.2
+++ NSpringServiceBase.vsl 18 Oct 2006 12:44:46 -0000 1.3
@@ -120,6 +120,9 @@
protected abstract $operation.returnType.fullyQualifiedName $operation.implementationSignature;
#end
+
+ // NSpringServiceBase.vsl merge-point
+
}
#if ($stringUtils.isNotBlank($service.packageName))
}
1.4 +3 -0 cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringServiceException.vsl
Index: NSpringServiceException.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringServiceException.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- NSpringServiceException.vsl 10 Oct 2006 03:58:58 -0000 1.3
+++ NSpringServiceException.vsl 18 Oct 2006 12:44:46 -0000 1.4
@@ -45,6 +45,9 @@
return new ${service.name}Exception(e);
}
}
+
+ // NSpringServiceException.vsl merge-point
+
}
/*
1.3 +3 -0 cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringServiceImpl.vsl
Index: NSpringServiceImpl.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringServiceImpl.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- NSpringServiceImpl.vsl 15 Aug 2006 22:48:47 -0000 1.2
+++ NSpringServiceImpl.vsl 18 Oct 2006 12:44:46 -0000 1.3
@@ -43,6 +43,9 @@
#end
#end
+
+ // NSpringServiceImpl.vsl merge-point
+
}
#if ($stringUtils.isNotBlank($service.packageName))
}
1.2 +3 -0 cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringServiceInterface.vsl
Index: NSpringServiceInterface.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringServiceInterface.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- NSpringServiceInterface.vsl 15 Jun 2006 14:59:55 -0000 1.1
+++ NSpringServiceInterface.vsl 18 Oct 2006 12:44:46 -0000 1.2
@@ -38,6 +38,9 @@
#end
#end
+
+ // NSpringServiceInterface.vsl merge-point
+
}
#if ($stringUtils.isNotBlank($service.packageName))
}
|
|
From: Chris M. <cm...@us...> - 2006-10-18 12:39:49
|
User: cmicali
Date: 06/10/18 05:39:48
Modified: andromda-cs/src/main/resources/templates/cs Enumeration.vsl
Interface.vsl
Log:
- Fix for [NETCART-10]
- Added merge-points to templates
Revision Changes Path
1.6 +2 -1 cartridges/andromda-cs/src/main/resources/templates/cs/Enumeration.vsl
Index: Enumeration.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/main/resources/templates/cs/Enumeration.vsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- Enumeration.vsl 15 Aug 2006 22:48:43 -0000 1.5
+++ Enumeration.vsl 18 Oct 2006 12:39:48 -0000 1.6
@@ -28,6 +28,7 @@
#end
// Enumeration.vsl merge-point
+
}
#if ($stringUtils.isNotBlank($enumeration.packageName))
}
1.4 +3 -0 cartridges/andromda-cs/src/main/resources/templates/cs/Interface.vsl
Index: Interface.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/main/resources/templates/cs/Interface.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- Interface.vsl 15 Aug 2006 22:48:43 -0000 1.3
+++ Interface.vsl 18 Oct 2006 12:39:48 -0000 1.4
@@ -47,6 +47,9 @@
#end
#end
+
+ // Interface.vsl merge-point
+
}
#if ($stringUtils.isNotBlank($interface.packageName))
}
|
User: cmicali
Date: 06/10/18 05:37:32
Modified: andromda-nhibernate/src/main/resources/templates/nhibernate
NHibernateEmbeddedValue.vsl NHibernateEntity.vsl
NHibernateEntityImpl.vsl NHibernateEnumeration.vsl
nhibernate.hbm.xml.vsl
Log:
- Fix for [NETCART-10]
- Added merge-points to templates
Revision Changes Path
1.5 +4 -1 cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEmbeddedValue.vsl
Index: NHibernateEmbeddedValue.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEmbeddedValue.vsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- NHibernateEmbeddedValue.vsl 2 Oct 2006 01:21:47 -0000 1.4
+++ NHibernateEmbeddedValue.vsl 18 Oct 2006 12:37:31 -0000 1.5
@@ -3,7 +3,7 @@
// license-header cs merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: HibernateEmbeddedValue.vsl in andromda-nhibernate-cartridge.
+// Generated by: NHibernateEmbeddedValue.vsl in andromda-nhibernate-cartridge.
using System;
@@ -122,6 +122,9 @@
/// Returns a hash code based on class attributes.
/// </summary>
#renderHashCodeMethod($embeddedValue $embeddedValue.attributes)
+
+ // NHibernateEmbeddedValue.vsl merge-point
+
}
#if ($stringUtils.isNotBlank($embeddedValue.packageName))
}
1.7 +2 -2 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.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- NHibernateEntity.vsl 2 Oct 2006 01:21:47 -0000 1.6
+++ NHibernateEntity.vsl 18 Oct 2006 12:37:31 -0000 1.7
@@ -3,7 +3,7 @@
// license-header cs merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: HibernateEntity.vsl in andromda-nhibernate-cartridge.
+// Generated by: NHibernateEntity.vsl in andromda-nhibernate-cartridge.
using System;
@@ -209,7 +209,7 @@
#endregion
#end
- // HibernateEntity.vsl merge-point
+ // NHibernateEntity.vsl merge-point
}
#if (!$entity.abstract && ($visualStudioVersion == "2003"))
1.3 +2 -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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- NHibernateEntityImpl.vsl 9 Apr 2006 14:32:40 -0000 1.2
+++ NHibernateEntityImpl.vsl 18 Oct 2006 12:37:31 -0000 1.3
@@ -3,7 +3,7 @@
// license-header cs merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: HibernateEntityImpl.vsl in andromda-nhibernate-cartridge.
+// Generated by: NHibernateEntityImpl.vsl in andromda-nhibernate-cartridge.
using System;
@@ -18,6 +18,7 @@
public#if ($entity.abstract) abstract#end class $entity.entityImplementationName
: $entity.fullyQualifiedEntityName
{
+ // NHibernateEntityImpl.vsl merge-point
}
#if ($stringUtils.isNotBlank($entity.packageName))
}
1.2 +4 -3 cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEnumeration.vsl
Index: NHibernateEnumeration.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEnumeration.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- NHibernateEnumeration.vsl 8 Mar 2006 04:15:24 -0000 1.1
+++ NHibernateEnumeration.vsl 18 Oct 2006 12:37:31 -0000 1.2
@@ -1,9 +1,10 @@
-// license-header java merge-point
+#set ($generatedFile = "${stringUtils.replace($enumeration.packageName, '.', '/')}/${enumeration.enumerationName}.cs")
+// Name: ${generatedFile}.cs
+// license-header cs merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: HibernateEnumeration.vsl in andromda-nhibernate-cartridge.
+// Generated by: NHibernateEnumeration.vsl in andromda-nhibernate-cartridge.
//
-#set ($generatedFile = "${stringUtils.replace($enumeration.packageName, '.', '/')}/${enumeration.enumerationName}.cs")
#if ($stringUtils.isNotBlank($enumeration.packageName))
package $enumeration.packageName;
#end
1.3 +1 -1 cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/nhibernate.hbm.xml.vsl
Index: nhibernate.hbm.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/nhibernate.hbm.xml.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- nhibernate.hbm.xml.vsl 15 Aug 2006 22:48:46 -0000 1.2
+++ nhibernate.hbm.xml.vsl 18 Oct 2006 12:37:31 -0000 1.3
@@ -62,5 +62,5 @@
#end## foreach
#end## ($entity.requiresMappingSpecialization)
</class>
-
+ <!-- NHibernate.hbm.xml.vsl merge-point -->
</hibernate-mapping>
\ No newline at end of file
|
