Menu
▾
▴
[Andromdaplugins-cvs] CVS update: plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/mda/conf andromda.xml.vsl
|
From: Eric C <ecr...@us...> - 2006-03-06 19:38:24
|
User: ecrutchfield
Date: 06/03/06 11:38:23
Modified: andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/mda/conf
andromda.xml.vsl
Added: andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/mda/conf/dotnet-1.1-mappings
NHibernateTypeMappings.xml CsWrapperMappings.xml
CsMappings.xml
Removed: andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/mda/conf/vs2003-mappings
CsWrapperMappings.xml CsMappings.xml
NHibernateTypeMappings.xml
Log:
restructuring
Revision Changes Path
1.1 plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/mda/conf/dotnet-1.1-mappings/NHibernateTypeMappings.xml
Index: NHibernateTypeMappings.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
This is used to map the model types to
hibernate types.
-->
<mappings name="NHibernate">
<mapping>
<from>datatype::Time</from>
<from>datatype::Date</from>
<from>datatype::DateTime</from>
<from>datatype::Timestamp</from>
<to>DateTime</to>
</mapping>
<mapping>
<from>datatype::char</from>
<to>Char</to>
</mapping>
<mapping>
<from>datatype::Character</from>
<to>Char</to>
</mapping>
<mapping>
<from>datatype::byte</from>
<to>Byte</to>
</mapping>
<mapping>
<from>datatype::Byte</from>
<to>Byte</to>
</mapping>
<mapping>
<from>datatype::short</from>
<to>Int16</to>
</mapping>
<mapping>
<from>datatype::Short</from>
<to>Int16</to>
</mapping>
<mapping>
<from>datatype::int</from>
<to>Int32</to>
</mapping>
<mapping>
<from>datatype::Integer</from>
<to>Int32</to>
</mapping>
<mapping>
<from>datatype::long</from>
<to>Int64</to>
</mapping>
<mapping>
<from>datatype::Long</from>
<to>Int64</to>
</mapping>
<mapping>
<from>datatype::float</from>
<to>float</to>
</mapping>
<mapping>
<from>datatype::Float</from>
<to>float</to>
</mapping>
<mapping>
<from>datatype::double</from>
<to>Double</to>
</mapping>
<mapping>
<from>datatype::Double</from>
<from>datatype::Money</from>
<to>Double</to>
</mapping>
<mapping>
<from>datatype::Decimal</from>
<to>Decimal</to>
</mapping>
<mapping>
<from>datatype::Boolean</from>
<to>Boolean</to>
</mapping>
<mapping>
<from>datatype::boolean</from>
<to>Boolean</to>
</mapping>
<mapping>
<from>datatype::Clob</from>
<to>StringClob</to>
</mapping>
<mapping>
<from>datatype::Blob</from>
<to>BinaryBlob</to>
</mapping>
</mappings>
1.1 plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/mda/conf/dotnet-1.1-mappings/CsWrapperMappings.xml
Index: CsWrapperMappings.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
This is used to map the C# language primitive types names
to C# wrapper type names.
-->
<mappings name="CsWrapper">
<mapping>
<from>int</from>
<to>int</to>
</mapping>
<mapping>
<from>char</from>
<to>char</to>
</mapping>
<mapping>
<from>byte</from>
<to>byte</to>
</mapping>
<mapping>
<from>short</from>
<to>short</to>
</mapping>
<mapping>
<from>long</from>
<to>long</to>
</mapping>
<mapping>
<from>float</from>
<to>float</to>
</mapping>
<mapping>
<from>double</from>
<to>double</to>
</mapping>
<mapping>
<from>bool</from>
<to>bool</to>
</mapping>
</mappings>
1.1 plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/mda/conf/dotnet-1.1-mappings/CsMappings.xml
Index: CsMappings.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
This is used to map the model types to C# types
for the generated code.
-->
<mappings name="Cs">
<mapping>
<from>package</from>
<to>namespace</to>
</mapping>
<mapping>
<from>concurrent</from>
<to/>
</mapping>
<mapping>
<from>guarded</from>
<to>lock</to>
</mapping>
<mapping>
<from>sequential</from>
<to/>
</mapping>
<mapping>
<from>datatype::File</from>
<to>System.IO.File</to>
</mapping>
<mapping>
<from>datatype::String</from>
<to>String</to>
</mapping>
<mapping>
<from>datatype::Time</from>
<from>datatype::Date</from>
<from>datatype::DateTime</from>
<from>datatype::Timestamp</from>
<to>DateTime</to>
</mapping>
<mapping>
<from>datatype::char</from>
<to>char</to>
</mapping>
<mapping>
<from>datatype::Character</from>
<to>char</to>
</mapping>
<mapping>
<from>datatype::byte</from>
<to>byte</to>
</mapping>
<mapping>
<from>datatype::Byte</from>
<to>byte</to>
</mapping>
<mapping>
<from>datatype::short</from>
<to>short</to>
</mapping>
<mapping>
<from>datatype::Short</from>
<to>short</to>
</mapping>
<mapping>
<from>datatype::int</from>
<to>int</to>
</mapping>
<mapping>
<from>datatype::Integer</from>
<to>int</to>
</mapping>
<mapping>
<from>datatype::long</from>
<to>long</to>
</mapping>
<mapping>
<from>datatype::Long</from>
<to>long</to>
</mapping>
<mapping>
<from>datatype::float</from>
<to>float</to>
</mapping>
<mapping>
<from>datatype::Float</from>
<to>float</to>
</mapping>
<mapping>
<from>datatype::double</from>
<to>double</to>
</mapping>
<mapping>
<from>datatype::Double</from>
<from>datatype::Money</from>
<to>double</to>
</mapping>
<mapping>
<from>datatype::Decimal</from>
<to>decimal</to>
</mapping>
<mapping>
<from>datatype::Boolean</from>
<to>bool</to>
</mapping>
<mapping>
<from>datatype::boolean</from>
<to>bool</to>
</mapping>
<mapping>
<from>datatype::Collection</from>
<to>System.Collections.ICollection</to>
</mapping>
<mapping>
<from>datatype::List</from>
<to>System.Collections.IList</to>
</mapping>
<mapping>
<from>datatype::Set</from>
<to>Iesi.Collections.ISet</to>
</mapping>
<mapping>
<from>datatype::Clob</from>
<to>String</to>
</mapping>
<mapping>
<from>datatype::Blob</from>
<to>Byte[]</to>
</mapping>
<mapping>
<from>datatype::Map</from>
<to>System.Collections.IDictionary</to>
</mapping>
<mapping>
<from>datatype::Mappings</from>
<to>org.andromda.metafacades.uml.TypeMappings</to>
</mapping>
<mapping>
<from>datatype::URI</from>
<to>Uri</to>
</mapping>
<mapping>
<from>datatype::URL</from>
<to>Uri</to>
</mapping>
<mapping>
<from>datatype::Object</from>
<to>Object</to>
</mapping>
<mapping>
<from>datatype::void</from>
<to>void</to>
</mapping>
<mapping>
<from>datatype::Document</from>
<to>System.Xml.XmlDocument</to>
</mapping>
<mapping>
<from>datatype::ContentHandler</from>
<to>org.xml.sax.ContentHandler</to>
</mapping>
<mapping>
<from>datatype::TreeNode</from>
<to>javax.swing.tree.TreeNode</to>
</mapping>
</mappings>
1.2 +31 -22 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.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- andromda.xml.vsl 5 Mar 2006 06:16:53 -0000 1.1
+++ andromda.xml.vsl 6 Mar 2006 19:38:22 -0000 1.2
@@ -24,12 +24,18 @@
<namespaces>
<namespace name="default">
<properties>
+ <property name="dotNetVersion">${dotNetVersion}</property>
+#if ($dotNetVersion == "1.1")
+ #set ($visualStudioVersion="2003")
+#else
+ #set ($visualStudioVersion="2003")
+#end
#if (${vsSolution})
- <property name="visualStudioVersion">true</property>
+ <property name="visualStudioVersion">${visualStudioVersion}</property>
#end
#if (${dotNetVersion} == "1.1")
- <property name="languageMappingsUri">file:${maven.conf.dir}/mappings/CsMappings.xml</property>
- <property name="wrapperMappingsUri">file:${maven.conf.dir}/mappings/CsWrapperMappings.xml</property>
+ <property name="languageMappingsUri">file:${conf.dir}/dotnet-1.1-mappings/CsMappings.xml</property>
+ <property name="wrapperMappingsUri">file:${conf.dir}/dotnet-1.1-mappings/CsWrapperMappings.xml</property>
#else
<property name="languageMappingsUri">Cs</property>
<property name="wrapperMappingsUri">CsWrapper</property>
@@ -50,15 +56,17 @@
<property name="entityPropertyNameMask">none</property>
<property name="parameterNameMask">none</property>
<property name="defaultIdentifierType">datatype::long</property>
- <property name="commonAssemblyName">${maven.andromda.commonAssemblyName}</property>
- <property name="coreAssemblyName">${maven.andromda.coreAssemblyName}</property>
+ <property name="commonAssemblyName">${application.id}-common</property>
+#if (${transactionPersistenceType} != "none")
+ <property name="coreAssemblyName">${application.id}-core</property>
+#end
</properties>
</namespace>
<namespace name="cs">
<properties>
- <property name="enumerations">${maven.andromda.common.generated.dir}</property>
- <property name="exceptions">${maven.andromda.common.generated.dir}</property>
- <property name="value-objects">${maven.andromda.common.generated.dir}</property>
+ <property name="enumerations">${common.generated.dir}</property>
+ <property name="exceptions">${common.generated.dir}</property>
+ <property name="value-objects">${common.generated.dir}</property>
</properties>
</namespace>
#if (${transactionPersistenceType} != "none")
@@ -66,7 +74,7 @@
<properties>
<property name="hibernateVersion">2</property>
#if (${dotNetVersion} == "1.1")
- <property name="hibernateTypeMappingsUri">file:${maven.conf.dir}/mappings/NHibernateTypeMappings.xml</property>
+ <property name="hibernateTypeMappingsUri">file:${conf.dir}/dotnet-1.1-mappings/NHibernateTypeMappings.xml</property>
#else
<property name="hibernateTypeMappingsUri">NHibernate</property>
#end
@@ -84,10 +92,10 @@
<property name="hibernateCacheProvider">net.sf.hibernate.cache.EhCacheProvider</property>
<property name="hibernateQueryCacheFactory">net.sf.hibernate.cache.StandardQueryCacheFactory</property>
<property name="hibernateTransactionFactoryClass">net.sf.hibernate.transaction.JTATransactionFactory</property>
- <property name="entities">${maven.andromda.core.generated.dir}</property>
- <property name="entity-impls">${maven.andromda.core.manual.dir}</property>
- <property name="configuration">${maven.andromda.core.generated.dir}</property>
- <property name="cache">${maven.andromda.core.generated.dir}</property>
+ <property name="entities">${core.generated.dir}</property>
+ <property name="entity-impls">${core.manual.dir}</property>
+ <property name="configuration">${core.generated.dir}</property>
+ <property name="cache">${core.generated.dir}</property>
</properties>
</namespace>
#end
@@ -108,21 +116,21 @@
<property name="hibernateQueryCacheFactory">net.sf.hibernate.cache.StandardQueryCacheFactory</property>
<property name="hibernateInheritanceStrategy">${hibernate.inheritance.strategy}</property>
<property name="springTypesPackage">${application.package}.Domain</property>
- <property name="daos">${maven.andromda.core.generated.dir}</property>
- <property name="dao-impls">${maven.andromda.core.manual.dir}</property>
+ <property name="daos">${core.generated.dir}</property>
+ <property name="dao-impls">${core.manual.dir}</property>
</properties>
</namespace>
#end
#if (${web})
<namespace name="aspdotnet">
<properties>
- <property name="dotNetVersion">${maven.andromda.net.version}</property>
- <property name="web">${maven.andromda.web.dir}</property>
- <property name="web_generated">${maven.andromda.web.generated.dir}</property>
- <property name="web_manual">${maven.andromda.web.manual.java.dir}</property>
- <property name="webAssemblyName">Edgewater.Interviewer.Web</property>
- <property name="AssemblyTitle">InterviewerWeb</property>
- <property name="AssemblyDescription">InterviewerWeb</property>
+ <property name="web">${web.dir}</property>
+ <property name="web_generated">${web.generated.dir}</property>
+ <property name="web_manual">${web.manual.dir}</property>
+ <property name="webAssemblyName">${applicationPackage}.web</property>
+ #if (${vsSolution} && ${dotNetVersion}=="1.1")
+ <property name="AssemblyTitle">${applicationName}</property>
+ <property name="AssemblyDescription"></property>
<property name="AssemblyConfiguration"></property>
<property name="AssemblyCompany"></property>
<property name="AssemblyProduct"></property>
@@ -133,6 +141,7 @@
<property name="AssemblyDelaySign">true</property>
<property name="AssemblyKeyFile">""</property>
<property name="AssemblyKeyName">""</property>
+ #end
</properties>
</namespace>
#end
|
