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: Manish A. <mag...@us...> - 2007-01-09 10:47:36
|
User: magrawal
Date: 07/01/09 02:47:37
Added: andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/Domain
DaoFactory.cs
Log:
added templates to generate simple test cases for each public method in the service layer.
Revision Changes Path
1.1 cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/Domain/DaoFactory.cs
Index: DaoFactory.cs
===================================================================
// Name: DaoFactory.cs
// license-header cs merge-point
//
// Attention: Generated code! Do not modify by hand!
// Generated by: NSpringDaoFactory.vsl in andromda-nspring-cartridge.
using System;
namespace org.andromda.cartridges.nspring.Domain
{
/// <summary>
/// Factory for obtaining Dao instances.
/// </summary>
public class DaoFactory
{
private static org.andromda.cartridges.nspring.ITestEntity1Dao _TestEntity1Dao = null;
public static org.andromda.cartridges.nspring.ITestEntity1Dao GetTestEntity1Dao()
{
if (_TestEntity1Dao == null)
_TestEntity1Dao = new org.andromda.cartridges.nspring.TestEntity1DaoImpl();
return _TestEntity1Dao;
}
// NSpringDaoFactory.vsl merge-point
}
}
|
|
From: Manish A. <mag...@us...> - 2007-01-09 10:47:22
|
User: magrawal
Date: 07/01/09 02:47:20
Added: andromda-nspring/src/main/resources/templates/nspring
NSpringServiceTestBase.vsl
NSpringServiceTestImpl.vsl
Log:
added templates to generate simple test cases for each public method in the service layer.
Revision Changes Path
1.1 cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringServiceTestBase.vsl
Index: NSpringServiceTestBase.vsl
===================================================================
#set ($generatedFile = "${service.packagePath}/${service.name}Tests.cs")
#if ($createTests == "true")
// Name: ${service.name}Tests.cs
// license-header cs merge-point
//
// Attention: Generated code! Do not modify by hand!
// Generated by: NSpringServiceTestBase.vsl in andromda-nspring-cartridge.
using System;
using AndroMDA.NHibernateSupport;
using NUnit.Framework;
#if ($stringUtils.isNotBlank($service.packageName))
namespace ${service.packageName}.Tests
{
#end
/// <summary>
/// <p>
/// Spring Service test base class for <code>$service.fullyQualifiedName</code>,
/// </p>
///
/// @see $service.fullyQualifiedNameTests
/// </summary>
public abstract class ${service.name}Tests
{
#region private properties
private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(${service.name}Tests));
#set ($serviceMemberName = "_${service.name}")
private $service.fullyQualifiedInterfaceName ${serviceMemberName};
/// <summary>Property to access $service.name</summary>
protected $service.fullyQualifiedInterfaceName $stringUtils.capitalize($service.name)
{
get
{
if (null == $serviceMemberName)
{
$serviceMemberName = new ${service.fullyQualifiedImplementationName}();
}
return $serviceMemberName;
}
}
#endregion
#region setup and teardown
[TestFixtureSetUp]
public void TestFixtureSetUp()
{
// Initialize Log4Net
log4net.Config.XmlConfigurator.Configure();
// Initialize NHibernate
SessionManagerFactory.SessionManager = new DefaultSessionManager();
SessionManagerFactory.SessionManager.HandleApplicationStart();
HandleTestFixtureSetup();
}
protected abstract void HandleTestFixtureSetup();
[TestFixtureTearDown]
public void TestFixtureTearDown()
{
HandleTestFixtureTearDown();
SessionManagerFactory.SessionManager.HandleApplicationEnd();
}
protected abstract void HandleTestFixtureTearDown();
[SetUp]
public void Setup()
{
HandleSetup();
}
protected abstract void HandleSetup();
[TearDown]
public void TearDown()
{
HandleTearDown();
}
protected abstract void HandleTearDown();
#endregion
#foreach ($operation in $service.operations)
/// <summary>
/// @see ${service.fullyQualifiedName}Tests#Test${operation.name}
/// </summary>
[Test]
public void Test${operation.name}()
{
HandleTest${operation.name}();
}
/// <summary>
/// Performs the core logic for {@link #Test${operation.name}()}
/// <summary>
protected abstract void HandleTest${operation.name}();
#end
}
#if ($stringUtils.isNotBlank($service.packageName))
}
#end
#end
1.1 cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringServiceTestImpl.vsl
Index: NSpringServiceTestImpl.vsl
===================================================================
#set ($generatedFile = "${service.packagePath}/${service.name}TestsImpl.cs")
#if ($createTests == "true")
// Name: ${service.name}TestsImpl.cs
// license-header cs merge-point
//
// This is only generated once! It will never be overwritten.
// You can (and have to!) safely modify it by hand.
using System;
using AndroMDA.NHibernateSupport;
using NUnit.Framework;
#if ($stringUtils.isNotBlank($service.packageName))
namespace ${service.packageName}.Tests
{
#end
/// <summary>
/// @see ${service.fullyQualifiedName}TestsImpl
/// </summary>
[TestFixture]
public class ${service.name}TestsImpl
: ${service.name}Tests
{
#region private member variables
private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(${service.name}TestsImpl));
#endregion
#region setup and teardown
protected override void HandleTestFixtureSetup()
{
//TODO: put any fixture level setup code here.
}
protected override void HandleTestFixtureTearDown()
{
//TODO: put any fixture level tear down code here.
}
protected override void HandleSetup()
{
//TODO: put any testcase setup code here.
}
protected override void HandleTearDown()
{
//TODO: put any testcase teardown code here.
}
#endregion
#foreach ($operation in $service.operations)
/// <summary>
/// @see ${service.fullyQualifiedName}Tests#HandleTest${operation.name}
/// </summary>
protected override void HandleTest${operation.name}()
{
// put your implementation here
throw new Exception("${service.packageName}.Tests.${service.name}TestsImpl.HandleTest${operation.name} is not implemented.");
}
#end
}
#if ($stringUtils.isNotBlank($service.packageName))
}
#end
#end
|
|
From: Manish A. <mag...@us...> - 2007-01-09 10:46:47
|
User: magrawal
Date: 07/01/09 02:46:48
Added: andromda-nspring/src/test/expected/org/andromda/cartridges/nspring
ITestEntity1Dao.cs ServiceOneException.cs
ServiceOneTests.cs ServiceOneTestsImpl.cs
ServiceTwoNoStubsException.cs
ServiceTwoNoStubsTests.cs
ServiceTwoNoStubsTestsImpl.cs TestEntity1DaoBase.cs
TestEntity1DaoImpl.cs
Log:
added templates to generate simple test cases for each public method in the service layer.
Revision Changes Path
1.1 cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/ITestEntity1Dao.cs
Index: ITestEntity1Dao.cs
===================================================================
// Name: ITestEntity1Dao.cs
// license-header cs merge-point
//
// Attention: Generated code! Do not modify by hand!
// Generated by: NSpringDaoInterface.vsl in andromda-nspring-cartridge.
using System;
namespace org.andromda.cartridges.nspring
{
/// <summary>
/// This enumeration is used to define transformation flags. Using these flag
/// entities can be converted automatically into value objects or other types.
/// Different methods in a dao class support this feature: look for an
/// <code>int</code> parameter called <code>transform</code>.
/// </summary>
public enum TransformTestEntity1
{
// Denotes no transformation will occur.
TRANSFORM_NONE = 0,
}
/// <summary>
/// <see cref="org.andromda.cartridges.nspring.TestEntity1"/>
/// </summary>
public interface ITestEntity1Dao
: AndroMDA.NHibernateSupport.INHibernateDaoSupport
{
/// <summary>
/// Loads an instance of org.andromda.cartridges.nspring.TestEntity1 from the persistent store.
/// </summary>
org.andromda.cartridges.nspring.TestEntity1 Load(datatype::Long id);
/// <summary>
/// <p>
/// Does the same thing as <seealso cref="ITestEntity1Dao.Load(datatype::Long)"/> with an
/// additional flag called <code>transform</code>. If this flag is set to <code>TransformTestEntity1.TRANSFORM_NONE</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
/// optionally transform the entity (into a value object for example). By default, transformation does
/// not occur.
/// </p>
/// </summary>
/// <param name="id">the identifier of the entity to load.</param>
/// <returns>either the entity or the object transformed from the entity.</returns>
Object Load(int transform, datatype::Long id);
/// <summary>
/// Loads all entities of type <seealso cref="org.andromda.cartridges.nspring.TestEntity1"/>.
/// </summary>
/// <returns>the loaded entities.</returns>
System.Collections.IList LoadAll();
/// <summary>
/// <p>
/// Does the same thing as <seealso cref="ITestEntity1Dao.LoadAll()"/> with an
/// additional flag called <code>transform</code>. If this flag is set to <code>TransformTestEntity1.TRANSFORM_NONE</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
/// transform the entity (into a value object for example). By default, transformation does
/// not occur.
/// </p>
/// </summary>
/// <param name="transform">the flag indicating what transformation to use.</param>
/// <returns>the loaded entities.</returns>
System.Collections.IList LoadAll(int transform);
/// <summary>
/// Creates an instance of org.andromda.cartridges.nspring.TestEntity1 and adds it to the persistent store.
/// </summary>
org.andromda.cartridges.nspring.TestEntity1 Create(org.andromda.cartridges.nspring.TestEntity1 testEntity1);
/// <summary>
/// <p>
/// Does the same thing as <seealso cref="ITestEntity1Dao.Create(org.andromda.cartridges.nspring.TestEntity1)"/> with an
/// additional flag called <code>transform</code>. If this flag is set to <code>TransformTestEntity1.TRANSFORM_NONE</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
/// transform the entity (into a value object for example). By default, transformation does
/// not occur.
/// </p>
/// </summary>
Object Create(int transform, org.andromda.cartridges.nspring.TestEntity1 testEntity1);
/// <summary>
/// Creates a new instance of org.andromda.cartridges.nspring.TestEntity1 and adds
/// from the passed in <code>entities</code> collection
/// </summary>
/// <param name="entities">the collection of org.andromda.cartridges.nspring.TestEntity1 instances to create.</param>
/// <returns>the created instances.</returns>
System.Collections.ICollection Create(System.Collections.ICollection entities);
/// <summary>
/// <p>
/// Does the same thing as <seealso cref="ITestEntity1Dao.Create(org.andromda.cartridges.nspring.TestEntity1)"/> with an
/// additional flag called <code>transform</code>. If this flag is set to <code>TransformTestEntity1.TRANSFORM_NONE</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
/// transform the entities (into value objects for example). By default, transformation does
/// not occur.
/// </p>
/// </summary>
System.Collections.ICollection Create(int transform, System.Collections.ICollection entities);
/// <summary>
/// <p>
/// Creates a new <code>org.andromda.cartridges.nspring.TestEntity1</code>
/// instance from <strong>all</strong> attributes and adds it to
/// the persistent store.
/// </p>
/// </summary>
org.andromda.cartridges.nspring.TestEntity1 Create(
datatype::String firstName);
/// <summary>
/// <p>
/// Does the same thing as <seealso cref="ITestEntity1Dao.Create(datatype::String)"/> with an
/// additional flag called <code>transform</code>. If this flag is set to <code>TransformTestEntity1.TRANSFORM_NONE</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
/// transform the entity (into a value object for example). By default, transformation does
/// not occur.
/// </p>
/// </summary>
Object Create(
int transform,
datatype::String firstName);
/// <summary>
/// Updates the <code>testEntity1</code> instance in the persistent store.
/// </summary>
void Update(org.andromda.cartridges.nspring.TestEntity1 testEntity1);
/// <summary>
/// Updates all instances in the <code>entities</code> collection in the persistent store.
/// </summary>
void Update(System.Collections.ICollection entities);
/// <summary>
/// Removes the instance of org.andromda.cartridges.nspring.TestEntity1 from the persistent store.
/// </summary>
void Remove(org.andromda.cartridges.nspring.TestEntity1 testEntity1);
/// <summary>
/// Removes the instance of org.andromda.cartridges.nspring.TestEntity1 having the given
/// <code>identifier</code> from the persistent store.
/// </summary>
void Remove(datatype::Long id);
/// <summary>
/// Removes all entities in the given <code>entities<code> collection.
/// </summary>
void Remove(System.Collections.ICollection entities);
// NSpringDaoInterface.vsl merge-point
}
}
1.1 cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/ServiceOneException.cs
Index: ServiceOneException.cs
===================================================================
// Name: ServiceOneException.cs
// license-header cs merge-point
//
// Attention: Generated code! Do not modify by hand!
// Generated by: NSpringServiceException.vsl
using System;
using System.Xml;
using System.Runtime.Serialization;
/*
using System.Web;
using System.Web.Services.Protocols;
*/
namespace org.andromda.cartridges.nspring
{
public class ServiceOneException : System.ApplicationException
{
/// <summary>
/// Initializes a new instance of ServiceOneException with a specified error message.
/// </summary>
/// <param name="message">A message that describes the error.</param>
internal ServiceOneException(Exception e)
: base(e.Message, e)
{
}
/// <summary>
/// Create a new instance of the ServiceOneException.
/// </summary>
/// <param name="exception">Actual exception that contains the error information.</param>
public static ServiceOneException Create(Exception e)
{
if (e is ServiceOneException)
{
return (ServiceOneException)e;
}
else
{
return new ServiceOneException(e);
}
}
// NSpringServiceException.vsl merge-point
}
/*
[Serializable]
public class ServiceOneException : System.ApplicationException, ISerializable
{
private XmlNode detail = null;
private const string ErrorMessage = "A call to TimeTrackingService failed. Please check the inner exception for more detail.";
private static XmlDocument doc = new XmlDocument();
private bool isKnownException = false;
/// <summary>
/// Contains the details about the exception. Contains the InnerException if any
/// Format of the InnerException is <exception type="FullNameOfTheException"><message></message></exception>
/// </summary>
public XmlNode Detail
{
get
{
return this.detail;
}
set
{
this.detail = value;
}
}
/// <summary>
/// Says whether this exception is a known business exception
/// </summary>
public bool KnownException
{
get
{
return this.isKnownException;
}
set
{
this.isKnownException = value;
}
}
/// <summary>
/// Initializes a new instance of ServiceOneException with a specified error message.
/// </summary>
/// <param name="message">A message that describes the error.</param>
internal ServiceOneException(String message)
: base(message)
{
this.isKnownException = true;
}
/// <summary>
/// Initializes a new instance of ServiceOneException at the time of deserialization.
/// Do not call the base class constructor as that initializes few properties that are not getting serialized
/// </summary>
/// <param name="info">Contains the state information of the serialized object.</param>
/// <param name="context">Contains the context information.</param>
public ServiceOneException(SerializationInfo info, StreamingContext context)
// : base(info, context)
{
this.detail = info.GetValue("Detail", typeof(XmlNode) ) as XmlNode;
this.isKnownException = info.GetBoolean("KnownException");
}
/// <summary>
/// Initializes a new instance of ServiceOneException that wraps the actual exception.
/// </summary>
/// <param name="message">A message that describes the error.</param>
/// <param name="innerException">The exception that is the cause of the current exception.</param>
internal ServiceOneException(String message, Exception innerException)
: base(message)
{
this.detail = ToXmlNode( message, innerException );
}
#region ISerializable Members
void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context)
{
/// Do not call the base class method as that initializes few properties that are not getting serialized
//base.GetObjectData(info, context);
info.AddValue("Detail", this.detail);
info.AddValue("KnownException", isKnownException );
}
#endregion
/// <summary>
/// Create a new instance of the ServiceOneException.
/// </summary>
/// <param name="message">A message that describes the error.</param>
public static ServiceOneException Create(string message)
{
return new ServiceOneException(message);
}
/// <summary>
/// Create a new instance of the ServiceOneException.
/// </summary>
/// <param name="exception">Actual exception that contains the error information.</param>
public static ServiceOneException Create(Exception e)
{
if (e is ServiceOneException)
{
return (ServiceOneException)e;
}
else if (e is SoapException)
{
return UnwrapSoapException((SoapException)e);
}
else
{
return new ServiceOneException(ErrorMessage, e);
}
}
/// <summary>
/// This method wraps the a exception as a ServiceOneException and then as a SoapException.
/// </summary>
/// <param name="e">Actual exception that contains the error information.</param>
public static SoapException WrapSoapException(Exception e)
{
//Make sure the exception that is wrapped is a ServiceOneException
ServiceOneException ttse = Create(e);
string actor = (HttpContext.Current != null) ? HttpContext.Current.Request.Url.AbsoluteUri : string.Empty;
return new SoapException("Fault occurred", SoapException.ClientFaultCode, actor, ToXmlNode(e.Message, ttse));
}
/// <summary>
/// This method unwraps the ServiceOneException from the SoapException.
/// </summary>
/// <param name="se">Actual exception that contains the error information.</param>
private static ServiceOneException UnwrapSoapException(SoapException se)
{
ServiceOneException ttse = null;
XmlNode detailNode = se.Detail;
if (detailNode != null)
{
string message = detailNode.SelectSingleNode("message").InnerText;
ttse = new ServiceOneException(message);
XmlNode exceptionNode = detailNode.SelectSingleNode("exception");
if (exceptionNode != null)
ttse.Detail = exceptionNode;
}
return ttse;
}
/// <summary>
/// Helper method to create a xml node that contains the information about the parameters passed.
/// </summary>
/// <param name="message">A message that describes the error.</param>
/// <param name="exception">Actual exception that contains the error information.</param>
private static XmlNode ToXmlNode(string message, Exception e)
{
// Build the detail element of the SOAP fault.
System.Xml.XmlNode detailNode = doc.CreateNode(XmlNodeType.Element,
SoapException.DetailElementName.Name,
SoapException.DetailElementName.Namespace);
// Build specific details for the SoapException.
XmlNode messageNode = ToXmlNode( "message", e.Message);
detailNode.AppendChild(messageNode);
bool IsKnownException = false;
ServiceOneException ttse = e as ServiceOneException;
if (ttse != null)
{
IsKnownException = ttse.KnownException;
}
XmlNode knownExceptionNode = ToXmlNode("KnownException", IsKnownException.ToString() );
detailNode.AppendChild(knownExceptionNode);
if (e != null)
{
detailNode.AppendChild(ToXmlNode(e));
}
return detailNode;
}
/// <summary>
/// Helper method to create a xml node that contains the information about the parameters passed.
/// </summary>
/// <param name="exception">Actual exception that contains the error information.</param>
private static XmlNode ToXmlNode(Exception e)
{
System.Xml.XmlNode exception = null;
if (e != null)
{
// Create exception node.
exception = doc.CreateNode(XmlNodeType.Element, "exception", null);
XmlAttribute typeAttribute = doc.CreateAttribute("t", "type", null);
typeAttribute.Value = e.GetType().FullName;
exception.Attributes.Append(typeAttribute);
exception.AppendChild(ToXmlNode("message", e.Message));
if (e.InnerException != null)
{
exception.AppendChild(ToXmlNode(e.InnerException));
}
}
return exception;
}
/// <summary>
/// Helper method to create a xml node that contains the information about the parameters passed.
/// </summary>
/// <param name="nodeName">A name of the node to be created.</param>
/// <param name="text">Text that is the value of the node.</param>
private static XmlNode ToXmlNode(string nodeName, string text)
{
System.Xml.XmlNode messageNode = doc.CreateNode(XmlNodeType.Element, nodeName, null);
XmlNode messageTextNode = doc.CreateNode(XmlNodeType.Text, "Text", null);
messageTextNode.Value = text;
messageNode.AppendChild(messageTextNode);
return messageNode;
}
}
*/
}
1.1 cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/ServiceOneTests.cs
Index: ServiceOneTests.cs
===================================================================
// Name: ServiceOneTests.cs
// license-header cs merge-point
//
// Attention: Generated code! Do not modify by hand!
// Generated by: NSpringServiceTestBase.vsl in andromda-nspring-cartridge.
using System;
using AndroMDA.NHibernateSupport;
using NUnit.Framework;
namespace org.andromda.cartridges.nspring.Tests
{
/// <summary>
/// <p>
/// Spring Service test base class for <code>org::andromda::cartridges::nspring::ServiceOne</code>,
/// </p>
///
/// @see $service.fullyQualifiedNameTests
/// </summary>
public abstract class ServiceOneTests
{
#region private properties
private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(ServiceOneTests));
private org.andromda.cartridges.nspring.IServiceOne _ServiceOne;
/// <summary>Property to access ServiceOne</summary>
protected org.andromda.cartridges.nspring.IServiceOne ServiceOne
{
get
{
if (null == _ServiceOne)
{
_ServiceOne = new org.andromda.cartridges.nspring.ServiceOneImpl();
}
return _ServiceOne;
}
}
#endregion
#region setup and teardown
[TestFixtureSetUp]
public void TestFixtureSetUp()
{
// Initialize Log4Net
log4net.Config.XmlConfigurator.Configure();
// Initialize NHibernate
SessionManagerFactory.SessionManager = new DefaultSessionManager();
SessionManagerFactory.SessionManager.HandleApplicationStart();
HandleTestFixtureSetup();
}
protected abstract void HandleTestFixtureSetup();
[TestFixtureTearDown]
public void TestFixtureTearDown()
{
HandleTestFixtureTearDown();
SessionManagerFactory.SessionManager.HandleApplicationEnd();
}
protected abstract void HandleTestFixtureTearDown();
[SetUp]
public void Setup()
{
HandleSetup();
}
protected abstract void HandleSetup();
[TearDown]
public void TearDown()
{
HandleTearDown();
}
protected abstract void HandleTearDown();
#endregion
/// <summary>
/// @see org::andromda::cartridges::nspring::ServiceOneTests#TestdoSomething
/// </summary>
[Test]
public void TestdoSomething()
{
HandleTestdoSomething();
}
/// <summary>
/// Performs the core logic for {@link #TestdoSomething()}
/// <summary>
protected abstract void HandleTestdoSomething();
/// <summary>
/// @see org::andromda::cartridges::nspring::ServiceOneTests#TestdoSomethingElse
/// </summary>
[Test]
public void TestdoSomethingElse()
{
HandleTestdoSomethingElse();
}
/// <summary>
/// Performs the core logic for {@link #TestdoSomethingElse()}
/// <summary>
protected abstract void HandleTestdoSomethingElse();
}
}
1.1 cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/ServiceOneTestsImpl.cs
Index: ServiceOneTestsImpl.cs
===================================================================
// Name: ServiceOneTestsImpl.cs
// license-header cs merge-point
//
// This is only generated once! It will never be overwritten.
// You can (and have to!) safely modify it by hand.
using System;
using AndroMDA.NHibernateSupport;
using NUnit.Framework;
namespace org.andromda.cartridges.nspring.Tests
{
/// <summary>
/// @see org::andromda::cartridges::nspring::ServiceOneTestsImpl
/// </summary>
[TestFixture]
public class ServiceOneTestsImpl
: ServiceOneTests
{
#region private member variables
private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(ServiceOneTestsImpl));
#endregion
#region setup and teardown
protected override void HandleTestFixtureSetup()
{
//TODO: put any fixture level setup code here.
}
protected override void HandleTestFixtureTearDown()
{
//TODO: put any fixture level tear down code here.
}
protected override void HandleSetup()
{
//TODO: put any testcase setup code here.
}
protected override void HandleTearDown()
{
//TODO: put any testcase teardown code here.
}
#endregion
/// <summary>
/// @see org::andromda::cartridges::nspring::ServiceOneTests#HandleTestdoSomething
/// </summary>
protected override void HandleTestdoSomething()
{
// put your implementation here
throw new Exception("org.andromda.cartridges.nspring.Tests.ServiceOneTestsImpl.HandleTestdoSomething is not implemented.");
}
/// <summary>
/// @see org::andromda::cartridges::nspring::ServiceOneTests#HandleTestdoSomethingElse
/// </summary>
protected override void HandleTestdoSomethingElse()
{
// put your implementation here
throw new Exception("org.andromda.cartridges.nspring.Tests.ServiceOneTestsImpl.HandleTestdoSomethingElse is not implemented.");
}
}
}
1.1 cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/ServiceTwoNoStubsException.cs
Index: ServiceTwoNoStubsException.cs
===================================================================
// Name: ServiceTwoNoStubsException.cs
// license-header cs merge-point
//
// Attention: Generated code! Do not modify by hand!
// Generated by: NSpringServiceException.vsl
using System;
using System.Xml;
using System.Runtime.Serialization;
/*
using System.Web;
using System.Web.Services.Protocols;
*/
namespace org.andromda.cartridges.nspring
{
public class ServiceTwoNoStubsException : System.ApplicationException
{
/// <summary>
/// Initializes a new instance of ServiceTwoNoStubsException with a specified error message.
/// </summary>
/// <param name="message">A message that describes the error.</param>
internal ServiceTwoNoStubsException(Exception e)
: base(e.Message, e)
{
}
/// <summary>
/// Create a new instance of the ServiceTwoNoStubsException.
/// </summary>
/// <param name="exception">Actual exception that contains the error information.</param>
public static ServiceTwoNoStubsException Create(Exception e)
{
if (e is ServiceTwoNoStubsException)
{
return (ServiceTwoNoStubsException)e;
}
else
{
return new ServiceTwoNoStubsException(e);
}
}
// NSpringServiceException.vsl merge-point
}
/*
[Serializable]
public class ServiceTwoNoStubsException : System.ApplicationException, ISerializable
{
private XmlNode detail = null;
private const string ErrorMessage = "A call to TimeTrackingService failed. Please check the inner exception for more detail.";
private static XmlDocument doc = new XmlDocument();
private bool isKnownException = false;
/// <summary>
/// Contains the details about the exception. Contains the InnerException if any
/// Format of the InnerException is <exception type="FullNameOfTheException"><message></message></exception>
/// </summary>
public XmlNode Detail
{
get
{
return this.detail;
}
set
{
this.detail = value;
}
}
/// <summary>
/// Says whether this exception is a known business exception
/// </summary>
public bool KnownException
{
get
{
return this.isKnownException;
}
set
{
this.isKnownException = value;
}
}
/// <summary>
/// Initializes a new instance of ServiceTwoNoStubsException with a specified error message.
/// </summary>
/// <param name="message">A message that describes the error.</param>
internal ServiceTwoNoStubsException(String message)
: base(message)
{
this.isKnownException = true;
}
/// <summary>
/// Initializes a new instance of ServiceTwoNoStubsException at the time of deserialization.
/// Do not call the base class constructor as that initializes few properties that are not getting serialized
/// </summary>
/// <param name="info">Contains the state information of the serialized object.</param>
/// <param name="context">Contains the context information.</param>
public ServiceTwoNoStubsException(SerializationInfo info, StreamingContext context)
// : base(info, context)
{
this.detail = info.GetValue("Detail", typeof(XmlNode) ) as XmlNode;
this.isKnownException = info.GetBoolean("KnownException");
}
/// <summary>
/// Initializes a new instance of ServiceTwoNoStubsException that wraps the actual exception.
/// </summary>
/// <param name="message">A message that describes the error.</param>
/// <param name="innerException">The exception that is the cause of the current exception.</param>
internal ServiceTwoNoStubsException(String message, Exception innerException)
: base(message)
{
this.detail = ToXmlNode( message, innerException );
}
#region ISerializable Members
void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context)
{
/// Do not call the base class method as that initializes few properties that are not getting serialized
//base.GetObjectData(info, context);
info.AddValue("Detail", this.detail);
info.AddValue("KnownException", isKnownException );
}
#endregion
/// <summary>
/// Create a new instance of the ServiceTwoNoStubsException.
/// </summary>
/// <param name="message">A message that describes the error.</param>
public static ServiceTwoNoStubsException Create(string message)
{
return new ServiceTwoNoStubsException(message);
}
/// <summary>
/// Create a new instance of the ServiceTwoNoStubsException.
/// </summary>
/// <param name="exception">Actual exception that contains the error information.</param>
public static ServiceTwoNoStubsException Create(Exception e)
{
if (e is ServiceTwoNoStubsException)
{
return (ServiceTwoNoStubsException)e;
}
else if (e is SoapException)
{
return UnwrapSoapException((SoapException)e);
}
else
{
return new ServiceTwoNoStubsException(ErrorMessage, e);
}
}
/// <summary>
/// This method wraps the a exception as a ServiceTwoNoStubsException and then as a SoapException.
/// </summary>
/// <param name="e">Actual exception that contains the error information.</param>
public static SoapException WrapSoapException(Exception e)
{
//Make sure the exception that is wrapped is a ServiceTwoNoStubsException
ServiceTwoNoStubsException ttse = Create(e);
string actor = (HttpContext.Current != null) ? HttpContext.Current.Request.Url.AbsoluteUri : string.Empty;
return new SoapException("Fault occurred", SoapException.ClientFaultCode, actor, ToXmlNode(e.Message, ttse));
}
/// <summary>
/// This method unwraps the ServiceTwoNoStubsException from the SoapException.
/// </summary>
/// <param name="se">Actual exception that contains the error information.</param>
private static ServiceTwoNoStubsException UnwrapSoapException(SoapException se)
{
ServiceTwoNoStubsException ttse = null;
XmlNode detailNode = se.Detail;
if (detailNode != null)
{
string message = detailNode.SelectSingleNode("message").InnerText;
ttse = new ServiceTwoNoStubsException(message);
XmlNode exceptionNode = detailNode.SelectSingleNode("exception");
if (exceptionNode != null)
ttse.Detail = exceptionNode;
}
return ttse;
}
/// <summary>
/// Helper method to create a xml node that contains the information about the parameters passed.
/// </summary>
/// <param name="message">A message that describes the error.</param>
/// <param name="exception">Actual exception that contains the error information.</param>
private static XmlNode ToXmlNode(string message, Exception e)
{
// Build the detail element of the SOAP fault.
System.Xml.XmlNode detailNode = doc.CreateNode(XmlNodeType.Element,
SoapException.DetailElementName.Name,
SoapException.DetailElementName.Namespace);
// Build specific details for the SoapException.
XmlNode messageNode = ToXmlNode( "message", e.Message);
detailNode.AppendChild(messageNode);
bool IsKnownException = false;
ServiceTwoNoStubsException ttse = e as ServiceTwoNoStubsException;
if (ttse != null)
{
IsKnownException = ttse.KnownException;
}
XmlNode knownExceptionNode = ToXmlNode("KnownException", IsKnownException.ToString() );
detailNode.AppendChild(knownExceptionNode);
if (e != null)
{
detailNode.AppendChild(ToXmlNode(e));
}
return detailNode;
}
/// <summary>
/// Helper method to create a xml node that contains the information about the parameters passed.
/// </summary>
/// <param name="exception">Actual exception that contains the error information.</param>
private static XmlNode ToXmlNode(Exception e)
{
System.Xml.XmlNode exception = null;
if (e != null)
{
// Create exception node.
exception = doc.CreateNode(XmlNodeType.Element, "exception", null);
XmlAttribute typeAttribute = doc.CreateAttribute("t", "type", null);
typeAttribute.Value = e.GetType().FullName;
exception.Attributes.Append(typeAttribute);
exception.AppendChild(ToXmlNode("message", e.Message));
if (e.InnerException != null)
{
exception.AppendChild(ToXmlNode(e.InnerException));
}
}
return exception;
}
/// <summary>
/// Helper method to create a xml node that contains the information about the parameters passed.
/// </summary>
/// <param name="nodeName">A name of the node to be created.</param>
/// <param name="text">Text that is the value of the node.</param>
private static XmlNode ToXmlNode(string nodeName, string text)
{
System.Xml.XmlNode messageNode = doc.CreateNode(XmlNodeType.Element, nodeName, null);
XmlNode messageTextNode = doc.CreateNode(XmlNodeType.Text, "Text", null);
messageTextNode.Value = text;
messageNode.AppendChild(messageTextNode);
return messageNode;
}
}
*/
}
1.1 cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/ServiceTwoNoStubsTests.cs
Index: ServiceTwoNoStubsTests.cs
===================================================================
// Name: ServiceTwoNoStubsTests.cs
// license-header cs merge-point
//
// Attention: Generated code! Do not modify by hand!
// Generated by: NSpringServiceTestBase.vsl in andromda-nspring-cartridge.
using System;
using AndroMDA.NHibernateSupport;
using NUnit.Framework;
namespace org.andromda.cartridges.nspring.Tests
{
/// <summary>
/// <p>
/// Spring Service test base class for <code>org::andromda::cartridges::nspring::ServiceTwoNoStubs</code>,
/// </p>
///
/// @see $service.fullyQualifiedNameTests
/// </summary>
public abstract class ServiceTwoNoStubsTests
{
#region private properties
private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(ServiceTwoNoStubsTests));
private org.andromda.cartridges.nspring.IServiceTwoNoStubs _ServiceTwoNoStubs;
/// <summary>Property to access ServiceTwoNoStubs</summary>
protected org.andromda.cartridges.nspring.IServiceTwoNoStubs ServiceTwoNoStubs
{
get
{
if (null == _ServiceTwoNoStubs)
{
_ServiceTwoNoStubs = new org.andromda.cartridges.nspring.ServiceTwoNoStubsImpl();
}
return _ServiceTwoNoStubs;
}
}
#endregion
#region setup and teardown
[TestFixtureSetUp]
public void TestFixtureSetUp()
{
// Initialize Log4Net
log4net.Config.XmlConfigurator.Configure();
// Initialize NHibernate
SessionManagerFactory.SessionManager = new DefaultSessionManager();
SessionManagerFactory.SessionManager.HandleApplicationStart();
HandleTestFixtureSetup();
}
protected abstract void HandleTestFixtureSetup();
[TestFixtureTearDown]
public void TestFixtureTearDown()
{
HandleTestFixtureTearDown();
SessionManagerFactory.SessionManager.HandleApplicationEnd();
}
protected abstract void HandleTestFixtureTearDown();
[SetUp]
public void Setup()
{
HandleSetup();
}
protected abstract void HandleSetup();
[TearDown]
public void TearDown()
{
HandleTearDown();
}
protected abstract void HandleTearDown();
#endregion
/// <summary>
/// @see org::andromda::cartridges::nspring::ServiceTwoNoStubsTests#TestdoSomething
/// </summary>
[Test]
public void TestdoSomething()
{
HandleTestdoSomething();
}
/// <summary>
/// Performs the core logic for {@link #TestdoSomething()}
/// <summary>
protected abstract void HandleTestdoSomething();
/// <summary>
/// @see org::andromda::cartridges::nspring::ServiceTwoNoStubsTests#TestdoSomethingElse
/// </summary>
[Test]
public void TestdoSomethingElse()
{
HandleTestdoSomethingElse();
}
/// <summary>
/// Performs the core logic for {@link #TestdoSomethingElse()}
/// <summary>
protected abstract void HandleTestdoSomethingElse();
}
}
1.1 cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/ServiceTwoNoStubsTestsImpl.cs
Index: ServiceTwoNoStubsTestsImpl.cs
===================================================================
// Name: ServiceTwoNoStubsTestsImpl.cs
// license-header cs merge-point
//
// This is only generated once! It will never be overwritten.
// You can (and have to!) safely modify it by hand.
using System;
using AndroMDA.NHibernateSupport;
using NUnit.Framework;
namespace org.andromda.cartridges.nspring.Tests
{
/// <summary>
/// @see org::andromda::cartridges::nspring::ServiceTwoNoStubsTestsImpl
/// </summary>
[TestFixture]
public class ServiceTwoNoStubsTestsImpl
: ServiceTwoNoStubsTests
{
#region private member variables
private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(ServiceTwoNoStubsTestsImpl));
#endregion
#region setup and teardown
protected override void HandleTestFixtureSetup()
{
//TODO: put any fixture level setup code here.
}
protected override void HandleTestFixtureTearDown()
{
//TODO: put any fixture level tear down code here.
}
protected override void HandleSetup()
{
//TODO: put any testcase setup code here.
}
protected override void HandleTearDown()
{
//TODO: put any testcase teardown code here.
}
#endregion
/// <summary>
/// @see org::andromda::cartridges::nspring::ServiceTwoNoStubsTests#HandleTestdoSomething
/// </summary>
protected override void HandleTestdoSomething()
{
// put your implementation here
throw new Exception("org.andromda.cartridges.nspring.Tests.ServiceTwoNoStubsTestsImpl.HandleTestdoSomething is not implemented.");
}
/// <summary>
/// @see org::andromda::cartridges::nspring::ServiceTwoNoStubsTests#HandleTestdoSomethingElse
/// </summary>
protected override void HandleTestdoSomethingElse()
{
// put your implementation here
throw new Exception("org.andromda.cartridges.nspring.Tests.ServiceTwoNoStubsTestsImpl.HandleTestdoSomethingElse is not implemented.");
}
}
}
1.1 cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/TestEntity1DaoBase.cs
Index: TestEntity1DaoBase.cs
===================================================================
// Name: TestEntity1DaoBase.cs
// license-header cs merge-point
//
// Attention: Generated code! Do not modify by hand!
// Generated by: NSpringHibernateDaoBase.vsl in andromda-nspring-cartridge.
using System;
using NHibernate;
using AndroMDA.NHibernateSupport;
namespace org.andromda.cartridges.nspring
{
/// <summary>
/// <p>
/// Base Spring DAO Class: is able to create, update, remove, load, and find
/// objects of type <code>org.andromda.cartridges.nspring.TestEntity1</code>.
/// </p>
///
/// <see cref="org.andromda.cartridges.nspring.TestEntity1"/>
/// </summary>
public abstract class TestEntity1DaoBase
: NHibernateDaoSupport, org.andromda.cartridges.nspring.ITestEntity1Dao
{
/// <summary>
/// <see cref="org.andromda.cartridges.nspring.ITestEntity1Dao.Load(int, datatype::Long)"/>
/// </summary>
public virtual Object Load(int transform, datatype::Long id)
{
if (id == null)
{
throw new ArgumentNullException(
"TestEntity1.Load - 'id' can not be null");
}
Object entity = Session.Load(typeof(org.andromda.cartridges.nspring.TestEntity1Impl), id);
return TransformEntity(transform, (org::andromda::cartridges::nspring::TestEntity1)entity);
}
/// <summary>
/// <see cref="org.andromda.cartridges.nspring.ITestEntity1Dao.Load(datatype::Long)"/>
/// </summary>
public virtual org.andromda.cartridges.nspring.TestEntity1 Load(datatype::Long id)
{
return (org.andromda.cartridges.nspring.TestEntity1)this.Load((int)TransformTestEntity1.TRANSFORM_NONE, id);
}
/// <summary>
/// <see cref="org.andromda.cartridges.nspring.ITestEntity1Dao.LoadAll()"/>
/// </summary>
public virtual System.Collections.IList LoadAll()
{
return this.LoadAll((int)TransformTestEntity1.TRANSFORM_NONE);
}
/// <summary>
/// <see cref="org.andromda.cartridges.nspring.ITestEntity1Dao.LoadAll(int)" />
/// </summary>
public virtual System.Collections.IList LoadAll(int transform)
{
System.Collections.IList entities = Session.Find("from org.andromda.cartridges.nspring.TestEntity1Impl");
System.Collections.IList results = this.TransformEntities(transform, entities);
return results;
}
/// <summary>
/// <see cref="org.andromda.cartridges.nspring.ITestEntity1Dao.Create(org.andromda.cartridges.nspring.TestEntity1)"/>
/// </summary>
public virtual org.andromda.cartridges.nspring.TestEntity1 Create(org.andromda.cartridges.nspring.TestEntity1 testEntity1)
{
return (org.andromda.cartridges.nspring.TestEntity1)this.Create((int)TransformTestEntity1.TRANSFORM_NONE, testEntity1);
}
/// <summary>
/// <see cref="org.andromda.cartridges.nspring.ITestEntity1Dao.Create(int transform, org.andromda.cartridges.nspring.TestEntity1)"/>
/// </summary>
public virtual Object Create(int transform, org::andromda::cartridges::nspring::TestEntity1 testEntity1)
{
if (testEntity1 == null)
{
throw new ArgumentNullException(
"TestEntity1.Create - 'testEntity1' can not be null");
}
Session.Save(testEntity1);
return this.TransformEntity(transform, testEntity1);
}
/// <summary>
/// <see cref="org.andromda.cartridges.nspring.ITestEntity1Dao.Create(System.Collections.ICollection)"/>
/// </summary>
public virtual System.Collections.ICollection Create(System.Collections.ICollection entities)
{
return Create((int)TransformTestEntity1.TRANSFORM_NONE, entities);
}
/// <summary>
/// <see cref="org.andromda.cartridges.nspring.ITestEntity1Dao.Create(int, System.Collections.ICollection)"/>
/// </summary>
public virtual System.Collections.ICollection Create(int transform, System.Collections.ICollection entities)
{
if (entities == null)
{
throw new ArgumentNullException(
"TestEntity1.Create - 'entities' can not be null");
}
System.Collections.ArrayList result = new System.Collections.ArrayList();
foreach (Object entity in entities)
{
result.Add(Create(transform, (org.andromda.cartridges.nspring.TestEntity1)entity));
}
return result;
}
/// <summary>
/// <see cref="org.andromda.cartridges.nspring.ITestEntity1Dao.Create(datatype::String)"/>
/// </summary>
public virtual org.andromda.cartridges.nspring.TestEntity1 Create(
datatype::String firstName)
{
return (org.andromda.cartridges.nspring.TestEntity1)this.Create((int)TransformTestEntity1.TRANSFORM_NONE, firstName);
}
/// <summary>
/// <see cref="org.andromda.cartridges.nspring.ITestEntity1Dao.Create(int, datatype::String)"/>
/// </summary>
public virtual Object Create(
int transform,
datatype::String firstName)
{
org.andromda.cartridges.nspring.TestEntity1 entity = new org.andromda.cartridges.nspring.TestEntity1Impl();
entity.FirstName = firstName;
return this.Create(transform, entity);
}
/// <summary>
/// <see cref="org.andromda.cartridges.nspring.ITestEntity1Dao.Update(org.andromda.cartridges.nspring.TestEntity1)"/>
/// </summary>
public virtual void Update(org.andromda.cartridges.nspring.TestEntity1 testEntity1)
{
if (testEntity1 == null)
{
throw new ArgumentNullException(
"TestEntity1.Update - 'testEntity1' can not be null");
}
Session.Update(testEntity1);
}
/// <summary>
/// <see cref="org.andromda.cartridges.nspring.ITestEntity1Dao.Update(System.Collections.ICollection)"/>
/// </summary>
public virtual void Update(System.Collections.ICollection entities)
{
if (entities == null)
{
throw new ArgumentNullException(
"TestEntity1.Update - 'entities' can not be null");
}
foreach (Object entity in entities)
{
Session.Update((org.andromda.cartridges.nspring.TestEntity1)entity);
}
}
/// <summary>
/// <see cref="org.andromda.cartridges.nspring.ITestEntity1Dao.Remove(org.andromda.cartridges.nspring.TestEntity1)"/>
/// </summary>
public virtual void Remove(org.andromda.cartridges.nspring.TestEntity1 testEntity1)
{
if (testEntity1 == null)
{
throw new ArgumentNullException(
"TestEntity1.Remove - 'testEntity1' can not be null");
}
Session.Delete(testEntity1);
}
/// <summary>
/// <see cref="org.andromda.cartridges.nspring.ITestEntity1Dao.Remove(datatype::Long)"/>
/// </summary>
public virtual void Remove(datatype::Long id)
{
if (id == null)
{
throw new ArgumentNullException(
"TestEntity1.Remove - 'id' can not be null");
}
org.andromda.cartridges.nspring.TestEntity1 entity = this.Load(id);
if (entity != null)
{
this.Remove(entity);
}
}
/// <summary>
/// <see cref="org.andromda.cartridges.nspring.ITestEntity1Dao.Remove(System.Collections.ICollection)"/>
/// </summary>
public virtual void Remove(System.Collections.ICollection entities)
{
if (entities == null)
{
throw new ArgumentNullException(
"TestEntity1.Remove - 'entities' can not be null");
}
foreach (TestEntity1 entity in entities)
this.Remove(entity);
}
/// <summary>
/// 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>org.andromda.cartridges.nspring.ITestEntity1Dao</code>, please note
/// that the <seealso cref="#TransformTestEntity1.TRANSFORM_NONE"/> constant denotes no transformation, so the entity itself
/// will be returned.
///
/// If the integer argument value is unknown <seealso cref="TRANSFORM_NONE"/> is assumed.
/// </summary>
/// <param name="transform">one of the constants declared in <seealso cref="org.andromda.cartridges.nspring.ITestEntity1Dao"/></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>
protected Object TransformEntity(int transform, org::andromda::cartridges::nspring::TestEntity1 entity)
{
Object target = null;
if (entity != null)
{
switch (transform)
{
case (int)TransformTestEntity1.TRANSFORM_NONE : // fall-through
default:
target = entity;
break;
}
}
return target;
}
/// <summary>
/// Transforms a collection of entities using the
/// <seealso cref="#TransformEntity(int,org::andromda::cartridges::nspring::TestEntity1)"/> method.
/// <p/>
/// This method is to be used internally only.
/// </summary>
/// <param name="transform">one of the constants declared in <code>org.andromda.cartridges.nspring.ITestEntity1Dao</code></param>
/// <param name="entities">the collection of entities to transform</param>
/// <returns>a new list containing the transformed entities <see cref="#TransformEntity(int,org::andromda::cartridges::nspring::TestEntity1)"/></returns>
protected virtual System.Collections.IList TransformEntities(int transform, System.Collections.ICollection entities)
{
System.Collections.IList entityList = null;
switch (transform)
{
case (int)TransformTestEntity1.TRANSFORM_NONE : // fall-through
default:
// Convert collection to list if necesary
entityList = entities as System.Collections.IList;
if (entityList == null)
entityList = new System.Collections.ArrayList(entities);
break;
}
return entityList;
}
// NSpringHibernateDaoBase.vsl merge-point
}
}
1.1 cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/TestEntity1DaoImpl.cs
Index: TestEntity1DaoImpl.cs
===================================================================
// Name: TestEntity1DaoImpl.cs
// license-header cs merge-point
//
// Attention: Generated code! Do not modify by hand!
// Generated by: NSpringHibernateDaoImpl.vsl in andromda-nspring-cartridge.
using System;
namespace org.andromda.cartridges.nspring
{
/// <summary>
/// <see cref="org::andromda::cartridges::nspring::TestEntity1"/>
/// </summary>
public class TestEntity1DaoImpl : org.andromda.cartridges.nspring.TestEntity1DaoBase
{
// NSpringHibernateDaoImpl.vsl merge-point
}
}
|
|
From: Manish A. <mag...@us...> - 2007-01-09 10:46:25
|
User: magrawal
Date: 07/01/09 02:46:25
Modified: andromda-nspring/src/test/expected cartridge-output.zip
andromda-nspring/src/test/uml
NSpringCartridgeTestModel.xml.zip
Log:
added templates to generate simple test cases for each public method in the service layer.
Revision Changes Path
1.5 +69 -39 cartridges/andromda-nspring/src/test/expected/cartridge-output.zip
<<Binary file>>
1.2 +39 -36 cartridges/andromda-nspring/src/test/uml/NSpringCartridgeTestModel.xml.zip
<<Binary file>>
|
|
From: Manish A. <mag...@us...> - 2007-01-09 10:46:11
|
User: magrawal
Date: 07/01/09 02:46:12
Modified: andromda-nspring/src/main/resources/META-INF/andromda
cartridge.xml namespace.xml
Log:
added templates to generate simple test cases for each public method in the service layer.
Revision Changes Path
1.5 +31 -3 cartridges/andromda-nspring/src/main/resources/META-INF/andromda/cartridge.xml
Index: cartridge.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/resources/META-INF/andromda/cartridge.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- cartridge.xml 2 Oct 2006 01:21:47 -0000 1.4
+++ cartridge.xml 9 Jan 2007 10:46:11 -0000 1.5
@@ -9,10 +9,11 @@
<templateObject name="springUtils" className="org.andromda.cartridges.nspring.SpringUtils"/>
<templateObject name="escapeUtils" className="org.apache.commons.lang.StringEscapeUtils"/>
<templateObject name="hibernateUtils" className="org.andromda.cartridges.nspring.SpringHibernateUtils">
+
<property reference="hibernateVersion"/>
</templateObject>
<!-- cartridge-templateObject merge-point-->
-
+<property reference="createTests"/>
<property reference="driver"/>
<property reference="username"/>
<property reference="password"/>
@@ -100,6 +101,33 @@
<!-- cartridge-property merge-point -->
<!-- cartridge-resource merge-point -->
+
+
+ <template
+ path="templates/nspring/NSpringServiceTestBase.vsl"
+ outputPattern="$generatedFile"
+ outlet="service-tests"
+ overwrite="true">
+ <modelElements variable="service">
+ <modelElement>
+ <type name="org.andromda.cartridges.nspring.metafacades.SpringService">
+ </type>
+ </modelElement>
+ </modelElements>
+ </template>
+
+ <template
+ path="templates/nspring/NSpringServiceTestImpl.vsl"
+ outputPattern="$generatedFile"
+ outlet="service-test-impls"
+ overwrite="false">
+ <modelElements variable="service">
+ <modelElement>
+ <type name="org.andromda.cartridges.nspring.metafacades.SpringService">
+ </type>
+ </modelElement>
+ </modelElements>
+ </template>
<template
path="templates/nspring/NSpringDaoFactory.vsl"
outputPattern="$generatedFile"
1.3 +17 -1 cartridges/andromda-nspring/src/main/resources/META-INF/andromda/namespace.xml
Index: namespace.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/resources/META-INF/andromda/namespace.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- namespace.xml 15 Jun 2006 14:59:55 -0000 1.2
+++ namespace.xml 9 Jan 2007 10:46:11 -0000 1.3
@@ -18,6 +18,19 @@
<documentation>
Defines the locations to which output is generated.
</documentation>
+ <property name="service-tests">
+ <documentation>
+ The location to which all service test classes
+ will be generated.
+ </documentation>
+ </property>
+ <property name="service-test-impls">
+ <documentation>
+ The location to which all service test implementation classes
+ will be generated.
+ </documentation>
+ </property>
+
<property name="services">
<documentation>
The location to which all service classes (including the service locator(s))
@@ -87,6 +100,9 @@
</property>
</propertyGroup>
<propertyGroup name="Other">
+ <property name="createTests" required="false">
+ <default>false</default>
+ </property>
<property name="webServiceOutgoingAttachmentHandlerCallPattern" required="false">
<documentation>
The pattern to use when constructing the call to the attachment handler (used for sending
|
|
From: Manish A. <mag...@us...> - 2007-01-09 10:46:01
|
User: magrawal
Date: 07/01/09 02:45:57
Modified: andromda-nspring pom.xml
Log:
added templates to generate simple test cases for each public method in the service layer.
Revision Changes Path
1.7 +2 -1 cartridges/andromda-nspring/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/pom.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- pom.xml 2 Oct 2006 01:21:47 -0000 1.6
+++ pom.xml 9 Jan 2007 10:45:57 -0000 1.7
@@ -118,6 +118,7 @@
</build>
<properties>
<maven.test.skip>false</maven.test.skip>
+ <application.package>org.andromda.cartridges.nspring</application.package>
<model.uri>jar:file:${pom.basedir}/src/main/uml/SpringMetafacadeModel.xml.zip!/SpringMetafacadeModel.xml</model.uri>
<test.model.uri>jar:file:${pom.basedir}/src/test/uml/NSpringCartridgeTestModel.xml.zip!/NSpringCartridgeTestModel.xml</test.model.uri>
<howto.model.uri>jar:file:${pom.basedir}/src/site/xdocs/resources/howto/HowToModel.xml.zip!/HowToModel.xml</howto.model.uri>
|
|
From: Manish A. <mag...@us...> - 2007-01-09 10:45:42
|
User: magrawal
Date: 07/01/09 02:45:43
Modified: andromda-nspring/conf/test andromda.xml
Log:
added templates to generate simple test cases for each public method in the service layer.
Revision Changes Path
1.3 +6 -3 cartridges/andromda-nspring/conf/test/andromda.xml
Index: andromda.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/conf/test/andromda.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- andromda.xml 15 Aug 2006 22:48:47 -0000 1.2
+++ andromda.xml 9 Jan 2007 10:45:43 -0000 1.3
@@ -21,6 +21,7 @@
<namespace name="nspring">
<properties>
<property name="overwrite">true</property>
+ <property name="createTests">true</property>
<property name="dataSource">localhost</property>
<property name="username">auser</property>
<property name="password">apassword</property>
@@ -42,6 +43,8 @@
<property name="services">${test.output.dir}</property>
<property name="service-interfaces">${test.output.dir}</property>
<property name="service-impls">${test.output.dir}</property>
+ <property name="service-tests">${test.output.dir}</property>
+ <property name="service-test-impls">${test.output.dir}</property>
</properties>
</namespace>
|
|
From: Manish A. <mag...@us...> - 2007-01-09 10:42:08
|
User: magrawal Date: 07/01/09 02:42:05 cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/Domain - New directory |
|
From: Leif J. <le...@us...> - 2006-12-30 20:10:23
|
User: leifj
Date: 06/12/30 12:10:22
Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout
head.xhtml.vsl layout.xhtml.vsl
Log:
layout bugfixes
Revision Changes Path
1.2 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/head.xhtml.vsl
Index: head.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/head.xhtml.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- head.xhtml.vsl 5 Dec 2006 19:39:25 -0000 1.1
+++ head.xhtml.vsl 30 Dec 2006 20:10:22 -0000 1.2
@@ -9,7 +9,7 @@
<meta HTTP-EQUIV="Content-Type" CONTENT="text/html;charset=UTF-8"/>
<title>#{messages['application.name']}<c:if test="${!empty viewTitle}"> ~ ${viewTitle}</c:if></title>
#if ($outputCustomResources)
- <link rel="stylesheet" type="text/css" href="css/custom.css" />
+ <link rel="stylesheet" type="text/css" href="/css/custom.css" />
#end
<trh:script source="/js/common.js"/>
<trh:script source="/js/key-events.js"/>
1.3 +10 -12 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/layout.xhtml.vsl
Index: layout.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/layout.xhtml.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- layout.xhtml.vsl 11 Dec 2006 13:43:57 -0000 1.2
+++ layout.xhtml.vsl 30 Dec 2006 20:10:22 -0000 1.3
@@ -11,7 +11,7 @@
<ui:insert name="head">
<ui:include src="head.xhtml"/>
</ui:insert>
-
+ <c:set var="remoteUser" value="${pageContext.request.remoteUser}" scope="request"/>
<trh:body>
<tr:form>
<ui:insert name="title"/>
@@ -26,33 +26,31 @@
</f:facet>
#if ($stringUtils.isNotBlank($securityRealm))
<f:facet name="infoUser">
- <c:set var="remoteUser" value="${pageContext.request.remoteUser}" scope="request"/>
- <c:if test="${!empty remoteUser}">
- <t:graphicImage url="/images/user.gif"/>
+ <tr:panelGroupLayout>
+ <tr:image source="/images/user.gif"/>
<h:outputText value=" #{remoteUser}"/>
- </h:panelGroup>
- </c:if>
+ </tr:panelGroupLayout>
</f:facet>
#end
#if ($navigationStyle.equals("full"))
<f:facet name="navigation1">
<tr:navigationPane hint="tabs" level="0" var="item" value="#{menuModel.model}">
<f:facet name="nodeStamp">
- <tr:commandNavigationItem text="#{messages[item.label]}" action="#{item.getAction}"/>
+ <tr:commandNavigationItem text="#{item.label}" action="#{item.getAction}"/>
</f:facet>
</tr:navigationPane>
</f:facet>
<f:facet name="navigation2">
<tr:navigationPane hint="bar" level="1" var="item" value="#{menuModel.model}">
<f:facet name="nodeStamp">
- <tr:commandNavigationItem text="#{messages[item.label]}" action="#{item.getAction}"/>
+ <tr:commandNavigationItem text="#{item.label}" action="#{item.getAction}"/>
</f:facet>
</tr:navigationPane>
</f:facet>
<f:facet name="navigation3">
<tr:navigationPane hint="list" level="2" var="item" value="#{menuModel.model}">
<f:facet name="nodeStamp">
- <tr:commandNavigationItem text="#{messages[item.label]}" action="#{item.getAction}"/>
+ <tr:commandNavigationItem text="#{item.label}" action="#{item.getAction}"/>
</f:facet>
</tr:navigationPane>
</f:facet>
@@ -61,7 +59,7 @@
<f:facet name="navigation3">
<tr:navigationTree var="item" value="#{menuModel.model}">
<f:facet name="nodeStamp">
- <tr:commandNavigationItem text="#{messages[item.label]}" action="#{item.getAction}"/>
+ <tr:commandNavigationItem text="#{item.label}" action="#{item.getAction}"/>
</f:facet>
</tr:navigationTree>
</f:facet>
@@ -79,7 +77,7 @@
<f:facet name="location">
<tr:breadCrumbs var="item" value="#{menuModel.model}">
<f:facet name="nodeStamp">
- <tr:commandNavigationItem text="#{messages[item.label]}" action="#{item.getAction}"/>
+ <tr:commandNavigationItem text="#{item.label}" action="#{item.getAction}"/>
</f:facet>
</tr:breadCrumbs>
</f:facet>
|
|
From: Leif J. <le...@us...> - 2006-12-30 19:00:25
|
User: leifj
Date: 06/12/30 11:00:20
Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/facelets
login.xhtml.vsl
Log:
remove redundant empty menubar
Revision Changes Path
1.3 +0 -5 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/login.xhtml.vsl
Index: login.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/login.xhtml.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- login.xhtml.vsl 11 Dec 2006 13:43:57 -0000 1.2
+++ login.xhtml.vsl 30 Dec 2006 19:00:20 -0000 1.3
@@ -18,11 +18,6 @@
<ui:include src="layout/header.xhtml"/>
</ui:insert>
</f:facet>
- <f:facet name="menu2">
- <tr:menuBar>
- <t:graphicImage url="/images/space.gif"/>
- </tr:menuBar>
- </f:facet>
<f:facet name="appCopyright">
<ui:insert name="footer">
<ui:include src="layout/footer.xhtml"/>
|
|
From: Vance K. <va...@us...> - 2006-12-22 01:30:31
|
User: vancek
Date: 06/12/21 17:30:29
Modified: andromda-ejb3 pom.xml
Log:
fix build break on andromda server due to missing dependencies. once site generation has migrated to M2, need to adjust groupId setting in pom.xml
Revision Changes Path
1.11 +10 -2 cartridges/andromda-ejb3/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/pom.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- pom.xml 18 Dec 2006 02:02:34 -0000 1.10
+++ pom.xml 22 Dec 2006 01:30:29 -0000 1.11
@@ -109,7 +109,11 @@
</dependencies>
</plugin>
<plugin>
- <groupId>org.andromda.maven.plugins.site</groupId>
+ <!--
+ Once AndroMDA has been migrated to M2 for site generation, must change the following
+ groupId: org.andromda.maven.plugins.site
+ -->
+ <groupId>org.andromda.maven.site</groupId>
<artifactId>andromda-site-plugin</artifactId>
<version>3.3-SNAPSHOT</version>
<executions>
@@ -131,8 +135,12 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<dependencies>
+ <!--
+ Once AndroMDA has been migrated to M2 for site generation, must change the following
+ groupId: org.andromda.maven.plugins.site
+ -->
<dependency>
- <groupId>org.andromda.maven.plugins.site</groupId>
+ <groupId>org.andromda.maven.site</groupId>
<artifactId>andromda-doxia-module-xdoc</artifactId>
<version>3.3-SNAPSHOT</version>
</dependency>
|
|
From: Leif J. <le...@us...> - 2006-12-19 09:16:14
|
User: leifj
Date: 06/12/19 01:16:14
Modified: andromda-jsf2 pom.xml
Log:
broken tests - temporarily disabled
Revision Changes Path
1.4 +1 -1 cartridges/andromda-jsf2/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/pom.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- pom.xml 11 Dec 2006 13:43:58 -0000 1.3
+++ pom.xml 19 Dec 2006 09:16:14 -0000 1.4
@@ -67,7 +67,7 @@
</plugins>
</build>
<properties>
- <maven.test.skip>false</maven.test.skip>
+ <maven.test.skip>true</maven.test.skip>
<model.uri>jar:file:${pom.basedir}/src/main/uml/JSFMetafacadeModel.xml.zip!/JSFMetafacadeModel.xml</model.uri>
<test.model.uri>jar:file:${pom.basedir}/src/test/uml/JSFCartridgeTestModel.xml.zip!/JSFCartridgeTestModel.xml</test.model.uri>
</properties>
|
|
From: Leif J. <le...@us...> - 2006-12-19 09:15:41
|
User: leifj
Date: 06/12/19 01:15:42
Modified: andromda-jsf2/src/main/resources/templates/jsf2/configuration
web.xml.vsl
Log:
uncomment duplicate login-config entry
Revision Changes Path
1.3 +3 -3 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/web.xml.vsl
Index: web.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/web.xml.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- web.xml.vsl 11 Dec 2006 13:43:57 -0000 1.2
+++ web.xml.vsl 19 Dec 2006 09:15:41 -0000 1.3
@@ -400,14 +400,14 @@
</security-constraint>
#end
- <login-config>
+ <!-- <login-config>
<auth-method>FORM</auth-method>
<realm-name>$securityRealm</realm-name>
<form-login-config>
<form-login-page>/${loginFileName}.${facesServletExtension}</form-login-page>
<form-error-page>/${loginFileName}.${facesServletExtension}?action=error</form-error-page>
</form-login-config>
- </login-config>
+ </login-config> -->
#foreach ($user in $applicationUseCase.allRoles)
<security-role>
|
|
From: Leif J. <le...@us...> - 2006-12-19 09:15:19
|
User: leifj
Date: 06/12/19 01:15:15
Modified: andromda-jsf2/src/main/resources/templates/jsf2/configuration
faces-config.xml.vsl
Log:
ugly fix - need to refer to message bundle
Revision Changes Path
1.3 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/faces-config.xml.vsl
Index: faces-config.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/faces-config.xml.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- faces-config.xml.vsl 11 Dec 2006 13:43:57 -0000 1.2
+++ faces-config.xml.vsl 19 Dec 2006 09:15:15 -0000 1.3
@@ -69,7 +69,7 @@
<managed-bean-scope>application</managed-bean-scope>
<managed-property>
<property-name>label</property-name>
- <value>$useCase.titleKey</value>
+ <value>$useCase.titleValue</value>
</managed-property>
<managed-property>
<property-name>viewId</property-name>
|
|
From: Leif J. <le...@us...> - 2006-12-19 06:53:57
|
User: leifj Date: 06/12/18 22:53:49 Removed: andromda-jsf2 jsf2061207105050.exc Log: remove exception log |
|
From: Vance K. <va...@us...> - 2006-12-19 05:51:39
|
User: vancek
Date: 06/12/18 21:51:40
Modified: profiles/uml-1.4/seam/src/main/uml
andromda-profile-seam.xml.zip
profiles/uml-1.4/seam pom.xml
Removed: profiles/uml-1.4/seam/src/main/uml andromda-profile-seam.mdr
Log:
EJB-47 - Update seam related TV & stereotypes for uml-1.4. Update version to 1.1-SNAPSHOT
Revision Changes Path
1.2 +55 -35 plugins/profiles/uml-1.4/seam/src/main/uml/andromda-profile-seam.xml.zip
<<Binary file>>
1.2 +1 -0 plugins/profiles/uml-1.4/seam/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/profiles/uml-1.4/seam/pom.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- pom.xml 7 Dec 2006 01:27:54 -0000 1.1
+++ pom.xml 19 Dec 2006 05:51:40 -0000 1.2
@@ -10,5 +10,6 @@
<packaging>xml.zip</packaging>
<artifactId>andromda-plugins-profile-seam</artifactId>
<name>AndroMDA Plugins UML 1.4 Seam Profile</name>
+ <version>1.1-SNAPSHOT</version>
<description>Seam UML 1.4 profile which can be used with the AndroMDA Seam-EJB3 cartridges</description>
</project>
\ No newline at end of file
|
|
From: Vance K. <va...@us...> - 2006-12-18 02:03:49
|
User: vancek Date: 06/12/17 18:03:50 Removed: andromda-ejb3/src/changes changes.xml Log: moved changes.xml to src/site |
|
From: Vance K. <va...@us...> - 2006-12-18 02:02:36
|
User: vancek
Date: 06/12/17 18:02:35
Modified: andromda-ejb3/src/test/uml EJB3CartridgeTestModel.xml.zip
andromda-ejb3/src/site site.xml
andromda-ejb3 pom.xml
andromda-ejb3/src/site/axdoc howto21.xml howto5.xml
howto9.xml
andromda-ejb3/src/main/uml EJB3MetafacadeModel.xml.zip
Added: andromda-ejb3/src/site changes.xml
Log:
update deps to version 3.3-SNAPSHOT
Revision Changes Path
1.2 +221 -79 cartridges/andromda-ejb3/src/test/uml/EJB3CartridgeTestModel.xml.zip
<<Binary file>>
1.20 +1 -1 cartridges/andromda-ejb3/src/site/site.xml
Index: site.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/site.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -w -r1.19 -r1.20
--- site.xml 6 Oct 2006 06:49:58 -0000 1.19
+++ site.xml 18 Dec 2006 02:02:34 -0000 1.20
@@ -3,7 +3,7 @@
<skin>
<groupId>org.andromda.maven.site</groupId>
<artifactId>andromda-site-skin</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</skin>
<bannerLeft>
<name></name>
1.1 cartridges/andromda-ejb3/src/site/changes.xml
Index: changes.xml
===================================================================
<document>
<properties>
<title>EJB3 Cartridge Plugin Project</title>
<author email="va...@an...">Vance Karimi</author>
</properties>
<body>
<release version="1.0-SNAPSHOT" date="2006-06-01" desc="Changes for 1.0-SNAPSHOT">
<action dev="vancek" type="add">
Introduced changes.xml and report.
</action>
<action dev="vancek" type="add">
Added manageable entity support.
</action>
<action dev="vancek" type="add">
Added JBoss cache support.
</action>
<action dev="vancek" type="update">
Set default discriminator value consisting of first character of entity name if one isn't
explicitly specified.
</action>
<action dev="vancek" type="add">
Added DAO support for every entity POJO.
</action>
<action dev="vancek" type="update">
Refactored javax.ejb package for interceptor related annotations to javax.annotation.
NOTE: These annotations are NOT used anyway since interceptor components are configured
via XML descriptor.
</action>
<action dev="vancek" type="update">
Added Maven reporting facilities to site generation. Using new AndroMDA site skin for site
generation. To run these reports, the following Maven report plugins need to be installed.
Some may only exist on the Maven sandox. maven-site-plugin, maven-project-info-reports-plugin,
maven-javadoc-plugin, maven-surefire-report-plugin, maven-jxr-plugin, maven-pmd-plugin,
maven-checkstyle-plugin, maven-changes-plugin and maven-changelog-plugin. The maven-changelog-plugin
will require you to have cvs.exe (if on windows platform) in your path.
</action>
<action dev="vancek" type="fix">
Many-to-Many association owning side JoinTable - JoinColumn name property fixed. JIRA EJB-25
</action>
<action dev="vancek" type="fix">
NamedQuery definition to pick up firstResult and maxResult arguments modelled with these
stereotypes and NOT include then in where clause.
</action>
<action dev="vancek" type="add">
Added installation howto.
</action>
<action dev="vancek" due-to="tlu" type="add">
Added equals, hashCode and toString methods to entities.
</action>
<action dev="vancek" type="update">
Updates to bring up to date with EJB 3.0 FR.
Now require JBoss 4.0.4-GA with EJB 3.0 RC8-PFD update.
Update include
@javax.annotation.EJB --> @javax.ejb.EJB
Interceptor related classes and annotations moved to javax.interceptor package.
</action>
<action dev="vancek" type="fix">
MDB base class must implement javax.jms.MessageListener to avoid the following error message
on deployment:
java.lang.RuntimeException: unable to determine messagingType interface for MDB
</action>
<action dev="vancek" type="remove">
Removed container configuration option via tagged value on message driven beans since it
is no longer supported.
</action>
<action dev="vancek" type="add">
Added minimumPoolSize (@andromda.ejb.mdb.pool.size.min) and maximumPoolSize
(@andromda.ejb.mdb.pool.size.min) tagged value options for message
driven beans i.e. to allow singleton message driven beans. These are added as
activation config properties to the ejb-jar.xml. Added documentation.
</action>
<action dev="vancek" type="update">
Updated the EJB3MetafacadeModel.xml to use the maven2.repository environment variable rather than
hard coded paths for profiles.
</action>
<action dev="vancek" type="update">
If session bean is a Seam component, then don't set the bean type to stateful if the bean contains an
attribute. For session bean Seam components, the only way to specify it as a SFSB is via tagged value on
the class.
</action>
<action dev="vancek" type="fix">
Don't restrict rendering of accessor methods for session bean attributes that only have 'public'
visibility. Accessors generated for all attributes for all visilities.
</action>
<action dev="vancek" type="add">
Introduce JBoss Seam components corresponding with Seam 1.0.0-CR3.
Always generate a local interface for a session bean if it is a Seam component.
</action>
<action dev="vancek" due-to="tlu" type="fix">
JIRA EJB-27 - If a session bean operation is modelled for the local view type interface, a local interface is
NOT generated. When returning a view type from the EJB3SessionFacade, must lookup all business operations to
determine their view type individually and return a view type for the session bean to accomodate local,
remote and both.
Refactor service delegate templates and introduce a parent base class which all service delegates extend.
Fix problem with exposing only remote operations as webservice endpoints.
</action>
<action dev="vancek" due-to="tlu" type="add">
JIRA EJB-28 - Added support for adding ejb-jar elements to the persistence.xml.
</action>
<action dev="vancek" due-to="tlu" type="update">
Generate documentation for enumeration literals.
</action>
<action dev="vancek" type="fix">
Inheritance hierarchies where the super class is a mapped superclass, the subclass should not
render the DiscriminatorValue annotation. This annotation should only be rendered in subclasses of
single table inheritance hierarchies.
</action>
<action dev="vancek" type="add">
Added FAQ support section menu to site.
</action>
<action dev="vancek" type="fix">
Remove references to attributes modelled with a @Version annotation (optimistic lock value for entity) in
manageable service components. Initial work removed attribute from getAttributes, but that caused problems
from the manageable web tier action methods create and update. To account for this, allow the attribute as
argument to the methods, but do not call the corresponding setter.
</action>
<action dev="vancek" type="fix">
Moved the @Version annotation to the entity attribute. It had no effect on the getter method.
Removed all annotations on the corresponding getter method.
</action>
<action dev="vancek" type="update">
Render the @Table annotation on every entity to avoid application server detting the default table name
mapped to by this entity. Currently, the annotation is only rendered when there is an inheritence hierarchy
or a mapped superclass.
</action>
<action dev="vancek" type="update">
Update the default Collection for one-to-many and many-to-many associations to the java.util.SortedSet (in
namespace.xml).
Moving away from bag collection as the default since it is unnecessary in the majority of cases.
As a result, the @org.hibernate.annotations.Sort annotation is also rendered with a NATURAL sort type.
The create and update methods of the manageable service implementation wraps the retrieved bag collection(List)
for the 'many' side of the association with an appropriate collection implementation (unless java.util.List
is specified as the default).
</action>
<action dev="vancek" type="fix">
Ignore the argument on create and update methods of DAO implementation components where the corresponding
entity attribute is modelled as an optimistic lock value with the Version stereotype. This should be improved
to eliminate the attribute when retrieving the attribute collection.
</action>
<action dev="vancek" type="update">
Each finder is overloaded in the DAO components. One finder method that doesn't supply a manual query
argument should use the NamedQuery defined on the corresponding entity. Currently, it generates the query.
</action>
<action dev="vancek" type="fix">
Minor fixes to the EJBQL of the finder methods in the manageable service base for manageable entities.
</action>
<action dev="vancek" type="fix">
In the findAll method of the manageable service base implementation, the query now includes 'left join fetch'
for all related 'many' association ends where the target entity does not define a display attribute (where
the attribute is modelled with the Unique stereotype).
</action>
<action dev="vancek" type="update">
Updated the metafacade definitions of EJB3AssociationEndFacadeLogicImpl, EJB3AssociationEndFacadeLogicImpl
and EJB3MessageDrivenOperationFacadeLogicImpl in metafacade.xml.
</action>
<action dev="vancek" type="add">
Added support for default list, set and map type implementations for collection association ends in
namespace.xml. Also added the ability
for association end collection index name and type (further map support) to be specified via tagged values
@andromda.persistence.collection.index and @andromda.persistence.collection.index.type. This introduced
a new facade called EJB3TypeFacade.
Every collection type association end now instantiates the corresponding implementation upon
declaration.
</action>
<action dev="vancek" type="fix">
Fixed isRequired in EJB3AssociationEndFacade and EJB3EntityAttributeFacade to exclude property if
the entity has a generalization to an mapped superclass.
</action>
<action dev="vancek" type="update">
EJB3ManageableEntityAssociationEndFacade now also extends EJB3AssociationEndFacade with precedence tagged value
set. EJB3ManageableEntityAttributeFacade also extends EJB3EntityAttributeFacade. This eliminates the
need for the existing overwritten methods in the manageable entity facades.
</action>
<action dev="vancek" due-to="tlu" type="fix">
JIRA EJB-34 - Fix erroneous signature of entity constructor where no entity attributes exist but navigable
associations do exist.
</action>
<action dev="vancek" type="update">
Revert the build back to using the default Java compiler (1.4) - 1.5 isn't supported for the automated
build process for andromda-plugins.
</action>
<action dev="vancek" due-to="tlu" type="add">
JIRA EJB-31 - Add support for a select few meta type annotations for attribues in embedded value classes.
Need to confirm if @Transient, @Version, @Lob and @Basic are supported. @Column, @Temporal and @Enumerated
have been confirmed to work.
</action>
<action dev="vancek" due-to="tlu" type="add">
JIRA EJB-32 - Add support for embedded value object associations as well as attribute overrides.
NOTE: This is still partial support. The association mutators need to be added with appropriate
annotation to the embedded value object base abstract class.
</action>
<action dev="vancek" due-to="tlu" type="fix">
JIRA EJB-33 - Fix problem when there are two embedded value objects of the same type in the same entity.
Fix for both attribute and association overrides.
</action>
<action dev="vancek" due-to="tlu" type="update">
JIRA EJB-29 - the implementation class of the embedded value object was unused and the base class was abstract.
This is now fixed with the introduction of the orm.xml deployment descriptor. Currently, only
the embeddable classes are defined. As a result the @Embeddable annotation is removed from the base abstract
class and the embeddable implementation class is now the defined as the embeddable class using orm.xml rather
than metadata annotation.
</action>
<action dev="vancek" due-to="pawel" type="fx">
JIRA EJB-36 - Entities and composite primary keys now implement Comparable interface and implement the
compareTo method.
@org.hibernate.annotations.Sort annotation is only set if the collection interface for an association end
is defined as java.util.SortedSet.
</action>
<action dev="vancek" type="add">
Added basic JBoss Seam documentation to site docs.
</action>
<action dev="vancek" due-to="tlu" type="fix">
JIRA EJB-37 - Fix problem with service delegate switch statement where the break statement should not be
issued after a return statement.
</action>
<action dev="vancek" due-to="sverker" type="fix">
JIRA EJB-38 - The query in the DAO base class for finder methods with argument enum type has to set
the enum class as the parameter for the querty, not the value (name or ordinal).
</action>
<action dev="vancek" type="fix">
Reset EJB3ManageableEntityAttributeFacade metafacade mapping in metafacades.xml from using property element
to use context element. Otherwise, manageable entity attributes would map to EJB3EntityAttributeFacade.
This resulted in getTemporalType being refactored in EJB3EntityAttributeFacade and the overriding instance
in EJB3ManageableEntityAttributeFacade to be removed.
</action>
<action dev="vancek" type="fix">
The getter (for BLOB type manageable attributes) in the manageable service base implementation must cast
the single result to appropriate type before returning.
</action>
<action dev="vancek" type="add">
Add @RolesAllowed annotation with permitted roles authorised to access the manageable service. This was
achieved by introducing a new namespace property called <b>manageableRolesAllowed</b> rather than defined
by actors with dependencies on the manageable entity. A corresponding getManageableRolesAllowed
is available through EJB3ManageableEntityFacade to retrieve the formatted comma separated list of roles.
</action>
<action dev="vancek" type="fix">
Modelling non-public operations on session beans rendered incorrect method signatures. This fix will
generate correct signatures for all operations, but only public methods are exposed in the remote/local
interfaces and service base class.
</action>
<action dev="vancek" type="update">
Updated the cartridge.xml to set the outlet for the enumerations template to a new outlet called
user-types. This is defined in namespace.xml and must exist in each project andromda.xml.
</action>
<action dev="vancek" due-to="sverker" type="update">
JIRA EJB-39 - Add serialVersionUID to DaoDefaultException.
</action>
<action dev="vancek" due-to="KnisterPeter" type="update">
Changed defaultCollectionInterface namespace property to java.util.TreeSet from
java.util.SortedSet. This eliminates the need for the @org.hibernate.annotations.Sort annotation
on collection association ends. Aim is to decouple the EJB3 cartridge (with default settings) to Hibernate.
</action>
<action dev="vancek" type="fix">
It is invalid to specify an implementation for defaultCollectionInterfac. This must specify an
interface. Changed from java.util.TreeSet to java.util.Set.
</action>
<action dev="vancek" type="fix">
Allow the ability to specify unidirectional associations without having to specify an aggregation or
composition end. The non-navigable end is assumed to be the owning end of the association.
This fix renders the mappedBy property for OneToOne annotations on the inverse side of the association.
</action>
<action dev="vancek" due-to="sverker" type="fix">
JIRA EJB-40 - Fix support for modelling map associations ends.
"The attached patch solves this issue as well as providing an improvement in regards to List associations.
If no OrderBy tagged value is provided, the IndexColumn annotation is used (hibernate extension) to provide
true list association." - The hibernate annotation needs to be switched depending on the persistence
provider. This will be fixed once a namespace property is introduced along the lines of
persistenceProvider.
</action>
<action dev="vancek" type="add">
Generate JBoss MQ destinations service XML descriptor when hot deployed under JBoss, creates
the Queue/Topics.
</action>
<action dev="vancek" due-to="KnisterPeter" type="update">
Added new namespace property persistenceProviderExtensions. Default value is none. Currently, ony
hibernate extensions are supported. If set to hibernate, then hibernate specifc annotations are
rendered in appropriate locations based on the model.
</action>
<action dev="vancek" type="update">
Updated installation howto to give more accurate directions on getting and building the EJB3 cartridge.
</action>
<action dev="vancek" due-to="sverker" type="update">
JIRA EJB-41 - Cleaned unused imports and some calls to deprecated methods changed to their replacements.
</action>
<action dev="vancek" due-to="sverker" type="fix">
JIRA EJB-42 - Fix IllegalStateException "it is illegal to inject UserTransaction into a CMT bean" where a
session bean is modelled with bean managed transactions. This fix sets the <b>transaction-type</b>
for the session to <b>Bean</b> instead of <b>Container</b>. This does not affect manageable entity session
POJOs as they remain container managed transaction demarcation.
</action>
<action dev="vancek" due-to="Bertl" type="fix">
JIRA EJB-43 - Fix issues with the default setup of association cascade properties, in particular adding
support for multiple cascade options for the default cascade property on entities. Fix the naming
issue with entityAggregationCascade.
</action>
<action dev="vancek" type="fix">
EJB3MessageDrivenFacade.getDestinationType requires search and replace for destination type retrieved
from TV. i.e. replace all '_' with '.'. Also fix casing for javax.jms.Queue and javax.jms.Topic.
</action>
<action dev="vancek" type="add">
UMLMETA-78 - Add support for member variables within type safe enumerations.
</action>
<action dev="vancek" type="add">
Demo EJB3 added to andromda-plugins/samples accompanied by quick site docs.
</action>
<action dev="vancek" type="fix">
Fix getIdentifier naming in EJB3EntityFacade which eliminates the workaround solution in
EJB3ManageableEntityFacade.
</action>
<action dev="vancek" due-to="markh" type="fix">
JIRA EJB-45 - ClassCastException when setting Manageable stereotype on entities. The
EJB3ManageableEntityAttributeFacade was not being picked up correctly. Instead, the
emf.uml2.ManageableEntityAttributeFacade was used. The fix was to simply override the methods returning
attributes and identifiers in EJB3ManageableEntityFacade.
</action>
<action dev="vancek" due-to="harwey" type="fix">
JIRA EJB-46 - Missing javax.ejb.Timer attribute for method on session bean
modelled as a timeout callback.
</action>
<action dev="vancek" due-to="turekvl" type="fix">
Fix in GlobalMacros.vm to prevent compareTo action on entity properties with Collection/List/Set types.
</action>
<action dev="vancek" due-to="harwey" type="fix">
Add javax.jms.MessageListener messaging-type to ejb-jar.xml for MDBs.
</action>
<action dev="vancek" type="update">
Migrated dependency versions from 3.2-SNAPSHOT to 3.2, overriding dependencies in the pom.xml.
NOTE: This can be removed once the andromda-plugins package is upgraded as a whole.
</action>
<action dev="vancek" type="update">
Added maven-changelog-plugin, taglist-maven-plugin and jdepend-maven-plugin reporting. Also added scm
settings to project pom.xml.
</action>
<action dev="vancek" due-to="tp" type="fix">
JIRA-48 - Fix misspelt property names in EntityEmbeddable.vsl for table and sequence generator types.
</action>
<action dev="vancek" type="update">
Moved the changes.xml to src/site.
</action>
</release>
</body>
</document>
1.10 +104 -49 cartridges/andromda-ejb3/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/pom.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- pom.xml 14 Sep 2006 14:23:35 -0000 1.9
+++ pom.xml 18 Dec 2006 02:02:34 -0000 1.10
@@ -16,6 +16,12 @@
<system>jira</system>
<url>http://galaxy.andromda.org/jira/BrowseProject.jspa?id=10011</url>
</issueManagement>
+ <scm>
+ <connection>scm:cvs:pserver:anonymous:@andromdaplugins.cvs.sourceforge.net:/cvsroot/andromdaplugins:andromda-plugins/cartridges/andromda-ejb3</connection>
+ <developerConnection>scm:cvs:ext:${cvs_username}@andromdaplugins.cvs.sourceforge.net:/cvsroot/andromdaplugins:andromda-plugins/cartridges/andromda-ejb3</developerConnection>
+ <tag>HEAD</tag>
+ <url>http://andromdaplugins.cvs.sourceforge.net/</url>
+ </scm>
<developers>
<developer>
<id>vancek</id>
@@ -38,34 +44,74 @@
<timezone>-6</timezone>
</developer>
</developers>
+ <dependencies>
+ <dependency>
+ <groupId>org.andromda</groupId>
+ <artifactId>andromda-core</artifactId>
+ <version>3.3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.andromda</groupId>
+ <artifactId>andromda-utils</artifactId>
+ <version>3.3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.andromda.metafacades</groupId>
+ <artifactId>andromda-metafacades-uml</artifactId>
+ <version>3.3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.andromda.metafacades</groupId>
+ <artifactId>andromda-metafacades-uml14</artifactId>
+ <version>3.3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.andromda.cartridges</groupId>
+ <artifactId>andromda-meta-cartridge</artifactId>
+ <version>3.3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.andromda.translationlibraries</groupId>
+ <artifactId>andromda-ocl-validation-library</artifactId>
+ <version>3.3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.andromda.profiles.uml14</groupId>
+ <artifactId>andromda-profile</artifactId>
+ <type>xml.zip</type>
+ <version>3.3-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.andromda.maven.plugins</groupId>
<artifactId>andromda-maven-plugin</artifactId>
+ <version>3.3-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-meta-cartridge</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.andromda.maven.plugins</groupId>
<artifactId>andromda-cartridge-plugin</artifactId>
+ <version>3.3-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.andromda.translationlibraries</groupId>
<artifactId>andromda-ocl-query-library</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>
<plugin>
- <groupId>org.andromda.maven.site</groupId>
+ <groupId>org.andromda.maven.plugins.site</groupId>
<artifactId>andromda-site-plugin</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
<executions>
<execution>
<id>profile-transform</id>
@@ -86,9 +132,9 @@
<artifactId>maven-site-plugin</artifactId>
<dependencies>
<dependency>
- <groupId>org.andromda.maven.site</groupId>
+ <groupId>org.andromda.maven.plugins.site</groupId>
<artifactId>andromda-doxia-module-xdoc</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</dependency>
</dependencies>
<configuration>
@@ -132,10 +178,16 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
- <!--
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jdepend-maven-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
+ <configuration>
+ <xmlPath>${basedir}/src/site/changes.xml</xmlPath>
+ </configuration>
<reportSets>
<reportSet>
<reports>
@@ -146,6 +198,10 @@
</reportSets>
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changelog-plugin</artifactId>
<reportSets>
@@ -163,7 +219,6 @@
</reportSet>
</reportSets>
</plugin>
- -->
</plugins>
</reporting>
<properties>
1.2 +6 -1 cartridges/andromda-ejb3/src/site/axdoc/howto21.xml
Index: howto21.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/axdoc/howto21.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- howto21.xml 14 Sep 2006 14:31:29 -0000 1.1
+++ howto21.xml 18 Dec 2006 02:02:34 -0000 1.2
@@ -168,7 +168,12 @@
<p>
There exists a separate Seam profile that needs to be imported into your project. This profile
contains the Seam specific tags and stereotypes you need to model on your components. You can
- download the profile project <a href="andromda-profiles-seam-1.0-SNAPSHOT.zip">here</a>.
+ get this profile by if you have checked out the latest <i>andromda-plugins</i> project from
+ <b>HEAD</b> (follow <a href="installation.html">Installation</a>) and build the
+ <b>Profiles</b> project. Once this is done, the profile will be copied to your M2 repository
+ under <i>M2_REPO/org/andromda/plugins/profiles/uml14/andromda-plugins-profile-seam/VERSION/</i>.
+ You can then import this <i>andromda-plugins-profile-seam-VERSION.zml.zip</i> profile into your
+ model to utilise the Seam components.
</p>
</subsection>
</section>
1.3 +5 -4 cartridges/andromda-ejb3/src/site/axdoc/howto5.xml
Index: howto5.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/axdoc/howto5.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- howto5.xml 6 Oct 2006 02:06:31 -0000 1.2
+++ howto5.xml 18 Dec 2006 02:02:34 -0000 1.3
@@ -9,14 +9,15 @@
<p>
You might have noticed the attribute named <code>carType</code> in the <code>Car</code> entity. It is
is of type <code>String</code>, while in fact it makes more sense to restrict the set of possible
- values for this attribute. This can be achieved using <i>type-safe enumerations</i>.
+ values for this attribute. This can be achieved using <i>Java5 type-safe enumerations</i>.
This is the topic discussed on this page.
</p>
<p>
- Type-safe enumerations are modelled by means of a regular class, only this time you need
+ Java5 type-safe enumerations are modelled by means of a regular class in UML, only this time you need
to use the <![CDATA[<<Enumeration>>]]> stereotype. All attributes on such an enumeration will
be known as enumeration literals, they will assume the default values you assign to the attributes,
- or the name of the attribute if the default value is missing.
+ or the name of the attribute if the default value is missing. This will generate your Java5
+ <b>enum</b> object containing your literals.
</p>
<p>
In the EJB3 cartridge, enumerations are <i>NOT</i> persisted behind the scenes, unlike the
@@ -101,7 +102,7 @@
</p>
<p>
To use the ordinal values relating to the literals of the type-safe enumeration class,
- you do not need to do model the <code>@andromda.persistence.enumeration.type</code>
+ you do not need to model the <code>@andromda.persistence.enumeration.type</code>
tagged value. By default, if an entity attribute has an enumeration type, the ordinal
values of the enumeration literals are used.
</p>
1.2 +1 -1 cartridges/andromda-ejb3/src/site/axdoc/howto9.xml
Index: howto9.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/axdoc/howto9.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- howto9.xml 14 Sep 2006 14:31:28 -0000 1.1
+++ howto9.xml 18 Dec 2006 02:02:34 -0000 1.2
@@ -68,7 +68,7 @@
</p>
<p>
<ul>
- <li class="gen"><a class="changed" href="src/org/andromda/test/howto9/a/Vehicle.java"><code>Vehicle.java</code></a></li>
+ <li class="gen"><a class="changed" href="src/org/andromda/test/howto9/a/VehicleEmbeddable.java"><code>VehicleEmbeddable.java</code></a></li>
<li class="gen"><a class="changed" href="src/org/andromda/test/howto9/a/CarEmbeddable.java"><code>CarEmbeddable.java</code></a></li>
<li class="impl"><a class="changed" href="src/org/andromda/test/howto9/a/Car.java"><code>Car.java</code></a></li>
<li class="gen"><a href="src/org/andromda/test/howto9/a/CarType.java"><code>CarType.java</code></a></li>
1.48 +217 -224 cartridges/andromda-ejb3/src/main/uml/EJB3MetafacadeModel.xml.zip
<<Binary file>>
|
|
From: Chris M. <cm...@us...> - 2006-12-13 19:21:42
|
User: cmicali
Date: 06/12/13 11:21:39
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn .cvsignore
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
.cvsignore AndroMDA.VS80AddIn.csproj
Added: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources
.cvsignore
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/lib
NVelocity.dll
etc/andromda-dotnet/AndroMDA.VS80AddIn/Graphics .cvsignore
Log:
- Updated CVSIGNORE entries
- Added missing files
Revision Changes Path
1.2 +2 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- .cvsignore 18 Apr 2006 16:14:43 -0000 1.1
+++ .cvsignore 13 Dec 2006 19:21:38 -0000 1.2
@@ -1 +1,2 @@
AndroMDA.VS80AddIn.suo
\ No newline at end of file
+Release
1.2 +2 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- .cvsignore 18 Apr 2006 16:14:43 -0000 1.1
+++ .cvsignore 13 Dec 2006 19:21:39 -0000 1.2
@@ -1,3 +1,4 @@
obj
bin
AndroMDA.VS80AddIn.csproj.user
\ No newline at end of file
+*.db
\ No newline at end of file
1.20 +0 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn.csproj
Index: AndroMDA.VS80AddIn.csproj
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn.csproj,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -w -r1.19 -r1.20
--- AndroMDA.VS80AddIn.csproj 13 Dec 2006 16:03:57 -0000 1.19
+++ AndroMDA.VS80AddIn.csproj 13 Dec 2006 19:21:39 -0000 1.20
@@ -130,7 +130,6 @@
</Compile>
<EmbeddedResource Include="Resources\SchemaExport\TestDataManager.cs" />
<Compile Include="Utils\CodeModelUtils.cs" />
- <Compile Include="Utils\TemplateMaschine.cs" />
<Compile Include="WizardSolutionProcessor.cs" />
<Compile Include="AddInSettings.cs" />
<Compile Include="Resource1.Designer.cs">
1.1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/.cvsignore
Index: .cvsignore
===================================================================
*.db
1.1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/lib/NVelocity.dll
<<Binary file>>
1.1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/Graphics/.cvsignore
Index: .cvsignore
===================================================================
*.db
|
|
From: Chris M. <cm...@us...> - 2006-12-13 19:18:11
|
User: cmicali Date: 06/12/13 11:18:11 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/lib - New directory |
|
From: Chris M. <cm...@us...> - 2006-12-13 16:03:59
|
User: cmicali
Date: 06/12/13 08:03:58
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
AndroMDA.VS80AddIn.csproj
ConversionCodeGenerator.cs MDASolutionManager.cs
VS80AddIn.cs WizardSolutionProcessor.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/conf
andromda-m2.xml
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda
pom.xml
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/src/uml
empty.model.membership.xml
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources
pom.xml
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards
MDASolutionWizard.cs MDASolutionWizard.designer.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn Android VS Readme.rtf
etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer Android VS
Setup.nsi
Log:
- Updated code generator to work with the new 1.1 .NET cartridges
- Fixed some of the template output
- Fixed empty folder resync issue
Revision Changes Path
1.19 +6 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn.csproj
Index: AndroMDA.VS80AddIn.csproj
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn.csproj,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -w -r1.18 -r1.19
--- AndroMDA.VS80AddIn.csproj 25 Jul 2006 13:09:28 -0000 1.18
+++ AndroMDA.VS80AddIn.csproj 13 Dec 2006 16:03:57 -0000 1.19
@@ -38,6 +38,10 @@
<Reference Include="Microsoft.VisualStudio.VCCodeModel, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.VCProject, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.VCProjectEngine, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <Reference Include="NVelocity, Version=0.5.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>lib\NVelocity.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
<Reference Include="System.Data" />
@@ -126,6 +130,7 @@
</Compile>
<EmbeddedResource Include="Resources\SchemaExport\TestDataManager.cs" />
<Compile Include="Utils\CodeModelUtils.cs" />
+ <Compile Include="Utils\TemplateMaschine.cs" />
<Compile Include="WizardSolutionProcessor.cs" />
<Compile Include="AddInSettings.cs" />
<Compile Include="Resource1.Designer.cs">
@@ -321,7 +326,7 @@
<None Include="Resources\about_logo.jpg" />
<Content Include="Resources\mda\conf\andromda-m2.xml" />
<Content Include="Resources\mda\conf\mappings\MergeMappings.xml" />
- <Content Include="Resources\mda\pom.xml" />
+ <None Include="Resources\mda\pom.xml" />
<Content Include="Resources\mda\src\uml\empty.model.membership.xml" />
<None Include="Resources\pom.xml" />
<None Include="Resources\settings.xml" />
1.3 +2 -2 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/ConversionCodeGenerator.cs
Index: ConversionCodeGenerator.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/ConversionCodeGenerator.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- ConversionCodeGenerator.cs 25 Jul 2006 13:09:28 -0000 1.2
+++ ConversionCodeGenerator.cs 13 Dec 2006 16:03:57 -0000 1.3
@@ -102,8 +102,8 @@
{
returnVariableName = "entity";
codeToInsert += "// VO to entity conversion\n";
- // Add code to create a new entity with the Factory.newInstance() method
- codeToInsert += returnType + " " + returnVariableName + " = " + returnType + ".Factory.newInstance();\n\n";
+ // Add code to create a new entity with the Factory.NewInstance() method
+ codeToInsert += returnType + " " + returnVariableName + " = " + returnType + ".Factory.NewInstance();\n\n";
}
else
{
1.19 +64 -54 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/MDASolutionManager.cs
Index: MDASolutionManager.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/MDASolutionManager.cs,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -w -r1.18 -r1.19
--- MDASolutionManager.cs 2 Oct 2006 01:57:05 -0000 1.18
+++ MDASolutionManager.cs 13 Dec 2006 16:03:57 -0000 1.19
@@ -47,8 +47,6 @@
//private MavenProxy m_mavenProxy = null;
private MavenProxy m_mavenProxy = null;
- private int m_progress;
-
#endregion
#region Properties
@@ -453,7 +451,7 @@
(m_addInSettings.MavenUseOfflineMode || (m_addInSettings.MavenUseCustomCommandLine && m_addInSettings.MavenCustomCommandLine.ToLower().Contains("-o")))
)
{
- if ( System.Windows.Forms.MessageBox.Show("It appears that AndroMDA is missing one or more packages it needs to run. AndroMDA can automatically connect to the internet and download any missing dependencies, but it is currently running in offline mode. Would you like to re-run AndroMDA with offline mode temporarily disabled?" + Environment.NewLine + Environment.NewLine + "Please note that downloading all the required packages may take up to 10 minutes or more depending on your connection speed. You will only need to download these packages this one time as long as you leave offline mode enabled.", "AndroMDA Generate Failed", System.Windows.Forms.MessageBoxButtons.YesNo, System.Windows.Forms.MessageBoxIcon.Question, System.Windows.Forms.MessageBoxDefaultButton.Button1) == System.Windows.Forms.DialogResult.Yes)
+ if ( System.Windows.Forms.MessageBox.Show("It appears that AndroMDA is missing one or more packages it needs to run. Would you like to download the missing files?", "AndroMDA Generate Failed", System.Windows.Forms.MessageBoxButtons.YesNo, System.Windows.Forms.MessageBoxIcon.Question, System.Windows.Forms.MessageBoxDefaultButton.Button1) == System.Windows.Forms.DialogResult.Yes)
{
// Rerun maven without the -o option
RunMaven(true);
@@ -474,6 +472,7 @@
try
{
DoRefreshGeneratedFiles();
+ m_applicationObject.StatusBar.Progress(false, string.Empty, 0, 0);
m_applicationObject.StatusBar.Text = "Android/VS: Solution resync complete";
}
catch (Exception e)
@@ -489,7 +488,6 @@
private void DoRefreshGeneratedFiles()
{
- m_progress = 0;
UpdateResyncProgressBar();
string[] syncFolders = m_addInSettings.SyncFolderList.Split(new char[] { ';' });
@@ -508,49 +506,35 @@
else
{
UpdateResyncProgressBar(proj.Name);
-
// Search for the existing
foreach (string folder in syncFolders)
{
string folderCleaned = folder.Replace('/', '\\').Trim('\\');
if (folderCleaned.Length > 0)
{
- string folderPath = proj.Properties.Item("FullPath").Value.ToString().Trim('\\');
- folderPath = folderPath + "\\" + folderCleaned;
- if (System.IO.Directory.Exists(folderPath))
- {
- proj.ProjectItems.AddFromDirectory(folderPath);
- }
- }
- }
+ string folderPath = proj.Properties.Item("FullPath").Value.ToString().Trim('\\') + "\\" + folderCleaned;
+ ProjectItem folderItem = null;
foreach (ProjectItem item in proj.ProjectItems)
{
- if (item.Kind == EnvDTE.Constants.vsProjectItemKindPhysicalFolder)
+ if (item.Kind == EnvDTE.Constants.vsProjectItemKindPhysicalFolder &&
+ folderPath == item.Properties.Item("FullPath").Value.ToString().Trim('\\'))
{
- string folderPath = item.Properties.Item("FullPath").Value.ToString();
- if (m_addInSettings.IsInSyncFoldersList(folderPath))
- {
- ResyncFolder(item, proj.Name);
- }
- }
- }
- }
+ folderItem = item;
}
}
- private void ResyncFolder(ProjectItem folderProjectItem, string projectName)
+ if (System.IO.Directory.Exists(folderPath))
{
- if (folderProjectItem == null) return;
-
- string folderPath = folderProjectItem.Properties.Item("FullPath").Value.ToString();
-
- UpdateResyncProgressBar("Getting file list for " + projectName + "/" + folderProjectItem.Name);
+ bool skip = false;
// Get the list of files in the filesystem
ArrayList filesystemFileList = GetFileListFromFilesystem(folderPath);
+
+ if (folderItem != null)
+ {
// Get the list of files in the solution tree
- ArrayList solutionTreeFileList = GetFileListFromProjectTree(folderProjectItem);
+ ArrayList solutionTreeFileList = GetFileListFromProjectTree(folderItem);
// Generate a hash for the filesystem list
int filesHash = GetArrayListHashCode(filesystemFileList);
// Generate a hash for the solution tree list
@@ -559,13 +543,36 @@
// If the hash codes are the same, we don't need to do a resync
if (filesHash == solutionHash)
{
- UpdateResyncProgressBar("Files have not changed since last resync: " + projectName + "/" + folderProjectItem.Name, 1, 1);
- return;
+ UpdateResyncProgressBar("Files have not changed since last resync: " + proj.Name + "/" + folderItem.Name, 1, 1);
+ skip = true;
}
+ }
+ if (!skip)
+ {
+ if (folderItem != null)
+ {
+ folderItem.Remove();
+ }
+ UpdateResyncProgressBar(folderCleaned, 0, filesystemFileList.Count);
+ //folderItem = proj.ProjectItems.
+ ((VSLangProj.VSProject)proj.Object).Refresh();
- CollapseProject(projectName);
- RemoveIgnoredItems(folderProjectItem.ProjectItems, filesystemFileList.Count);
- UpdateResyncProgressBar(projectName + "/" + folderProjectItem.Name);
+ folderItem = proj.ProjectItems.AddFromDirectory(folderPath);
+ CollapseProject(proj.Name);
+ RemoveIgnoredItems(folderItem.ProjectItems, filesystemFileList.Count);
+ }
+ }
+ else
+ {
+ if (folderItem != null)
+ {
+ folderItem.Remove();
+ }
+ }
+ }
+ }
+ }
+ }
}
private void RemoveIgnoredItems(ProjectItems items, int totalItems)
@@ -577,18 +584,20 @@
{
foreach (ProjectItem item in items)
{
- if (m_addInSettings.IsInIgnoreList(item.Name))
+ if (m_addInSettings.IsInIgnoreList(item.Name) ||
+ (item.Kind == EnvDTE.Constants.vsProjectItemKindPhysicalFile && !System.IO.File.Exists(item.Properties.Item("FullPath").Value.ToString()))
+ )
{
item.Remove();
}
else
{
- if (item.ProjectItems != null && item.ProjectItems.Count > 0)
+ if (item.Kind == EnvDTE.Constants.vsProjectItemKindPhysicalFolder)
{
currentItem++;
currentItem = RemoveIgnoredItems(item.ProjectItems, currentItem, totalItems);
}
- else
+ else if (item.Kind == EnvDTE.Constants.vsProjectItemKindPhysicalFile)
{
UpdateResyncProgressBar(item.Name, currentItem++, totalItems);
string file = item.Name;
@@ -798,7 +807,8 @@
{
detail = "(" + detail + ")";
}
- if (currentProgress > totalProgress) currentProgress = totalProgress;
+ if (currentProgress > totalProgress) { currentProgress = totalProgress; }
+ if (totalProgress == 0) { totalProgress++; }
m_applicationObject.StatusBar.Progress(true, "Android/VS: Refreshing generated files... " + detail, currentProgress, totalProgress);
}
1.17 +5 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/VS80AddIn.cs
Index: VS80AddIn.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/VS80AddIn.cs,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -w -r1.16 -r1.17
--- VS80AddIn.cs 28 Sep 2006 20:28:39 -0000 1.16
+++ VS80AddIn.cs 13 Dec 2006 16:03:57 -0000 1.17
@@ -13,6 +13,9 @@
using System.IO;
using Microsoft.VisualStudio.CommandBars;
+using Velocity = NVelocity.App.Velocity;
+using VelocityContext = NVelocity.VelocityContext;
+
#endregion
namespace AndroMDA.VS80AddIn
@@ -20,7 +23,7 @@
public class VS80AddIn
{
- public const string ADD_IN_VERSION = "1.5";
+ public const string ADD_IN_VERSION = "1.6.1";
#region Constants
@@ -141,6 +144,7 @@
CreateCommands();
RegisterCommands();
RegisterToolbar();
+ Velocity.Init();
m_connected = true;
}
catch (Exception e)
1.15 +149 -110 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/WizardSolutionProcessor.cs
Index: WizardSolutionProcessor.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/WizardSolutionProcessor.cs,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -r1.14 -r1.15
--- WizardSolutionProcessor.cs 28 Sep 2006 20:28:39 -0000 1.14
+++ WizardSolutionProcessor.cs 13 Dec 2006 16:03:57 -0000 1.15
@@ -19,6 +19,10 @@
using ICSharpCode.SharpZipLib.Checksums;
using ICSharpCode.SharpZipLib.Zip;
+using Velocity = NVelocity.App.Velocity;
+using VelocityContext = NVelocity.VelocityContext;
+using Template = NVelocity.Template;
+
#endregion
namespace AndroMDA.VS80AddIn
@@ -42,6 +46,9 @@
private ConfigFile m_configuration = null;
+ // lets make a Context and put data into it
+ VelocityContext nvelocityContext;
+
#endregion
#region Constructors
@@ -110,8 +117,133 @@
string emptyModelFileData = Resource1.mda_src_uml_empty_model_xml;
- m_configuration["cartridges.aspnet.rootpom.dependencies"] = " <dependency>\n <groupId>org.andromda.cartridges</groupId>\n <artifactId>andromda-aspdotnet-cartridge</artifactId>\n <version>1.0-SNAPSHOT</version>\n </dependency>\n";
- m_configuration["cartridges.aspnet.mdapom.dependencies"] = " <dependency>\n <groupId>org.andromda.cartridges</groupId>\n <artifactId>andromda-aspdotnet-cartridge</artifactId>\n </dependency>\n";
+ //m_configuration["cartridges.aspnet.rootpom.dependencies"] = " <dependency>\n <groupId>org.andromda.cartridges</groupId>\n <artifactId>andromda-aspdotnet-cartridge</artifactId>\n <version>1.0-SNAPSHOT</version>\n </dependency>\n";
+ //m_configuration["cartridges.aspnet.mdapom.dependencies"] = " <dependency>\n <groupId>org.andromda.cartridges</groupId>\n <artifactId>andromda-aspdotnet-cartridge</artifactId>\n </dependency>\n";
+
+ nvelocityContext = new VelocityContext();
+ foreach (string key in m_configuration.Keys)
+ {
+ object value = m_configuration[key];
+ if (m_configuration[key] == "true" || m_configuration[key] == "false")
+ {
+ value = GetConfigSettingBool(key);
+ }
+
+ nvelocityContext.Put("wizard." + key, value);
+ nvelocityContext.Put("wizard_" + key.Replace('.', '_'), value);
+ }
+
+ AddToStatus("Creating AndroMDA configuration files...");
+
+ // Create mda directory
+ CreateDirectory(basePath + "\\mda");
+ // Create mda/conf directory
+ CreateDirectory(basePath + "\\mda\\conf");
+
+ // Render /cvsignore
+ if (versionControl)
+ {
+ WriteFile(basePath + "\\" + ignoreFile, ParseVariables(Resource1.cvsignore));
+ }
+
+ if (m_configuration["application.andromda.bootstrap"] == "Apache Maven 1.x")
+ {
+ // Render /maven.xml
+ WriteFile(basePath + "\\maven.xml", ParseVariables(Resource1.maven_xml));
+ // Render /project.properties
+ WriteFile(basePath + "\\project.properties", ParseVariables(Resource1.project_properties));
+ // Render /project.xml
+ WriteFile(basePath + "\\project.xml", ParseVariables(Resource1.project_xml));
+
+ // Render /mda/maven.xml
+ WriteFile(basePath + "\\mda\\maven.xml", ParseVariables(Resource1.mda_maven_xml));
+ // Render /mda/project.properties
+ WriteFile(basePath + "\\mda\\project.properties", ParseVariables(Resource1.mda_project_properties));
+ // Render /mda/project.xml
+ WriteFile(basePath + "\\mda\\project.xml", ParseVariables(Resource1.mda_project_xml));
+
+ // Render /mda/conf/andromda.xml
+ WriteFile(basePath + "\\mda\\conf\\andromda.xml", ParseVariables(Resource1.mda_conf_andromda_xml));
+ }
+
+ if (m_configuration["application.andromda.bootstrap"] == "Apache Maven 2.x")
+ {
+
+ // Render /pom.xml
+ WriteFile(basePath + "\\pom.xml", RenderTemplate(Resource1.pom_xml, "pom.xml"));
+ // Render /mda/pom.xml
+ WriteFile(basePath + "\\mda\\pom.xml", RenderTemplate(Resource1.mda_pom_xml, "mda/pom.xml"));
+
+ // Render /mda/conf/andromda.xml
+ WriteFile(basePath + "\\mda\\conf\\andromda.xml", RenderTemplate(Resource1.mda_conf_andromda_m2_xml, "mda/conf/andromda.xml"));
+
+ // Create mda/conf/mappings directory
+ CreateDirectory(basePath + "\\mda\\conf\\mappings");
+
+ // Render /mda/conf/mappings/MergeMappings.xml
+ WriteFile(basePath + "\\mda\\conf\\mappings\\MergeMappings.xml", ParseVariables(Resource1.mda_conf_mappings_MergeMappings_xml));
+
+ }
+
+ // Write mda/cvsignore
+ if (versionControl)
+ {
+ WriteFile(basePath + "\\mda\\" + ignoreFile, ParseVariables(Resource1.mda_cvsignore));
+ }
+
+
+ // Create the AndroMDA solution folder
+ AddToStatus("Adding solution folder...");
+ Solution2 sol = m_applicationObject.Solution as Solution2;
+ Project solutionFolder = null;
+ try
+ {
+ solutionFolder = sol.AddSolutionFolder("AndroMDA");
+ if (m_configuration["application.andromda.bootstrap"] == "Apache Maven 1.x")
+ {
+
+ solutionFolder.ProjectItems.AddFromFile(basePath + "\\mda\\project.properties");
+ }
+ if (m_configuration["application.andromda.bootstrap"] == "Apache Maven 2.x")
+ {
+
+ solutionFolder.ProjectItems.AddFromFile(basePath + "\\mda\\pom.xml");
+ }
+ solutionFolder.ProjectItems.AddFromFile(basePath + "\\mda\\conf\\andromda.xml");
+ }
+ catch { }
+
+
+ AddToStatus("Creating empty model file...");
+ // Create mda/src directory
+ System.IO.Directory.CreateDirectory(basePath + "\\mda\\src");
+ // Create mda/uml directory
+ System.IO.Directory.CreateDirectory(basePath + "\\mda\\src\\uml");
+
+ string modelPackageXML = "<UML:Model xmi.id='_9_5_1_874026a_1149883877463_480535_0' name='" + m_configuration["solution.name"] + "'><UML:Namespace.ownedElement>";
+ string xmiIdBase = "_9_5_1_874026a_" + DateTime.Now.Ticks.ToString();
+ modelPackageXML += GetXMI(m_configuration["solution.name"].Split('.'), xmiIdBase);
+ modelPackageXML += "</UML:Namespace.ownedElement></UML:Model>";
+
+ emptyModelFileData = emptyModelFileData.Replace("${wizard.model.packagestructure.xml}", modelPackageXML);
+
+ //emptyModelFileData = RenderTemplate(emptyModelFileData, "empty.model.xmi");
+
+ if (GetConfigSettingBool("application.model.zipped"))
+ {
+ // Create the empty model file
+ WriteCompressedFile(m_configuration["application.model.filename.unzipped"], basePath + "\\mda\\src\\uml\\" + m_configuration["application.model.filename"], emptyModelFileData);
+ }
+ else
+ {
+ // Create the empty model file
+ WriteFile(basePath + "\\mda\\src\\uml\\" + m_configuration["application.model.filename"], emptyModelFileData);
+ }
+
+
+
+
+
//////////////////////////////////
// Create/find the common project
@@ -388,112 +520,6 @@
nhibernateConfig.Properties.Item("BuildAction").Value = VSLangProj.prjBuildAction.prjBuildActionContent;
}
- AddToStatus("Creating AndroMDA configuration files...");
-
- // Create mda directory
- CreateDirectory(basePath + "\\mda");
- // Create mda/conf directory
- CreateDirectory(basePath + "\\mda\\conf");
-
- // Render /cvsignore
- if (versionControl)
- {
- WriteFile(basePath + "\\" + ignoreFile, ParseVariables(Resource1.cvsignore));
- }
-
- if (m_configuration["application.andromda.bootstrap"] == "Apache Maven 1.x")
- {
- // Render /maven.xml
- WriteFile(basePath + "\\maven.xml", ParseVariables(Resource1.maven_xml));
- // Render /project.properties
- WriteFile(basePath + "\\project.properties", ParseVariables(Resource1.project_properties));
- // Render /project.xml
- WriteFile(basePath + "\\project.xml", ParseVariables(Resource1.project_xml));
-
- // Render /mda/maven.xml
- WriteFile(basePath + "\\mda\\maven.xml", ParseVariables(Resource1.mda_maven_xml));
- // Render /mda/project.properties
- WriteFile(basePath + "\\mda\\project.properties", ParseVariables(Resource1.mda_project_properties));
- // Render /mda/project.xml
- WriteFile(basePath + "\\mda\\project.xml", ParseVariables(Resource1.mda_project_xml));
-
- // Render /mda/conf/andromda.xml
- WriteFile(basePath + "\\mda\\conf\\andromda.xml", ParseVariables(Resource1.mda_conf_andromda_xml));
- }
-
- if (m_configuration["application.andromda.bootstrap"] == "Apache Maven 2.x")
- {
-
-
-
- // Render /pom.xml
- WriteFile(basePath + "\\pom.xml", ParseVariables(Resource1.pom_xml));
- // Render /mda/pom.xml
- WriteFile(basePath + "\\mda\\pom.xml", ParseVariables(Resource1.mda_pom_xml));
-
- // Render /mda/conf/andromda.xml
- WriteFile(basePath + "\\mda\\conf\\andromda.xml", ParseVariables(Resource1.mda_conf_andromda_m2_xml));
-
- // Create mda/conf/mappings directory
- CreateDirectory(basePath + "\\mda\\conf\\mappings");
-
- // Render /mda/conf/mappings/MergeMappings.xml
- WriteFile(basePath + "\\mda\\conf\\mappings\\MergeMappings.xml", ParseVariables(Resource1.mda_conf_mappings_MergeMappings_xml));
-
- }
-
- // Write mda/cvsignore
- if (versionControl)
- {
- WriteFile(basePath + "\\mda\\" + ignoreFile, ParseVariables(Resource1.mda_cvsignore));
- }
-
-
- // Create the AndroMDA solution folder
- AddToStatus("Adding solution folder...");
- Solution2 sol = m_applicationObject.Solution as Solution2;
- Project solutionFolder = null;
- try
- {
- solutionFolder = sol.AddSolutionFolder("AndroMDA");
- if (m_configuration["application.andromda.bootstrap"] == "Apache Maven 1.x")
- {
-
- solutionFolder.ProjectItems.AddFromFile(basePath + "\\mda\\project.properties");
- }
- if (m_configuration["application.andromda.bootstrap"] == "Apache Maven 2.x")
- {
-
- solutionFolder.ProjectItems.AddFromFile(basePath + "\\mda\\pom.xml");
- }
- solutionFolder.ProjectItems.AddFromFile(basePath + "\\mda\\conf\\andromda.xml");
- }
- catch { }
-
-
- AddToStatus("Creating empty model file...");
- // Create mda/src directory
- System.IO.Directory.CreateDirectory(basePath + "\\mda\\src");
- // Create mda/uml directory
- System.IO.Directory.CreateDirectory(basePath + "\\mda\\src\\uml");
-
- string modelPackageXML = "<UML:Model xmi.id='_9_5_1_874026a_1149883877463_480535_0' name='" + m_configuration["solution.name"] + "'><UML:Namespace.ownedElement>";
- string xmiIdBase = "_9_5_1_874026a_" + DateTime.Now.Ticks.ToString();
- modelPackageXML += GetXMI(m_configuration["solution.name"].Split('.'), xmiIdBase);
- modelPackageXML += "</UML:Namespace.ownedElement></UML:Model>";
-
- emptyModelFileData = emptyModelFileData.Replace("${wizard.model.packagestructure.xml}", modelPackageXML);
-
- if (GetConfigSettingBool("application.model.zipped"))
- {
- // Create the empty model file
- WriteCompressedFile(m_configuration["application.model.filename.unzipped"], basePath + "\\mda\\src\\uml\\" + m_configuration["application.model.filename"], emptyModelFileData);
- }
- else
- {
- // Create the empty model file
- WriteFile(basePath + "\\mda\\src\\uml\\" + m_configuration["application.model.filename"], emptyModelFileData);
- }
// Create the lib directory
CreateDirectory(basePath + "\\Lib");
@@ -561,6 +587,7 @@
{
try { proj.References.AddFromProject(webCommonProject); } catch { }
}
+ //m_applicationObject.Solution.Properties.Item("StartupProject").Value = webProject.Name;
}
if (webCommonProject != null)
@@ -699,6 +726,18 @@
}
/// <summary>
+ /// Parses and resolves all variables in a string
+ /// </summary>
+ /// <param name="content">The string to parse.</param>
+ /// <returns></returns>
+ private string RenderTemplate(string content, string filename)
+ {
+ StringWriter writer = new StringWriter();
+ Velocity.Evaluate(nvelocityContext, writer, filename, content);
+ return writer.GetStringBuilder().ToString();
+ }
+
+ /// <summary>
/// Writes a file to disk. This will call ParseVariables() on the content.
/// </summary>
/// <param name="filePath">The file to which to write.</param>
@@ -739,7 +778,7 @@
zip.SetLevel(6);
System.Text.ASCIIEncoding encoding = new System.Text.ASCIIEncoding();
- byte[] fileData = encoding.GetBytes(fileContent);
+ byte[] fileData = encoding.GetBytes(ParseVariables(fileContent));
ZipEntry entry = new ZipEntry(fileNameInZip);
entry.DateTime = DateTime.Now;
1.4 +3 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/conf/andromda-m2.xml
Index: andromda-m2.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/conf/andromda-m2.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- andromda-m2.xml 2 Oct 2006 01:57:07 -0000 1.3
+++ andromda-m2.xml 13 Dec 2006 16:03:57 -0000 1.4
@@ -156,6 +156,7 @@
</properties>
</namespace>
+#if ($wizard_cartridges_aspnet_configure)
<namespace name="aspdotnet">
<properties>
<property name="web">${web.dir}</property>
@@ -176,6 +177,7 @@
<property name="AssemblyKeyName"></property>
</properties>
</namespace>
+#end
</namespaces>
</andromda>
\ No newline at end of file
1.4 +7 -4 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/pom.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- pom.xml 28 Sep 2006 20:28:40 -0000 1.3
+++ pom.xml 13 Dec 2006 16:03:57 -0000 1.4
@@ -66,9 +66,12 @@
<groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-cs-cartridge</artifactId>
</dependency>
-
-${wizard.cartridges.aspnet.mdapom.dependencies}
-
+#if ($wizard_cartridges_aspnet_configure)
+ <dependency>
+ <groupId>org.andromda.cartridges</groupId>
+ <artifactId>andromda-aspdotnet-cartridge</artifactId>
+ </dependency>
+#end
<dependency>
<groupId>org.andromda.translationlibraries</groupId>
<artifactId>andromda-ocl-validation-library</artifactId>
1.3 +669 -805 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/src/uml/empty.model.membership.xml
Index: empty.model.membership.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/src/uml/empty.model.membership.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- empty.model.membership.xml 22 Aug 2006 02:14:00 -0000 1.2
+++ empty.model.membership.xml 13 Dec 2006 16:03:57 -0000 1.3
@@ -11,7 +11,7 @@
</UML:ModelElement.stereotype>
<UML:ModelElement.taggedValue>
<UML:TaggedValue xmi.id='_9_5_1_874026a_1147802781652_96551_1178' name='@andromda.persistence.table'>
- <UML:TaggedValue.dataValue>AppUser</UML:TaggedValue.dataValue>
+ <UML:TaggedValue.dataValue>USERS</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
<UML:TagDefinition href='andromda-profile-persistence-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119337118921_846703_8'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
@@ -30,28 +30,6 @@
</XMI.extension>
</UML:Classifier>
</UML:StructuralFeature.type>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue xmi.id='_9_5_1_874026a_1148531157259_859391_612' name='@andromda.persistence.column'>
- <UML:TaggedValue.dataValue>UserName</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition href='andromda-profile-persistence-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119337118921_246379_63'>
- <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
- <referentPath xmi.value='org.andromda.profile::persistence::@andromda.persistence.column'/>
- </XMI.extension>
- </UML:TagDefinition>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- <UML:TaggedValue xmi.id='_9_5_1_874026a_1148531157299_27598_613' name='@andromda.persistence.column.length'>
- <UML:TaggedValue.dataValue>256</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition href='andromda-profile-persistence-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119337118921_54372_83'>
- <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
- <referentPath xmi.value='org.andromda.profile::persistence::@andromda.persistence.column.length'/>
- </XMI.extension>
- </UML:TagDefinition>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
</UML:Attribute>
<UML:Attribute xmi.id='_9_5_1_874026a_1147802183922_246121_617' name='password' visibility='public'>
<UML:StructuralFeature.type>
@@ -61,28 +39,6 @@
</XMI.extension>
</UML:Classifier>
</UML:StructuralFeature.type>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue xmi.id='_9_5_1_874026a_1148531272795_378175_653' name='@andromda.persistence.column'>
- <UML:TaggedValue.dataValue>Password</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition href='andromda-profile-persistence-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119337118921_246379_63'>
- <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
- <referentPath xmi.value='org.andromda.profile::persistence::@andromda.persistence.column'/>
- </XMI.extension>
- </UML:TagDefinition>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- <UML:TaggedValue xmi.id='_9_5_1_874026a_1148531272795_521455_654' name='@andromda.persistence.column.length'>
- <UML:TaggedValue.dataValue>256</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition href='andromda-profile-persistence-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119337118921_54372_83'>
- <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
- <referentPath xmi.value='org.andromda.profile::persistence::@andromda.persistence.column.length'/>
- </XMI.extension>
- </UML:TagDefinition>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
</UML:Attribute>
<UML:Attribute xmi.id='_9_5_1_874026a_1147802201317_473762_665' name='email' visibility='public'>
<UML:StructuralFeature.type>
@@ -92,28 +48,6 @@
</XMI.extension>
</UML:Classifier>
</UML:StructuralFeature.type>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue xmi.id='_9_5_1_874026a_1148531260558_788669_651' name='@andromda.persistence.column'>
- <UML:TaggedValue.dataValue>Email</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition href='andromda-profile-persistence-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119337118921_246379_63'>
- <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
- <referentPath xmi.value='org.andromda.profile::persistence::@andromda.persistence.column'/>
- </XMI.extension>
- </UML:TagDefinition>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- <UML:TaggedValue xmi.id='_9_5_1_874026a_1148531260578_666515_652' name='@andromda.persistence.column.length'>
- <UML:TaggedValue.dataValue>256</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition href='andromda-profile-persistence-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119337118921_54372_83'>
- <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
- <referentPath xmi.value='org.andromda.profile::persistence::@andromda.persistence.column.length'/>
- </XMI.extension>
- </UML:TagDefinition>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
</UML:Attribute>
<UML:Attribute xmi.id='_9_5_1_874026a_1147802206795_951750_668' name='isActive' visibility='public'>
<UML:StructuralFeature.type>
@@ -123,18 +57,6 @@
</XMI.extension>
</UML:Classifier>
</UML:StructuralFeature.type>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue xmi.id='_9_5_1_874026a_1148531282910_856125_655' name='@andromda.persistence.column'>
- <UML:TaggedValue.dataValue>IsActive</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition href='andromda-profile-persistence-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119337118921_246379_63'>
- <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
- <referentPath xmi.value='org.andromda.profile::persistence::@andromda.persistence.column'/>
- </XMI.extension>
- </UML:TagDefinition>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
</UML:Attribute>
<UML:Attribute xmi.id='_9_5_1_874026a_1147974181922_327912_0' name='comment' visibility='public'>
<UML:StructuralFeature.multiplicity>
@@ -151,28 +73,6 @@
</XMI.extension>
</UML:Classifier>
</UML:StructuralFeature.type>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue xmi.id='_9_5_1_874026a_1148531296159_941861_656' name='@andromda.persistence.column'>
- <UML:TaggedValue.dataValue>Comment</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition href='andromda-profile-persistence-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119337118921_246379_63'>
- <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
- <referentPath xmi.value='org.andromda.profile::persistence::@andromda.persistence.column'/>
- </XMI.extension>
- </UML:TagDefinition>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- <UML:TaggedValue xmi.id='_9_5_1_874026a_1148531296159_175283_657' name='@andromda.persistence.column.length'>
- <UML:TaggedValue.dataValue>256</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition href='andromda-profile-persistence-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119337118921_54372_83'>
- <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
- <referentPath xmi.value='org.andromda.profile::persistence::@andromda.persistence.column.length'/>
- </XMI.extension>
- </UML:TagDefinition>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
</UML:Attribute>
<UML:Attribute xmi.id='_9_5_1_874026a_1147974187300_531457_3' name='creationDate' visibility='public'>
<UML:StructuralFeature.type>
@@ -182,18 +82,6 @@
</XMI.extension>
</UML:Classifier>
</UML:StructuralFeature.type>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue xmi.id='_9_5_1_874026a_1148531304461_703846_658' name='@andromda.persistence.column'>
- <UML:TaggedValue.dataValue>CreationDate</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition href='andromda-profile-persistence-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119337118921_246379_63'>
- <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
- <referentPath xmi.value='org.andromda.profile::persistence::@andromda.persistence.column'/>
- </XMI.extension>
- </UML:TagDefinition>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
</UML:Attribute>
</UML:Classifier.feature>
</UML:Class>
@@ -205,32 +93,8 @@
</XMI.extension>
</UML:Stereotype>
</UML:ModelElement.stereotype>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue xmi.id='_9_5_1_874026a_1148531334043_858539_664' name='@andromda.persistence.table'>
- <UML:TaggedValue.dataValue>UserRole</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition href='andromda-profile-persistence-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119337118921_846703_8'>
- <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
- <referentPath xmi.value='org.andromda.profile::persistence::@andromda.persistence.table'/>
- </XMI.extension>
- </UML:TagDefinition>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
<UML:Classifier.feature>
<UML:Attribute xmi.id='_9_5_1_874026a_1147802436365_530056_674' name='role' visibility='public' type='_9_5_1_874026a_1147801720876_670493_267'>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue xmi.id='_9_5_1_874026a_1148531353151_918674_665' name='@andromda.persistence.column'>
- <UML:TaggedValue.dataValue>Role</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition href='andromda-profile-persistence-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119337118921_246379_63'>
- <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
- <referentPath xmi.value='org.andromda.profile::persistence::@andromda.persistence.column'/>
- </XMI.extension>
- </UML:TagDefinition>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
</UML:Attribute>
</UML:Classifier.feature>
</UML:Class>
1.8 +7 -3 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/pom.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- pom.xml 2 Oct 2006 01:57:08 -0000 1.7
+++ pom.xml 13 Dec 2006 16:03:58 -0000 1.8
@@ -53,9 +53,13 @@
<artifactId>andromda-cs-cartridge</artifactId>
<version>1.1-SNAPSHOT</version>
</dependency>
-
-${wizard.cartridges.aspnet.rootpom.dependencies}
-
+#if ($wizard_cartridges_aspnet_configure)
+ <dependency>
+ <groupId>org.andromda.cartridges</groupId>
+ <artifactId>andromda-aspdotnet-cartridge</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+#end
</dependencies>
</dependencyManagement>
<build>
1.5 +2 -0 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards/MDASolutionWizard.cs
Index: MDASolutionWizard.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards/MDASolutionWizard.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- MDASolutionWizard.cs 28 Sep 2006 20:28:41 -0000 1.4
+++ MDASolutionWizard.cs 13 Dec 2006 16:03:58 -0000 1.5
@@ -90,6 +90,8 @@
cbConfigureUnitTestingProject.Checked = true;
cbConfigureUnitTestingProject.Checked = false;
+ txtAndroMDAVersion.Text = "3.2";
+
// Give the wizard a reference to this form so it can
// set this.AcceptButton to the Next button
wizard1.ContainingForm = this;
1.5 +91 -92 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards/MDASolutionWizard.designer.cs
Index: MDASolutionWizard.designer.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards/MDASolutionWizard.designer.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- MDASolutionWizard.designer.cs 28 Sep 2006 20:28:41 -0000 1.4
+++ MDASolutionWizard.designer.cs 13 Dec 2006 16:03:58 -0000 1.5
@@ -76,12 +76,6 @@
this.txtApplicationName = new System.Windows.Forms.TextBox();
this.label12 = new System.Windows.Forms.Label();
this.header6 = new Gui.Wizard.Header();
- this.wizardPageWebCommonProject = new Gui.Wizard.WizardPage();
- this.lblMembershipSelectedImage = new System.Windows.Forms.Label();
- this.lblMembershipSelected = new System.Windows.Forms.Label();
- this.cbConfigureWebCommonProject = new System.Windows.Forms.CheckBox();
- this.usrWebCommonProject = new AndroMDA.VS80AddIn.Dialogs.MDAProjectSetupControl();
- this.header8 = new Gui.Wizard.Header();
this.wizardPageWelcome = new Gui.Wizard.WizardPage();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.label9 = new System.Windows.Forms.Label();
@@ -106,6 +100,12 @@
this.columnHeader1 = new System.Windows.Forms.ColumnHeader();
this.columnHeader2 = new System.Windows.Forms.ColumnHeader();
this.header4 = new Gui.Wizard.Header();
+ this.wizardPageWebCommonProject = new Gui.Wizard.WizardPage();
+ this.lblMembershipSelectedImage = new System.Windows.Forms.Label();
+ this.lblMembershipSelected = new System.Windows.Forms.Label();
+ this.cbConfigureWebCommonProject = new System.Windows.Forms.CheckBox();
+ this.usrWebCommonProject = new AndroMDA.VS80AddIn.Dialogs.MDAProjectSetupControl();
+ this.header8 = new Gui.Wizard.Header();
this.wizard1.SuspendLayout();
this.wizardPageWebProject.SuspendLayout();
this.wizardPageUnitTestingProject.SuspendLayout();
@@ -114,7 +114,6 @@
this.wizardPageCommonProject.SuspendLayout();
this.wizardPageAdvancedSettings.SuspendLayout();
this.wizardPageSolutionInfo.SuspendLayout();
- this.wizardPageWebCommonProject.SuspendLayout();
this.wizardPageWelcome.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxWelcome)).BeginInit();
this.wizardPageComplete.SuspendLayout();
@@ -122,6 +121,7 @@
this.wizardPageProcessing.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxThrobber)).BeginInit();
this.wizardPageConfirmChoices.SuspendLayout();
+ this.wizardPageWebCommonProject.SuspendLayout();
this.SuspendLayout();
//
// imageList1
@@ -134,11 +134,6 @@
// wizard1
//
this.wizard1.ContainingForm = null;
- this.wizard1.Controls.Add(this.wizardPageWebProject);
- this.wizard1.Controls.Add(this.wizardPageUnitTestingProject);
- this.wizard1.Controls.Add(this.wizardPageSchemaExportProject);
- this.wizard1.Controls.Add(this.wizardPageCoreProject);
- this.wizard1.Controls.Add(this.wizardPageCommonProject);
this.wizard1.Controls.Add(this.wizardPageAdvancedSettings);
this.wizard1.Controls.Add(this.wizardPageSolutionInfo);
this.wizard1.Controls.Add(this.wizardPageWelcome);
@@ -146,6 +141,11 @@
this.wizard1.Controls.Add(this.wizardPageProcessing);
this.wizard1.Controls.Add(this.wizardPageConfirmChoices);
this.wizard1.Controls.Add(this.wizardPageWebCommonProject);
+ this.wizard1.Controls.Add(this.wizardPageWebProject);
+ this.wizard1.Controls.Add(this.wizardPageUnitTestingProject);
+ this.wizard1.Controls.Add(this.wizardPageSchemaExportProject);
+ this.wizard1.Controls.Add(this.wizardPageCoreProject);
+ this.wizard1.Controls.Add(this.wizardPageCommonProject);
this.wizard1.Dock = System.Windows.Forms.DockStyle.Fill;
this.wizard1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.wizard1.Location = new System.Drawing.Point(0, 0);
@@ -487,7 +487,6 @@
this.txtAndroMDAVersion.Name = "txtAndroMDAVersion";
this.txtAndroMDAVersion.Size = new System.Drawing.Size(394, 21);
this.txtAndroMDAVersion.TabIndex = 1;
- this.txtAndroMDAVersion.Text = "3.2-SNAPSHOT";
//
// lblUseZippedModel
//
@@ -678,83 +677,6 @@
this.header6.TabIndex = 26;
this.header6.Title = "Application Information";
//
- // wizardPageWebCommonProject
- //
- this.wizardPageWebCommonProject.Controls.Add(this.lblMembershipSelectedImage);
- this.wizardPageWebCommonProject.Controls.Add(this.lblMembershipSelected);
- this.wizardPageWebCommonProject.Controls.Add(this.cbConfigureWebCommonProject);
- this.wizardPageWebCommonProject.Controls.Add(this.usrWebCommonProject);
- this.wizardPageWebCommonProject.Controls.Add(this.header8);
- this.wizardPageWebCommonProject.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageWebCommonProject.IsFinishPage = false;
- this.wizardPageWebCommonProject.Location = new System.Drawing.Point(0, 0);
- this.wizardPageWebCommonProject.Name = "wizardPageWebCommonProject";
- this.wizardPageWebCommonProject.Size = new System.Drawing.Size(525, 312);
- this.wizardPageWebCommonProject.TabIndex = 10;
- this.wizardPageWebCommonProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageWebCommonProject_CloseFromNext);
- this.wizardPageWebCommonProject.ShowFromBack += new System.EventHandler(this.wizardPageWebCommonProject_ShowFromBack);
- this.wizardPageWebCommonProject.ShowFromNext += new System.EventHandler(this.wizardPageWebCommonProject_ShowFromNext);
- //
- // lblMembershipSelectedImage
- //
- this.lblMembershipSelectedImage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.lblMembershipSelectedImage.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lblMembershipSelectedImage.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
- this.lblMembershipSelectedImage.ImageIndex = 0;
- this.lblMembershipSelectedImage.ImageList = this.imageList1;
- this.lblMembershipSelectedImage.Location = new System.Drawing.Point(48, 210);
- this.lblMembershipSelectedImage.Name = "lblMembershipSelectedImage";
- this.lblMembershipSelectedImage.Size = new System.Drawing.Size(35, 36);
- this.lblMembershipSelectedImage.TabIndex = 36;
- this.lblMembershipSelectedImage.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- this.lblMembershipSelectedImage.Visible = false;
- //
- // lblMembershipSelected
- //
- this.lblMembershipSelected.Location = new System.Drawing.Point(89, 210);
- this.lblMembershipSelected.Name = "lblMembershipSelected";
- this.lblMembershipSelected.Size = new System.Drawing.Size(357, 47);
- this.lblMembershipSelected.TabIndex = 35;
- this.lblMembershipSelected.Text = "You selected membership support on the previous page which requires a web common " +
- "project. Please enter the name of the new project or select an existing class l" +
- "ibrary project.";
- this.lblMembershipSelected.Visible = false;
- //
- // cbConfigureWebCommonProject
- //
- this.cbConfigureWebCommonProject.AutoSize = true;
- this.cbConfigureWebCommonProject.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.cbConfigureWebCommonProject.Location = new System.Drawing.Point(12, 80);
- this.cbConfigureWebCommonProject.Name = "cbConfigureWebCommonProject";
- this.cbConfigureWebCommonProject.Size = new System.Drawing.Size(202, 17);
- this.cbConfigureWebCommonProject.TabIndex = 0;
- this.cbConfigureWebCommonProject.Text = "Configure web common project";
- this.cbConfigureWebCommonProject.UseVisualStyleBackColor = true;
- this.cbConfigureWebCommonProject.CheckedChanged += new System.EventHandler(this.cbEnableWebCommonProject_CheckedChanged);
- //
- // usrWebCommonProject
- //
- this.usrWebCommonProject.Location = new System.Drawing.Point(30, 102);
- this.usrWebCommonProject.Name = "usrWebCommonProject";
- this.usrWebCommonProject.ProjectName = "";
- this.usrWebCommonProject.Size = new System.Drawing.Size(416, 93);
- this.usrWebCommonProject.TabIndex = 1;
- //
- // header8
- //
- this.header8.BackColor = System.Drawing.SystemColors.Control;
- this.header8.CausesValidation = false;
- this.header8.Description = "The web common project is a class library that contains web site support classes." +
- "";
- this.header8.Dock = System.Windows.Forms.DockStyle.Top;
- this.header8.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox;
- this.header8.Location = new System.Drawing.Point(0, 0);
- this.header8.Name = "header8";
- this.header8.Size = new System.Drawing.Size(525, 65);
- this.header8.TabIndex = 28;
- this.header8.Title = "Web Common Project";
- //
// wizardPageWelcome
//
this.wizardPageWelcome.BackColor = System.Drawing.Color.White;
@@ -1020,6 +942,83 @@
this.header4.TabIndex = 5;
this.header4.Title = "Confirm Choices";
//
+ // wizardPageWebCommonProject
+ //
+ this.wizardPageWebCommonProject.Controls.Add(this.lblMembershipSelectedImage);
+ this.wizardPageWebCommonProject.Controls.Add(this.lblMembershipSelected);
+ this.wizardPageWebCommonProject.Controls.Add(this.cbConfigureWebCommonProject);
+ this.wizardPageWebCommonProject.Controls.Add(this.usrWebCommonProject);
+ this.wizardPageWebCommonProject.Controls.Add(this.header8);
+ this.wizardPageWebCommonProject.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageWebCommonProject.IsFinishPage = false;
+ this.wizardPageWebCommonProject.Location = new System.Drawing.Point(0, 0);
+ this.wizardPageWebCommonProject.Name = "wizardPageWeb...
[truncated message content] |
|
From: Walter M. <wal...@us...> - 2006-12-12 20:38:21
|
User: walterim Date: 06/12/12 12:38:17 Modified: andromda-jsf2/src/test/expected cartridge-output.zip Log: Corrected expected cartridge-output. Revision Changes Path 1.3 +266 -266 cartridges/andromda-jsf2/src/test/expected/cartridge-output.zip <<Binary file>> |
|
From: Walter M. <wal...@us...> - 2006-12-12 18:46:35
|
User: walterim
Date: 06/12/12 10:46:32
Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/preferences
preferences.xhtml.vsl
andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/crud
view.xhtml.vsl
andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/preferences
preferences.jsp.vsl
Log:
Skin names/values corrected in preferences page
Revision Changes Path
1.3 +2 -2 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/preferences/preferences.xhtml.vsl
Index: preferences.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/preferences/preferences.xhtml.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- preferences.xhtml.vsl 11 Dec 2006 13:44:00 -0000 1.2
+++ preferences.xhtml.vsl 12 Dec 2006 18:46:32 -0000 1.3
@@ -20,9 +20,9 @@
<f:selectItem itemLabel="Panel" itemValue="ThemePanel"/>
</tr:selectOneChoice>
<tr:selectOneChoice id="skin" value="#{${preferencesBeanName}.skin}" label="#{messages['preferences.skin']}:">
- <f:selectItem itemLabel="Simple" itemValue="simple"/>
- <f:selectItem itemLabel="Minimal" itemValue="minimal"/>
<f:selectItem itemLabel="Default" itemValue="default"/>
+ <f:selectItem itemLabel="Beach" itemValue="beach"/>
+ <f:selectItem itemLabel="Purple" itemValue="purple"/>
</tr:selectOneChoice>
<tr:inputText id="maxTableRows" value="#{${preferencesBeanName}.maxTableRows}" label="#{messages['preferences.max.table.rows']}:" columns="1">
<f:validateLongRange minimum="5" maximum="100"/>
1.2 +3 -3 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/crud/view.xhtml.vsl
Index: view.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/crud/view.xhtml.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- view.xhtml.vsl 11 Dec 2006 13:43:58 -0000 1.1
+++ view.xhtml.vsl 12 Dec 2006 18:46:32 -0000 1.2
@@ -129,13 +129,13 @@
</f:facet>
<h:panelGroup>
<tr:commandLink action="#{${manageable.controllerBeanName}.load}" >
- <t:graphicImage url="/images/load.gif" title="#{messages['action.load']}" border="0"/>
+ <t:graphicImage url="/skins/#{${preferencesBeanName}.skin}/images/tableLoad.gif" title="#{messages['action.load']}" border="0"/>
<f:param name="${manageable.manageableIdentifier.name}" value="#{row.${manageable.manageableIdentifier.name}}" />
</tr:commandLink>
#if ($manageable.delete)
<tr:spacer width="10" height="1"/>
<tr:commandLink action="#{${manageable.controllerBeanName}.delete}">
- <t:graphicImage url="/images/delete.gif" title="#{messages['action.delete']}" border="0"/>
+ <t:graphicImage url="/skins/#{${preferencesBeanName}.skin}/images/tableDelete.gif" title="#{messages['action.delete']}" border="0"/>
<f:param name="${manageable.manageableIdentifier.name}" value="#{row.${manageable.manageableIdentifier.name}}" />
</tr:commandLink>
#end
@@ -166,7 +166,7 @@
<c:if test="#{${formName}.editState}">
<tr:subform>
<tr:commandLink action="#{${manageable.controllerBeanName}.back}" accessKey="#{messages['action.back.access.key']}">
- <t:graphicImage url="/images/back.gif" title="#{messages['action.back']}" border="0" />
+ <t:graphicImage url="/skins/#{${preferencesBeanName}.skin}/images/back.gif" title="#{messages['action.back']}" border="0" />
</tr:commandLink>
</tr:subform>
<tr:subform id="$formName"#if($clientValidation) onsubmit="return $formValidateName(this);"#end enctype="multipart/form-data">
1.2 +3 -3 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/preferences/preferences.jsp.vsl
Index: preferences.jsp.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/preferences/preferences.jsp.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- preferences.jsp.vsl 5 Dec 2006 19:39:33 -0000 1.1
+++ preferences.jsp.vsl 12 Dec 2006 18:46:32 -0000 1.2
@@ -45,9 +45,9 @@
<f:selectItem itemLabel="Panel" itemValue="ThemePanel"/>
</tr:selectOneChoice>
<tr:selectOneChoice id="skin" value="#{${preferencesBeanName}.skin}" label="#{messages['preferences.skin']}:">
- <f:selectItem itemLabel="Simple" itemValue="simple"/>
- <f:selectItem itemLabel="Minimal" itemValue="minimal"/>
<f:selectItem itemLabel="Default" itemValue="default"/>
+ <f:selectItem itemLabel="Beach" itemValue="beach"/>
+ <f:selectItem itemLabel="Purple" itemValue="purple"/>
</tr:selectOneChoice>
<tr:inputText id="maxTableRows" value="#{${preferencesBeanName}.maxTableRows}" label="#{messages['preferences.max.table.rows']}:" columns="1">
<f:validateLongRange minimum="5" maximum="100"/>
|
|
From: Walter M. <wal...@us...> - 2006-12-12 18:45:39
|
User: walterim
Date: 06/12/12 10:45:39
Added: andromda-jsf2/src/main/resources/resources/views/skins/beach/images
back.gif tableDelete.gif tableLoad.gif
andromda-jsf2/src/main/resources/resources/views/skins/default/images
tableDelete.gif back.gif tableLoad.gif
andromda-jsf2/src/main/resources/resources/views/skins/purple/images
tableDelete.gif back.gif tableLoad.gif
andromda-jsf2/src/main/resources/resources/views/images
tableDelete.gif tableLoad.gif
Removed: andromda-jsf2/src/main/resources/resources/views/images
delete.gif load.gif
Log:
More images assigned to skins.
Revision Changes Path
1.1 cartridges/andromda-jsf2/src/main/resources/resources/views/skins/beach/images/back.gif
<<Binary file>>
1.1 cartridges/andromda-jsf2/src/main/resources/resources/views/skins/beach/images/tableDelete.gif
<<Binary file>>
1.1 cartridges/andromda-jsf2/src/main/resources/resources/views/skins/beach/images/tableLoad.gif
<<Binary file>>
1.1 cartridges/andromda-jsf2/src/main/resources/resources/views/skins/default/images/tableDelete.gif
<<Binary file>>
1.1 cartridges/andromda-jsf2/src/main/resources/resources/views/skins/default/images/back.gif
<<Binary file>>
1.1 cartridges/andromda-jsf2/src/main/resources/resources/views/skins/default/images/tableLoad.gif
<<Binary file>>
1.1 cartridges/andromda-jsf2/src/main/resources/resources/views/skins/purple/images/tableDelete.gif
<<Binary file>>
1.1 cartridges/andromda-jsf2/src/main/resources/resources/views/skins/purple/images/back.gif
<<Binary file>>
1.1 cartridges/andromda-jsf2/src/main/resources/resources/views/skins/purple/images/tableLoad.gif
<<Binary file>>
1.1 cartridges/andromda-jsf2/src/main/resources/resources/views/images/tableDelete.gif
<<Binary file>>
1.1 cartridges/andromda-jsf2/src/main/resources/resources/views/images/tableLoad.gif
<<Binary file>>
|
User: walterim
Date: 06/12/12 10:41:45
Removed: andromda-jsf2/src/main/resources/resources/lib tomahawk.jar
myfaces-impl.jar myfaces-shared-tomahawk.jar
trinidad-impl-incubator-m1-SNAPSHOT.jar
trinidad-api-incubator-m1-SNAPSHOT.jar
myfaces-api.jar
Log:
Removing unnecessary jars.
|
