diff --git a/ADL.NET/ADL.csproj b/ADL.NET/ADL.csproj deleted file mode 100755 index b2b9933..0000000 --- a/ADL.NET/ADL.csproj +++ /dev/null @@ -1,84 +0,0 @@ - - - Debug - AnyCPU - 8.0.50727 - 2.0 - {7D9E1F28-3F9C-4675-A02C-C9B2E98A839E} - Library - Properties - ADL - ADL - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - True - True - Resources.resx - - - - - - - - - - - - - - - - - - {77FB7DE5-1F33-4DDC-8A2E-79EF4728705E} - CygnetToolkit - - - - - Designer - ResXFileCodeGenerator - Resources.Designer.cs - - - - - \ No newline at end of file diff --git a/ADL.NET/Exceptions/DataFormatException.cs b/ADL.NET/Exceptions/DataFormatException.cs deleted file mode 100755 index cf93118..0000000 --- a/ADL.NET/Exceptions/DataFormatException.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -/* - * Application Description Framework - * DataRangeException.cs - * - * (c) 2007 Cygnet Solutions Ltd - * - * $Author: af $ - * $Revision: 1.1 $ - */ - -namespace ADL.Exceptions { - /// - /// An exception to be thrown if an attempt is made to set a property to a - /// value which is unsuitably formatted for the data type - /// - public class DataFormatException : DataSuitabilityException { - public DataFormatException(String message) : base(message) {} - } -} diff --git a/ADL.NET/Exceptions/DataRangeException.cs b/ADL.NET/Exceptions/DataRangeException.cs deleted file mode 100755 index 9906b6e..0000000 --- a/ADL.NET/Exceptions/DataRangeException.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -/* - * Application Description Framework - * DataRangeException.cs - * - * (c) 2007 Cygnet Solutions Ltd - * - * $Author: af $ - * $Revision: 1.1 $ - */ - -namespace ADL.Exceptions { - /// - /// An exception to be thrown if an attempt is made to set a scalar property with a - /// defined range to a value which is outside that range - /// - public class DataRangeException : DataSuitabilityException { - public DataRangeException(String message) : base(message) {} - } -} diff --git a/ADL.NET/Exceptions/DataRequiredException.cs b/ADL.NET/Exceptions/DataRequiredException.cs deleted file mode 100755 index 1857b63..0000000 --- a/ADL.NET/Exceptions/DataRequiredException.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -/* - * Application Description Framework - * DataRequiredException.cs - * - * (c) 2007 Cygnet Solutions Ltd - * - * $Author: af $ - * $Revision: 1.1 $ - */ -namespace ADL.Exceptions { - /// - /// An exception to be thrown if an attempt is made to set a required property to null - /// - public class DataRequiredException : DataSuitabilityException { - public DataRequiredException(String message) : base(message){} - } -} diff --git a/ADL.NET/Exceptions/DataSuitabilityException.cs b/ADL.NET/Exceptions/DataSuitabilityException.cs deleted file mode 100755 index 377181c..0000000 --- a/ADL.NET/Exceptions/DataSuitabilityException.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -/* - * Application Description Framework - * DataRangeException.cs - * - * (c) 2007 Cygnet Solutions Ltd - * - * $Author: af $ - * $Revision: 1.1 $ - */ - -namespace ADL.Exceptions { - /// - /// An exception to be thrown if an attempt is made to set a property - /// to a value which is unsuitable - /// - public abstract class DataSuitabilityException : Exception { - public DataSuitabilityException(String message) : base(message) {} - } -} diff --git a/ADL.NET/Exceptions/DomainKnowledgeViolationException.cs b/ADL.NET/Exceptions/DomainKnowledgeViolationException.cs deleted file mode 100755 index 67d0006..0000000 --- a/ADL.NET/Exceptions/DomainKnowledgeViolationException.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -/* - * Application Description Framework - * DomainKnowledgeViolationException.cs - * - * (c) 2007 Cygnet Solutions Ltd - * - * $Author: af $ - * $Revision: 1.1 $ - */ - -namespace ADL.Exceptions { - /// - /// An exception to be thrown if a state arises which violates - /// some specific knowledge about the application domain (i.e. - /// a 'business rule' violation) - /// - public class DomainKnowledgeViolationException : Exception { - public DomainKnowledgeViolationException(String message) : base(message) { } - } -} diff --git a/ADL.NET/Properties/AssemblyInfo.cs b/ADL.NET/Properties/AssemblyInfo.cs deleted file mode 100755 index 2e82949..0000000 --- a/ADL.NET/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("ADL")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("ADL")] -[assembly: AssemblyCopyright("Copyright © 2007 Cygnet Solutions Ltd")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("6be1b0e7-f012-44ee-a35f-892f53b627ad")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/ADL.NET/Trans/adl2hibernate.xsl b/ADL.NET/Trans/adl2hibernate.xsl deleted file mode 100755 index 18e2a57..0000000 --- a/ADL.NET/Trans/adl2hibernate.xsl +++ /dev/null @@ -1,247 +0,0 @@ - - - - - - - - SRU.Hospitality.Entities - SRU.Hospitality.DataModel - - - - - - - - - - - *************************************************************************** - * - * C1873: C1873-SUS-Hospitality.auto.hbm.xml - * - * ©2007 Cygnet Solutions Ltd - * - * THIS FILE IS AUTOMATICALLY GENERATED AND SHOULD NOT - * BE MANUALLY EDITED. - * - * Generated using adl2hibernate-mapping.xsl revision - * - *************************************************************************** - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DateTime - DateTime - String - String - Boolean - TimeStamp - Int32 - Double - Decimal - [unknown?] - - - - - - - - - - - - 0 - - - - - - - - -1 - - - 1 - - - - - - - - - \ No newline at end of file diff --git a/ADL.NET/Trans/types.xml b/ADL.NET/Trans/types.xml deleted file mode 100755 index 61a6076..0000000 --- a/ADL.NET/Trans/types.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/transforms/adl2adl.xslt b/transforms/adl2adl.xslt new file mode 100755 index 0000000..785cf34 --- /dev/null +++ b/transforms/adl2adl.xslt @@ -0,0 +1,132 @@ + + + + + + + + + + + + *************************************************************************** + * + * ©2007 Cygnet Solutions Ltd + * + * THIS FILE IS AUTOMATICALLY GENERATED AND SHOULD NOT + * BE MANUALLY EDITED. + * + * Generated using adl2adl.xsl revision + * + *************************************************************************** + + + + + + + + + + + Class "" has an 'Id' field, but no key. This is not allowed. + + + + + + + + + + + + + +
+ + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ADL.NET/Trans/adl2controllerclasses.xsl b/transforms/adl2controllerclasses.xslt similarity index 61% rename from ADL.NET/Trans/adl2controllerclasses.xsl rename to transforms/adl2controllerclasses.xslt index 6283e9f..21d5ce4 100755 --- a/ADL.NET/Trans/adl2controllerclasses.xsl +++ b/transforms/adl2controllerclasses.xslt @@ -9,13 +9,17 @@ Transform ADL into (partial) controller classes $Author: af $ - $Revision: 1.2 $ - $Date: 2008-01-14 16:53:31 $ + $Revision: 1.1 $ + $Date: 2008-01-21 16:38:31 $ --> - + + - + - - + + + - - + + - + + select="substring( '$Revision: 1.1 $', 11)"/> @@ -81,8 +86,8 @@ using System.Web.Security; using NHibernate; using NHibernate.Expression; using Castle.MonoRail.Framework; -using ADL.Entities; -using ADL.Exceptions; +using Cygnet.Entities; +using Cygnet.Entities.Exceptions; using Iesi.Collections.Generic; using ; @@ -114,176 +119,165 @@ namespace { record; - + string id = Form[""]; - if ( String.IsNullOrEmpty( id)) - { + if ( String.IsNullOrEmpty( id)) { /* it's new, create persistent object */ record = new (); /* perform any domain knowledge behaviour on the new record * after instantiation */ record.AfterCreationHook( hibernator); - messages.Add( "New record created"); - } - else - { + messages.Add( "Created new "); + + } else { /* it's existing, retrieve it */ record = hibernator.CreateCriteria(typeof()) .Add(Expression.Eq("", Int32.Parse(id))) .UniqueResult<>(); + + if ( record != null) + throw new Exception( String.Format( "No record of type with key value {0} found", id)); + } - if ( record != null) - { - try + try { + /* actually update the record */ + BindObjectInstance( record, ParamStore.Form, "instance"); + + + /* for properties of type 'entity', it should not be necessary to do anything + * special - BindObjectInstance /should/ do it all. Unfortunately it sometimes + * doesn't, and I haven't yet characterised why not. TODO: Fix this! */ + record. = + hibernator.CreateCriteria(typeof()) + .Add(Expression.Eq(" + + ", Int32.Parse(Form[""]))) + .UniqueResult<>(); + + + + /* to update a link table which has no other data than the near and far keys, it is + * sufficient to smash the existing values and create new ones. It's also a lot easier! */ + + string[] = Form.GetValues( ""); + + if ( != null) { - /* actually update the record */ - BindObjectInstance( record, ParamStore.Form, "instance"); - - - /* for properties of type 'entity', it should not be necessary to do anything - * special - BindObjectInstance /should/ do it all. Unfortunately it sometimes - * doesn't, and I haven't yet characterised why not. TODO: Fix this! */ - record. = - hibernator.CreateCriteria(typeof()) - .Add(Expression.Eq(" + /* update the linking table for my ; first smash the old values */ + if ( != null) { + .Clear(); + } else { + = new HashedSet<>(); + } + + /* then reinstate the values from the indexes passed */ + foreach ( string index in ) + { + + - ", Int32.Parse(Form[""]))) - .UniqueResult<>(); - - - - /* to update a link table which has no other data than the near and far keys, it is - * sufficient to smash the existing values and create new ones. It's also a lot easier! */ - + + + .Add( + hibernator.CreateCriteria(typeof()) + .Add(Expression.Eq(, Int32.Parse(index))) + .UniqueResult<>()); + } + } + + + + /* with a list we cannot just smash the old values! Instead we need to check + * each one and exclude it if no longer required */ + if ( Form.GetValues( "") != null) + { string[] = Form.GetValues( ""); - - if ( != null) - { - /* update the linking table for my ; first smash the old values */ - if ( != null) - { - .Clear(); - } - else - { - = new HashedSet<>(); - } - - /* then reinstate the values from the indexes passed */ - foreach ( string index in ) - { - - .Add( - hibernator.CreateCriteria(typeof()) - .Add(Expression.Eq("Id", Int32.Parse(index))) - .UniqueResult<>()); - } - } - - - /* with a list we cannot just smash the old values! Instead we need to check - * each one and exclude it if no longer required */ - if ( Form.GetValues( "") != null) - { - string[] = Form.GetValues( ""); + /* updating child records; first remove any not on the submitted list */ + foreach ( item in record.){ + String itemId = item.KeyString; + bool found = false; - /* updating child records; first remove any not on the submitted list */ - foreach ( item in record.) - { - String itemId = item.KeyString; - bool found = false; - - foreach ( string index in ) - { - - if ( index.Equals( itemId)) - { - found = true; - } - } - - if ( ! found) - { - record..Remove( item); + foreach ( string index in ){ + + if ( index.Equals( itemId)){ + found = true; } } - - /* then add any on the included list which are not already members */ - foreach ( string index in ) - { - item = - hibernator.CreateCriteria(typeof()) - .Add(Expression.Eq("Id", Int32.Parse(index))) - .UniqueResult<>(); - - if ( ! record..Contains( item)) - { - record..Add( item); - } - } - } - - - /* perform any domain knowledge behaviour on the record prior to updating */ - record.BeforeUpdateHook( hibernator); - - /* write the record to the database, in order to guarantee we have a valid key */ - hibernator.Save(record); - hibernator.Flush(); - - /* perform any domain knowledge behaviour on the record after updating */ - record.AfterUpdateHook( hibernator); - messages.Add( "Record saved successfully"); - } - catch ( DataSuitabilityException dse) - { - AddError( dse.Message); - } - catch ( ApplicationException axe) - { - AddError( axe.Message); - } + if ( ! found){ + record..Remove( item); + } + } - PropertyBag["messages"] = messages; - PropertyBag["instance"] = record; + /* then add any on the included list which are not already members */ + foreach ( string index in ){ + + + + + + item = + hibernator.CreateCriteria(typeof()) + .Add(Expression.Eq("", Int32.Parse(index))) + .UniqueResult<>(); + + if ( ! record..Contains( item)){ + record..Add( item); + } + } + } + - - - - RenderViewWithFailover(""); - } - else - { - throw new Exception( String.Format( "No record of type with key value {0} found", id)); + /* perform any domain knowledge behaviour on the record prior to updating */ + record.BeforeUpdateHook( hibernator); + + /* write the record to the database, in order to guarantee we have a valid key */ + hibernator.Save(record); + hibernator.Flush(); + + /* perform any domain knowledge behaviour on the record after updating */ + record.AfterUpdateHook( hibernator); + + messages.Add( "Record saved successfully"); + + }catch ( DataSuitabilityException dse){ + AddError( dse.Message); + + }catch ( ApplicationException axe){ + AddError( axe.Message); } + + PropertyBag["messages"] = messages; + PropertyBag["instance"] = record; + + + + + RenderViewWithFailover(""); } /// <summary> /// Actually delete the selected record /// </summary> [AccessibleThrough(Verb.Get)] - public void Delete() - { + public void Delete() { ISession hibernator = NHibernateHelper.GetCurrentSession(); string id = Params[""]; string reallydelete = Params["reallydelete"]; - if ( "true".Equals( reallydelete)) - { + if ( "true".Equals( reallydelete)){ record = hibernator.CreateCriteria(typeof()) .Add(Expression.Eq("", Int32.Parse(id))) .UniqueResult<>(); - if ( record != null) - { + if ( record != null){ record.BeforeDeleteHook( hibernator); hibernator.Delete( @@ -292,14 +286,13 @@ namespace { .UniqueResult<>()); hibernator.Flush(); - } - else - { + + }else{ throw new ApplicationException( "No such record?"); } } - + InternalShowList(); @@ -308,18 +301,17 @@ namespace { } - + - - - + + + /// <summary> /// list all instances of this entity to allow the user to select one for editing /// this method invokes the default list view - which is probably what you want unless /// you've a special reason for doing something different /// </summary> - public void InternalShowList() - { + public void InternalShowList(){ InternalShowList( ""); } @@ -327,11 +319,10 @@ namespace { /// list all instances of this entity to allow the user to select one for editing /// </summary> /// <param name="view">The name of the list view to show</param> - public void InternalShowList( String view) - { + public void InternalShowList( String view){ ISession hibernator = NHibernateHelper.GetCurrentSession(); IList<> instances = - hibernator.CreateCriteria(typeof()) + hibernator.CreateCriteria(typeof()) .List<>(); @@ -345,12 +336,11 @@ namespace { } - - if ( Form[ "" ] == null) - { + + if ( Form[ "" ] == null) { AddError( - - + + "You must supply a value for " ); @@ -359,22 +349,17 @@ namespace { - + - + "" - + - - - - - - - - + + + /// <summary> /// Handle the submission of the form named @@ -456,7 +441,7 @@ namespace { - + /// <summary> /// list all instances of this entity to allow the user to select one /// this method invokes the named view. @@ -470,20 +455,20 @@ namespace { - + /* produce a list of to populate the menu for */ - + /* produce a list of to populate the LHS of the shuffle for */ - + /* produce a list of to populate the multi-select for */ @@ -495,9 +480,9 @@ namespace { - + PropertyBag[""] = - hibernator.CreateCriteria(typeof()) + hibernator.CreateCriteria(typeof()) .List<>(); @@ -505,13 +490,13 @@ namespace { - - - - - - - - + + + Cannot find entity "". + + + Entity "" does not have a single-property primary key. + + - \ No newline at end of file + diff --git a/ADL.NET/Trans/adl2entityclass.xsl b/transforms/adl2entityclasses.xslt similarity index 55% rename from ADL.NET/Trans/adl2entityclass.xsl rename to transforms/adl2entityclasses.xslt index 73f257b..f7db1a0 100755 --- a/ADL.NET/Trans/adl2entityclass.xsl +++ b/transforms/adl2entityclasses.xslt @@ -8,50 +8,51 @@ Transform ADL into entity classes $Author: af $ - $Revision: 1.2 $ - $Date: 2008-01-14 16:53:31 $ + $Revision: 1.1 $ + $Date: 2008-01-21 16:38:31 $ --> - + + + - - + - - + + - - - - - + + select="substring( '$Revision: 1.1 $', 11)"/> - + /* ---- [ cut here: next file '.auto.cs'] ---------------- */ @@ -74,8 +75,8 @@ using System.Collections.Generic; using System.Text; using System.Text.RegularExpressions; - using ADL.Entities; - using ADL.Exceptions; + using Cygnet.Entities; + using Cygnet.Entities.Exceptions; using Iesi.Collections.Generic; /// <summary> @@ -95,52 +96,6 @@ } - /* - /// <summary> - /// Auto-generated one-arg constructor; initialises Id slot and also all - /// one-to-many slots - /// </summary> - public ( int key) - { - - - - } - */ - - /// <summary> /// Auto-generated overridden property for the Key slot, maps onto /// </summary> @@ -154,10 +109,12 @@ return .ToString(); // Single key. - StringBuilder result = new StringBuilder(); - - result.Append('|'); - result.Append(); + StringBuilder result = new StringBuilder(); + + result.Append(.KeyString); + + result.Append('|'); + return result.ToString(); @@ -168,49 +125,37 @@ /// <summary> /// A user readable distinct identifying string /// </summary> - public override string UserIdentifier - { - get { - StringBuilder result = new StringBuilder(); - - - - - - - result.Append( ); - - - result.Append(); - - - - - - result.Append( ", "); - - - - - - result.AppendFormat( "#{0}", ); - - + public override string UserIdentifier { + get { + StringBuilder result = new StringBuilder(); + + + + result.Append(.UserIdentifier); + + result.Append( ", "); + + + + + result.AppendFormat( "#{0}", ); + + - return result.ToString(); - } + return result.ToString(); + } } - + } } + - + , @@ -220,49 +165,26 @@ - + - + // auto generating iv/property pair for slot with name - - - - - - - - - - - - + - + true + - - - - - - - - true + - - - - - - ICollection<> @@ -274,8 +196,7 @@ - - + @@ -296,14 +217,11 @@ - - - - - - - - + + + + + private Regex Validator = new Regex( ""); @@ -315,7 +233,7 @@ { get { return _; } set { - + if ( value == null) { throw new DataRequiredException( @@ -329,15 +247,16 @@ ); } - - - - + - + + + - + + + if ( value > ) @@ -370,63 +289,60 @@ + + // auto generating for set with name , having many-to-many child + private ICollection<> _; + + public virtual ICollection<> + { + get { return _; } + set { _ = value; } + } + + + + + // auto generating for set with name , having one-to-many child + private ICollection<> _; + + public virtual ICollection<> + { + get { return _; } + set { _ = value; } + } + + + + + + - - - - - - - - - - - + + + + + + + - - - - - ? - - - - Error! not found. - - - + ? - - - - - - - - - - - + + + + - - - - true - - - - Error! not found. - - - + true - + - + /* */ @@ -434,7 +350,7 @@ - + "" diff --git a/transforms/adl2hibernate.xslt b/transforms/adl2hibernate.xslt new file mode 100755 index 0000000..00cee2a --- /dev/null +++ b/transforms/adl2hibernate.xslt @@ -0,0 +1,204 @@ + + + + + + + + + + + + *************************************************************************** + * + * ©2007 Cygnet Solutions Ltd + * + * THIS FILE IS AUTOMATICALLY GENERATED AND SHOULD NOT + * BE MANUALLY EDITED. + * + * Generated using adl2hibernate-mapping.xsl revision + * + *************************************************************************** + + + + + + + + + + + + + + + + + + Class '' has no properties in its key + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + () + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Error! Found type "" but cannot find 'dotnet' or 'hibernate' attributes. + + + Error! Type "" not found. + + + + + + + + + + + + + \ No newline at end of file diff --git a/ADL.NET/Trans/adl2mssql.xsl b/transforms/adl2mssql.xslt similarity index 100% rename from ADL.NET/Trans/adl2mssql.xsl rename to transforms/adl2mssql.xslt diff --git a/ADL.NET/Trans/adl2psql.xsl b/transforms/adl2psql.xslt similarity index 100% rename from ADL.NET/Trans/adl2psql.xsl rename to transforms/adl2psql.xslt diff --git a/ADL.NET/Trans/adl2views.xsl b/transforms/adl2views.xslt similarity index 83% rename from ADL.NET/Trans/adl2views.xsl rename to transforms/adl2views.xslt index 0ecf911..90fd505 100755 --- a/ADL.NET/Trans/adl2views.xsl +++ b/transforms/adl2views.xslt @@ -1,5 +1,9 @@ - + + @@ -23,7 +27,7 @@ - + + select="substring( '$Revision: 1.1 $', 11)"/> - + - + [ cut here: next file 'tail.txt' ] - - - + + + [ cut here: next file '' ] @@ -108,10 +112,10 @@ - + - + an an @@ -123,15 +127,15 @@ - [ cut here: next file '.auto.vm' ] + [ cut here: next file '.auto.vm' ] #if ( $instance) - #set( $title = " $instance.UserIdentifier") + #set( $title = " $instance.UserIdentifier") #else - #set( $title = "Add a new ") + #set( $title = "Add a new ") #end @@ -150,7 +154,7 @@