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: Eric C. <ecr...@us...> - 2006-06-15 15:01:15
|
User: ecrutchfield
Date: 06/06/15 08:01:09
Modified: andromda-nhibernate/src/main/resources/templates/nhibernate
NHibernateEmbeddedValueImpl.vsl
NHibernateEmbeddedValue.vsl
Log:
Made EmbeddedValue objects serializable.
Revision Changes Path
1.3 +1 -0 cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEmbeddedValueImpl.vsl
Index: NHibernateEmbeddedValueImpl.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEmbeddedValueImpl.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- NHibernateEmbeddedValueImpl.vsl 9 Apr 2006 14:32:40 -0000 1.2
+++ NHibernateEmbeddedValueImpl.vsl 15 Jun 2006 15:01:08 -0000 1.3
@@ -14,6 +14,7 @@
/// <summary>
/// <see cref="$embeddedValue.fullyQualifiedName"/>
/// </summary>
+ [Serializable]
public#if ($embeddedValue.abstract) abstract#end class $embeddedValue.implementationName
: $embeddedValue.fullyQualifiedName
{
1.2 +1 -0 cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEmbeddedValue.vsl
Index: NHibernateEmbeddedValue.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEmbeddedValue.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- NHibernateEmbeddedValue.vsl 8 Mar 2006 04:15:24 -0000 1.1
+++ NHibernateEmbeddedValue.vsl 15 Jun 2006 15:01:08 -0000 1.2
@@ -14,6 +14,7 @@
/// <summary>
$embeddedValue.getDocumentation(" /// ")
/// </summary>
+ [Serializable]
public abstract class $embeddedValue.name
#if($embeddedValue.generalization)
: $embeddedValue.generalization.fullyQualifiedName
|
|
From: Eric C. <ecr...@us...> - 2006-06-15 15:00:06
|
User: ecrutchfield
Date: 06/06/15 07:59:56
Modified: andromda-nspring/src/main/java/org/andromda/cartridges/nspring/metafacades
SpringGlobals.java SpringServiceLogicImpl.java
andromda-nspring/src/main/resources/templates/nspring
NSpringDaoInterface.vsl NSpringHibernateDaoBase.vsl
NSpringHibernateDaoImpl.vsl
andromda-nspring/src/main/resources/META-INF/andromda
profile.xml namespace.xml cartridge.xml
metafacades.xml
Added: andromda-nspring/src/main/resources/templates/nspring
NSpringServiceInterface.vsl NSpringServiceImpl.vsl
NSpringServiceBase.vsl
Removed: andromda-nspring/src/main/resources/templates/nspring
NSpringHibernateDaoImplManual.vsl
Log:
[Applied Naresh's latest code for generating services] - Added capabilty to generate service layer. Merged manual and normal DaoImpl templated into one.
Revision Changes Path
1.2 +5 -0 cartridges/andromda-nspring/src/main/java/org/andromda/cartridges/nspring/metafacades/SpringGlobals.java
Index: SpringGlobals.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/java/org/andromda/cartridges/nspring/metafacades/SpringGlobals.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- SpringGlobals.java 8 Mar 2006 04:18:24 -0000 1.1
+++ SpringGlobals.java 15 Jun 2006 14:59:55 -0000 1.2
@@ -18,6 +18,11 @@
final static String EJB_IMPLEMENTATION_SUFFIX = "Bean";
/**
+ * The pattern used to construct the service interface name.
+ */
+ static final String SERVICE_INTERFACE_PATTERN = "serviceInterfaceNamePattern";
+
+ /**
* The service base class suffix.
*/
final static String SERVICE_BASE_SUFFIX = "Base";
1.2 +30 -0 cartridges/andromda-nspring/src/main/java/org/andromda/cartridges/nspring/metafacades/SpringServiceLogicImpl.java
Index: SpringServiceLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/java/org/andromda/cartridges/nspring/metafacades/SpringServiceLogicImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- SpringServiceLogicImpl.java 8 Mar 2006 04:18:24 -0000 1.1
+++ SpringServiceLogicImpl.java 15 Jun 2006 14:59:55 -0000 1.2
@@ -101,6 +101,16 @@
}
/**
+ * @see org.andromda.cartridges.nspring.metafacades.SpringService#getFullyQualifiedInterfaceName()
+ */
+ protected java.lang.String handleGetFullyQualifiedInterfaceName()
+ {
+ return SpringMetafacadeUtils.getFullyQualifiedName(
+ this.getPackageName(),
+ this.getInterfaceName());
+ }
+
+ /**
* @see org.andromda.cartridges.nspring.metafacades.SpringService#getBaseName()
*/
protected java.lang.String handleGetBaseName()
@@ -235,6 +245,26 @@
}
/**
+ * @see org.andromda.cartridges.nspring.metafacades.SpringServiceLogic#handleGetInterfaceName()
+ */
+ protected String handleGetInterfaceName()
+ {
+ return this.getInterfaceNamePattern().replaceAll(
+ "\\{0\\}",
+ this.getName());
+ }
+
+ /**
+ * Gets the value of the {@link SpringGlobals#SERVICE_INTERFACE_PATTERN}
+ *
+ * @return the service interface name pattern.
+ */
+ private String getInterfaceNamePattern()
+ {
+ return String.valueOf(this.getConfiguredProperty(SpringGlobals.SERVICE_INTERFACE_PATTERN));
+ }
+
+ /**
* @see org.andromda.cartridges.nspring.metafacades.SpringService#isRemotable()
*/
protected boolean handleIsRemotable()
1.3 +15 -20 cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringDaoInterface.vsl
Index: NSpringDaoInterface.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringDaoInterface.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- NSpringDaoInterface.vsl 9 Apr 2006 13:49:12 -0000 1.2
+++ NSpringDaoInterface.vsl 15 Jun 2006 14:59:55 -0000 1.3
@@ -80,39 +80,36 @@
/// <summary>
/// <p>
- /// Does the same thing as <seealso cref="#Load($identifier.type.fullyQualifiedName)"/> with an
+ /// Does the same thing as <seealso cref="${entity.daoName}.Load($identifier.type.fullyQualifiedName)"/> with an
/// additional flag called <code>transform</code>. If this flag is set to <code>$daoNoTransformationEnumName</code> then
/// the returned entity will <strong>NOT</strong> be transformed. If this flag is any of the other constants
/// defined in this class then the result <strong>WILL BE</strong> passed through an operation which can
/// optionally transform the entity (into a value object for example). By default, transformation does
/// not occur.
/// </p>
- ///
+ /// </summary>
/// <param name="$identifier.name">the identifier of the entity to load.</param>
/// <returns>either the entity or the object transformed from the entity.</returns>
- /// </summary>
Object Load(int transform, $identifier.type.fullyQualifiedName $identifier.name);
/// <summary>
/// Loads all entities of type <seealso cref="${entity.fullyQualifiedEntityName}"/>.
- ///
- /// <returns>the loaded entities.</returns>
/// </summary>
+ /// <returns>the loaded entities.</returns>
System.Collections.IList LoadAll();
/// <summary>
/// <p>
- /// Does the same thing as <seealso cref="#LoadAll()"/> with an
+ /// Does the same thing as <seealso cref="${entity.daoName}.LoadAll()"/> with an
/// additional flag called <code>transform</code>. If this flag is set to <code>$daoNoTransformationEnumName</code> then
/// the returned entity will <strong>NOT</strong> be transformed. If this flag is any of the other constants
/// defined here then the result <strong>WILL BE</strong> passed through an operation which can optionally
/// 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>
- /// </summary>
System.Collections.IList LoadAll(int transform);
#end
@@ -125,7 +122,7 @@
/// <summary>
/// <p>
- /// Does the same thing as <seealso cref="#Create($entity.fullyQualifiedEntityName)"/> with an
+ /// Does the same thing as <seealso cref="${entity.daoName}.Create($entity.fullyQualifiedEntityName)"/> with an
/// additional flag called <code>transform</code>. If this flag is set to <code>$daoNoTransformationEnumName</code> then
/// the returned entity will <strong>NOT</strong> be transformed. If this flag is any of the other constants
/// defined here then the result <strong>WILL BE</strong> passed through an operation which can optionally
@@ -139,16 +136,14 @@
/// <summary>
/// Creates a new instance of $entity.fullyQualifiedEntityName and adds
/// from the passed in <code>entities</code> collection
- ///
+ /// </summary>
/// <param name="entities">the collection of $entity.fullyQualifiedEntityName instances to create.</param>
- ///
/// <returns>the created instances.</returns>
- /// </summary>
System.Collections.ICollection Create(System.Collections.ICollection entities);
/// <summary>
/// <p>
- /// Does the same thing as <seealso cref="#Create($entity.fullyQualifiedEntityName)"/> with an
+ /// Does the same thing as <seealso cref="${entity.daoName}.Create($entity.fullyQualifiedEntityName)"/> with an
/// additional flag called <code>transform</code>. If this flag is set to <code>$daoNoTransformationEnumName</code> then
/// the returned entity will <strong>NOT</strong> be transformed. If this flag is any of the other constants
/// defined here then the result <strong>WILL BE</strong> passed through an operation which can optionally
@@ -177,7 +172,7 @@
/// <summary>
/// <p>
- /// Does the same thing as <seealso cref="#Create($entity.getAttributeTypeList(true,false))"/> with an
+ /// Does the same thing as <seealso cref="${entity.daoName}.Create($entity.getAttributeTypeList(true,false))"/> with an
/// additional flag called <code>transform</code>. If this flag is set to <code>$daoNoTransformationEnumName</code> then
/// the returned entity will <strong>NOT</strong> be transformed. If this flag is any of the other constants
/// defined here then the result <strong>WILL BE</strong> passed through an operation which can optionally
@@ -210,7 +205,7 @@
/// <summary>
/// <p>
- /// Does the same thing as <seealso cref="#Create($entity.getRequiredAttributeTypeList(true,false))"/> with an
+ /// Does the same thing as <seealso cref="${entity.daoName}.Create($entity.getRequiredAttributeTypeList(true,false))"/> with an
/// additional flag called <code>transform</code>. If this flag is set to <code>$daoNoTransformationEnumName</code> then
/// the returned entity will <strong>NOT</strong be transformed. If this flag is any of the other constants
/// defined here then the result <strong>WILL BE</strong> passed through an operation which can optionally
@@ -273,9 +268,9 @@
#if(!$operation.criteriaFinder)
/// <summary>
/// <p>
- /// Does the same thing as <seealso cref="#${operation.getSignature(false)}"/> with an
+ /// Does the same thing as <seealso cref="${operation.getSignature(false)}"/> with an
/// additional argument called <code>queryString</code>. This <code>queryString</code>
- /// argument allows you to override the query string defined in <seealso cref="#${operation.getSignature(false)}"/>.
+ /// argument allows you to override the query string defined in <seealso cref="${entity.daoName}.${operation.getSignature(false)}"/>.
/// </p>
/// </summary>
#if ($operation.exceptionsPresent)
@@ -290,7 +285,7 @@
#end
/// <summary>
/// <p>
- /// Does the same thing as <seealso cref="#${operation.getSignature(false)}"/> with an
+ /// Does the same thing as <seealso cref="${entity.daoName}.${operation.getSignature(false)}"/> with an
/// additional flag called <code>transform</code>. If this flag is set to <code>$daoNoTransformationEnumName</code> then
/// finder results will <strong>NOT</strong> be transformed during retrieval.
/// If this flag is any of the other constants defined here
@@ -308,7 +303,7 @@
/// <summary>
/// <p>
- /// Does the same thing as <seealso cref="#${operation.name}(boolean#if(!$operation.arguments.empty), ${operation.argumentTypeNames}#end)"/> with an
+ /// Does the same thing as <seealso cref="${entity.daoName}.${operation.name}(boolean#if(!$operation.arguments.empty), ${operation.argumentTypeNames}#end)"/> with an
/// additional argument called <code>queryString</code>. This <code>queryString</code>
/// argument allows you to override the query string defined in <seealso cref="#${operation.name}(int#if(!$operation.arguments.empty), ${operation.typedArgumentList}#end)"/>.
/// </p>
@@ -322,7 +317,7 @@
#else
/// <summary>
/// <p>
- /// Does the same thing as <seealso cref="#${operation.getSignature(false)}"/> with an
+ /// Does the same thing as <seealso cref="${entity.daoName}.${operation.getSignature(false)}"/> with an
/// additional flag called <code>transform</code>. If this flag is set to <code>$daoNoTransformationEnumName</code> then
/// finder results will <strong>NOT</strong> be transformed during retrieval.
/// If this flag is any of the other constants defined here
1.4 +2 -4 cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringHibernateDaoBase.vsl
Index: NSpringHibernateDaoBase.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringHibernateDaoBase.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- NSpringHibernateDaoBase.vsl 9 Apr 2006 13:49:12 -0000 1.3
+++ NSpringHibernateDaoBase.vsl 15 Jun 2006 14:59:55 -0000 1.4
@@ -542,11 +542,10 @@
#end
///
/// If the integer argument value is unknown <seealso cref="${entity.daoNoTransformationConstantName}"/> is assumed.
- ///
+ /// </summary>
/// <param name="transform">one of the constants declared in <seealso cref="$entity.fullyQualifiedDaoName"/></param>
/// <param name="entity">an entity that was found</param>
/// <returns>the transformed entity (i.e. new value object, etc) <see cref="#TransformEntities(int,System.Collections.ICollection)"/></returns>
- /// </summary>
protected Object TransformEntity(int transform, $entity.fullyQualifiedName entity)
{
Object target = null;
@@ -586,11 +585,10 @@
/// <seealso cref="#TransformEntity(int,$entity.fullyQualifiedName)"/> method.
/// <p/>
/// This method is to be used internally only.
- ///
+ /// </summary>
/// <param name="transform">one of the constants declared in <code>$entity.fullyQualifiedDaoName</code></param>
/// <param name="entities">the collection of entities to transform</param>
/// <returns>a new list containing the transformed entities <see cref="#TransformEntity(int,$entity.fullyQualifiedName)"/></returns>
- /// </summary>
protected $inheritanceModifierAllEntityMethod System.Collections.IList TransformEntities(int transform, System.Collections.ICollection entities)
{
System.Collections.IList entityList = null;
1.3 +46 -0 cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringHibernateDaoImpl.vsl
Index: NSpringHibernateDaoImpl.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringHibernateDaoImpl.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- NSpringHibernateDaoImpl.vsl 9 Apr 2006 13:49:12 -0000 1.2
+++ NSpringHibernateDaoImpl.vsl 15 Jun 2006 14:59:55 -0000 1.3
@@ -2,8 +2,13 @@
// Name: ${entity.daoImplementationName}.cs
// license-header cs merge-point
//
+#if ($entity.daoImplementationRequired)
+// This is only generated once! It will never be overwritten.
+// You can (and have to!) safely modify it by hand.
+#else
// Attention: Generated code! Do not modify by hand!
// Generated by: NSpringHibernateDaoImpl.vsl in andromda-nspring-cartridge.
+#end
using System;
@@ -17,6 +22,47 @@
/// </summary>
public class $entity.daoImplementationName : $entity.fullyQualifiedDaoBaseName
{
+#foreach ($operation in $entity.daoBusinessOperations)
+#set ($returnType = $operation.returnType)
+#set ($returnObject = "returnValue")
+#set ($signature = $operation.implementationSignature)
+ /// <summary>
+ /// @see ${entity.fullyQualifiedDaoName}#${operation.getSignature(false)}
+ /// </summary>
+ protected override $returnType.fullyQualifiedName $signature
+#if ($operation.exceptionsPresent)
+ throws $operation.exceptionList
+#end
+ {
+ //@todo implement $operation.visibility $returnType.fullyQualifiedName $signature
+#if ($operation.returnTypePresent)
+ return $operation.returnType.javaNullString;
+#else
+ throw new InvalidOperationException("${entity.fullyQualifiedName}.${signature} Not implemented!");
+#end
+ }
+
+#end
+#foreach ($valueObjectRef in $entity.valueObjectReferences)
+ /// <summary>
+ /// @see ${entity.fullyQualifiedDaoName}#${valueObjectRef.transformationMethodName}($entity.fullyQualifiedName)
+ /// </summary>
+ public override $valueObjectRef.targetElement.fullyQualifiedName ${valueObjectRef.transformationMethodName}($entity.fullyQualifiedName entity)
+ {
+ // put your implementation here
+ return null;
+ }
+
+ /// <summary>
+ /// @see ${entity.fullyQualifiedDaoName}#${valueObjectRef.transformationToEntityMethodName}($valueObjectRef.targetElement.fullyQualifiedName)
+ /// </summary>
+ public override $entity.fullyQualifiedEntityName ${valueObjectRef.transformationToEntityMethodName}($valueObjectRef.targetElement.fullyQualifiedName $stringUtils.uncapitalize($valueObjectRef.name))
+ {
+ // put your implementation here
+ return null;
+ }
+
+#end
}
#if ($stringUtils.isNotBlank($entity.packageName))
}
1.1 cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringServiceInterface.vsl
Index: NSpringServiceInterface.vsl
===================================================================
#set ($generatedFile = "${service.packagePath}/${service.interfaceName}.cs")
// Name: ${service.name}.cs
// license-header cs merge-point
//
// Attention: Generated code! Do not modify by hand!
// Generated by: NSpringServiceInterface.vsl in andromda-nspring-cartridge.
using System;
#if ($stringUtils.isNotBlank($service.packageName))
namespace $service.packageName
{
#end
/// <summary>
$service.getDocumentation(" /// ")
/// </summary>
public interface $service.interfaceName
#if ($service.generalization)
: $service.generalization.fullyQualifiedName
#if (!$service.interfaceAbstractions.empty)
, $service.implementedInterfaceList
#end
#else
#if (!$service.interfaceAbstractions.empty)
, $service.implementedInterfaceList
#end
#end
{
#foreach ($operation in $service.operations)
/// <summary>
$operation.getDocumentation(" /// ")
/// </summary>
#if ($operation.exceptionsPresent)
$operation.visibility $operation.returnType.fullyQualifiedName $operation.signature
$operation.throwsClause;
#else
$operation.returnType.fullyQualifiedName $operation.signature;
#end
#end
}
#if ($stringUtils.isNotBlank($service.packageName))
}
#end
1.1 cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringServiceImpl.vsl
Index: NSpringServiceImpl.vsl
===================================================================
#set ($generatedFile = "${service.packagePath}/${service.implementationName}.cs")
// Name: ${service.implementationName}.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;
#if ($stringUtils.isNotBlank($service.packageName))
namespace $service.packageName
{
#end
/// <summary>
/// @see $service.fullyQualifiedName
/// </summary>
public#if($service.abstract) abstract#end class $service.implementationName
: $service.fullyQualifiedBaseName
{
private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof($service.implementationName));
#foreach ($operation in $service.operations)
/// <summary>
/// @see ${service.fullyQualifiedName}#${operation.getSignature(false)}
/// </summary>
#set ($abstract = $service.abstract && $operation.abstract)
#if ($abstract)
#set ($termination = ";")
#else
#set ($termination = "")
#end
protected#if ($abstract) abstract#else override#end $operation.returnType.fullyQualifiedName $operation.implementationSignature$termination
#if (!$abstract)
{
// put your implementation here
#if ($operation.returnTypePresent)
return $operation.returnType.javaNullString;
#else
throw new InvalidOperationException("${service.fullyQualifiedName}.${operation.implementationSignature} Not implemented!");
#end
}
#end
#end
}
#if ($stringUtils.isNotBlank($service.packageName))
}
#end
1.1 cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringServiceBase.vsl
Index: NSpringServiceBase.vsl
===================================================================
#set ($generatedFile = "${service.packagePath}/${service.baseName}.cs")
// Name: ${service.baseName}.cs
// license-header cs merge-point
//
// Attention: Generated code! Do not modify by hand!
// Generated by: NSpringServiceBase.vsl in andromda-nspring-cartridge.
using System;
using AndroMDA.NHibernateSupport;
#if ($stringUtils.isNotBlank($service.packageName))
namespace $service.packageName
{
#end
/// <summary>
/// <p>
/// Spring Service base class for <code>$service.fullyQualifiedName</code>,
/// provides access to all services and entities referenced by this service.
/// </p>
///
/// @see $service.fullyQualifiedName
/// </summary>
public abstract class $service.baseName
#if($service.generalization)
: $service.generalization.fullyQualifiedImplementationName
#else
: $service.fullyQualifiedInterfaceName
#end
{
private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof($service.baseName));
#foreach($entityRef in $service.entityReferences)
#set ($daoPropertyName = "$stringUtils.capitalize($entityRef.name)Dao")
/// <summary>Property to access $daoPropertyName</summary>
protected $entityRef.targetElement.fullyQualifiedDaoName $daoPropertyName
{
get { return ${springTypesPackage}.DaoFactory.Get$daoPropertyName(); }
}
#end
#foreach ($operation in $service.operations)
/// <summary>
/// @see ${service.fullyQualifiedName}#${operation.getSignature(false)}
/// </summary>
$operation.visibility $operation.returnType.fullyQualifiedName $operation.signature
{
#if ($requiredCheckEnabled)
#foreach ($argument in $operation.arguments)
#if ($argument.required && !$argument.type.primitive)
if ($argument.name == null)
{
throw new ArgumentNullException(
"${service.fullyQualifiedName}.${operation.signature} - '${argument.name}' can not be null");
}
#end
#end
#end
#if ($operation.constraintsPresent)
this.$operation.preconditionCall;
#end
#set ($call = "${operation.implementationCall};")
## If transactionType is PROPAGATION_REQUIRED then wrap the call with Hibernate session and transaction
#if ($operation.transactionType == "PROPAGATION_REQUIRED")
#if ($operation.returnTypePresent)
#if ($operation.returnType.primitive)
$operation.returnType.fullyQualifiedName result;
#else
$operation.returnType.fullyQualifiedName result = null;
#end
#end
SessionManagerFactory.SessionManager.HandleSessionStart();
SessionManagerFactory.SessionManager.BeginTransaction();
try
{
#if ($operation.returnTypePresent)
result = $call
#else
$call
#end
SessionManagerFactory.SessionManager.CommitTransaction();
}
catch (Exception ex)
{
SessionManagerFactory.SessionManager.RollbackTransaction();
log.Error(ex);
throw;
}
finally
{
SessionManagerFactory.SessionManager.HandleSessionEnd();
}
#if ($operation.returnTypePresent)
return result;
#end
#else
## If transactionType is not PROPAGATION_REQUIRED then make a simple call
#if ($operation.returnTypePresent)
return $call
#else
$call
#end
#end
}
#if ($operation.constraintsPresent)
/// <summary>
/// Performs any precondition checks for {@link #${operation.call}}.
/// </summary>
private void $operation.preconditionSignature
{
#renderPreconditions($operation)
}
#end
/// <summary>
/// Performs the core logic for {@link #${operation.getSignature(false)}}
/// <summary>
protected abstract $operation.returnType.fullyQualifiedName $operation.implementationSignature;
#end
}
#if ($stringUtils.isNotBlank($service.packageName))
}
#end
1.2 +5 -2 cartridges/andromda-nspring/src/main/resources/META-INF/andromda/profile.xml
Index: profile.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/resources/META-INF/andromda/profile.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- profile.xml 8 Mar 2006 04:18:36 -0000 1.1
+++ profile.xml 15 Jun 2006 14:59:55 -0000 1.2
@@ -87,8 +87,11 @@
</element>
<element name="TRANSACTION_TYPE">
<documentation>
- Defines a Spring transaction type for the service operation
- (when <strong>NOT</strong> wrapped by EJBs).
+ Defines whether the service operation will start a new NHibernate session
+ and a transaction. PROPAGATION_REQUIRED, which is the default value,
+ will start a new session and transaction and PROPAGATION_SUPPORTS will
+ not. Other values are not supported by the NSpring cartridge and should
+ not be used.
</documentation>
<value>@andromda.spring.transaction.type</value>
<appliedOnElement>Service Operation</appliedOnElement>
1.2 +14 -0 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.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- namespace.xml 8 Mar 2006 04:18:36 -0000 1.1
+++ namespace.xml 15 Jun 2006 14:59:55 -0000 1.2
@@ -30,6 +30,12 @@
will be generated.
</documentation>
</property>
+ <property name="service-interfaces">
+ <documentation>
+ The location to which all service interfaces and common API classes such
+ as default service exceptions will be generated.
+ </documentation>
+ </property>
<property name="daos">
<documentation>
The location to which Spring DAOs, and any support classes.
@@ -211,6 +217,14 @@
package ending in the <em>ejb</em> package.
</documentation>
</property>
+ <property name="serviceInterfaceNamePattern">
+ <default>I{0}</default>
+ <documentation>
+ The pattern to use when constructing the service interface name. <em>{0}</em> is used to represent
+ the entity name in the model, so if you specified a value of <code>I{0}</code> all
+ the entities generated would have a prefix of "I".
+ </documentation>
+ </property>
<property name="defaultServiceExceptionNamePattern">
<default>{0}Exception</default>
<documentation>
1.3 +43 -1 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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- cartridge.xml 25 Mar 2006 20:24:02 -0000 1.2
+++ cartridge.xml 15 Jun 2006 14:59:55 -0000 1.3
@@ -153,7 +153,7 @@
</template>
<template
- path="templates/nspring/NSpringHibernateDaoImplManual.vsl"
+ path="templates/nspring/NSpringHibernateDaoImpl.vsl"
outputPattern="$generatedFile"
outlet="dao-impls"
overwrite="false">
@@ -166,6 +166,48 @@
</modelElements>
</template>
+ <template
+ path="templates/nspring/NSpringServiceInterface.vsl"
+ outputPattern="$generatedFile"
+ outlet="service-interfaces"
+ overwrite="true">
+ <modelElements variable="service">
+ <modelElement>
+ <type name="org.andromda.cartridges.nspring.metafacades.SpringService">
+ <property name="configonly">false</property>
+ </type>
+ </modelElement>
+ </modelElements>
+ </template>
+
+ <template
+ path="templates/nspring/NSpringServiceBase.vsl"
+ outputPattern="$generatedFile"
+ outlet="services"
+ overwrite="true">
+ <modelElements variable="service">
+ <modelElement>
+ <type name="org.andromda.cartridges.nspring.metafacades.SpringService">
+ <property name="configonly">false</property>
+ </type>
+ </modelElement>
+ </modelElements>
+ </template>
+
+ <template
+ path="templates/nspring/NSpringServiceImpl.vsl"
+ outputPattern="$generatedFile"
+ outlet="service-impls"
+ overwrite="false">
+ <modelElements variable="service">
+ <modelElement>
+ <type name="org.andromda.cartridges.nspring.metafacades.SpringService">
+ <property name="configonly">false</property>
+ </type>
+ </modelElement>
+ </modelElements>
+ </template>
+
<!-- cartridge-template merge-point -->
</cartridge>
\ No newline at end of file
1.2 +1 -0 cartridges/andromda-nspring/src/main/resources/META-INF/andromda/metafacades.xml
Index: metafacades.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/resources/META-INF/andromda/metafacades.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- metafacades.xml 8 Mar 2006 04:18:36 -0000 1.1
+++ metafacades.xml 15 Jun 2006 14:59:55 -0000 1.2
@@ -17,6 +17,7 @@
<property reference="entityNamePattern"/>
<property reference="hibernateQueryUseNamedParameters"/>
<property reference="hibernateInheritanceStrategy"/>
+ <property reference="serviceInterfaceNamePattern"/>
<property reference="serviceOperationTransactionType"/>
<property reference="ejbServiceOperationTransactionType"/>
<property reference="serviceHibernateInterceptorEnabled"/>
|
|
From: Chris M. <cm...@us...> - 2006-06-15 03:29:37
|
User: cmicali
Date: 06/06/14 20:29:32
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn AndroMDA VS2005
Add-In Readme.rtf
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
AddInSettings.cs MDASolutionManager.cs
MavenProxy.cs VS80AddIn.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs
AboutOptionsPage.designer.cs AboutOptionsPage.resx
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils
VSExternalToolProxy.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer AndroMDA
VS2005 Add-In Setup.exe AndroMDA VS2005 Add-In
Setup.nsi
Log:
- Reworked and simplified the process launch code
- Added dialog to catch missing dependencies and ask user to rerun with online mode
- Slightly tweaked about dialog
Revision Changes Path
No revision
No revision
No revision
No revision
1.8 +15 -7 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/AddInSettings.cs
Index: AddInSettings.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/AddInSettings.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- AddInSettings.cs 5 Jun 2006 22:27:23 -0000 1.7
+++ AddInSettings.cs 15 Jun 2006 03:29:32 -0000 1.8
@@ -239,22 +239,30 @@
#region Helper methods
- public bool IsInIgnoreList(string file)
+ public bool IsInIgnoreList(string fileToTest)
{
- return IsInIgnoreList(file, true);
+ return IsInIgnoreList(fileToTest, true);
}
- public bool IsInIgnoreList(string file, bool stripPath)
+ public bool IsInIgnoreList(string fileToTest, bool stripPath)
{
// Get the list of files to ignore
- string[] ignoreFiles = ResyncIgnoreList.Split(new char[] { ';' });
+ string[] filesIgnored = ResyncIgnoreList.Split(new char[] { ';' });
+
+ // Strip the path of the input file
if (stripPath)
{
- file = FileUtils.GetFilename(file);
+ fileToTest = FileUtils.GetFilename(fileToTest);
}
- foreach (string s in ignoreFiles)
+ // Make the file name lowercase and trim space off the ends
+ fileToTest = fileToTest.ToLower().Trim();
+
+ // Iterate through the ignored files
+ foreach (string ignoredFile in filesIgnored)
{
- if (s.ToLower().Equals(file.ToLower()))
+ string ignoredFileCleaned = ignoredFile.ToLower().Trim();
+ // TODO: Support regular expressions
+ if (ignoredFileCleaned == fileToTest)
{
return true;
}
1.13 +27 -8 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.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- MDASolutionManager.cs 5 Jun 2006 22:27:23 -0000 1.12
+++ MDASolutionManager.cs 15 Jun 2006 03:29:32 -0000 1.13
@@ -45,7 +45,7 @@
private Mutex m_restartBuildMutex = new Mutex(false);
//private MavenProxy m_mavenProxy = null;
- private VSExternalToolProxy m_mavenProxy = null;
+ private MavenProxy m_mavenProxy = null;
private int m_progress;
@@ -355,6 +355,12 @@
MavenLastRunDateTime = null;
}
+ public void RunMaven(bool forceOnlineMode)
+ {
+ m_mavenProxy.ForceOnlineMode = forceOnlineMode;
+ RunMaven();
+ }
+
public void RunMaven()
{
if (IsEnabled)
@@ -392,6 +398,16 @@
break;
case VSExternalToolProxy.ToolExitStatus.Error:
m_applicationObject.StatusBar.Text = "AndroMDA: Generation failed";
+ if (m_mavenProxy.Status == MavenProxy.MavenStatus.UnsatisfiedDependency &&
+ (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)
+ {
+ // Rerun maven without the -o option
+ RunMaven(true);
+ }
+ }
break;
}
}
@@ -616,18 +632,21 @@
private ArrayList GetFileListFromProjectTree(ProjectItem item)
{
ArrayList filesList = new ArrayList();
+ if (item.Kind == EnvDTE.Constants.vsProjectItemKindPhysicalFile)
+ {
for (short i = 1; i <= item.FileCount; i++)
{
string filename = item.get_FileNames(i);
- if (!m_addInSettings.IsInIgnoreList(filename))
- {
filesList.Add(filename);
}
}
+ else if (item.Kind == EnvDTE.Constants.vsProjectItemKindPhysicalFolder)
+ {
foreach (ProjectItem childItem in item.ProjectItems)
{
filesList.AddRange(GetFileListFromProjectTree(childItem));
}
+ }
return filesList;
}
1.4 +55 -20 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/MavenProxy.cs
Index: MavenProxy.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/MavenProxy.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- MavenProxy.cs 3 May 2006 20:23:05 -0000 1.3
+++ MavenProxy.cs 15 Jun 2006 03:29:32 -0000 1.4
@@ -32,8 +32,23 @@
public class MavenProxy : VSExternalToolProxy
{
+ public enum MavenStatus { None, UnsatisfiedDependency }
+
private AddInSettings m_addInSettings = null;
private string m_mavenOptions;
+ private MavenStatus m_mavenStatus;
+ private bool m_forceOnlineMode;
+
+ public MavenStatus Status
+ {
+ get { return m_mavenStatus; }
+ }
+
+ public bool ForceOnlineMode
+ {
+ get { return m_forceOnlineMode; }
+ set { m_forceOnlineMode = value; }
+ }
public MavenProxy(EnvDTE.DTE applicationObject, AddInSettings addInSettings)
: base(applicationObject)
@@ -51,16 +66,16 @@
{
m_addInSettings = addInSettings;
this.Failed += new ThreadExceptionEventHandler(m_mavenProxy_Failed);
- this.Cancelled += new EventHandler(m_mavenProxy_Cancelled);
- this.ProcessStdOut += new ProcessTextDelegate(MavenProxy_ProcessOutput);
- this.ProcessStdErr += new ProcessTextDelegate(MavenProxy_ProcessOutput);
+ this.Cancelled += new EventHandler(m_mavenProxy_Canceled);
+ this.ProcessStdOut += new ProcessTextDelegate(MavenProxy_ProcessStdOut);
+ this.ProcessStdErr += new ProcessTextDelegate(MavenProxy_ProcessStdErr);
}
- void m_mavenProxy_Cancelled(object sender, EventArgs e)
+ void m_mavenProxy_Canceled(object sender, EventArgs e)
{
this.OutputWindowPane.OutputString("\n");
- this.OutputWindowPane.OutputString("Generation cancelled\n");
- ApplicationObject.StatusBar.Text = "AndroMDA: Generation cancelled";
+ this.OutputWindowPane.OutputString("Generation canceled\n");
+ ApplicationObject.StatusBar.Text = "AndroMDA: Generation canceled";
}
void m_mavenProxy_Failed(object sender, ThreadExceptionEventArgs e)
@@ -78,10 +93,23 @@
ApplicationObject.StatusBar.Highlight(true);
}
- void MavenProxy_ProcessOutput(ref string text, ref bool cancelOutput)
+ void MavenProxy_ProcessStdErr(ref string text, ref bool cancelOutput)
{
- if (text.Length > 0)
+ ProcessOutput(ref text, ref cancelOutput);
+ if (text.Contains("The build cannot continue because of the following unsatisfied dependency"))
{
+ m_mavenStatus = MavenStatus.UnsatisfiedDependency;
+ }
+ }
+
+ void MavenProxy_ProcessStdOut(ref string text, ref bool cancelOutput)
+ {
+ ProcessOutput(ref text, ref cancelOutput);
+ }
+
+ private void ProcessOutput(ref string text, ref bool cancelOutput)
+ {
+ if (text == string.Empty) return;
// Filter out the full java strack trace from any errors that occur when maven runs
if (text.Trim()[0] == '\t' || text.Contains(".java:") || text.Contains("(Native Method)"))
{
@@ -96,7 +124,6 @@
}
}
}
- }
public override void BeforeStart()
{
@@ -125,6 +152,12 @@
}
}
+ if (m_forceOnlineMode)
+ {
+ m_mavenOptions = m_mavenOptions.Replace("-o", string.Empty);
+ m_forceOnlineMode = false;
+ }
+
this.OutputWindowPane.OutputString("Launching 'maven " + m_mavenOptions + "'...\n\n");
string java_home = System.Environment.GetEnvironmentVariable("JAVA_HOME");
@@ -177,6 +210,8 @@
this.CommandLine += maven_cmd_line_args;
+ m_mavenStatus = MavenStatus.None;
+
base.BeforeStart();
}
1.10 +1 -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.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- VS80AddIn.cs 30 May 2006 23:01:57 -0000 1.9
+++ VS80AddIn.cs 15 Jun 2006 03:29:32 -0000 1.10
@@ -20,7 +20,7 @@
public class VS80AddIn
{
- public const string ADD_IN_VERSION = "1.3";
+ public const string ADD_IN_VERSION = "1.3.1";
#region Constants
1.7 +17 -17 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/AboutOptionsPage.designer.cs
Index: AboutOptionsPage.designer.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/AboutOptionsPage.designer.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- AboutOptionsPage.designer.cs 4 Jun 2006 02:06:01 -0000 1.6
+++ AboutOptionsPage.designer.cs 15 Jun 2006 03:29:32 -0000 1.7
@@ -30,8 +30,8 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutOptionsPage));
- System.Windows.Forms.ListViewGroup listViewGroup5 = new System.Windows.Forms.ListViewGroup("Code Statistics", System.Windows.Forms.HorizontalAlignment.Left);
- System.Windows.Forms.ListViewGroup listViewGroup6 = new System.Windows.Forms.ListViewGroup("File Statistics", System.Windows.Forms.HorizontalAlignment.Left);
+ System.Windows.Forms.ListViewGroup listViewGroup1 = new System.Windows.Forms.ListViewGroup("Code Statistics", System.Windows.Forms.HorizontalAlignment.Left);
+ System.Windows.Forms.ListViewGroup listViewGroup2 = new System.Windows.Forms.ListViewGroup("File Statistics", System.Windows.Forms.HorizontalAlignment.Left);
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
@@ -142,10 +142,10 @@
this.listViewStatus.FullRowSelect = true;
this.listViewStatus.GridLines = true;
this.listViewStatus.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
- this.listViewStatus.Location = new System.Drawing.Point(3, 3);
+ this.listViewStatus.Location = new System.Drawing.Point(1, 3);
this.listViewStatus.MultiSelect = false;
this.listViewStatus.Name = "listViewStatus";
- this.listViewStatus.Size = new System.Drawing.Size(381, 208);
+ this.listViewStatus.Size = new System.Drawing.Size(385, 208);
this.listViewStatus.TabIndex = 7;
this.listViewStatus.UseCompatibleStateImageBehavior = false;
this.listViewStatus.View = System.Windows.Forms.View.Details;
@@ -179,9 +179,9 @@
this.pnlGenerating.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.pnlGenerating.Controls.Add(this.label3);
this.pnlGenerating.Controls.Add(this.pictureBox2);
- this.pnlGenerating.Location = new System.Drawing.Point(3, 3);
+ this.pnlGenerating.Location = new System.Drawing.Point(1, 3);
this.pnlGenerating.Name = "pnlGenerating";
- this.pnlGenerating.Size = new System.Drawing.Size(381, 208);
+ this.pnlGenerating.Size = new System.Drawing.Size(385, 208);
this.pnlGenerating.TabIndex = 7;
//
// label3
@@ -203,7 +203,7 @@
this.pictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox2.Image")));
this.pictureBox2.Location = new System.Drawing.Point(147, 41);
this.pictureBox2.Name = "pictureBox2";
- this.pictureBox2.Size = new System.Drawing.Size(83, 81);
+ this.pictureBox2.Size = new System.Drawing.Size(87, 81);
this.pictureBox2.TabIndex = 8;
this.pictureBox2.TabStop = false;
//
@@ -214,18 +214,18 @@
this.columnHeader2});
this.listViewStatistics.FullRowSelect = true;
this.listViewStatistics.GridLines = true;
- listViewGroup5.Header = "Code Statistics";
- listViewGroup5.Name = "listViewGroup1";
- listViewGroup6.Header = "File Statistics";
- listViewGroup6.Name = "listViewGroup2";
+ listViewGroup1.Header = "Code Statistics";
+ listViewGroup1.Name = "listViewGroup1";
+ listViewGroup2.Header = "File Statistics";
+ listViewGroup2.Name = "listViewGroup2";
this.listViewStatistics.Groups.AddRange(new System.Windows.Forms.ListViewGroup[] {
- listViewGroup5,
- listViewGroup6});
+ listViewGroup1,
+ listViewGroup2});
this.listViewStatistics.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
- this.listViewStatistics.Location = new System.Drawing.Point(3, 3);
+ this.listViewStatistics.Location = new System.Drawing.Point(1, 3);
this.listViewStatistics.MultiSelect = false;
this.listViewStatistics.Name = "listViewStatistics";
- this.listViewStatistics.Size = new System.Drawing.Size(381, 208);
+ this.listViewStatistics.Size = new System.Drawing.Size(385, 208);
this.listViewStatistics.TabIndex = 6;
this.listViewStatistics.UseCompatibleStateImageBehavior = false;
this.listViewStatistics.View = System.Windows.Forms.View.Details;
@@ -258,9 +258,9 @@
this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.panel1.Controls.Add(this.label8);
this.panel1.Controls.Add(this.linkLabel2);
- this.panel1.Location = new System.Drawing.Point(3, 3);
+ this.panel1.Location = new System.Drawing.Point(1, 3);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(381, 208);
+ this.panel1.Size = new System.Drawing.Size(385, 208);
this.panel1.TabIndex = 5;
//
// label8
1.5 +57 -57 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/AboutOptionsPage.resx
Index: AboutOptionsPage.resx
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/AboutOptionsPage.resx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- AboutOptionsPage.resx 4 Jun 2006 02:06:01 -0000 1.4
+++ AboutOptionsPage.resx 15 Jun 2006 03:29:32 -0000 1.5
@@ -938,75 +938,75 @@
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACK
EQAAAk1TRnQBSQFMAgEBAwEAAQQBAAEEAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
- AwABEAMAAQEBAAEgBgABEBoAAYECDgH/AWsCDgH/AWsCDgH/AWsCDgH/AWsCDgH/AWsCDgH/AWsCDgH/
- AWsCDgH/AWsCDgH/AWsCDgH/AWsCDgH/AWwCDgH/AbcCDgH/EAABBwIBAQcBHgIBASgBPgIBAWcBTwIC
- AZkBVgICAa0BVQICAa4BUgICAaIBRAIBAXcBJwIBATgBDAIBAQ4BAgMBDAABBwIBAQgBTwICAZkBZAIM
+ AwABEAMAAQEBAAEgBgABEBoAAYECEAH/AW0CEAH/AW0CEAH/AW0CEAH/AW0CEAH/AW0CEAH/AW0CEAH/
+ AW0CEAH/AW0CEAH/AW0CEAH/AW0CEAH/AW4CEAH/AbcCEAH/EAABBwIBAQcBHgIBASgBPgIBAWcBTwIC
+ AZkBVgICAa0BVQICAa4BUgICAaIBRAIBAXcBJwIBATgBDAIBAQ4BAgMBDAABBwIBAQgBTwICAZkBZAIK
AeQBWwICAb0BSwICAYwBPAIBAWQBJQIBATUBHAIBASYBRQIBAXsBVgICAa8BUgICAaUBQwIBAXMBGgIB
ASIBAgMBTAAB7AHaAdMC/wHoAdYC/wHmAdIC/wHlAc4C/wHiAcoC/wHhAcYC/wHgAcMC/wHdAb8C/wHc
- AbsC/wHaAbgC/wHZAbMB/wGLAWQBYAH/AbMCDgH/DAABCgIBAQwBMwIBAU8BwgGbAZMB/AH0AegB4wH/
+ AbsC/wHaAbgC/wHZAbMB/wGLAWYBYgH/AbMCEAH/DAABCgIBAQwBMwIBAU8BvgGTAYsB/AH0AegB4wH/
AvQB8wH/AfAB8gHzAf8B8QHyAfMB/wH0Ae0B6QH/Ae4B2wHQAf8BYgIDAdQBQQIBAXABFAIBARkBAgMB
- CAABXgIDAcUD1AP/AfkD/wH7Av8B+wH2Af8BywG3AaMB/wF0ASsBJgHzAbYCZQH9Af8CxgL/AtoC/wLp
+ CAABXgIDAcUD1AP/AfkD/wH7Av8B+wH2Af8BywG3AaMB/wF0ASQBHgHzAbYCYQH9Af8CxgL/AtoC/wLp
Af8ByAKpAf8BVwICAbYBKQIBATwBAgMBSAAB4gHZAdIC/wHqAdUC/wHoAc8C/wHlAcoC/wHiAcQC/wHe
- Ab8C/wHdAboC/wHaAbUC/wHYAbEC/wHWAasC/wHUAaMB/wGJAWIBZgH/AbMCDgH/CAABCQIBAQoBRQIB
- AXkB9QHrAeUB/wHwAfEB8gH/AeQB3QHbAf8BvgGLAYAB/wHCAYEBYAH/AcwBjwF/Af8B3wHOAcQB/wHt
- AfAB8gH/AfYC9AH/AZMBTwFMAfgBRgIBAX0BEgIBARYBAgMBBAADtwH/AcECwgL/AfYB7gH/AUcBrAFA
+ Ab8C/wHdAboC/wHaAbUC/wHYAbEC/wHWAasC/wHUAaMB/wGJAWQBaAH/AbMCEAH/CAABCQIBAQoBRQIB
+ AXkB9QHrAeUB/wHwAfEB8gH/AeQB3QHbAf8BvgGLAYEB/wHCAYEBYgH/AcwBjwGBAf8B3wHOAcQB/wHt
+ AfAB8gH/AfYC9AH/AY4BSQFGAfgBRgIBAX0BEgIBARYBAgMBBAADtwH/AcECwgL/AfYB7gH/AUkBrAFC
Af8BsAHZAaUB/wHvAcYBjQH/AccCgQL/AqEC/wKyAv8CxAL/AtQC/wL+Af8B8QLqAf8BVwICAbEBGAIB
AR9IAAHkAd0B1gL/Ae0B2wL/AeoB1gL/AegB0QL/AeoBxwH/AcEBugHSAv8B5wG+Av8B3gG7Av8B2wG2
- Av8B2AGxAv8B1wGpAf8BiwFkAWcB/wGzAg4B/wgAATACAQFKAfcB8QHtAf8B8AH0AfUB/wHIAYEBawH/
- Ab8BaQE4Af8BwgF0AUYB/wHsAe4B7wH/AdIBiAFxAf8BwAFsATsB/wG9AW4BQAH/AeoB6QHoAf8B9QH2
- AfcB/wF2AR8BGwHxATsCAQFgAQgCAQEJBAADvwH/AtkB2gL/Ae4B3wH/ARUBsAEmAf8BHgGtASkB/wFM
- AYEBNwL/ArUC/wKeAv8CoAL/AbEBsAL/AcUBwwn/AbMCiQH+AUACAQFtSAAB5gHgAdsC/wHzAeYC/wHz
- AeYC/wHuAb4B/wEyAU4B7wH/AQ4BQQL/AW4BfQHgAv8B3gG9Av8B3gG9Av8B3gG9Av8B3gG9Af8BjgFn
- AWgB/wGzAg4B/wgAAfEB3gHTAf8B9AL2Af8BxAF8AVEB/wHFAXEBQAH/AcsBdAFBAf8BwAF9AVUB/wH+
- A/8B2QGoAY8B/wHKAXMBQQH/AccBcQE/Af8BvAFmATQB/wHuAe8B8AH/AfYB7gHqAf8BWAICAboBHAIB
- ASUEAAPLAf8B2wLcAv8B5gHOAf8BMgHMAVIB/wErAb4BPwH/AaYBiAGBAv8CwwL/ArAC/wHRAdkB/wH4
- AbEBzAL/AecG/wH9AfwB/QH/AfwC+wH/AVMCAgGkSAAB6QHjAd8C/wHmAckB/wGQAY8ByQH/AQ4BNgL/
- AQ4BNwL/AR8BTgL/AQ4BOAL/AfkB3AGsAv8B3gG9Av8B3gG9Av8B3AG0Af8BjgFoAWkB/wGzAg4B/wQA
- ATECAQFLAfkB+gH5Af8B4QHBAbEB/wHGAXEBQAH/AcwBdQFDAf8BzAF1AUIB/wHMAXQBQAH/AcoBbgE5
- Af8BywFxAT0B/wHMAXQBQQH/AcsBdAFCAf8BxwFyAUAB/wHGAYEBWwH/AfMC9QH/Ab0BkgGHAfwBNAIB
- AVIEAAPPAf8B3wHgAeIC/wHdAbwB/wFQAeoBgAH/AT0B0wFaAf8BywGcAZ8C/wLNAv8CwwL/AfQB/AH/
+ Av8B2AGxAv8B1wGpAf8BiwFmAWkB/wGzAhAB/wgAATACAQFKAfcB8QHtAf8B8AH0AfUB/wHIAYEBbQH/
+ Ab8BawE6Af8BwgF2AUgB/wHsAe4B7wH/AdIBiAFzAf8BwAFuAT0B/wG9AXABQgH/AeoB6QHoAf8B9QH2
+ AfcB/wF2ARkBGAHxATsCAQFgAQgCAQEJBAADvwH/AtkB2gL/Ae4B3wH/ARcBsAEoAf8BIAGtASsB/wFO
+ AYEBOQL/ArUC/wKeAv8CoAL/AbEBsAL/AcUBwwn/AbEChQH+AUACAQFtSAAB5gHgAdsC/wHzAeYC/wHz
+ AeYC/wHuAb4B/wE0AVAB7wH/ARABQwL/AXABfwHgAv8B3gG9Av8B3gG9Av8B3gG9Av8B3gG9Af8BjgFp
+ AWoB/wGzAhAB/wgAAfEB3gHTAf8B9AL2Af8BxAF+AVMB/wHFAXMBQgH/AcsBdgFDAf8BwAF/AVcB/wH+
+ A/8B2QGoAY8B/wHKAXUBQwH/AccBcwFBAf8BvAFoATYB/wHuAe8B8AH/AfYB7gHqAf8BWAICAboBHAIB
+ ASUEAAPLAf8B2wLcAv8B5gHOAf8BNAHMAVQB/wEtAb4BQQH/AaYBiAGBAv8CwwL/ArAC/wHRAdkB/wH4
+ AbEBzAL/AecG/wH9AfwB/QH/AfwC+wH/AVMCAgGkSAAB6QHjAd8C/wHmAckB/wGQAY8ByQH/ARABOAL/
+ ARABOQL/ASEBUAL/ARABOgL/AfkB3AGsAv8B3gG9Av8B3gG9Av8B3AG0Af8BjgFqAWsB/wGzAhAB/wQA
+ ATECAQFLAfkB+gH5Af8B4QHBAbEB/wHGAXMBQgH/AcwBdwFFAf8BzAF3AUQB/wHMAXYBQgH/AcoBcAE7
+ Af8BywFzAT8B/wHMAXYBQwH/AcsBdgFEAf8BxwF0AUIB/wHGAYEBXQH/AfMC9QH/AbkBigF/AfwBNAIB
+ AVIEAAPPAf8B3wHgAeIC/wHdAbwB/wFSAeoBgQH/AT8B0wFcAf8BywGcAZ8C/wLNAv8CwwL/AfQB/AH/
AaICzAH/Aa0BggGBAf8B9wHzAfIB/wHrAeIB3wH/AfAB6QHlAf8BWgIDAcJIAAHrAeYB4wL/AeUByQH/
- AWMBfgHzAf8BMgFYAv8B/AHkAbkC/wHpAbIB/wEOATUC/wEqAU0B8wL/AdwBrAL/AdUBrAL/Ad4BuQH/
- AY8BaQFrAf8BswIOAf8EAAFqAgoB4QH6Af0B/gH/AcYBdAFEAf8BzQF2AUQB/wHNAXYBQwH/AcwBdAFB
- Af8BxwF1AUUF/wHaAZEBeQH/AcwBdAFBAf8BzAF1AUIB/wHLAXQBQgH/AcEBagE2Af8D8QH/AfIB3wHV
- Af8BRAIBAXcEAAPSAf8B4wHmAegC/wHXAaoB/wFLAcIB4AH/AVcBswL/AZ0BgQGOAv8CygL/AtYC/wH1
+ AWUBgAHzAf8BNAFaAv8B/AHkAbkC/wHpAbIB/wEQATcC/wEsAU8B8wL/AdwBrAL/AdUBrAL/Ad4BuQH/
+ AY8BawFtAf8BswIQAf8EAAFqAggB4QH6Af0B/gH/AcYBdgFGAf8BzQF4AUYB/wHNAXgBRQH/AcwBdgFD
+ Af8BxwF3AUcF/wHaAZEBewH/AcwBdgFDAf8BzAF3AUQB/wHLAXYBRAH/AcEBbAE4Af8D8QH/AfIB3wHV
+ Af8BRAIBAXcEAAPSAf8B4wHmAegC/wHXAaoB/wFNAcIB4AH/AVkBswL/AZ0BgQGOAv8CygL/AtYC/wH1
Av8BywGhAZ4B/wHdAZQBmAL/AcUBxgL/ArIC/wLKAf8BWwICAb1IAAHtAeoB5wL/AecBzgL/AeQBwgL/
- AeMBvgL/Ad4BvQL/AdwBugH/AqUB2QH/AQ4BPgL/AcYBswG8Av8B1wGvAv8B4QG+Af8BkwFrAW0B/wGz
- Ag4B/wQAAdQBtwGwAv4D/wHKAXMBQAH/AdABeQFGAf8BzAF0AUEB/wHMAXQBQQH/AcwBcQE9Af8B5AHq
- AewB/wH6AfEB7AH/AcoBbgE6Af8BzAF0AUEB/wHNAXYBQwH/AcgBcgFAAf8B6wHbAdMB/wH1AekB4wH/
- AUgCAgGCBAAB1wHTAcsB/wHyAbgBcAL/Ac8BnAH/AbABuwHFAf8BgQG2AeMB/wFPAWABow7/AcsB6AL/
+ AeMBvgL/Ad4BvQL/AdwBugH/AqUB2QH/ARABQAL/AcYBswG8Av8B1wGvAv8B4QG+Af8BkwFtAW8B/wGz
+ AhAB/wQAAdABswGsAv4D/wHKAXUBQgH/AdABewFIAf8BzAF2AUMB/wHMAXYBQwH/AcwBcwE/Af8B5AHq
+ AewB/wH6AfEB7AH/AcoBcAE8Af8BzAF2AUMB/wHNAXgBRQH/AcgBdAFCAf8B6wHbAdMB/wH1AekB4wH/
+ AUgCAgGCBAAB1wHTAcsB/wHyAbgBcgL/Ac8BnAH/AbABuwHFAf8BgQG2AeMB/wFRAWIBow7/AcsB6AL/
AckB2AL/ApwC/wKgAf8B/QKyAf8BQwIBAXVIAAHvAe0B6wL/AegB0QL/AeEBwwL/AeABwAL/Ad8BvgL/
- Ad0BuwL/AeUBtQH/ARkBQwL/AQ4BNQP/Ad4BvQL/AeQBxAH/AZQBbQFvAf8BswIOAf8EAAHwAdwB0QX/
- AdIBegFHAf8B0wF8AUkB/wHMAXQBQQH/AcwBdAFBAf8BzAF0AUEB/wHFAXYBRwH/AfYB+QH7Af8B+wHx
- Ae0B/wHLAXABOwH/Ac8BdwFFAf8BzAF2AUQB/wHuAdsB0gH/AfcB7AHlAf8BRgIBAXwEAAHbAcEBnQH/
- AeIBqAFtAv8BxwGKAv8ByQGPAv8ByQGOAv8ByQGQAf8BvgGgAaQG/wL+Av8CzwL/AsMC/wKxAv8CngH/
- AbkCYgH9ARUCAQEbSAAB8gLxAv8B5wHRAv8B4AHAAv8B3wG/Av8B3QG8Av8B3AG6Av8B2wG4Af8B7QHW
- Ab8B/wEOATsC/wFuAXkB2wL/AeYByQH/AZgBbwFxAf8BswIOAf8EAAGSAUkBRQH1BP8B3wGBAVQB/wHb
- AYEBUgH/Ac4BdgFDAf8BywFvAToB/wHLAXIBPgH/AcwBdAFBAf8BxAGBAVoF/wHcAZQBfgH/AdIBewFJ
- Af8BzwF3AUQB/wH7AfUB8wH/AfUB5AHcAf8BOgIBAV8EAAHbAccBsgH/A9kC/wG6AW8C/wG7AXIC/wG8
- AXUC/wG9AXcB/wH5AboBdAH/AcUBqwGtAv8C9wL/AuEC/wLQAv8CxgH/AdICjwH/AR8CAQEqAQIDAUgA
- AfQC8wL/AeIBxgL/AdcBsQL/AdcBsAL/AdYBrwL/AdYBrQL/AdYBrAL/AdcBqQH/AVQBcAHzAf8B/AHd
- AaUC/wHpAc8B/wGaAW8BcQH/AbMCDgH/BAABSAICAYAE/wH7AckBrgH/Ae4BigFlAf8B0gGBAVYB/wHx
- AfYB+QH/AesBwgGuAf8BywFxAT0B/wHKAX4BUQX/Ad8BpQGJAf8B3AGBAVMB/wHYAYEBUgX/AdIBtQGu
- Af4BIwIBATEEAAPRAf8BxwHKAc0B/wH+Aa0BRAH/AfMB8QHvAf8B8gHWAaoB/wH0Ab8BfAH/AfoBrgFM
- Av8BqAEtAf8ByAGBAUgB/wG+AZEBhQH/AbICdQH9AVsCAgG4ARQCAQEZUAAC9gH1Av8B4QHCAv8B1gGs
- Av8B1QGrAv8B1QGrAv8B1AGpAv8B1AGpAv8B0wGoAv8B1QGmAv8B0QGkAv8B7QHWAf8BnAFtAW4B/wGz
- Ag4B/wgAAfYB6AHgBv8BowF8Af8B+gGVAW8B/wHNAcYBwwX/AfwB9QHxBf8B9gH7Af0B/wHmAYMBYAH/
- AesBgwFdAf8B/QH1Ae4B/wH+AvwB/wFNAgIBkwEMAgEBDgQAA+gB/wHqAusB/wHNAbQBtQH/AecC3AH/
- AfUC9wH/Ae8C8QH/AeoB7AHtAf8B4QHkAeYB/wHbAd8B5QH/AdYB2AHaAf8BuQGsAaUB/gFrAhcB6QEX
+ Ad0BuwL/AeUBtQH/ARsBRQL/ARABNwP/Ad4BvQL/AeQBxAH/AZQBbwFxAf8BswIQAf8EAAHwAdwB0QX/
+ AdIBfAFJAf8B0wF+AUsB/wHMAXYBQwH/AcwBdgFDAf8BzAF2AUMB/wHFAXgBSQH/AfYB+QH7Af8B+wHx
+ Ae0B/wHLAXIBPQH/Ac8BeQFHAf8BzAF4AUYB/wHuAdsB0gH/AfcB7AHlAf8BRgIBAXwEAAHbAcEBnQH/
+ AeIBqAFvAv8BxwGKAv8ByQGPAv8ByQGOAv8ByQGQAf8BvgGgAaQG/wL+Av8CzwL/AsMC/wKxAv8CngH/
+ AbkCXgH9ARUCAQEbSAAB8gLxAv8B5wHRAv8B4AHAAv8B3wG/Av8B3QG8Av8B3AG6Av8B2wG4Af8B7QHW
+ Ab8B/wEQAT0C/wFwAXsB2wL/AeYByQH/AZgBcQFzAf8BswIQAf8EAAGKAT0BOwH1BP8B3wGBAVYB/wHb
+ AYEBVAH/Ac4BeAFFAf8BywFxATwB/wHLAXQBQAH/AcwBdgFDAf8BxAGBAVwF/wHcAZQBgAH/AdIBfQFL
+ Af8BzwF5AUYB/wH7AfUB8wH/AfUB5AHcAf8BOgIBAV8EAAHbAccBsgH/A9kC/wG6AXEC/wG7AXQC/wG8
+ AXcC/wG9AXkB/wH5AboBdgH/AcUBqwGtAv8C9wL/AuEC/wLQAv8CxgH/AdICjwH/AR8CAQEqAQIDAUgA
+ AfQC8wL/AeIBxgL/AdcBsQL/AdcBsAL/AdYBrwL/AdYBrQL/AdYBrAL/AdcBqQH/AVYBcgHzAf8B/AHd
+ AaUC/wHpAc8B/wGaAXEBcwH/AbMCEAH/BAABSAICAYAE/wH7AckBrgH/Ae4BigFnAf8B0gGBAVgB/wHx
+ AfYB+QH/AesBwgGuAf8BywFzAT8B/wHKAYABUwX/Ad8BpQGJAf8B3AGBAVUB/wHYAYEBVAX/Ac4BsQGq
+ Af4BIwIBATEEAAPRAf8BxwHKAc0B/wH+Aa0BRgH/AfMB8QHvAf8B8gHWAaoB/wH0Ab8BfgH/AfoBrgFO
+ Av8BqAEvAf8ByAGBAUoB/wG+AZEBhQH/AbICcQH9AVsCAgG4ARQCAQEZUAAC9gH1Av8B4QHCAv8B1gGs
+ Av8B1QGrAv8B1QGrAv8B1AGpAv8B1AGpAv8B0wGoAv8B1QGmAv8B0QGkAv8B7QHWAf8BnAFvAXAB/wGz
+ AhAB/wgAAfYB6AHgBv8BowF+Af8B+gGVAXEB/wHNAcYBwwX/AfwB9QHxBf8B9gH7Af0B/wHmAYMBYgH/
+ AesBgwFfAf8B/QH1Ae4B/wH+AvwB/wFNAgIBkwEMAgEBDgQAA+gB/wHqAusB/wHNAbQBtQH/AecC3AH/
+ AfUC9wH/Ae8C8QH/AeoB7AHtAf8B4QHkAeYB/wHbAd8B5QH/AdYB2AHaAf8BtwGoAaEB/gFrAhAB6QEX
AgEBHVAAAvgB9Qr/Af4D/wH7AfkC/wH5AfQC/wH2Ae8C/wH0AeoC/wHzAeYB/wH7AfAB4wL/AfEB1wH/
- AZ8BaQFqAf8BsAIOAf8IAAFKAgIBhgn/AdABnAL/AbsBhwH/AekBvwGqAf8B1wHHAcAB/wHfAckBvwH/
- AfwBqQGBAv8BpAF9Av8B6AHXBf8BwgGcAZMB/AEeAgEBKAEDAgEBAgEEAgEBBAHfAt4B/wHdAcsBvAH/
- AbYBgQF9Af8BqwKBAf8BsAKBAf8BswKBAf8BuwGEAYUB/wHKAp8B/wHqAuwB/wHpAuoB/wGRAl0B+AEn
- AgEBOFQAAfoB+QH3Dv8C/gL/AfsB+AL/AfkB9AL/AfYB7gH/Ae4B3wHaAf8B8QGYATAB/wHeAYEBGgH/
- AboBiQGBAf8BygIOAf8IAAECAwEBYAIDAdMK/wHtAv8B+wHRAv8B7wG7Av8B5AGxAv8B6wHNCf8B1QG4
- AbEB/gEjAgEBMQEEAgEBBAQAATwCAQFkAfUB+QH+Af8B/QHDAYEC/wHMAZcC/wHNAZ8C/wHPAakC/wHR
+ AZ8BawFsAf8BsAIQAf8IAAFKAgIBhgn/AdABnAL/AbsBhwH/AekBvwGqAf8B1wHHAcAB/wHfAckBvwH/
+ AfwBqQGBAv8BpAF/Av8B6AHXBf8BvgGUAYsB/AEeAgEBKAEDAgEBAgEEAgEBBAHfAt4B/wHdAcsBvAH/
+ AbYBgQF/Af8BqwKBAf8BsAKBAf8BswKBAf8BuwGEAYUB/wHKAp8B/wHqAuwB/wHpAuoB/wGMAlMB+AEn
+ AgEBOFQAAfoB+QH3Dv8C/gL/AfsB+AL/AfkB9AL/AfYB7gH/Ae4B3wHaAf8B8QGYATIB/wHeAYEBHAH/
+ AboBiQGBAf8BygIQAf8IAAECAwEBYAIDAdMK/wHtAv8B+wHRAv8B7wG7Av8B5AGxAv8B6wHNCf8B0QG0
+ Aa0B/gEjAgEBMQEEAgEBBAQAATwCAQFkAfUB+QH+Af8B/QHDAYEC/wHMAZcC/wHNAZ8C/wHPAakC/wHR
AbEB/wH9AcoBtgH/AfMBwQG3Av8C2wL/AuQB/wHvAugB/wFGAgEBfAEDAgEBA1AAAf0B+gH4Ev8C/gL/
- AfwB+QL/AfkB9AH/Ae8B4QHcAv8BzwGBAf8BugGJAYEB/wHKAg4B/xAAAQIDAQFGAgEBewH1AeYB3hX/
- AfoB8QHsAf8BbwETARAB6QEYAgEBHwEDAgEBAwgAAUsCAgGLAf4BtwFpAf8B/gHLAZYC/wHMAZ8C/wHO
- AagC/wHOAbAC/wHOAbgC/wHNAcAB/wHaAa0BqgH+AXcCIgHrAf8C/QX/AUwCAgGOAQgCAQEJUAAB9wHS
+ AfwB+QL/AfkB9AH/Ae8B4QHcAv8BzwGBAf8BugGJAYEB/wHKAhAB/xAAAQIDAQFGAgEBewH1AeYB3hX/
+ AfoB8QHsAf8BbAEPAQ4B6QEYAgEBHwEDAgEBAwgAAUsCAgGLAf4BtwFrAf8B/gHLAZYC/wHMAZ8C/wHO
+ AagC/wHOAbAC/wHOAbgC/wHNAcAB/wHWAakBpgH+AXUCGgHrAf8C/QX/AUwCAgGOAQgCAQEJUAAB9wHS
Aa8B/wHyAcsBqwH/AeoBxAGnAf8B4QG7AaIB/wHZAbMBnQH/AdABqgGYAf8BygGkAZQB/wHIAaIBkwH/
- AcgBogGTAf8BugGJAYEB/wHKAg4B/yAAAUACAQFtAXkCHAHsAdUBuAGwAf4BsQF9AXcB+gFSAgIBniAA
+ AcgBogGTAf8BugGJAYEB/wHKAhAB/yAAAUACAQFtAXQCFQHsAdEBtAGsAf4BrQF1AW8B+gFSAgIBniAA
AQIDAQECAwEBFAIBARoBKAIBATkBNwIBAVgBSgICAYUBTgICAY8BFAIBARoBLQIBAUQBCgIBAQwBAgMB
TAABQgFNAT4HAAE+AwABKAMAAUADAAEQAwABAQEAAQEFAAGAFwAD/wEAAcABAQHgAQMBgAEBAgABwAEB
AcABAQGAAwABwAEBAYABAAGAAwABwAEBAYABAAGAAwABwAEBAYABAAGAAwABwAEBAgABgAMAAcABAQIA
1.3 +56 -56 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils/VSExternalToolProxy.cs
Index: VSExternalToolProxy.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils/VSExternalToolProxy.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- VSExternalToolProxy.cs 3 May 2006 20:23:06 -0000 1.2
+++ VSExternalToolProxy.cs 15 Jun 2006 03:29:32 -0000 1.3
@@ -29,7 +29,7 @@
public event ProcessTextDelegate ProcessStdOut;
public event ProcessTextDelegate ProcessStdErr;
- public enum ToolExitStatus { DidNotExit, Cancelled, Error, Success };
+ public enum ToolExitStatus { DidNotExit, Canceled, Error, Success };
private string m_executablePath = string.Empty;
private string m_workingDirectory = string.Empty;
@@ -40,6 +40,7 @@
private NameValueCollection m_environmentVariables = new NameValueCollection();
public ArrayList m_outputLines;
public string m_output = string.Empty;
+ System.Diagnostics.ProcessStartInfo m_psi = null;
#endregion
@@ -122,6 +123,18 @@
m_applicationObject = applicationObject;
}
+ public bool OutputContains(string value)
+ {
+ foreach (string line in OutputLines)
+ {
+ if (line.Contains(value))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
public override void BeforeStart()
{
m_psi = new System.Diagnostics.ProcessStartInfo();
@@ -141,46 +154,6 @@
}
}
- private void RedirectStream(object parameters)
- {
- object[] paramlist = parameters as object[];
- System.IO.StreamReader sr = paramlist[0] as System.IO.StreamReader;
- bool isStdErr = (bool)paramlist[1] ;
- if (sr == null)
- {
- return;
- }
- string str;
- bool cancelOutput;
- while (this.IsRunning && !CancelRequested && (str = sr.ReadLine()) != null)
- {
- cancelOutput = false;
- if (isStdErr)
- {
- ProcessStdErr(ref str, ref cancelOutput);
- }
- else
- {
- ProcessStdOut(ref str, ref cancelOutput);
- }
-
-/*
- if (str.ToLower().Contains("model validation failed"))
- {
- lock (this) { m_eventArgs.ExitStatus = ExitStatus.ModelValidationFailed; }
- }
-*/
- if (!cancelOutput)
- {
- this.OutputLines.Add(str);
- m_outputWindowPane.OutputString(str + "\n");
- }
- System.Threading.Thread.Sleep(0);
- }
- }
-
- System.Diagnostics.ProcessStartInfo m_psi = null;
-
protected override void DoWork()
{
Process toolProcess = new Process();
@@ -195,38 +168,33 @@
m_psi.RedirectStandardOutput = true;
m_psi.RedirectStandardError = true;
+ toolProcess.EnableRaisingEvents = true;
+ toolProcess.ErrorDataReceived += new DataReceivedEventHandler(toolProcess_ErrorDataReceived);
+ toolProcess.OutputDataReceived += new DataReceivedEventHandler(toolProcess_OutputDataReceived);
+
// Associate process info with the process.
toolProcess.StartInfo = m_psi;
VSExternalToolEventArgs eventArguments = new VSExternalToolEventArgs();
this.EventArguments = eventArguments;
- if (CancelRequested)
- {
- eventArguments.ExitStatus = ToolExitStatus.Cancelled;
- AcknowledgeCancel();
- return;
- }
-
if (!toolProcess.Start())
{
throw new Exception("External tool failed to start");
}
+ toolProcess.BeginOutputReadLine();
+ toolProcess.BeginErrorReadLine();
+
try
{
- Thread stdoutThread = new Thread(new ParameterizedThreadStart(RedirectStream));
- Thread stderrThread = new Thread(new ParameterizedThreadStart(RedirectStream));
m_applicationObject.MainWindow.SetFocus();
- stdoutThread.Start(new object[] { toolProcess.StandardOutput, false });
- stderrThread.Start(new object[] { toolProcess.StandardError, true });
-
- // Loop until the process has completed
while (!toolProcess.WaitForExit(250) && !CancelRequested)
{
}
+
if (!CancelRequested)
{
eventArguments.ExitCode = toolProcess.ExitCode;
@@ -234,8 +202,8 @@
}
else
{
- eventArguments.ExitStatus = ToolExitStatus.Cancelled;
toolProcess.Kill();
+ eventArguments.ExitStatus = ToolExitStatus.Canceled;
AcknowledgeCancel();
}
}
@@ -256,5 +224,37 @@
}
}
}
+
+ void toolProcess_ErrorDataReceived(object sender, DataReceivedEventArgs e)
+ {
+ ProcessOutput(e.Data, true);
+ }
+
+ void toolProcess_OutputDataReceived(object sender, DataReceivedEventArgs e)
+ {
+ ProcessOutput(e.Data, false);
+ }
+
+ void ProcessOutput(string input, bool isStdErr)
+ {
+ if (input != null)
+ {
+ bool cancelOutput = false;
+ if (isStdErr)
+ {
+ ProcessStdErr(ref input, ref cancelOutput);
+ }
+ else
+ {
+ ProcessStdOut(ref input, ref cancelOutput);
+ }
+ if (!cancelOutput)
+ {
+ this.OutputLines.Add(input);
+ this.OutputWindowPane.OutputString(input + "\n");
+ }
+ }
+ }
+
}
}
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
|
|
From: Chad B. <cwb...@us...> - 2006-06-14 15:13:46
|
User: cwbrandon
Date: 06/06/14 08:13:36
Modified: andromda-cs pom.xml
andromda-nhibernate pom.xml
andromda-nhibernate/src/main/uml
HibernateMetafacadeModel.xml.zip
maven2/plugins/andromdanetapp pom.xml
andromda-nspring pom.xml
andromda-nspring/src/main/uml SpringMetafacadeModel.xml.zip
andromda-cs/src/main/uml empty-model.xmi
Log:
fix build
Revision Changes Path
1.2 +1 -1 cartridges/andromda-cs/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/pom.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- pom.xml 8 Mar 2006 04:10:48 -0000 1.1
+++ pom.xml 14 Jun 2006 15:13:36 -0000 1.2
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-meta-cartridge</artifactId>
- <version>3.2-RC1-SNAPSHOT</version>
+ <version>3.2-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>
1.2 +7 -7 cartridges/andromda-nhibernate/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/pom.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- pom.xml 8 Mar 2006 04:15:44 -0000 1.1
+++ pom.xml 14 Jun 2006 15:13:36 -0000 1.2
@@ -39,27 +39,27 @@
<dependency>
<groupId>org.andromda</groupId>
<artifactId>andromda-core</artifactId>
- <version>3.2-RC1-SNAPSHOT</version>
+ <version>3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.metafacades</groupId>
<artifactId>andromda-metafacades-uml</artifactId>
- <version>3.2-RC1-SNAPSHOT</version>
+ <version>3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.metafacades</groupId>
<artifactId>andromda-metafacades-uml14</artifactId>
- <version>3.2-RC1-SNAPSHOT</version>
+ <version>3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-meta-cartridge</artifactId>
- <version>3.2-RC1-SNAPSHOT</version>
+ <version>3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.translationlibraries</groupId>
<artifactId>andromda-ocl-validation-library</artifactId>
- <version>3.2-RC1-SNAPSHOT</version>
+ <version>3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
@@ -86,7 +86,7 @@
<dependency>
<groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-meta-cartridge</artifactId>
- <version>3.2-RC1-SNAPSHOT</version>
+ <version>3.2-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>
@@ -97,7 +97,7 @@
<dependency>
<groupId>org.andromda.translationlibraries</groupId>
<artifactId>andromda-ocl-query-library</artifactId>
- <version>3.2-RC1-SNAPSHOT</version>
+ <version>3.2-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>
1.2 +87 -88 cartridges/andromda-nhibernate/src/main/uml/HibernateMetafacadeModel.xml.zip
<<Binary file>>
1.3 +3 -3 plugins/maven2/plugins/andromdanetapp/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/maven2/plugins/andromdanetapp/pom.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- pom.xml 4 May 2006 22:05:27 -0000 1.2
+++ pom.xml 14 Jun 2006 15:13:36 -0000 1.3
@@ -20,12 +20,12 @@
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>andromdapp-maven-plugin</artifactId>
- <version>3.2-RC1-SNAPSHOT</version>
+ <version>3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.andromdapp</groupId>
<artifactId>andromda-andromdapp-core</artifactId>
- <version>3.2-RC1-SNAPSHOT</version>
+ <version>3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.plugins.andromdapp.projects</groupId>
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.andromda.templateengines</groupId>
<artifactId>andromda-templateengine-velocity</artifactId>
- <version>3.2-RC1-SNAPSHOT</version>
+ <version>3.2-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
1.2 +8 -8 cartridges/andromda-nspring/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/pom.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- pom.xml 8 Mar 2006 04:18:48 -0000 1.1
+++ pom.xml 14 Jun 2006 15:13:36 -0000 1.2
@@ -25,27 +25,27 @@
<dependency>
<groupId>org.andromda</groupId>
<artifactId>andromda-core</artifactId>
- <version>3.2-RC1-SNAPSHOT</version>
+ <version>3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.metafacades</groupId>
<artifactId>andromda-metafacades-uml</artifactId>
- <version>3.2-RC1-SNAPSHOT</version>
+ <version>3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-meta-cartridge</artifactId>
- <version>3.2-RC1-SNAPSHOT</version>
+ <version>3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.translationlibraries</groupId>
<artifactId>andromda-ocl-validation-library</artifactId>
- <version>3.2-RC1-SNAPSHOT</version>
+ <version>3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda</groupId>
<artifactId>andromda-utils</artifactId>
- <version>3.2-RC1-SNAPSHOT</version>
+ <version>3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.andromda.translationlibraries</groupId>
<artifactId>andromda-ocl-query-library</artifactId>
- <version>3.2-RC1-SNAPSHOT</version>
+ <version>3.2-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
@@ -78,7 +78,7 @@
<dependency>
<groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-meta-cartridge</artifactId>
- <version>3.2-RC1-SNAPSHOT</version>
+ <version>3.2-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>
@@ -89,7 +89,7 @@
<dependency>
<groupId>org.andromda.translationlibraries</groupId>
<artifactId>andromda-ocl-query-library</artifactId>
- <version>3.2-RC1-SNAPSHOT</version>
+ <version>3.2-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>
1.2 +104 -101 cartridges/andromda-nspring/src/main/uml/SpringMetafacadeModel.xml.zip
<<Binary file>>
1.2 +1 -1 cartridges/andromda-cs/src/main/uml/empty-model.xmi
Index: empty-model.xmi
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/main/uml/empty-model.xmi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- empty-model.xmi 8 Mar 2006 04:10:55 -0000 1.1
+++ empty-model.xmi 14 Jun 2006 15:13:36 -0000 1.2
@@ -19,7 +19,7 @@
</XMI.extension>
<UML:Namespace.ownedElement>
<UML:Package xmi.id='eee_1045467100313_365297_7' name='Component View' isRoot='false' isLeaf='false' isAbstract='false'/>
- <UML:Package href='andromda-profile-3.2-RC1-SNAPSHOT.xml.zip|_8a70287_1078771814628_224704_589'>
+ <UML:Package href='andromda-profile-3.2-SNAPSHOT.xml.zip|_8a70287_1078771814628_224704_589'>
<XMI.extension xmi.extender='MagicDraw UML 9.0' xmi.extenderID='MagicDraw UML 9.0'>
<referentPath xmi.value='::org.andromda.profile'/>
</XMI.extension>
|
|
From: Vance K. <va...@us...> - 2006-06-14 14:37:31
|
User: vancek
Date: 06/06/14 07:37:25
Modified: andromda-ejb3/src/main/resources/templates/ejb3
Enumeration.vsl
andromda-ejb3/src/changes changes.xml
Log:
generate docs for enumeration literals - JIRA EJB-30
Revision Changes Path
1.4 +5 -2 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/Enumeration.vsl
Index: Enumeration.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/Enumeration.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- Enumeration.vsl 9 Mar 2006 13:22:37 -0000 1.3
+++ Enumeration.vsl 14 Jun 2006 14:37:25 -0000 1.4
@@ -13,10 +13,13 @@
public enum ${enum.name} implements java.io.Serializable
{
#foreach ($literal in $enum.literals)
+ /**
+$literal.getDocumentation(" * ")
+ */
${literal.name}#if ($velocityCount != $enum.literals.size()),#else#**#;#end
-#end
+#end
/**
* Return the ${enum.name} from a string value
* @return ${enum.name} enum object
1.6 +3 -0 cartridges/andromda-ejb3/src/changes/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/changes/changes.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- changes.xml 14 Jun 2006 08:08:47 -0000 1.5
+++ changes.xml 14 Jun 2006 14:37:25 -0000 1.6
@@ -97,6 +97,9 @@
<action dev="vancek" due-to="tlu" type="add">
Added support for adding ejb-jar elements to the persistence.xml. JIRA EJB-28.
</action>
+ <action dev="vancek" due-to="tlu" type="update">
+ Generate documentation for enumeration literals.
+ </action>
</release>
</body>
</document>
\ No newline at end of file
|
|
From: Vance K. <va...@us...> - 2006-06-14 08:08:48
|
User: vancek
Date: 06/06/14 01:08:47
Modified: andromda-ejb3/src/main/resources/META-INF/andromda
namespace.xml cartridge.xml
andromda-ejb3/src/main/resources/templates/ejb3/config
persistence.xml.vsl
andromda-ejb3/src/changes changes.xml
Log:
added support for extra ejb-jar inclusions in persistence.xml - JIRA EJB-28
Revision Changes Path
1.24 +6 -0 cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/namespace.xml
Index: namespace.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/namespace.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -w -r1.23 -r1.24
--- namespace.xml 14 Jun 2006 04:55:21 -0000 1.23
+++ namespace.xml 14 Jun 2006 08:08:47 -0000 1.24
@@ -205,6 +205,12 @@
or serializable types to/from JDBC.
</documentation>
</property>
+ <property name="jarFiles" required="false">
+ <documentation>
+ The comma separated ejb jars that are included
+ in the deployed ear package.
+ </documentation>
+ </property>
</propertyGroup>
<propertyGroup name="Cache">
<property name="hibernateCacheProvider" required="false">
1.26 +1 -0 cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/cartridge.xml
Index: cartridge.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/cartridge.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -w -r1.25 -r1.26
--- cartridge.xml 14 Jun 2006 04:52:37 -0000 1.25
+++ cartridge.xml 14 Jun 2006 08:08:47 -0000 1.26
@@ -49,6 +49,7 @@
<property reference="daoInheritanceEnabled"/>
<property reference="enableDaoPropertiesCreateMethod"/>
<property reference="seamEnabled"/>
+ <property reference="jarFiles"/>
<!-- cartridge-property merge-point -->
1.3 +8 -0 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/config/persistence.xml.vsl
Index: persistence.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/config/persistence.xml.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- persistence.xml.vsl 11 Apr 2006 15:50:03 -0000 1.2
+++ persistence.xml.vsl 14 Jun 2006 08:08:47 -0000 1.3
@@ -17,6 +17,14 @@
#if ($stringUtils.isNotBlank($entityManagerJTADataSource))
<jta-data-source>${entityManagerJTADataSource}</jta-data-source>
#end
+#if ($stringUtils.isNotBlank($jarFiles))
+#**##set ($jars = $stringUtils.split($jarFiles,','))
+#**##foreach ($jar in $jars)
+#* *##if ($stringUtils.isNotBlank($jar))
+ <jar-file>${jar}</jar-file>
+#* *##end
+#**##end
+#end
<properties>
#if ($stringUtils.isNotBlank($hibernateHbm2DDLAuto))
<property name="hibernate.hbm2ddl.auto" value="${hibernateHbm2DDLAuto}"/>
1.5 +7 -4 cartridges/andromda-ejb3/src/changes/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/changes/changes.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- changes.xml 14 Jun 2006 05:07:25 -0000 1.4
+++ changes.xml 14 Jun 2006 08:08:47 -0000 1.5
@@ -44,7 +44,7 @@
<action dev="vancek" type="add">
Added installation howto.
</action>
- <action dev="tlu" type="add">
+ <action dev="vancek" due-to="tlu" type="add">
Added equals, hashCode and toString methods to entities.
</action>
<action dev="vancek" type="update">
@@ -69,7 +69,7 @@
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="vance" type="update">
+ <action dev="vancek" type="update">
Updated the EJB3MetafacadeModel.xml to use the maven2.repository environment variable rather than
hard coded paths for profiles.
</action>
@@ -86,14 +86,17 @@
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" type="fix">
+ <action dev="vancek" due-to="tlu" type="fix">
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.
+ remote and both. JIRA EJB-27
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">
+ Added support for adding ejb-jar elements to the persistence.xml. JIRA EJB-28.
+ </action>
</release>
</body>
</document>
\ No newline at end of file
|
|
From: Vance K. <va...@us...> - 2006-06-14 05:12:16
|
User: vancek
Date: 06/06/13 22:12:15
Modified: andromda-ejb3/src/site/xdoc howto3.xml howto12.xml
Log:
fixed view types for session bean/operations and service delegate
Revision Changes Path
1.7 +15 -2 cartridges/andromda-ejb3/src/site/xdoc/howto3.xml
Index: howto3.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/xdoc/howto3.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- howto3.xml 29 May 2006 01:53:36 -0000 1.6
+++ howto3.xml 14 Jun 2006 05:12:15 -0000 1.7
@@ -93,6 +93,12 @@
If you wish, you can override this feature by modelling the <code>@andromda.service.type</code>
tagged value on the session bean class.
</p>
+ <p class="highlight">
+ Stateless session beans that are JBoss Seam components do not follow the above rule. If your
+ class is modelled as a Seam component and you have modelled attributes on this class, it will not
+ be rendered as a stateful session bean, unless you specify the <code>@andromda.service.type</code>
+ tagged value.
+ </p>
</subsection>
<a name="View_Interface"/>
<subsection name="View Interfaces">
@@ -111,6 +117,10 @@
<li><p>both - This class/operations are available via the local and remote interfaces</p></li>
</ul>
</p>
+ <p>
+ If you have operations that exist in both the local and remote interfaces, your service
+ delegate class will allow you to select how you want to invoke your bean operations.
+ </p>
</subsection>
<a name="Transactions"/>
<subsection name="Transactions">
@@ -154,8 +164,11 @@
<p>
As you saw in the example in this howto, a session bean delegate class is generated for
every session bean. A client invokes the session bean's business methods via the delegate
- class, acting like a proxy via the service locator class. Both the service delegate and
- service locator classes are regenerated every time AndroMDA is run. You can find out
+ class, acting like a proxy via the service locator class.
+ </p>
+ <p>
+ Both the service delegate and
+ service locator classes are re-generated every time AndroMDA is run. You can find out
more information about session delegates from <a href="howto12.html">here</a>.
</p>
</subsection>
1.4 +2 -2 cartridges/andromda-ejb3/src/site/xdoc/howto12.xml
Index: howto12.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/xdoc/howto12.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- howto12.xml 29 May 2006 01:53:36 -0000 1.3
+++ howto12.xml 14 Jun 2006 05:12:15 -0000 1.4
@@ -45,7 +45,7 @@
</p>
<p>
The EJB3 cartridges cuts down the service delegates which references the service locator
- and provides the ability to invoke all methods available on the remote interface of
+ and provides the ability to invoke all available methods on the appropriate view interface of
the session bean.
</p>
<p>
@@ -106,7 +106,7 @@
<p>
In circumstance where you have manageable entities, a <code>ManageableServiceLocator</code>
class will also be generated with similar logic as the <code>ServiceLocator</code>
- class, except it provides the facility to get the manageable service beans remote interfaces.
+ class, except it used the remote interface of the manageable service bean.
</p>
</subsection>
<a name="Further_Reading"/>
|
|
From: Vance K. <va...@us...> - 2006-06-14 05:11:33
|
User: vancek
Date: 06/06/13 22:11:30
Modified: andromda-ejb3/src/site/xdoc howto10.xml
Log:
added singleton MDB docs
Revision Changes Path
1.5 +18 -0 cartridges/andromda-ejb3/src/site/xdoc/howto10.xml
Index: howto10.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/xdoc/howto10.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- howto10.xml 29 May 2006 01:53:36 -0000 1.4
+++ howto10.xml 14 Jun 2006 05:11:30 -0000 1.5
@@ -243,6 +243,24 @@
<a href="howto11.html">Environment Entry Injections</a> for further information.
</p>
</subsection>
+ <a name="Singleton_MDB"/>
+ <subsection name="Singleton MDB">
+ <p>
+ In some circumstance, you need to configure your MDB to maintain a max pool size of 1
+ such that you have a singleton message driven bean. This can be achieved via
+ the <a href="profile.html#@andromda.ejb.mdb.pool.size.max">maximum pool size</a>
+ tagged value which is modelled on the MDB.
+ </p>
+ <p>
+ You also have the option of configuring the
+ <a href="profile.html#@andromda.ejb.mdb.pool.size.min">minimum pool size</a>
+ of the MDB.
+ </p>
+ <p>
+ Both tagged values will add the appropriate activation config property to the
+ <code>ejb-jar.xml</code> deployment descriptor.
+ </p>
+ </subsection>
</section>
<section name="Next">
<p>
|
|
From: Vance K. <va...@us...> - 2006-06-14 05:07:26
|
User: vancek
Date: 06/06/13 22:07:25
Modified: andromda-ejb3/src/changes changes.xml
Log:
update maven2.reposity
introduced Seam components
fix view types - jira EJB-27
Revision Changes Path
1.4 +27 -2 cartridges/andromda-ejb3/src/changes/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/changes/changes.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- changes.xml 3 Jun 2006 15:39:42 -0000 1.3
+++ changes.xml 14 Jun 2006 05:07:25 -0000 1.4
@@ -59,7 +59,7 @@
on deployment:
java.lang.RuntimeException: unable to determine messagingType interface for MDB
</action>
- <action dev="vancek" type="delete">
+ <action dev="vancek" type="remove">
Removed container configuration option via tagged value on message driven beans since it
is no longer supported.
</action>
@@ -67,7 +67,32 @@
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.
+ activation config properties to the ejb-jar.xml. Added documentation.
+ </action>
+ <action dev="vance" 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" type="fix">
+ 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>
</release>
</body>
|
|
From: Vance K. <va...@us...> - 2006-06-14 05:05:45
|
User: vancek Date: 06/06/13 22:05:43 Modified: andromda-ejb3/src/main/uml EJB3MetafacadeModel.xml.zip Log: added initial support for JBoss Seam to entity and session bean components fixed JIRA EJB-27 getting view types in service delegates when mixing local and remote types Revision Changes Path 1.40 +213 -208 cartridges/andromda-ejb3/src/main/uml/EJB3MetafacadeModel.xml.zip <<Binary file>> |
|
From: Vance K. <va...@us...> - 2006-06-14 05:04:05
|
User: vancek
Date: 06/06/13 22:04:04
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3SessionOperationFacadeLogicImpl.java
EJB3SessionFacadeLogicImpl.java
Log:
fixed JIRA EJB-27 for getting view type of session bean and bean operations for mixed local and remote types
Revision Changes Path
1.12 +134 -0 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3SessionOperationFacadeLogicImpl.java
Index: EJB3SessionOperationFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3SessionOperationFacadeLogicImpl.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- EJB3SessionOperationFacadeLogicImpl.java 30 Apr 2006 01:54:47 -0000 1.11
+++ EJB3SessionOperationFacadeLogicImpl.java 14 Jun 2006 05:04:03 -0000 1.12
@@ -96,6 +96,103 @@
}
/**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3SessionOperationFacadeLogic#handleIsViewTypeStrictlyLocal()
+ */
+ protected boolean handleIsViewTypeStrictlyLocal()
+ {
+ boolean isViewTypeStrictlyLocal = false;
+ String viewType = (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_EJB_VIEWTYPE);
+ if (StringUtils.equalsIgnoreCase(viewType, EJB3Globals.VIEW_TYPE_LOCAL) || this.isViewTypeStrictlyBoth())
+ {
+ isViewTypeStrictlyLocal = true;
+ }
+ return isViewTypeStrictlyLocal;
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3SessionOperationFacadeLogic#handleIsViewTypeStrictlyRemote()
+ */
+ protected boolean handleIsViewTypeStrictlyRemote()
+ {
+ boolean isViewTypeStrictlyRemote = false;
+ String viewType = (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_EJB_VIEWTYPE);
+ if (StringUtils.equalsIgnoreCase(viewType, EJB3Globals.VIEW_TYPE_REMOTE) || this.isViewTypeStrictlyBoth())
+ {
+ isViewTypeStrictlyRemote = true;
+ }
+ return isViewTypeStrictlyRemote;
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3SessionOperationFacadeLogic#handleIsViewTypeStrictlyBoth()
+ */
+ protected boolean handleIsViewTypeStrictlyBoth()
+ {
+ boolean isViewTypeStrictlyBoth = false;
+ String viewType = (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_EJB_VIEWTYPE);
+ if (StringUtils.equalsIgnoreCase(viewType, EJB3Globals.VIEW_TYPE_BOTH))
+ {
+ isViewTypeStrictlyBoth = true;
+ }
+ return isViewTypeStrictlyBoth;
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3SessionOperationFacadeLogic#handleIsViewTypeAbsoluteLocal()
+ */
+ protected boolean handleIsViewTypeAbsoluteLocal()
+ {
+ boolean isViewTypeAsbolutelyLocal = false;
+ EJB3SessionFacade session = (EJB3SessionFacade)this.getOwner();
+ if (!this.isLifecycleCallback() &&
+ StringUtils.equalsIgnoreCase(this.getVisibility(), "public") &&
+ ((session.isViewTypeBoth() &&
+ ((session.isViewTypeStrictlyRemote() && this.isViewTypeStrictlyLocal()) ||
+ ((session.isViewTypeStrictlyLocal() || session.isViewTypeStrictlyBoth()) &&
+ !this.isViewTypeStrictlyRemote()))) ||
+ (session.isViewTypeStrictlyLocal() && !this.isViewTypeStrictlyRemote()) ||
+ this.isViewTypeStrictlyBoth()))
+ {
+ isViewTypeAsbolutelyLocal = true;
+ }
+ return isViewTypeAsbolutelyLocal;
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3SessionOperationFacadeLogic#handleIsViewTypeAbsoluteRemote()
+ */
+ protected boolean handleIsViewTypeAbsoluteRemote()
+ {
+ boolean isViewTypeAsbolutelyRemote = false;
+ EJB3SessionFacade session = (EJB3SessionFacade)this.getOwner();
+ if (!this.isLifecycleCallback() &&
+ StringUtils.equalsIgnoreCase(this.getVisibility(), "public") &&
+ ((session.isViewTypeBoth() &&
+ ((session.isViewTypeStrictlyLocal() && this.isViewTypeStrictlyRemote()) ||
+ ((session.isViewTypeStrictlyRemote() || session.isViewTypeStrictlyBoth()) &&
+ !this.isViewTypeStrictlyLocal()))) ||
+ (session.isViewTypeStrictlyRemote() && !this.isViewTypeStrictlyLocal()) ||
+ this.isViewTypeStrictlyBoth()))
+ {
+ isViewTypeAsbolutelyRemote = true;
+ }
+ return isViewTypeAsbolutelyRemote;
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3SessionOperationFacadeLogic#handleIsViewTypeAbsoluteBoth()
+ */
+ protected boolean handleIsViewTypeAbsoluteBoth()
+ {
+ boolean isViewTypeAbsolutelyBoth = false;
+ if (this.isViewTypeAbsoluteLocal() && this.isViewTypeAbsoluteRemote())
+ {
+ isViewTypeAbsolutelyBoth = true;
+ }
+ return isViewTypeAbsolutelyBoth;
+ }
+
+ /**
* @see org.andromda.cartridges.ejb3.metafacades.EJB3SessionOperationFacadeLogic#handleGetTransactionType()
*/
protected String handleGetTransactionType()
@@ -429,4 +526,41 @@
{
return this.isPostConstruct() || this.isPreDestroy() || this.isPostActivate() || this.isPrePassivate();
}
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3SessionOperationFacadeLogic#handleIsSeamValidationValidator()
+ */
+ protected boolean handleIsSeamValidationValidator()
+ {
+ boolean isSeamValidorMethod = false;
+ if (this.hasStereotype(EJB3Profile.STEREOTYPE_SEAM_VALIDATION_VALIDATOR))
+ {
+ isSeamValidorMethod = true;
+ }
+ return isSeamValidorMethod;
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3SessionOperationFacadeLogic#handleGetSeamValidationOutcome()
+ */
+ protected String handleGetSeamValidationOutcome()
+ {
+ String validationOutcome = (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_SEAM_VALIDATION_OUTCOME);
+ if (StringUtils.isNotBlank(validationOutcome) &&
+ !StringUtils.equals(validationOutcome, "org.jboss.seam.annotations.Outcome.REDISPLAY"))
+ {
+ validationOutcome = "\"" + validationOutcome + "\"";
+ }
+ return validationOutcome;
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3SessionOperationFacadeLogic#
+ * handleIsSeamValidationRefreshEntities()
+ */
+ protected boolean handleIsSeamValidationRefreshEntities()
+ {
+ return BooleanUtils.toBoolean(
+ (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_SEAM_VALIDATION_REFRESH_ENTITIES));
+ }
}
\ No newline at end of file
1.17 +158 -6 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3SessionFacadeLogicImpl.java
Index: EJB3SessionFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3SessionFacadeLogicImpl.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -w -r1.16 -r1.17
--- EJB3SessionFacadeLogicImpl.java 11 Apr 2006 16:11:34 -0000 1.16
+++ EJB3SessionFacadeLogicImpl.java 14 Jun 2006 05:04:03 -0000 1.17
@@ -227,8 +227,15 @@
String sessionType = (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_EJB_SESSION_TYPE);
if (StringUtils.isBlank(sessionType))
{
+ if (this.isSeamComponent())
+ {
+ isStateless = true;
+ }
+ else
+ {
isStateless = this.getAllInstanceAttributes() == null || this.getAllInstanceAttributes().isEmpty();
}
+ }
else
{
isStateless = sessionType.equalsIgnoreCase(EJB3Globals.SERVICE_TYPE_STATELESS);
@@ -258,8 +265,69 @@
*/
protected java.lang.String handleGetViewType()
{
- return EJB3MetafacadeUtils.getViewType(this,
+ String viewType = EJB3MetafacadeUtils.getViewType(this,
String.valueOf(this.getConfiguredProperty(SERVICE_DEFAULT_VIEW_TYPE)));
+
+ /**
+ * Check all session bean operations.
+ * If session view type is remote, check for operations with view type local and return both.
+ * If session view type is local, check for operations with view type remote and return both.
+ * Otherwise session view type is both, return both.
+ *
+ * NOTE: do not invoke viewType on EJB3SessionOperationFacade to avoid cyclic dependency and throwing
+ * StackOverFlowError.
+ */
+ if (viewType.equalsIgnoreCase(EJB3Globals.VIEW_TYPE_LOCAL))
+ {
+ boolean operationWithRemoteViewExists =
+ CollectionUtils.exists(
+ this.getBusinessOperations(),
+ new Predicate()
+ {
+ public boolean evaluate(Object object)
+ {
+ EJB3SessionOperationFacade operation = (EJB3SessionOperationFacade)object;
+ String operationViewType =
+ String.valueOf(operation.findTaggedValue(EJB3Profile.TAGGEDVALUE_EJB_VIEWTYPE));
+ if (operationViewType.equalsIgnoreCase(EJB3Globals.VIEW_TYPE_REMOTE) ||
+ operationViewType.equalsIgnoreCase(EJB3Globals.VIEW_TYPE_BOTH))
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ });
+ viewType = (operationWithRemoteViewExists ? EJB3Globals.VIEW_TYPE_BOTH : viewType);
+ }
+ else if (viewType.equalsIgnoreCase(EJB3Globals.VIEW_TYPE_REMOTE))
+ {
+ boolean operationWithLocalViewExists =
+ CollectionUtils.exists(
+ this.getBusinessOperations(),
+ new Predicate()
+ {
+ public boolean evaluate(Object object)
+ {
+ EJB3SessionOperationFacade operation = (EJB3SessionOperationFacade)object;
+ String operationViewType =
+ String.valueOf(operation.findTaggedValue(EJB3Profile.TAGGEDVALUE_EJB_VIEWTYPE));
+ if (operationViewType.equalsIgnoreCase(EJB3Globals.VIEW_TYPE_LOCAL) ||
+ operationViewType.equalsIgnoreCase(EJB3Globals.VIEW_TYPE_BOTH))
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ });
+ viewType = (operationWithLocalViewExists ? EJB3Globals.VIEW_TYPE_BOTH : viewType);
+ }
+ return viewType;
}
/**
@@ -268,8 +336,8 @@
protected boolean handleIsViewTypeLocal()
{
boolean isLocal = false;
- if (this.getViewType().equalsIgnoreCase(EJB3Globals.VIEW_TYPE_LOCAL) ||
- this.getViewType().equalsIgnoreCase(EJB3Globals.VIEW_TYPE_BOTH))
+ if (this.getViewType().equalsIgnoreCase(EJB3Globals.VIEW_TYPE_LOCAL) || this.isViewTypeBoth() ||
+ this.isSeamComponent())
{
isLocal = true;
}
@@ -282,8 +350,7 @@
protected boolean handleIsViewTypeRemote()
{
boolean isRemote = false;
- if (this.getViewType().equalsIgnoreCase(EJB3Globals.VIEW_TYPE_REMOTE) ||
- this.getViewType().equalsIgnoreCase(EJB3Globals.VIEW_TYPE_BOTH))
+ if (this.getViewType().equalsIgnoreCase(EJB3Globals.VIEW_TYPE_REMOTE) || this.isViewTypeBoth())
{
isRemote = true;
}
@@ -291,6 +358,67 @@
}
/**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3SessionFacadeLogic#handleIsViewTypeBoth()
+ */
+ protected boolean handleIsViewTypeBoth()
+ {
+ boolean isBoth = false;
+ if (this.getViewType().equalsIgnoreCase(EJB3Globals.VIEW_TYPE_BOTH))
+ {
+ isBoth = true;
+ }
+ return isBoth;
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3SessionFacadeLogic#handleIsViewTypeStrictlyLocal()
+ */
+ protected boolean handleIsViewTypeStrictlyLocal()
+ {
+
+ boolean isViewTypeStrictlyLocal = false;
+ String viewType = EJB3MetafacadeUtils.getViewType(this,
+ String.valueOf(this.getConfiguredProperty(SERVICE_DEFAULT_VIEW_TYPE)));
+ if (StringUtils.equalsIgnoreCase(viewType, EJB3Globals.VIEW_TYPE_LOCAL) ||
+ StringUtils.equalsIgnoreCase(viewType, EJB3Globals.VIEW_TYPE_BOTH))
+ {
+ isViewTypeStrictlyLocal = true;
+ }
+ return isViewTypeStrictlyLocal;
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3SessionFacadeLogic#handleIsViewTypeStrictlyRemote()
+ */
+ protected boolean handleIsViewTypeStrictlyRemote()
+ {
+ boolean isViewTypeStrictlyRemote = false;
+ String viewType = EJB3MetafacadeUtils.getViewType(this,
+ String.valueOf(this.getConfiguredProperty(SERVICE_DEFAULT_VIEW_TYPE)));
+ if (StringUtils.equalsIgnoreCase(viewType, EJB3Globals.VIEW_TYPE_REMOTE) ||
+ StringUtils.equalsIgnoreCase(viewType, EJB3Globals.VIEW_TYPE_BOTH))
+ {
+ isViewTypeStrictlyRemote = true;
+ }
+ return isViewTypeStrictlyRemote;
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3SessionFacadeLogic#handleIsViewTypeStrictlyBoth()
+ */
+ protected boolean handleIsViewTypeStrictlyBoth()
+ {
+ boolean isViewTypeStrictlyBoth = false;
+ String viewType = EJB3MetafacadeUtils.getViewType(this,
+ String.valueOf(this.getConfiguredProperty(SERVICE_DEFAULT_VIEW_TYPE)));
+ if (StringUtils.equalsIgnoreCase(viewType, EJB3Globals.VIEW_TYPE_BOTH))
+ {
+ isViewTypeStrictlyBoth = true;
+ }
+ return isViewTypeStrictlyBoth;
+ }
+
+ /**
* @see org.andromda.cartridges.ejb3.metafacades.EJB3SessionFacade#getHomeInterfaceName()
*/
protected java.lang.String handleGetHomeInterfaceName()
@@ -1004,4 +1132,28 @@
}
}) != null;
}
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3SessionFacadeLogic#handleIsSeamComponent()
+ */
+ protected boolean handleIsSeamComponent()
+ {
+ return EJB3MetafacadeUtils.isSeamComponent(this);
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3SessionFacadeLogic#handleGetSeamComponentScopeType()
+ */
+ protected String handleGetSeamComponentScopeType()
+ {
+ return EJB3MetafacadeUtils.getSeamComponentScopeType(this, this.isStateless());
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3SessionFacadeLogic#handleGetSeamComponentName()
+ */
+ protected String handleGetSeamComponentName()
+ {
+ return EJB3MetafacadeUtils.getSeamComponentName(this);
+ }
}
\ No newline at end of file
|
|
From: Vance K. <va...@us...> - 2006-06-14 05:01:14
|
User: vancek
Date: 06/06/13 22:01:14
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3MetafacadeUtils.java
Log:
getViewType no longer has to worry about interface view type for entity pojos
Revision Changes Path
1.6 +74 -24 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3MetafacadeUtils.java
Index: EJB3MetafacadeUtils.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3MetafacadeUtils.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- EJB3MetafacadeUtils.java 1 Feb 2006 08:41:34 -0000 1.5
+++ EJB3MetafacadeUtils.java 14 Jun 2006 05:01:13 -0000 1.6
@@ -90,8 +90,7 @@
* view type can be retrieved from the <code>classifier</code>, then the
* <code>defaultViewType</code> is returned.
*
- * If the model element has the entity stereotype, returns 'local'.
- * Otherwise (session ejb) checks the ejb tagged value and if there is
+ * If session ejb pojo then checks the ejb tagged value and if there is
* no value defined, returns 'remote'.
*
* @param classifier The classifier to lookup the view type tagged value
@@ -105,19 +104,16 @@
final String methodName = "EJBMetafacadeUtils.getViewType";
ExceptionUtils.checkNull(methodName, "classifer", classifier);
String viewType = (String)classifier.findTaggedValue(EJB3Profile.TAGGEDVALUE_EJB_VIEWTYPE);
- if (classifier.hasStereotype(EJB3Profile.STEREOTYPE_ENTITY))
- {
if (StringUtils.isEmpty(viewType))
{
- viewType = (StringUtils.isNotBlank(defaultViewType) ? defaultViewType : EJB3Globals.VIEW_TYPE_LOCAL);
- }
- }
- else if (classifier.hasStereotype(EJB3Profile.STEREOTYPE_SERVICE))
+ if (classifier.hasStereotype(EJB3Profile.STEREOTYPE_SERVICE))
{
// if the view type wasn't found, search all super classes
if (StringUtils.isEmpty(viewType))
{
- viewType = (String)CollectionUtils.find(classifier.getAllGeneralizations(), new Predicate()
+ viewType = (String)CollectionUtils.find(
+ classifier.getAllGeneralizations(),
+ new Predicate()
{
public boolean evaluate(Object object)
{
@@ -128,7 +124,9 @@
}
if (StringUtils.isEmpty(viewType))
{
- viewType = (StringUtils.isNotBlank(defaultViewType) ? defaultViewType : EJB3Globals.VIEW_TYPE_REMOTE);
+ viewType = (StringUtils.isNotBlank(defaultViewType) ?
+ defaultViewType : EJB3Globals.VIEW_TYPE_REMOTE);
+ }
}
}
return viewType.toLowerCase();
@@ -356,4 +354,56 @@
fullyQualifiedName.append(StringUtils.trimToEmpty(suffix));
return fullyQualifiedName.toString();
}
+
+ /**
+ * Returns true if the Seam stereotype is modelled on the class.
+ *
+ * @param classifier The classifier to lookup if the stereotype is modelled
+ * @return True is stereotype exists, false otherwise
+ */
+ static boolean isSeamComponent(ClassifierFacade classifier)
+ {
+ boolean isSeamComponent = false;
+ if (classifier.hasStereotype(EJB3Profile.STEREOTYPE_SEAM_COMPONENT))
+ {
+ isSeamComponent = true;
+ }
+ return isSeamComponent;
+ }
+
+ /**
+ * Gets the Seam component scope type for Entity and Session beans.
+ * If no scope has been specified:
+ * If the Classifier is a stateless session bean, then returns STATELESS
+ * If the Classifier is an entity or stateful session bean, then returns CONVERSATION
+ *
+ * @param classifier The classifier to lookup the scope type tagged value
+ * @paam stateful Whether the classifier is a stateful session bean
+ * @return The scope type as a String
+ */
+ static String getSeamComponentScopeType(ClassifierFacade classifier, boolean stateless)
+ {
+ final String methodName = "EJBMetafacadeUtils.getSeamComponentScopeType";
+ ExceptionUtils.checkNull(methodName, "classifer", classifier);
+ return (String)classifier.findTaggedValue(EJB3Profile.TAGGEDVALUE_SEAM_SCOPE_TYPE);
+ }
+
+ /**
+ * Returns the Seam component name. Can override using tagged value, otherwise just the
+ * class name.
+ *
+ * @param classifier The classifier to get the tagged value or the name from.
+ * @return The Seam component name
+ */
+ static String getSeamComponentName(ClassifierFacade classifier)
+ {
+ final String methodName = "EJBMetafacadeUtils.getSeamComponentName";
+ ExceptionUtils.checkNull(methodName, "classifer", classifier);
+ String componentName = (String)classifier.findTaggedValue(EJB3Profile.TAGGEDVALUE_SEAM_COMPONENT_NAME);
+ if (StringUtils.isBlank(componentName))
+ {
+ componentName = StringUtils.uncapitalize(classifier.getName());
+ }
+ return componentName;
+ }
}
\ No newline at end of file
|
|
From: Vance K. <va...@us...> - 2006-06-14 04:58:20
|
User: vancek
Date: 06/06/13 21:58:19
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3SessionAttributeFacadeLogicImpl.java
Log:
added initial JBoss Seam support
Revision Changes Path
1.2 +65 -0 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3SessionAttributeFacadeLogicImpl.java
Index: EJB3SessionAttributeFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3SessionAttributeFacadeLogicImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- EJB3SessionAttributeFacadeLogicImpl.java 28 Dec 2005 00:32:55 -0000 1.1
+++ EJB3SessionAttributeFacadeLogicImpl.java 14 Jun 2006 04:58:19 -0000 1.2
@@ -29,4 +29,69 @@
return (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_EJB_TRANSACTION_TYPE, true);
}
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3SessionAttributeFacadeLogic#handleIsSeamComponentIn()
+ */
+ protected boolean handleIsSeamComponentIn()
+ {
+ boolean isSeamComponentIn = false;
+ if (this.hasStereotype(EJB3Profile.STEREOTYPE_SEAM_COMPONENT_IN))
+ {
+ isSeamComponentIn = true;
+ }
+ return isSeamComponentIn;
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3SessionAttributeFacadeLogic#handleIsSeamComponentOut()
+ */
+ protected boolean handleIsSeamComponentOut()
+ {
+ boolean isSeamComponentOut = false;
+ if (this.hasStereotype(EJB3Profile.STEREOTYPE_SEAM_COMPONENT_OUT))
+ {
+ isSeamComponentOut = true;
+ }
+ return isSeamComponentOut;
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3SessionAttributeFacadeLogic#handleIsSeamLifecyleCreate()
+ */
+ protected boolean handleIsSeamLifecyleCreate()
+ {
+ boolean isSeamLifecycleCreate = false;
+ if (this.hasStereotype(EJB3Profile.STEREOTYPE_SEAM_LIFECYCLE_CREATE))
+ {
+ isSeamLifecycleCreate = true;
+ }
+ return isSeamLifecycleCreate;
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3SessionAttributeFacadeLogic#handleIsSeamLifecycleDestroy()
+ */
+ protected boolean handleIsSeamLifecycleDestroy()
+ {
+ boolean isSeamLifecycleCreate = false;
+ if (this.hasStereotype(EJB3Profile.STEREOTYPE_SEAM_LIFECYCLE_DESTROY))
+ {
+ isSeamLifecycleCreate = true;
+ }
+ return isSeamLifecycleCreate;
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3SessionAttributeFacadeLogic#handleIsSeamValidationValid()
+ */
+ protected boolean handleIsSeamValidationValid()
+ {
+ boolean isSeamValidComponent = false;
+ if (this.hasStereotype(EJB3Profile.STEREOTYPE_SEAM_VALIDATION_VALID))
+ {
+ isSeamValidComponent = true;
+ }
+ return isSeamValidComponent;
+ }
+
}
\ No newline at end of file
|
|
From: Vance K. <va...@us...> - 2006-06-14 04:56:58
|
User: vancek
Date: 06/06/13 21:56:57
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3
EJB3Profile.java EJB3Globals.java
Log:
added initial JBoss Seam support
Revision Changes Path
1.25 +59 -0 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/EJB3Profile.java
Index: EJB3Profile.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/EJB3Profile.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -w -r1.24 -r1.25
--- EJB3Profile.java 3 Jun 2006 15:36:47 -0000 1.24
+++ EJB3Profile.java 14 Jun 2006 04:56:57 -0000 1.25
@@ -178,6 +178,43 @@
*/
public static final String STEREOTYPE_POST_LOAD = profile.get("POST_LOAD");
+ /**
+ * Specifies the bean is a Seam component
+ */
+ public static final String STEREOTYPE_SEAM_COMPONENT = profile.get("SEAM_COMPONENT");
+
+ /**
+ * Specifies the bean attribute is a component attribute to be injected from a context variable
+ */
+ public static final String STEREOTYPE_SEAM_COMPONENT_IN = profile.get("SEAM_COMPONENT_IN");
+
+ /**
+ * Specifies the bean attribute is a component attribute to be outjected from a context variable
+ */
+ public static final String STEREOTYPE_SEAM_COMPONENT_OUT = profile.get("SEAM_COMPONENT_OUT");
+
+ /**
+ * Specifies the bean operation is a Seam Create lifecycle operation
+ */
+ public static final String STEREOTYPE_SEAM_LIFECYCLE_CREATE = profile.get("SEAM_LIFECYCLE_CREATE");
+
+ /**
+ * Specifies the bean operation is a Seam Destroy lifecycle operation
+ */
+ public static final String STEREOTYPE_SEAM_LIFECYCLE_DESTROY = profile.get("SEAM_LIFECYCLE_DESTROY");
+
+ /**
+ * Specifies the bean component attribute must be validated before the action listener
+ * Seam component method is invoked
+ */
+ public static final String STEREOTYPE_SEAM_VALIDATION_VALID = profile.get("SEAM_VALIDATION_VALID");
+
+ /**
+ * Specifies the bean component operation requires validation of the components before
+ * being invoked
+ */
+ public static final String STEREOTYPE_SEAM_VALIDATION_VALIDATOR = profile.get("SEAM_VALIDATION_VALIDATOR");
+
/* ----------------- Tagged Values -------------------- */
/**
@@ -526,4 +563,26 @@
*/
public static final String TAGGEDVALUE_WEBSERVICE_OPERATION_RESULT_NAME =
profile.get("WEBSERVICE_OPERATION_RESULT_NAME");
+
+ /**
+ * Defines the JBoss Seam component scope type
+ */
+ public static final String TAGGEDVALUE_SEAM_SCOPE_TYPE = profile.get("SEAM_COMPONENT_SCOPE_TYPE");
+
+ /**
+ * Defines the Seam component name
+ */
+ public static final String TAGGEDVALUE_SEAM_COMPONENT_NAME = profile.get("SEAM_COMPONENT_NAME");
+
+ /**
+ * Defines the JSF outcome when validation fails
+ */
+ public static final String TAGGEDVALUE_SEAM_VALIDATION_OUTCOME = profile.get("SEAM_VALIDATION_OUTCOME");
+
+ /**
+ * Defines whether invalid entities in the managed state should be refreshed from the
+ * database when validation fails.
+ */
+ public static final String TAGGEDVALUE_SEAM_VALIDATION_REFRESH_ENTITIES =
+ profile.get("SEAM_VALIDATION_REFRESH_ENTITIES");
}
\ No newline at end of file
1.12 +10 -0 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/EJB3Globals.java
Index: EJB3Globals.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/EJB3Globals.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- EJB3Globals.java 15 May 2006 12:30:17 -0000 1.11
+++ EJB3Globals.java 14 Jun 2006 04:56:57 -0000 1.12
@@ -246,4 +246,14 @@
* The property used to specify whether to enable query cache.
*/
public static final String HIBERNATE_USER_QUERY_CACHE = "hibernateUseQueryCache";
+
+ /**
+ * Seam component scope type STATELESS
+ */
+ public static final String SEAM_COMPONENT_SCOPE_STATELESS = "STATELESS";
+
+ /**
+ * Seam component scope type CONVERSATION
+ */
+ public static final String SEAM_COMPONENT_SCOPE_CONVERSATION = "CONVERSATION";
}
|
|
From: Vance K. <va...@us...> - 2006-06-14 04:55:22
|
User: vancek
Date: 06/06/13 21:55:21
Modified: andromda-ejb3/src/main/resources/templates/ejb3
SessionBeanBase.vsl Entity.vsl EntityEmbeddable.vsl
andromda-ejb3/src/main/resources/META-INF/andromda
namespace.xml profile.xml
andromda-ejb3/src/main/resources/templates/ejb3/config
ejb-jar.xml.vsl
andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3EntityFacadeLogicImpl.java
Log:
added initial JBoss Seam support
Revision Changes Path
1.6 +44 -10 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionBeanBase.vsl
Index: SessionBeanBase.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionBeanBase.vsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- SessionBeanBase.vsl 3 Jun 2006 15:39:42 -0000 1.5
+++ SessionBeanBase.vsl 14 Jun 2006 04:55:20 -0000 1.6
@@ -1,5 +1,8 @@
// license-header java merge-point
-/* Autogenerated by AndroMDA (SessionBean.vsl) - do not edit */
+//
+// Attention: Generated code! Do not modify by hand!
+// Generated by: SessionBeanBase.vsl in andromda-ejb3-cartridge.
+//
#parse("templates/ejb3/Globals.vm")
#if ($stringUtils.isNotBlank($service.packageName))
package $service.packageName;
@@ -16,6 +19,15 @@
*
$service.getDocumentation(" * ")
*/
+##
+## Define the Seam component name for the class if JBoss Seam is enabled
+##
+#**##if ($service.seamComponent)
+...@or...("${service.seamComponentName}")
+#* *##if ($stringUtils.isNotBlank($service.seamComponentScopeType))
+...@or...ope(org.jboss.seam.ScopeType.${service.seamComponentScopeType})
+#* *##end
+#**##end
#if ($service.transactionManagement)
@javax.ejb.TransactionManagement(javax.ejb.TransactionManagementType.${service.transactionManagement})
#end
@@ -180,6 +192,19 @@
/**
* The $attribute.name property
*/
+#* *##if ($service.seamComponent)
+#* *##if ($attribute.seamComponentIn)
+ @org.jboss.seam.annotations.In#if (!$attribute.required)(required = false)#else#**#(create = true)#end
+
+#* *##end
+#* *##if ($attribute.seamComponentOut)
+ @org.jboss.seam.annotations.Out#if (!$attribute.required)(required = false)#end
+
+#* *##end
+#* *##if ($attribute.seamValidationValid)
+ @org.hibernate.validator.Valid
+#* *##end
+#* *##end
protected $attribute.type.fullyQualifiedName $attribute.name;
#**##end
@@ -252,7 +277,6 @@
#**##foreach ($attribute in $instanceAttributes)
#* *##set ($visibility = $attribute.visibility)
-#* *##if ($visibility == "public")
/**
* Get the ${attribute.name} property
$attribute.getDocumentation(" * ")
@@ -285,7 +309,6 @@
#* *##end
#* *##end
-#**##end
#end
#if (!$entityReferences.empty)
@@ -350,6 +373,17 @@
// Interceptor class exclusions are defined in ejb-jar.xm
// @javax.interceptor.ExcludeClassInterceptors
#* *##end
+#* *##if ($service.seamComponent)
+#* *##if ($operation.seamLifecycleCreate)
+ @org.jboss.seam.annotations.Create
+#* *##elseif ($operation.seamLifecycleDestroy)
+ @org.jboss.seam.annotations.Destroy
+#* *##end
+#* *##if ($operation.seamValidationValidator)
+#* *##set ($argExists = false)
+ @org.jboss.seam.annotations.IfInvalid(#if ($operation.seamValidationOutcome)outcome = ${operation.seamValidationOutcome}#set ($argExists = true)#end#if ($operation.seamValidationRefreshEntities)#if ($argExists), #end#**#refreshEntities = ${operation.seamValidationRefreshEntities}#end)
+#* *##end
+#* *##end
$operation.visibility $operation.returnType.fullyQualifiedName $operation.signature
#* *##if ($operation.exceptionsPresent)
$operation.throwsClause
1.19 +15 -8 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/Entity.vsl
Index: Entity.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/Entity.vsl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -w -r1.18 -r1.19
--- Entity.vsl 15 May 2006 12:44:38 -0000 1.18
+++ Entity.vsl 14 Jun 2006 04:55:20 -0000 1.19
@@ -20,22 +20,29 @@
*/
@javax.persistence.Entity
+#if ($entity.seamComponent)
+...@or...("${entity.seamComponentName}")
+#**##if ($stringUtils.isNotBlank($entity.seamComponentScopeType))
+...@or...ope(org.jboss.seam.ScopeType.${entity.seamComponentScopeType})
+#**##end
+#else
+// Uncomment to enable seam component name
+// @org.jboss.seam.annotations.Name("${entity.seamComponentName}")
+// Uncomment to set specific component scope type
+//@org.jboss.seam.annotations.Scope(org.jboss.seam.ScopeType.#if ($entity.stateless)STATELESS#else#**#CONVERSATION#end)
+#end
@javax.persistence.Table(name = "${entity.tableName}")
#if ($entity.listenerEnabled)
@javax.persistence.EntityListeners({${entity.fullyQualifiedEntityListenerName}.class})
#else
-/**
- * Uncomment to enable entity listener for ${entity.entityName}
- * @javax.persistence.EntityListeners({${entity.fullyQualifiedEntityListenerName}.class})
- */
+// Uncomment to enable entity listener for ${entity.entityName}
+// @javax.persistence.EntityListeners({${entity.fullyQualifiedEntityListenerName}.class})
#end
#if ($entity.cacheEnabled)
@org.hibernate.annotations.Cache(usage = org.hibernate.annotations.CacheConcurrencyStrategy.${entity.cacheType})
#else
-/**
- * Uncomment to enable caching for ${entity.entityName}
- * @org.hibernate.annotations.Cache(usage = org.hibernate.annotations.CacheConcurrencyStrategy.${entity.cacheType})
- */
+// Uncomment to enable caching for ${entity.entityName}
+// @org.hibernate.annotations.Cache(usage = org.hibernate.annotations.CacheConcurrencyStrategy.${entity.cacheType})
#end
#set ($finders = $entity.getQueryOperations(false))
#if (!$finders.empty)
1.31 +17 -0 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EntityEmbeddable.vsl
Index: EntityEmbeddable.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EntityEmbeddable.vsl,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -w -r1.30 -r1.31
--- EntityEmbeddable.vsl 1 Jun 2006 14:40:47 -0000 1.30
+++ EntityEmbeddable.vsl 14 Jun 2006 04:55:20 -0000 1.31
@@ -41,6 +41,12 @@
@javax.persistence.MappedSuperclass
#else
@javax.persistence.Entity
+#**##if ($entity.seamComponent)
+...@or...("${entity.seamComponentName}")
+#* *##if ($stringUtils.isNotBlank($entity.seamComponentScopeType))
+...@or...ope(org.jboss.seam.ScopeType.${entity.seamComponentScopeType})
+#* *##end
+#**##end
##
## Include the Table annotation for a base class in single table inheritence hierarchy
## but not in the subclasses. Include in all classes for joined and table per class
@@ -426,6 +432,17 @@
#* *##if ($stringUtils.isNotBlank($attribute.enumerationType))
@javax.persistence.Enumerated(javax.persistence.EnumType.${attribute.enumerationType})
#* *##end
+#* *##if ($entity.seamComponent)
+##
+## If JBoss Seam is enabled, add NotNull and Length annotations
+##
+#* *##if (!$attribute.columnNullable)
+ @org.hibernate.validator.NotNull
+#* *##end
+#* *##if ($attribute.columnLength)
+ @org.hibernate.validator.Length(max = $attribute.columnLength)
+#* *##end
+#* *##end
#* *##end
##
## Override attribute type if attribute is a LOB and lob type is specified
1.23 +7 -0 cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/namespace.xml
Index: namespace.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/namespace.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -w -r1.22 -r1.23
--- namespace.xml 30 Apr 2006 01:52:09 -0000 1.22
+++ namespace.xml 14 Jun 2006 04:55:21 -0000 1.23
@@ -1064,6 +1064,13 @@
locator class.
</documentation>
</property>
+ <property name="seamEnabled">
+ <default>false</default>
+ <documentation>
+ Set to true to enable the JBoss Seam application
+ framework for Java EE 5.
+ </documentation>
+ </property>
</propertyGroup>
</properties>
</namespace>
\ No newline at end of file
1.30 +107 -0 cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/profile.xml
Index: profile.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/profile.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -w -r1.29 -r1.30
--- profile.xml 3 Jun 2006 15:36:47 -0000 1.29
+++ profile.xml 14 Jun 2006 04:55:21 -0000 1.30
@@ -430,6 +430,71 @@
<value>WebServiceOperation</value>
<appliedOnElement>Service operation</appliedOnElement>
</element>
+ <element name="SEAM_COMPONENT">
+ <documentation>
+ Indicates this bean is a Seam component object. This
+ must be set before anything else is modelled on the class.
+ </documentation>
+ <value>Seam</value>
+ <appliedOnElement>Entity, Session and Java Beans</appliedOnElement>
+ </element>
+ <element name="SEAM_COMPONENT_IN">
+ <documentation>
+ Indicates a Seam component attribute which is to be injected
+ from a context variable at the begining of each component method
+ invocation.
+ </documentation>
+ <value>In</value>
+ <appliedOnElement>Session and Java Bean Attribute</appliedOnElement>
+ </element>
+ <element name="SEAM_COMPONENT_OUT">
+ <documentation>
+ Indicates a Seam component attribute which is to be outjected
+ to a context variable at the end of each component method
+ invocation.
+ </documentation>
+ <value>Out</value>
+ <appliedOnElement>Session and Java Bean Attribute</appliedOnElement>
+ </element>
+ <element name="SEAM_LIFECYCLE_CREATE">
+ <documentation>
+ Indicates that the method is a Seam component lifecycle operation
+ and should be called when an instance of the component is instantiated by
+ Seam.
+ </documentation>
+ <value>Create</value>
+ <appliedOnElement>Session and Java Bean Operation</appliedOnElement>
+ </element>
+ <element name="SEAM_LIFECYCLE_DESTROY">
+ <documentation>
+ Indicates that the method is a Seam component lifecycle operation
+ and should be called when the context ends and its context variables
+ are destroyed.
+ All SFSB components must define a Destroy method to guarantee
+ destruction of the SFSB when the context ends.
+ </documentation>
+ <value>Destroy</value>
+ <appliedOnElement>Session and Java Bean Operation</appliedOnElement>
+ </element>
+ <element name="SEAM_VALIDATION_VALID">
+ <documentation>
+ Specifies that the Hibernate Validator should validate this and related
+ component attributes before an action listener Seam component method is
+ invoked.
+ </documentation>
+ <value>Valid</value>
+ <appliedOnElement>Session and Java Bean Attribute</appliedOnElement>
+ </element>
+ <element name="SEAM_VALIDATION_VALIDATOR">
+ <documentation>
+ Specifies that the validator should validate all Seam components marked
+ with @Valid annotation before the method is invoked. Use of
+ tagged values for outcome when validation fails and for refreshing
+ entities when validation fails is provided.
+ </documentation>
+ <value>Validator</value>
+ <appliedOnElement>Session and Java Bean Operations</appliedOnElement>
+ </element>
</elementGroup>
<elementGroup name="Tagged Values">
<element name="ATTRIBUTE_PERSISTENCE_OPTIONAL">
@@ -1357,6 +1422,48 @@
<value>@andromda.webservice.operation.result.name</value>
<appliedOnElement>Service and WebService</appliedOnElement>
</element>
+ <element name="SEAM_COMPONENT_SCOPE_TYPE">
+ <documentation>
+ The JBoss Seam component scope type.
+ The default for stateless session beans is STATELESS.
+ The default for entity beans and stateful session beans
+ is CONVERSATION.
+ </documentation>
+ <value>@andromda.seam.component.scope</value>
+ <appliedOnElement>Entity, Session and Java Beans</appliedOnElement>
+ <allowedValues>
+ <value>EVENT</value>
+ <value>PAGE</value>
+ <value>CONVERSATION</value>
+ <value>SESSION</value>
+ <value>BUSINESS_PROCESS</value>
+ <value>APPLICATION</value>
+ <value>STATELESS</value>
+ </allowedValues>
+ </element>
+ <element name="SEAM_COMPONENT_NAME">
+ <documentation>
+ Override the default Seam component object name.
+ </documentation>
+ <value>@andromda.seam.component.name</value>
+ <appliedOnElement>Entity, Session and Java Beans</appliedOnElement>
+ </element>
+ <element name="SEAM_VALIDATION_OUTCOME">
+ <documentation>
+ Returns the JSF outcome when validation fails.
+ </documentation>
+ <value>@andromda.seam.validation.outcome</value>
+ <appliedOnElement>Session and Java Bean Operation</appliedOnElement>
+ </element>
+ <element name="SEAM_VALIDATION_REFRESH_ENTITIES">
+ <documentation>
+ Specifies whether invalid entities in the managed state
+ should be refreshed from the database when
+ validation fails.
+ </documentation>
+ <value>@andromda.seam.validation.refreshEntities</value>
+ <appliedOnElement>Session and Java Bean Operation</appliedOnElement>
+ </element>
</elementGroup>
</elements>
</profile>
\ No newline at end of file
1.6 +6 -0 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/config/ejb-jar.xml.vsl
Index: ejb-jar.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/config/ejb-jar.xml.vsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- ejb-jar.xml.vsl 3 Jun 2006 15:36:47 -0000 1.5
+++ ejb-jar.xml.vsl 14 Jun 2006 04:55:21 -0000 1.6
@@ -221,6 +221,12 @@
</interceptor-binding>
#**##end
#end
+#if (${seamEnabled} == 'true')
+ <interceptor-binding>
+ <ejb-name>*</ejb-name>
+ <interceptor-class>org.jboss.seam.ejb.SeamInterceptor</interceptor-class>
+ </interceptor-binding>
+#end
</assembly-descriptor>
</ejb-jar>
\ No newline at end of file
1.24 +24 -2 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java
Index: EJB3EntityFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -w -r1.23 -r1.24
--- EJB3EntityFacadeLogicImpl.java 15 May 2006 12:30:17 -0000 1.23
+++ EJB3EntityFacadeLogicImpl.java 14 Jun 2006 04:55:21 -0000 1.24
@@ -1592,5 +1592,27 @@
String.valueOf(this.getConfiguredProperty(EJB3Globals.HIBERNATE_USER_QUERY_CACHE)));
}
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleIsSeamComponent()
+ */
+ protected boolean handleIsSeamComponent()
+ {
+ return EJB3MetafacadeUtils.isSeamComponent(this);
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleGetSeamComponentScopeType()
+ */
+ protected String handleGetSeamComponentScopeType()
+ {
+ return EJB3MetafacadeUtils.getSeamComponentScopeType(this, false);
+ }
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleGetSeamComponentName()
+ */
+ protected String handleGetSeamComponentName()
+ {
+ return EJB3MetafacadeUtils.getSeamComponentName(this);
+ }
}
\ No newline at end of file
|
|
From: Vance K. <va...@us...> - 2006-06-14 04:52:37
|
User: vancek
Date: 06/06/13 21:52:37
Modified: andromda-ejb3/src/main/resources/META-INF/andromda
cartridge.xml
Log:
added ServiceDelegateBase template
Revision Changes Path
1.25 +15 -0 cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/cartridge.xml
Index: cartridge.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/cartridge.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -w -r1.24 -r1.25
--- cartridge.xml 27 Apr 2006 06:48:28 -0000 1.24
+++ cartridge.xml 14 Jun 2006 04:52:37 -0000 1.25
@@ -48,6 +48,7 @@
<property reference="daos"/>
<property reference="daoInheritanceEnabled"/>
<property reference="enableDaoPropertiesCreateMethod"/>
+ <property reference="seamEnabled"/>
<!-- cartridge-property merge-point -->
@@ -223,6 +224,20 @@
</template>
<template
+ path="templates/ejb3/ServiceDelegateBase.vsl"
+ outputPattern="$generatedFile"
+ outlet="services"
+ overwrite="true"
+ outputToSingleFile="true"
+ outputOnEmptyElements="false">
+ <modelElements>
+ <modelElement variable="services">
+ <type name="org.andromda.cartridges.ejb3.metafacades.EJB3SessionFacade"/>
+ </modelElement>
+ </modelElements>
+ </template>
+
+ <template
path="templates/ejb3/ServiceLocator.vsl"
outputPattern="$generatedFile"
outlet="services"
|
|
From: Vance K. <va...@us...> - 2006-06-14 04:49:56
|
User: vancek
Date: 06/06/13 21:49:55
Modified: andromda-ejb3/src/main/resources/templates/ejb3
ServiceDelegate.vsl WebServiceInterface.vsl
SessionLocal.vsl SessionRemote.vsl
Log:
Fix for JIRA EJB-27 - mixing local and remote interfaces with service delegates.
Revision Changes Path
1.5 +29 -24 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/ServiceDelegate.vsl
Index: ServiceDelegate.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/ServiceDelegate.vsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- ServiceDelegate.vsl 2 Mar 2006 10:19:45 -0000 1.4
+++ ServiceDelegate.vsl 14 Jun 2006 04:49:55 -0000 1.5
@@ -1,4 +1,8 @@
// license-header java merge-point
+//
+// Attention: Generated code! Do not modify by hand!
+// Generated by: ServiceDelegate.vsl in andromda-ejb3-cartridge.
+//
#if ($stringUtils.isNotBlank($service.packageName))
package $service.packageName;
#end
@@ -10,28 +14,24 @@
* @see $service.fullyQualifiedServiceName
*/
public class $service.serviceDelegateName
+ extends ${ejb3TypesPackage}.ServiceDelegateBase
{
/**
- * Environment properties
- */
- private java.util.Properties env = null;
-
- /**
* Default constructor
*/
public ${service.serviceDelegateName}()
{
- // Null implementation
+ super();
}
/**
* Constructor setting the envirinment properties.
*
- * @param env
+ * @param properties
*/
- public ${service.serviceDelegateName}(java.util.Properties env)
+ public ${service.serviceDelegateName}(java.util.Properties properties)
{
- this.env = env;
+ super(properties);
}
#if ($service.viewTypeRemote)
@@ -41,7 +41,7 @@
private final ${service.fullyQualifiedServiceRemoteInterfaceName} get${service.name}Remote()
throws javax.naming.NamingException
{
- return ${ejb3TypesPackage}.ServiceLocator.getInstance().get_${transform.toUnderscoreName(${service.fullyQualifiedServiceName})}_Remote(env);
+ return ${ejb3TypesPackage}.ServiceLocator.getInstance().get_${transform.toUnderscoreName(${service.fullyQualifiedServiceName})}_Remote(getProperties());
}
#end
@@ -52,7 +52,7 @@
private final ${service.fullyQualifiedServiceLocalInterfaceName} get${service.name}Local()
throws javax.naming.NamingException
{
- return ${ejb3TypesPackage}.ServiceLocator.getInstance().get_${transform.toUnderscoreName(${service.fullyQualifiedServiceName})}_Local(env);
+ return ${ejb3TypesPackage}.ServiceLocator.getInstance().get_${transform.toUnderscoreName(${service.fullyQualifiedServiceName})}_Local(getProperties());
}
#end
@@ -60,11 +60,11 @@
##
## Do not include lifecycle callback methods
##
-#**##if (!$operation.lifecycleCallback)
+#**##if (!$operation.lifecycleCallback && $operation.visibility == "public")
/**
* @see ${service.fullyQualifiedServiceName}#${operation.getSignature(false)}
*
- * Use the remote interface for calling session bean operations.
+ * Call the session bean operation using appropriate view type
*/
$operation.visibility $operation.returnType.fullyQualifiedName $operation.signature
#* *##if ($operation.exceptionsPresent)
@@ -73,10 +73,22 @@
{
try
{
-#* *##if (!$operation.returnTypePresent)
- get${service.name}Remote().${operation.name}(${operation.argumentNames});
-#* *##else
- return get${service.name}Remote().${operation.name}(${operation.argumentNames});
+#* *##if ($operation.viewTypeAbsoluteBoth)
+ switch (getViewType())
+ {
+ case LOCAL_VIEW_TYPE:
+ #if ($operation.returnTypePresent)return #end#**#get${service.name}Local().${operation.name}(${operation.argumentNames});
+ break;
+
+ case REMOTE_VIEW_TYPE:
+ default:
+ #if ($operation.returnTypePresent)return #end#**#get${service.name}Remote().${operation.name}(${operation.argumentNames});
+ break;
+ }
+#* *##elseif ($operation.viewTypeAbsoluteRemote)
+ #if ($operation.returnTypePresent)return #end#**#get${service.name}Remote().${operation.name}(${operation.argumentNames});
+#* *##elseif ($operation.viewTypeAbsoluteLocal)
+ #if ($operation.returnTypePresent)return #end#**#get${service.name}Local().${operation.name}(${operation.argumentNames});
#* *##end
}
#* *##if ($operation.exceptionsPresent)
@@ -100,11 +112,4 @@
#**##end
#end
- /**
- * Close down service delegate resources
- */
- public void close()
- {
- ${ejb3TypesPackage}.ServiceLocator.getInstance().shutdown();
- }
}
\ No newline at end of file
1.3 +1 -1 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/WebServiceInterface.vsl
Index: WebServiceInterface.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/WebServiceInterface.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- WebServiceInterface.vsl 17 Apr 2006 01:57:46 -0000 1.2
+++ WebServiceInterface.vsl 14 Jun 2006 04:49:55 -0000 1.3
@@ -26,7 +26,7 @@
## Operation must be exposed as a web-service operation (<<WebService>> on class or <<WebServiceOperation>> on operation)
## All operations throw java.rmi.RemoteException
##
-#* *##if (!$operation.lifecycleCallback && ($operation.visibility == "public") && ($operation.viewTypeRemote || $operation.viewTypeBoth) && ($operation.exposed))
+#* *##if ($operation.viewTypeAbsoluteRemote && $operation.exposed)
@javax.jws.WebMethod(operationName = "$operation.methodName")
#* *##if ($stringUtils.isNotBlank($operation.resultName))
@javax.jws.WebResult(name = "${operation.resultName}")
1.6 +1 -1 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionLocal.vsl
Index: SessionLocal.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionLocal.vsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- SessionLocal.vsl 24 Apr 2006 02:31:32 -0000 1.5
+++ SessionLocal.vsl 14 Jun 2006 04:49:55 -0000 1.6
@@ -69,7 +69,7 @@
## Only expose methods that are not lifecycle callbacks
## Only expose public methods with local view type accessability
##
-#* *##if (!$operation.lifecycleCallback && $operation.visibility == "public" && ($operation.viewTypeLocal || $operation.viewTypeBoth))
+#* *##if ($operation.viewTypeAbsoluteLocal)
/**
$operation.getDocumentation(" * ")
*/
1.6 +5 -2 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionRemote.vsl
Index: SessionRemote.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionRemote.vsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- SessionRemote.vsl 5 Mar 2006 05:57:37 -0000 1.5
+++ SessionRemote.vsl 14 Jun 2006 04:49:55 -0000 1.6
@@ -1,5 +1,8 @@
// license-header java merge-point
-/* Autogenerated by AndroMDA (SessionRemote.vsl) - do not edit */
+//
+// Attention: Generated code! Do not modify by hand!
+// Generated by: SessionRemote.vsl in andromda-ejb3-cartridge.
+//
#if ($stringUtils.isNotBlank($service.packageName))
package $service.packageName;
#end
@@ -66,7 +69,7 @@
## Only expose methods that are not lifecycle callbacks
## Only expose public methods with remote view type accessability
##
-#* *##if (!$operation.lifecycleCallback && $operation.visibility == "public" && ($operation.viewTypeRemote || $operation.viewTypeBoth))
+#* *##if ($operation.viewTypeAbsoluteRemote)
/**
$operation.getDocumentation(" * ")
*/
|
|
From: Vance K. <va...@us...> - 2006-06-14 04:48:32
|
User: vancek
Date: 06/06/13 21:48:32
Added: andromda-ejb3/src/main/resources/templates/ejb3
ServiceDelegateBase.vsl
Log:
Initial revision - base class for service delegates
Revision Changes Path
1.1 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/ServiceDelegateBase.vsl
Index: ServiceDelegateBase.vsl
===================================================================
// license-header java merge-point
//
// Attention: Generated code! Do not modify by hand!
// Generated by: ServiceDelegateBase.vsl in andromda-ejb3-cartridge.
//
#set ($generatedFile = "ServiceDelegateBase.java")
#if($stringUtils.isNotEmpty($ejb3TypesPackage))
package $ejb3TypesPackage;
#**##set ($generatedFile = "${stringUtils.replace($ejb3TypesPackage,'.','/')}/${generatedFile}")
#end
/**
* Service delegate base class extended by all service delegates.
*
*/
public abstract class ServiceDelegateBase
{
/**
* Define remote interface view type
*/
public static final int REMOTE_VIEW_TYPE = 0;
/**
* Define local interface view type
*/
public static final int LOCAL_VIEW_TYPE = 1;
/**
* Default remote view type selected
*/
private int viewType = REMOTE_VIEW_TYPE;
/**
* Environment properties
*/
private java.util.Properties properties = null;
/**
* Default empty constructor
*/
public ServiceDelegateBase()
{
// empty constructor
}
/**
* Constructor setting the envirinment properties.
*
* @param properties
*/
public ServiceDelegateBase(java.util.Properties properties)
{
this.properties = properties;
}
/**
* Get the view interface for invoking business operations
*/
public int getViewType()
{
return this.viewType;
}
/**
* Set the view interface for invoking business operations
*/
public void setViewType(int viewType)
{
this.viewType = viewType;
}
/**
* Get the environment properties if set, otherwise return null
*/
public java.util.Properties getProperties()
{
return this.properties;
}
/**
* Set the environment properties
*/
public void setProperties(java.util.Properties properties)
{
this.properties = properties;
}
/**
* Close down service delegate resources
*/
public void close()
{
${ejb3TypesPackage}.ServiceLocator.getInstance().shutdown();
}
}
|
|
From: Vance K. <va...@us...> - 2006-06-14 04:46:37
|
User: vancek
Date: 06/06/13 21:46:35
Modified: andromda-ejb3/src/main/resources/templates/ejb3
SessionBean.vsl SessionBeanImpl.vsl
SessionListener.vsl ServiceLocator.vsl
Log:
fixed headers
Revision Changes Path
1.24 +4 -1 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionBean.vsl
Index: SessionBean.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionBean.vsl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -w -r1.23 -r1.24
--- SessionBean.vsl 14 Mar 2006 06:10:47 -0000 1.23
+++ SessionBean.vsl 14 Jun 2006 04:46:35 -0000 1.24
@@ -1,5 +1,8 @@
// license-header java merge-point
-/* Autogenerated by AndroMDA (SessionBean.vsl) - do not edit */
+//
+// Attention: Generated code! Do not modify by hand!
+// Generated by: SessionBean.vsl in andromda-ejb3-cartridge.
+//
#parse("templates/ejb3/Globals.vm")
#if ($stringUtils.isNotBlank($service.packageName))
package $service.packageName;
1.13 +3 -0 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionBeanImpl.vsl
Index: SessionBeanImpl.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionBeanImpl.vsl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- SessionBeanImpl.vsl 17 Apr 2006 01:56:36 -0000 1.12
+++ SessionBeanImpl.vsl 14 Jun 2006 04:46:35 -0000 1.13
@@ -1,4 +1,7 @@
// license-header java merge-point
+//
+// Generated by: SessionBeanImpl.vsl in andromda-ejb3-cartridge.
+//
#if ($stringUtils.isNotBlank($service.packageName))
package $service.packageName;
#end
1.8 +3 -0 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionListener.vsl
Index: SessionListener.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionListener.vsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- SessionListener.vsl 3 Jun 2006 15:39:42 -0000 1.7
+++ SessionListener.vsl 14 Jun 2006 04:46:35 -0000 1.8
@@ -1,4 +1,7 @@
// license-header java merge-point
+//
+// Generated by: SessionListener.vsl in andromda-ejb3-cartridge.
+//
#if ($stringUtils.isNotBlank($service.packageName))
package $service.packageName;
#end
1.8 +4 -1 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/ServiceLocator.vsl
Index: ServiceLocator.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/ServiceLocator.vsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- ServiceLocator.vsl 11 Apr 2006 15:41:05 -0000 1.7
+++ ServiceLocator.vsl 14 Jun 2006 04:46:35 -0000 1.8
@@ -1,5 +1,8 @@
// license-header java merge-point
-/* Autogenerated by AndroMDA (ManageableServiceLocator.vsl) - do not edit */
+//
+// Attention: Generated code! Do not modify by hand!
+// Generated by: ServiceLocator.vsl in andromda-ejb3-cartridge.
+//
#set ($generatedFile = "${serviceLocatorName}.java")
#if($stringUtils.isNotEmpty($ejb3TypesPackage))
package $ejb3TypesPackage;
|
|
From: Vance K. <va...@us...> - 2006-06-13 15:50:46
|
User: vancek Date: 06/06/13 08:50:44 Added: andromda-database .cvsignore Log: Initial revision Revision Changes Path 1.1 cartridges/andromda-database/.cvsignore Index: .cvsignore =================================================================== target *.log |
|
From: Vance K. <va...@us...> - 2006-06-13 15:50:13
|
User: vancek
Date: 06/06/13 08:50:04
Modified: andromda-database/src/test/uml
DatabaseCartridgeTestModel.xml.zip
andromda-database pom.xml
andromda-database/src/main/uml
DatabaseMetafacadeModel.xml.zip
Log:
Updated version from 3.2-RC1-SNAPSHOT TO 3.2-SNAPSHOT
Revision Changes Path
1.2 +69 -49 cartridges/andromda-database/src/test/uml/DatabaseCartridgeTestModel.xml.zip
<<Binary file>>
1.3 +2 -2 cartridges/andromda-database/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-database/pom.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- pom.xml 31 Dec 2005 18:42:36 -0000 1.2
+++ pom.xml 13 Jun 2006 15:50:04 -0000 1.3
@@ -20,12 +20,12 @@
<dependency>
<groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-meta-cartridge</artifactId>
- <version>3.2-RC1-SNAPSHOT</version>
+ <version>3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.metafacades</groupId>
<artifactId>andromda-metafacades-uml</artifactId>
- <version>3.2-RC1-SNAPSHOT</version>
+ <version>3.2-SNAPSHOT</version>
<type>xml.zip</type>
<scope>runtime</scope>
</dependency>
1.2 +71 -65 cartridges/andromda-database/src/main/uml/DatabaseMetafacadeModel.xml.zip
<<Binary file>>
|
|
From: Vance K. <va...@us...> - 2006-06-13 02:14:18
|
User: vancek
Date: 06/06/12 19:14:17
Modified: . pom.xml
Log:
Update dependency and plugin versions from 3.2-RC1-SNAPSHOT to 3.2-SNAPSHOT.
Revision Changes Path
1.10 +8 -8 plugins/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/pom.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- pom.xml 11 Jun 2006 20:23:57 -0000 1.9
+++ pom.xml 13 Jun 2006 02:14:16 -0000 1.10
@@ -87,33 +87,33 @@
<dependency>
<groupId>org.andromda</groupId>
<artifactId>andromda-core</artifactId>
- <version>3.2-RC1-SNAPSHOT</version>
+ <version>3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda</groupId>
<artifactId>andromda-utils</artifactId>
- <version>3.2-RC1-SNAPSHOT</version>
+ <version>3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.metafacades</groupId>
<artifactId>andromda-metafacades-uml</artifactId>
- <version>3.2-RC1-SNAPSHOT</version>
+ <version>3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-meta-cartridge</artifactId>
- <version>3.2-RC1-SNAPSHOT</version>
+ <version>3.2-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.andromda.translationlibraries</groupId>
<artifactId>andromda-ocl-validation-library</artifactId>
- <version>3.2-RC1-SNAPSHOT</version>
+ <version>3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.profiles.uml14</groupId>
<artifactId>andromda-profile</artifactId>
- <version>3.2-RC1-SNAPSHOT</version>
+ <version>3.2-SNAPSHOT</version>
<type>xml.zip</type>
<scope>runtime</scope>
</dependency>
@@ -137,7 +137,7 @@
<plugin>
<groupId>org.andromda.maven.plugins</groupId>
<artifactId>andromda-maven-plugin</artifactId>
- <version>3.2-RC1-SNAPSHOT</version>
+ <version>3.2-SNAPSHOT</version>
<executions>
<execution>
<goals>
@@ -155,7 +155,7 @@
<extensions>true</extensions>
<groupId>org.andromda.maven.plugins</groupId>
<artifactId>andromda-cartridge-plugin</artifactId>
- <version>3.2-RC1-SNAPSHOT</version>
+ <version>3.2-SNAPSHOT</version>
<executions>
<execution>
<goals>
|
|
From: Chris M. <cm...@us...> - 2006-06-12 00:11:20
|
User: cmicali
Date: 06/06/11 17:11:19
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
AndroMDA.VS80AddIn.csproj Resource1.Designer.cs
Resource1.resx
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs
MDASolutionWizard.designer.cs
MDASolutionWizard.resx
Added: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources
indicator_arrows.gif orange.bmp rightbox.bmp
Log:
- Updated graphics in solution wizard
Revision Changes Path
1.14 +3 -0 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.13
retrieving revision 1.14
diff -u -w -r1.13 -r1.14
--- AndroMDA.VS80AddIn.csproj 9 Jun 2006 22:27:23 -0000 1.13
+++ AndroMDA.VS80AddIn.csproj 12 Jun 2006 00:11:18 -0000 1.14
@@ -282,7 +282,10 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="AddIn.ico" />
+ <None Include="Resources\indicator_arrows.gif" />
<Content Include="Resources\mda\src\uml\empty.model.membership.xml" />
+ <None Include="Resources\rightbox.bmp" />
+ <None Include="Resources\orange.bmp" />
<None Include="Resources\Common\cvsignore" />
<None Include="Resources\Core\cvsignore" />
<None Include="Resources\cvsignore" />
1.7 +42 -29 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resource1.Designer.cs
Index: Resource1.Designer.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resource1.Designer.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- Resource1.Designer.cs 9 Jun 2006 22:27:23 -0000 1.6
+++ Resource1.Designer.cs 12 Jun 2006 00:11:18 -0000 1.7
@@ -135,6 +135,13 @@
}
}
+ internal static System.Drawing.Bitmap indicator_arrows {
+ get {
+ object obj = ResourceManager.GetObject("indicator_arrows", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
internal static byte[] lib_AndroMDA_NHibernateSupport_dll {
get {
object obj = ResourceManager.GetObject("lib_AndroMDA_NHibernateSupport_dll", resourceCulture);
@@ -318,18 +325,14 @@
}
/// <summary>
- /// Looks up a localized string similar to <?xml version='1.0' encoding='UTF-8'?>
- ///<!-- <!DOCTYPE XMI SYSTEM "uml14xmi12.dtd"> -->
- ///<!-- This xmi file is optimized for MagicDraw UML. Some references are not saved. -->
- ///<!-- Change MagicDraw UML environment options property General->.Save Rich XMI -->
- ///
- ///<XMI xmi.version='1.2' timestamp='Fri Jun 09 17:43:05 EDT 2006' xmlns:UML='omg.org/UML/1.4'>
- /// <XMI.header>
- /// <XMI.documentation>
- /// <XMI.exporter>MagicDraw UML</XMI.exporter>
- /// <XMI.exporterVersion>9.5</XMI.exporterVersion>
- /// </XMI.documentation>
- /// <XMI. [rest of string was truncated]";.
+ /// Looks up a localized string similar to
+ /// <UML:Package xmi.id='_9_5_1_874026a_1147797303695_917720_2' name='Domain'>
+ /// <UML:Namespace.ownedElement>
+ /// <UML:Class xmi.id='_9_5_1_874026a_1147797358974_560038_4' name='User'>
+ /// <UML:ModelElement.stereotype>
+ /// <UML:Stereotype href='andromda-profile-persistence-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_354011_73'>
+ /// <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
+ /// <referentPath xmi.value='org.andromda.profil [rest of string was truncated]";.
/// </summary>
internal static string mda_src_uml_empty_model_membership_xml {
get {
@@ -525,6 +528,13 @@
}
}
+ internal static System.Drawing.Bitmap orange {
+ get {
+ object obj = ResourceManager.GetObject("orange", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to # ---------- Default Build Properties ----------
///# Change this to generate to the correct MDA database mappings
@@ -569,6 +579,13 @@
}
}
+ internal static System.Drawing.Bitmap rightbox {
+ get {
+ object obj = ResourceManager.GetObject("rightbox", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to <?xml version="1.0" encoding="utf-8" ?>
///<configuration>
@@ -657,10 +674,11 @@
///-->
///<configuration>
///
- /// <appSettings>
- /// <add key="nhibernate.config" value="~/nhibernate.config"/>
- /// </appSettings>
- /// [rest of string was truncated]";.
+ /// <connectionStrings/>
+ ///
+ /// <system.web>
+ /// <!--
+ /// Set compilation debug=" [rest of string was truncated]";.
/// </summary>
internal static string web_web_config {
get {
@@ -689,19 +707,14 @@
}
/// <summary>
- /// Looks up a localized string similar to <?xml version="1.0"?>
- ///<!--
- /// Note: As an alternative to hand editing this file you can use the
- /// web admin tool to configure settings for your application. Use
- /// the Website->Asp.Net Configuration option in Visual Studio.
- /// A full list of settings and comments can be found in
- /// machine.config.comments usually located in
- /// \Windows\Microsoft.Net\Framework\v2.x\Config
- ///-->
- ///<configuration>
- ///
- /// <configSections>
- /// <section name="nhibernate" type="System.Configuration.NameValueSectionHan [rest of string was truncated]";.
+ /// Looks up a localized string similar to <nhibernate>
+ /// <!-- properties -->
+ /// <add key="hibernate.connection.provider" value="NHibernate.Connection.DriverConnectionProvider"/>
+ /// <add key="hibernate.dialect" value="${wizard.database.nhibernatedialect}"/>
+ /// <add key="hibernate.connection.driver_class" value="${wizard.hibernate.connection.driver_class}"/>
+ /// <add key="hibernate.connection.connection_string" value="server=localhost;database=${wizard.database.name};Integrated Security=SSPI;"/>
+ /// <add key="hibernate.use_outer_join" value="true"/>
+ /// <add [rest of string was truncated]";.
/// </summary>
internal static string web_web_config_nhibernate {
get {
1.7 +84 -75 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resource1.resx
Index: Resource1.resx
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resource1.resx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- Resource1.resx 9 Jun 2006 22:27:23 -0000 1.6
+++ Resource1.resx 12 Jun 2006 00:11:18 -0000 1.7
@@ -118,124 +118,133 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="common_cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\Common\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name="common_project_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\Common\project.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
- </data>
- <data name="core_cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\Core\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name="core_project_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\Core\project.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
- </data>
- <data name="cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="web_web_config" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Web\web.config;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
- <data name="lib_AndroMDA_NHibernateSupport_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\Lib\AndroMDA.NHibernateSupport.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="SchemaExport_Program_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\SchemaExport\Program.cs;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
- <data name="lib_Bamboo_Prevalence_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\Lib\Bamboo.Prevalence.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="mda_project_properties" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\mda\project.properties;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
- <data name="lib_Castle_DynamicProxy_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\Lib\Castle.DynamicProxy.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="mda_src_uml_empty_model_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\mda\src\uml\empty.model.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
- <data name="lib_HashCodeProvider_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\Lib\HashCodeProvider.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="lib_NHibernate_Caches_Prevalence_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Lib\NHibernate.Caches.Prevalence.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="lib_Iesi_Collections_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Lib\Iesi.Collections.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="lib_log4net_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\Lib\log4net.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="nhibernate_config" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\nhibernate.config;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
- <data name="lib_NHibernate_Caches_Prevalence_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\Lib\NHibernate.Caches.Prevalence.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="SchemaExport_App_config" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\SchemaExport\App.config;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
- <data name="lib_NHibernate_Caches_SysCache_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\Lib\NHibernate.Caches.SysCache.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="lib_Bamboo_Prevalence_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Lib\Bamboo.Prevalence.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="lib_NHibernate_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\Lib\NHibernate.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="mda_src_uml_empty_model_membership_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\mda\src\uml\empty.model.membership.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
<data name="lib_NHibernate_Nullables2_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Lib\NHibernate.Nullables2.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
+ <data name="lib_Castle_DynamicProxy_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Lib\Castle.DynamicProxy.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
<data name="maven_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\maven.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
+ <data name="SchemaExport_cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\SchemaExport\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="Membership_UserDaoImpl_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Membership\UserDaoImpl.cs;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ </data>
+ <data name="web_web_config_rolesection" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Web\web.config.rolesection;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ </data>
<data name="mda_conf_andromda_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\mda\conf\andromda.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
- <data name="mda_cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\mda\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="web_cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Web\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="mda_maven_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\mda\maven.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ <data name="Membership_DomainMembershipUser_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Membership\DomainMembershipUser.cs;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
- <data name="mda_project_properties" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\mda\project.properties;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ <data name="project_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\project.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
- <data name="mda_project_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\mda\project.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ <data name="cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="mda_src_uml_empty_model_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\mda\src\uml\empty.model.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ <data name="lib_log4net_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Lib\log4net.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="project_properties" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\project.properties;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ <data name="lib_AndroMDA_NHibernateSupport_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Lib\AndroMDA.NHibernateSupport.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="project_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\project.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ <data name="Membership_DomainMembershipProvider_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Membership\DomainMembershipProvider.cs;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
- <data name="SchemaExport_App_config" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\SchemaExport\App.config;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ <data name="Membership_MembershipServiceImpl_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Membership\MembershipServiceImpl.cs;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
- <data name="SchemaExport_cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\SchemaExport\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="mda_cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\mda\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="nhibernate_config" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\nhibernate.config;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ <data name="Membership_DomainRoleProvider_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Membership\DomainRoleProvider.cs;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
- <data name="SchemaExport_Program_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\SchemaExport\Program.cs;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ <data name="lib_NHibernate_Caches_SysCache_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Lib\NHibernate.Caches.SysCache.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="project_properties" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\project.properties;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ </data>
+ <data name="common_cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Common\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="web_web_config_membershipsection" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Web\web.config.membershipsection;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ </data>
+ <data name="mda_maven_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\mda\maven.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
<data name="web_bin_cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Web\Bin\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="web_cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\Web\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name="web_web_config" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\Web\web.config;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ <data name="core_project_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Core\project.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
- <data name="web_web_config_nhibernate" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\Web\web.config.nhibernate;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="common_project_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Common\project.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
- <data name="Membership_DomainMembershipProvider_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\Membership\DomainMembershipProvider.cs;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ <data name="rightbox" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\rightbox.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="Membership_DomainMembershipUser_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\Membership\DomainMembershipUser.cs;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ <data name="core_cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Core\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="Membership_DomainRoleProvider_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\Membership\DomainRoleProvider.cs;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ <data name="lib_NHibernate_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Lib\NHibernate.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="Membership_MembershipServiceImpl_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\Membership\MembershipServiceImpl.cs;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ <data name="orange" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\orange.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="Membership_UserDaoImpl_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\Membership\UserDaoImpl.cs;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ <data name="lib_HashCodeProvider_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Lib\HashCodeProvider.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="web_web_config_membershipsection" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\Web\web.config.membershipsection;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ <data name="web_web_config_nhibernate" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Web\web.config.nhibernate;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="web_web_config_rolesection" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\Web\web.config.rolesection;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ <data name="mda_project_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\mda\project.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
- <data name="mda_src_uml_empty_model_membership_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\mda\src\uml\empty.model.membership.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ <data name="indicator_arrows" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\indicator_arrows.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
\ No newline at end of file
1.8 +15 -15 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDASolutionWizard.designer.cs
Index: MDASolutionWizard.designer.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDASolutionWizard.designer.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- MDASolutionWizard.designer.cs 11 Jun 2006 15:35:24 -0000 1.7
+++ MDASolutionWizard.designer.cs 12 Jun 2006 00:11:18 -0000 1.8
@@ -33,13 +33,13 @@
this.imageList1 = new System.Windows.Forms.ImageList(this.components);
this.wizard1 = new Gui.Wizard.Wizard();
this.wizardPageComplete = new Gui.Wizard.WizardPage();
- this.lstLog = new System.Windows.Forms.ListBox();
this.lnkViewLog = new System.Windows.Forms.LinkLabel();
this.lblFinishPageTitle = new System.Windows.Forms.Label();
this.pictureBoxComplete = new System.Windows.Forms.PictureBox();
this.lblFinishPageDescription = new System.Windows.Forms.Label();
this.lblFinishPageTitleImage = new System.Windows.Forms.Label();
this.txtErrorMessage = new System.Windows.Forms.TextBox();
+ this.lstLog = new System.Windows.Forms.ListBox();
this.wizardPageProcessing = new Gui.Wizard.WizardPage();
this.lstStatus = new System.Windows.Forms.ListBox();
this.label7 = new System.Windows.Forms.Label();
@@ -116,7 +116,6 @@
// wizard1
//
this.wizard1.ContainingForm = null;
- this.wizard1.Controls.Add(this.wizardPageComplete);
this.wizard1.Controls.Add(this.wizardPageProcessing);
this.wizard1.Controls.Add(this.wizardPageConfirmChoices);
this.wizard1.Controls.Add(this.wizardPageWebCommonProject);
@@ -126,6 +125,7 @@
this.wizard1.Controls.Add(this.wizardPageCommonProject);
this.wizard1.Controls.Add(this.wizardPageSolutionInfo);
this.wizard1.Controls.Add(this.wizardPageWelcome);
+ this.wizard1.Controls.Add(this.wizardPageComplete);
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);
@@ -163,16 +163,6 @@
this.wizardPageComplete.TabIndex = 7;
this.wizardPageComplete.ShowFromNext += new System.EventHandler(this.wizardPageComplete_ShowFromNext);
//
- // lstLog
- //
- this.lstLog.FormattingEnabled = true;
- this.lstLog.HorizontalScrollbar = true;
- this.lstLog.Location = new System.Drawing.Point(174, 49);
- this.lstLog.Name = "lstLog";
- this.lstLog.Size = new System.Drawing.Size(339, 251);
- this.lstLog.TabIndex = 17;
- this.lstLog.Visible = false;
- //
// lnkViewLog
//
this.lnkViewLog.AutoSize = true;
@@ -200,7 +190,7 @@
// pictureBoxComplete
//
this.pictureBoxComplete.Dock = System.Windows.Forms.DockStyle.Left;
- this.pictureBoxComplete.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxComplete.Image")));
+ this.pictureBoxComplete.Image = global::AndroMDA.VS80AddIn.Resource1.orange;
this.pictureBoxComplete.Location = new System.Drawing.Point(0, 0);
this.pictureBoxComplete.Name = "pictureBoxComplete";
this.pictureBoxComplete.Size = new System.Drawing.Size(164, 312);
@@ -242,6 +232,16 @@
this.txtErrorMessage.Size = new System.Drawing.Size(334, 230);
this.txtErrorMessage.TabIndex = 14;
//
+ // lstLog
+ //
+ this.lstLog.FormattingEnabled = true;
+ this.lstLog.HorizontalScrollbar = true;
+ this.lstLog.Location = new System.Drawing.Point(174, 49);
+ this.lstLog.Name = "lstLog";
+ this.lstLog.Size = new System.Drawing.Size(339, 251);
+ this.lstLog.TabIndex = 17;
+ this.lstLog.Visible = false;
+ //
// wizardPageProcessing
//
this.wizardPageProcessing.Controls.Add(this.lstStatus);
@@ -289,7 +289,7 @@
// pictureBoxThrobber
//
this.pictureBoxThrobber.BackColor = System.Drawing.Color.White;
- this.pictureBoxThrobber.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxThrobber.Image")));
+ this.pictureBoxThrobber.Image = global::AndroMDA.VS80AddIn.Resource1.indicator_arrows;
this.pictureBoxThrobber.Location = new System.Drawing.Point(8, 40);
this.pictureBoxThrobber.Name = "pictureBoxThrobber";
this.pictureBoxThrobber.Size = new System.Drawing.Size(31, 22);
@@ -796,7 +796,7 @@
// pictureBoxWelcome
//
this.pictureBoxWelcome.Dock = System.Windows.Forms.DockStyle.Left;
- this.pictureBoxWelcome.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxWelcome.Image")));
+ this.pictureBoxWelcome.Image = global::AndroMDA.VS80AddIn.Resource1.orange;
this.pictureBoxWelcome.Location = new System.Drawing.Point(0, 0);
this.pictureBoxWelcome.Name = "pictureBoxWelcome";
this.pictureBoxWelcome.Size = new System.Drawing.Size(164, 312);
1.8 +1096 -4488plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDASolutionWizard.resx
Index: MDASolutionWizard.resx
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDASolutionWizard.resx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- MDASolutionWizard.resx 11 Jun 2006 15:35:24 -0000 1.7
+++ MDASolutionWizard.resx 12 Jun 2006 00:11:18 -0000 1.8
@@ -261,3955 +261,1132 @@
</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="pictureBoxComplete.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- /9j/4AAQSkZJRgABAgEASABIAAD/4QpURXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB
- AAAAYgEbAAUAAAABAAAAagEoAAMAAAABAAIAAAExAAIAAAAcAAAAcgEyAAIAAAAUAAAAjodpAAQAAAAB
- AAAApAAAANAACvyAAAAnEAAK/IAAACcQQWRvYmUgUGhvdG9zaG9wIENTMiBXaW5kb3dzADIwMDY6MDQ6
- MDIgMjM6MTU6NTYAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAApKADAAQAAAABAAABgwAAAAAAAAAG
- AQMAAwAAAAEABgAAARoABQAAAAEAAAEeARsABQAAAAEAAAEmASgAAwAAAAEAAgAAAgEABAAAAAEAAAEu
- AgIABAAAAAEAAAkeAAAAAAAAAEgAAAABAAAASAAAAAH/2P/gABBKRklGAAECAABIAEgAAP/tAAxBZG9i
- ZV9DTQAB/+4ADkFkb2JlAGSAAAAAAf/bAIQADAgICAkIDAkJDBELCgsRFQ8MDA8VGBMTFRMTGBEMDAwM
- DAwRDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAENCwsNDg0QDg4QFA4ODhQUDg4ODhQRDAwMDAwR
- EQwMDAwMDBEMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwM/8AAEQgAoABEAwEiAAIRAQMRAf/dAAQA
- Bf/EAT8AAAEFAQEBAQEBAAAAAAAAAAMAAQIEBQYHCAkKCwEAAQUBAQEBAQEAAAAAAAAAAQACAwQFBgcI
- CQoLEAABBAEDAgQCBQcGCAUDDDMBAAIRAwQhEjEFQVFhEyJxgTIGFJGhsUIjJBVSwWIzNHKC0UMHJZJT
- 8OHxY3M1FqKygyZEk1RkRcKjdDYX0lXiZfKzhMPTdePzRieUpIW0lcTU5PSltcXV5fVWZnaGlqa2xtbm
- 9jdHV2d3h5ent8fX5/cRAAICAQIEBAMEBQYHBwYFNQEAAhEDITESBEFRYXEiEwUygZEUobFCI8FS0fAz
- JGLhcoKSQ1MVY3M08SUGFqKygwcmNcLSRJNUoxdkRVU2dGXi8rOEw9N14/NGlKSFtJXE1OT0pbXF1eX1
- VmZ2hpamtsbW5vYnN0dXZ3eHl6e3x//aAAwDAQACEQMRAD8AqOyHPurbOjnAH5r03F6P0s4lO/Fqc7YJ
- JaJOi8v6ZWLep4tZ132tH4r2ANDWho4AgKrywviJ1d343MwOGECY6Sl6TTU/Y3SP+4lX+YFF/Ruk+m+M
- Sqdp/MHgrhexpDXGHHgKUTI8QrPDHsHG97L+/L/GL4s++Mq6vgMe4AeEFS9RN1yj7L9Zs/H4DbJHz1UV
- Qyx4ZU9ZyOb3sImd2F9ZtE1nZYOD4/FUBbmbiIdLeYK0SU9DmNvBePa7QqXDzmbFAxiSYjURafxP4Xg5
- g+9w1lHzmP8AlI95f12h9szY2+/4Skup+x4u31YEQkl/pzL28Nurk/6Fw9/Hps//0G+quOMjruMD/gz6
- n3L1Q8rzr6gUCzrT7D/gqpHzK9F7qDlh6L7l1fjc75oR/cgP+d6nnuq9RbV9bemYBMG+p74+BXRd1559
- Ysz/ANeT0yD/ADNez/O3L0I8qYdXMlGhHxD5N9fqfR+tb7IgXsaZ8ws0cLpf8amP6eb07KA+nvY4+Y1X
- M1mWhVOZHqei+CzvCR2UUN3B/BEchO5UMXRy7Oh9uP7NifdO1JZe/wBnp9t8pIexHt+lxuXw/wDT4P8A
- Bf/R3P8AF1je/KyvhX/FduFy/wDi9pLOkWWn/C2kj5LqFHhFY4/a3fik+LnMv9U8P+KHx/6w5k/4wH2A
- n9BkMZwfHWP85ewHXUcFVH9J6ZZech+Mx1xMl5aJn4q35eCeBRPi1pzEowAGsbt4z/Gjjl/R6cgD+YsB
- Pz0XB0Gax8F6h9fMf1/qrmgCXMaHt+RC8rw3TUFX5kaAuv8AA56yincgvMKwyu254rqaXvPDW6rVp6Ph
- dOYMvrLwXcsxQdZ/lKPBgnlNQF+PRv8AxDnsHKwvLKj+jAfPPyi4f7Pzfs3270nfZt23dH/Sj91Ja/8A
- zvt+2fzbfscbPRgRtSWj/o7+v0r/AA3nP9Nz/wAx/lPc3/yf/fv/0u5+p+O6joNAd+f7/vW0Fi9L630T
- G6XiU2Z1Ic2pgI3DmNVoU9V6ZdJpya36ToZTYD0gDXRm5oyObJKQI4pyOunV896z/jL6zhdZy8Oimt1O
- Pd6bSRqQOV6H0zKdmdPx8p42uuYHEfFeT5f1ezsvrudkPDaqLLi9tr+C0/ursj9ccHpmDVi1uFllLdpj
- y8FJDFkkdIGu7HmnghCJ9yJmT8kfmjF6Tq+O3I6Zk0OIHqMIE+MLyvpX1ftpqdb1R4xKmOI2u+k4D91W
- +q/XvLvJbW70ge7lzd/UMvOtPqWl/wDKJ9vylSS5bFEXnkKH6IW8tzfNcRjykSJz04yP+i9Bk/WHC6fW
- 6jpNQHjc7Ulc7l5mTkuddc8uJ/OdP3AK5gdFy854GNU62dDYRDB811GJ9Xuk9JDcjqTxkZDdWs5rH9lQ
- 5OfjGPDhiMcB+ky5OUx4ScvO5ve5g/5MS45cX9ebx/7A6t+z/wBpei/05+e396El2P8Azvq+1+ntb9ni
- Nn5v+akqf3ufeW/Fs1/vWP8AzUf3f8F//9Ohb17AH0MOr+01V7PrFfEUVsqH8hsK1T9TuqO5qrb5lxV+
- j6m3NE5F7ah4M1Tj8RjH5MUR5r/uPLb5+e4vCPFkk86/qHUsr2ue/b5u0QXY1r9C8ucezRJXZM6F0HF9
- 2TkOucPzXcJ39Z6DgiMbHY5w4MKtk+IZp6cYj/VgvE/hWAejFPmJfvT9EfseWwfql1POd+jpLG/6S2QP
- xXR4f1V6N0pot6ld69rdfTH0PuVPO+uWXaCyohjPDhYGR1O69xL3ucT27KEzyz/jJhlzeWZrBD2h/U+b
- /GeszvrZVQw0dPrFTBp7NAuXzurXXuLrXlxPYKvXjZWQdBsafBaGN0ZrPdZqfEph9uGs5cUl+H4dkyHi
- yFyvUyP5zZ7PxSXQfZ6Y2Rokh95j+5/vNz/R2Lt0p//Uo2/WnNfw4D5qld13Lf8ASsI+CDX0gu+k6Vaq
- 6PSOVnE4I76ssPhcjvJz3511h+k5yZtWXafa2PNb1WBjs7BWGtpYNAEw81EaQg28fwvFHWWvm4dPRL7N
- bST5LSx+j0VakK2bmjhCfkeahlmzT60PBuQw4sY0ASbaax7QEC28INuR5qnbkeaMMRJsqnkA2bHr+9JZ
- v2j3pKx7P5MHu/m//9XJZkogyvNYrcnzRBleazzy/g6gzOx9p80xyvNZX2rzTHK80Pu6733TdleaC/J8
- 1nuyfNBdkp8eX8FkszdsyVVtyFWdcT3QnPJU8MIDBPN4pvWO6UlXk8pKXgDB7xf/1uEDynFigkhQXCcu
- 6T1T4peohpJUE+5JkXpi4pkkaQZk9VSkkkktUkkkkp//1+CSSSSUpJJJJSkkkklKSSSSUpJJJJT/AP/Q
- 4JJJJJSkkkklKSSSSUpJJJJSkkkklP8A/9n/7RB0UGhvdG9zaG9wIDMuMAA4QklNBCUAAAAAABAAAAAA
- AAAAAAAAAAAAAAAAOEJJTQPtAAAAAAAQAEgAAAABAAEASAAAAAEAAThCSU0EJgAAAAAADgAAAAAAAAAA
- AAA/gAAAOEJJTQQNAAAAAAAEAAAAHjhCSU0EGQAAAAAABAAAAB44QklNA/MAAAAAAAkAAAAAAAAAAAEA
- OEJJTQQKAAAAAAABAAA4QklNJxAAAAAAAAoAAQAAAAAAAAACOEJJTQP1AAAAAABIAC9mZgABAGxmZgAG
- AAAAAAABAC9mZgABAKGZmgAGAAAAAAABADIAAAABAFoAAAAGAAAAAAABADUAAAABAC0AAAAGAAAAAAAB
- OEJJTQP4AAAAAABwAAD/////////////////////////////A+gAAAAA////////////////////////
- /////wPoAAAAAP////////////////////////////8D6AAAAAD/////////////////////////////
- A+gAADhCSU0EAAAAAAAAAgADOEJJTQQCAAAAAAAIAAAAAAAAAAA4QklNBDAAAAAAAAQBAQEBOEJJTQQt
- AAAAAAAGAAEAAAAEOEJJTQQIAAAAAAAQAAAAAQAAAkAAAAJAAAAAADhCSU0EHgAAAAAABAAAAAA4QklN
- BBoAAAAAA0cAAAAGAAAAAAAAAAAAAAGDAAAApAAAAAkAVwBpAHoAYQByAGQAQgBpAGcAAAABAAAAAAAA
- AAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAKQAAAGDAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAA
- AAAAAAAAEAAAAAEAAAAAAABudWxsAAAAAgAAAAZib3VuZHNPYmpjAAAAAQAAAAAAAFJjdDEAAAAEAAAA
- AFRvcCBsb25nAAAAAAAAAABMZWZ0bG9uZwAAAAAAAAAAQnRvbWxvbmcAAAGDAAAAAFJnaHRsb25nAAAA
- pAAAAAZzbGljZXNWbExzAAAAAU9iamMAAAABAAAAAAAFc2xpY2UAAAASAAAAB3NsaWNlSURsb25nAAAA
- AAAAAAdncm91cElEbG9uZwAAAAAAAAAGb3JpZ2luZW51bQAAAAxFU2xpY2VPcmlnaW4AAAANYXV0b0dl
- bmVyYXRlZAAAAABUeXBlZW51bQAAAApFU2xpY2VUeXBlAAAAAEltZyAAAAAGYm91bmRzT2JqYwAAAAEA
- AAAAAABSY3QxAAAABAAAAABUb3AgbG9uZwAAAAAAAAAATGVmdGxvbmcAAAAAAAAAAEJ0b21sb25nAAAB
- gwAAAABSZ2h0bG9uZwAAAKQAAAADdXJsVEVYVAAAAAEAAAAAAABudWxsVEVYVAAAAAEAAAAAAABNc2dl
- VEVYVAAAAAEAAAAAAAZhbHRUYWdURVhUAAAAAQAAAAAADmNlbGxUZXh0SXNIVE1MYm9vbAEAAAAIY2Vs
- bFRleHRURVhUAAAAAQAAAAAACWhvcnpBbGlnbmVudW0AAAAPRVNsaWNlSG9yekFsaWduAAAAB2RlZmF1
- bHQAAAAJdmVydEFsaWduZW51bQAAAA9FU2xpY2VWZXJ0QWxpZ24AAAAHZGVmYXVsdAAAAAtiZ0NvbG9y
- VHlwZWVudW0AAAARRVNsaWNlQkdDb2xvclR5cGUAAAAATm9uZQAAAAl0b3BPdXRzZXRsb25nAAAAAAAA
- AApsZWZ0T3V0c2V0bG9uZwAAAAAAAAAMYm90dG9tT3V0c2V0bG9uZwAAAAAAAAALcmlnaHRPdXRzZXRs
- b25nAAAAAAA4QklNBCgAAAAAAAwAAAABP/AAAAAAAAA4QklNBBQAAAAAAAQAAAAHOEJJTQQMAAAAAAk6
- AAAAAQAAAEQAAACgAAAAzAAAf4AAAAkeABgAAf/Y/+AAEEpGSUYAAQIAAEgASAAA/+0ADEFkb2JlX0NN
- AAH/7gAOQWRvYmUAZIAAAAAB/9sAhAAMCAgICQgMCQkMEQsKCxEVDwwMDxUYExMVExMYEQwMDAwMDBEM
- DAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAQ0LCw0ODRAODhAUDg4OFBQODg4OFBEMDAwMDBERDAwM
- DAwMEQwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAz/wAARCACgAEQDASIAAhEBAxEB/90ABAAF/8QB
- PwAAAQUBAQEBAQEAAAAAAAAAAwABAgQFBgcICQoLAQABBQEBAQEBAQAAAAAAAAABAAIDBAUGBwgJCgsQ
- AAEEAQMCBAIFBwYIBQMMMwEAAhEDBCESMQVBUWETInGBMgYUkaGxQiMkFVLBYjM0coLRQwclklPw4fFj
- czUWorKDJkSTVGRFwqN0NhfSVeJl8rOEw9N14/NGJ5SkhbSVxNTk9KW1xdXl9VZmdoaWprbG1ub2N0dX
- Z3eHl6e3x9fn9xEAAgIBAgQEAwQFBgcHBgU1AQACEQMhMRIEQVFhcSITBTKBkRShsUIjwVLR8DMkYuFy
- gpJDUxVjczTxJQYWorKDByY1wtJEk1SjF2RFVTZ0ZeLys4TD03Xj80aUpIW0lcTU5PSltcXV5fVWZnaG
- lqa2xtbm9ic3R1dnd4eXp7fH/9oADAMBAAIRAxEAPwCo7Ic+6ts6OcAfmvTcXo/SziU78Wpztgklok6L
- y/plYt6ni1nXfa0fivYA0NaGjgCAqvLC+InV3fjczA4YQJjpKXpNNT9jdI/7iVf5gUX9G6T6b4xKp2n8
- weCuF7GkNcYceApRMjxCs8Mewcb3sv78v8Yviz74yrq+Ax7gB4QVL1E3XKPsv1mz8fgNskfPVRVDLHhl
- T1nI5vewiZ3YX1m0TWdlg4Pj8VQFuZuIh0t5grRJT0OY28F49rtCpcPOZsUDGJJiNRFp/E/heDmD73DW
- UfOY/wCUj3l/XaH2zNjb7/hKS6n7Hi7fVgRCSX+nMvbw26uT/oXD38emz//Qb6q44yOu4wP+DPqfcvVD
- yvOvqBQLOtPsP+CqkfMr0XuoOWHovuXV+NzvmhH9yA/53qee6r1FtX1t6ZgEwb6nvj4FdF3Xnn1izP8A
- 15PTIP8AM17P87cvQjyph1cyUaEfEPk31+p9H61vsiBexpnzCzRwul/xqY/p5vTsoD6e9jj5jVczWZaF
- U5kep6L4LO8JHZRQ3cH8ERyE7lQxdHLs6H24/s2J907Ull7/AGen23ykh7Ee36XG5fD/ANPg/wAF/9Hc
- /wAXWN78rK+Ff8V24XL/AOL2ks6RZaf8LaSPkuoUeEVjj9rd+KT4ucy/1Tw/4ofH/rDmT/jAfYCf0GQx
- nB8dY/zl7AddRwVUf0npll5yH4zHXEyXlomfirfl4J4FE+LWnMSjAAaxu3jP8aOOX9HpyAP5iwE/PRcH
- QZrHwXqH18x/X+quaAJcxoe35ELyvDdNQVfmRoC6/wADnrKKdyC8wrDK7bniuppe88NbqtWno+F05gy+
- svBdyzFB1n+Uo8GCeU1AX49G/wDEOewcrC8sqP6MB88/KLh/s/N+zfbvSd9m3bd0f9KP3Ulr/wDO+37Z
- /Nt+xxs9GBG1JaP+jv6/Sv8ADec/03P/ADH+U9zf/J/9+//S7n6n47qOg0B35/v+9bQWL0vrfRMbpeJT
- ZnUhzamAjcOY1WhT1Xpl0mnJrfpOhlNgPSANdGbmjI5skpAjinI66dXz3rP+MvrOF1nLw6Ka3U493ptJ
- GpA5XofTMp2Z0/Hynja65gcR8V5Pl/V7Oy+u52Q8NqosuL22v4LT+6uyP1xwemYNWLW4WWUt2mPLwUkM
- WSR0ga7seaeCEIn3ImZPyR+aMXpOr47cjpmTQ4geowgT4wvK+lfV+2mp1vVHjEqY4ja76TgP3Vb6r9e8
- u8ltbvSB7uXN39Qy860+paX/AMon2/KVJLlsUReeQofohby3N81xGPKRInPTjI/6L0GT9YcLp9bqOk1A
- eNztSVzuXmZOS511zy4n850/cArmB0XLzngY1TrZ0NhEMHzXUYn1e6T0kNyOpPGRkN1azmsf2VDk5+MY
- 8OGIxwH6TLk5THhJy87m97mD/kxLjlxf15vH/sDq37P/AGl6L/Tn57f3oSXY/wDO+r7X6e1v2eI2fm/5
- qSp/e595b8WzX+9Y/wDNR/d/wX//06FvXsAfQw6v7TVXs+sV8RRWyofyGwrVP1O6o7mqtvmXFX6Pqbc0
- TkXtqHgzVOPxGMfkxRHmv+48tvn57i8I8WSTzr+odSyva579vm7RBdjWv0Ly5x7NEldkzoXQcX3ZOQ65
- w/Ndwnf1noOCIxsdjnDgwq2T4hmnpxiP9WC8T+FYB6MU+Yl+9P0R+x5bB+qXU8536Oksb/pLZA/FdHh/
- VXo3Smi3qV3r2t19MfQ+5U8765ZdoLKiGM8OFgZHU7r3Eve5xPbsoTPLP+MmGXN5ZmsEPaH9T5v8Z6zO
- +tlVDDR0+sVMGns0C5fO6tde4uteXE9gq9eNlZB0Gxp8FoY3Rms91mp8SmH24azlxSX4fh2TIeLIXK9T
- I/nNns/FJdB9npjZGiSH3mP7n+83P9HYu3Sn/9Sjb9ac1/DgPmqV3Xct/wBKwj4INfSC76TpVqro9I5W
- cTgjvqyw+FyO8nPfnXWH6TnJm1Zdp9rY81vVYGOzsFYa2lg0ATDzURpCDbx/C8UdZa+bh09Evs1tJPkt
- LH6PRVqQrZuaOEJ+R5qGWbNPrQ8G5DDixjQBJtprHtAQLbwg25HmqduR5owxEmyqeQDZsev70lm/aPek
- rHs/kwe7+b//1clmSiDK81ityfNEGV5rPPL+DqDM7H2nzTHK81lfavNMcrzQ+7rvfdN2V5oL8nzWe7J8
- 0F2Snx5fwWSzN2zJVW3IVZ1xPdCc8lTwwgME83im9Y7pSVeTykpeAMHvF//W4QPKcWKCSFBcJy7pPVPi
- l6iGklQT7kmRemLimSRpBmT1VKSSSS1SSSSSn//X4JJJJJSkkkklKSSSSUpJJJJSkkkklP8A/9Dgkkkk
- lKSSSSUpJJJJSkkkklKSSSSU/wD/2ThCSU0EIQAAAAAAVQAAAAEBAAAADwBBAGQAbwBiAGUAIABQAGgA
- bwB0AG8AcwBoAG8AcAAAABMAQQBkAG8AYgBlACAAUABoAG8AdABvAHMAaABvAHAAIABDAFMAMgAAAAEA
- OEJJTQ+gAAAAAAEMbWFuaUlSRlIAAAEAOEJJTUFuRHMAAADgAAAAEAAAAAEAAAAAAABudWxsAAAAAwAA
- AABBRlN0bG9uZwAAAAAAAAAARnJJblZsTHMAAAABT2JqYwAAAAEAAAAAAABudWxsAAAAAgAAAABGcklE
- bG9uZyRVG90AAAAARnJHQWRvdWJAPgAAAAAAAAAAAABGU3RzVmxMcwAAAAFPYmpjAAAAAQAAAAAAAG51
- bGwAAAAEAAAAAEZzSURsb25nAAAAAAAAAABBRnJtbG9uZwAAAAAAAAAARnNGclZsTHMAAAABbG9uZyRV
- G90AAAAATENudGxvbmcAAAAAAAA4QklNUm9sbAAAAAgAAAAAAAAAADhCSU0PoQAAAAAAHG1mcmkAAAAC
- AAAAEAAAAAEAAAAAAAAAAQAAAAA4QklNBAYAAAAAAAcABAABAAEBAP/hOrFodHRwOi8vbnMuYWRvYmUu
- Y29tL3hhcC8xLjAvADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3pr
- YzlkIj8+Cjx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IjMuMS4xLTEx
- MSI+CiAgIDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYt
- c3ludGF4LW5zIyI+CiAgICAgIDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiCiAgICAgICAgICAg
- IHhtbG5zOnhhcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIgogICAgICAgICAgICB4
- bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyI+
- CiAgICAgICAgIDx4YXBNTTpEb2N1bWVudElEPnV1aWQ6MDc3QUVCQzBCRkMyREExMTkzNzZDNDcxMERC
- MDE1RTk8L3hhcE1NOkRvY3VtZW50SUQ+CiAgICAgICAgIDx4YXBNTTpJbnN0YW5jZUlEPnV1aWQ6MDg3
- QUVCQzBCRkMyREExMTkzNzZDNDcxMERCMDE1RTk8L3hhcE1NOkluc3RhbmNlSUQ+CiAgICAgICAgIDx4
- YXBNTTpEZXJpdmVkRnJvbSByZGY6cGFyc2VUeXBlPSJSZXNvdXJjZSI+CiAgICAgICAgICAgIDxzdFJl
- ZjppbnN0YW5jZUlEPnV1aWQ6MDU3QUVCQzBCRkMyREExMTkzNzZDNDcxMERCMDE1RTk8L3N0UmVmOmlu
- c3RhbmNlSUQ+CiAgICAgICAgICAgIDxzdFJlZjpkb2N1bWVudElEPnV1aWQ6OTJENTNCMzFCREMyREEx
- MTkzNzZDNDcxMERCMDE1RTk8L3N0UmVmOmRvY3VtZW50SUQ+CiAgICAgICAgIDwveGFwTU06RGVyaXZl
- ZEZyb20+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjph
- Ym91dD0iIgogICAgICAgICAgICB4bWxuczp4YXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8i
- PgogICAgICAgICA8eGFwOkNyZWF0ZURhdGU+MjAwNi0wNC0wMlQyMzoxNTo1Ni0wNDowMDwveGFwOkNy
- ZWF0ZURhdGU+CiAgICAgICAgIDx4YXA6TW9kaWZ5RGF0ZT4yMDA2LTA0LTAyVDIzOjE1OjU2LTA0OjAw
- PC94YXA6TW9kaWZ5RGF0ZT4KICAgICAgICAgPHhhcDpNZXRhZGF0YURhdGU+MjAwNi0wNC0wMlQyMzox
- NTo1Ni0wNDowMDwveGFwOk1ldGFkYXRhRGF0ZT4KICAgICAgICAgPHhhcDpDcmVhdG9yVG9vbD5BZG9i
- ZSBQaG90b3Nob3AgQ1MyIFdpbmRvd3M8L3hhcDpDcmVhdG9yVG9vbD4KICAgICAgPC9yZGY6RGVzY3Jp
- cHRpb24+CiAgICAgIDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiCiAgICAgICAgICAgIHhtbG5z
- OmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyI+CiAgICAgICAgIDxkYzpmb3JtYXQ+
- aW1hZ2UvanBlZzwvZGM6Zm9ybWF0PgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgICAgPHJkZjpE
- ZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8v
- bnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIj4KICAgICAgICAgPHBob3Rvc2hvcDpDb2xvck1vZGU+
- MzwvcGhvdG9zaG9wOkNvbG9yTW9kZT4KICAgICAgICAgPHBob3Rvc2hvcDpJQ0NQcm9maWxlPnNSR0Ig
- SUVDNjE5NjYtMi4xPC9waG90b3Nob3A6SUNDUHJvZmlsZT4KICAgICAgICAgPHBob3Rvc2hvcDpIaXN0
- b3J5Lz4KICAgICAgPC9yZGY6RGVzY3JpcHRpb24+CiAgICAgIDxyZGY6RGVzY3JpcHRpb24gcmRmOmFi
- b3V0PSIiCiAgICAgICAgICAgIHhtbG5zOnRpZmY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vdGlmZi8xLjAv
- Ij4KICAgICAgICAgPHRpZmY6T3JpZW50YXRpb24+MTwvdGlmZjpPcmllbnRhdGlvbj4KICAgICAgICAg
- PHRpZmY6WFJlc29sdXRpb24+NzIwMDAwLzEwMDAwPC90aWZmOlhSZXNvbHV0aW9uPgogICAgICAgICA8
- dGlmZjpZUmVzb2x1dGlvbj43MjAwMDAvMTAwMDA8L3RpZmY6WVJlc29sdXRpb24+CiAgICAgICAgIDx0
- aWZmOlJlc29sdXRpb25Vbml0PjI8L3RpZmY6UmVzb2x1dGlvblVuaXQ+CiAgICAgICAgIDx0aWZmOk5h
- dGl2ZURpZ2VzdD4yNTYsMjU3LDI1OCwyNTksMjYyLDI3NCwyNzcsMjg0LDUzMCw1MzEsMjgyLDI4Mywy
- OTYsMzAxLDMxOCwzMTksNTI5LDUzMiwzMDYsMjcwLDI3MSwyNzIsMzA1LDMxNSwzMzQzMjs4OTc3N0Iz
- QzE3OTIxREY4NUU1OUUwRkRCMTI0MDBDMjwvdGlmZjpOYXRpdmVEaWdlc3Q+CiAgICAgIDwvcmRmOkRl
- c2NyaXB0aW9uPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4
- bWxuczpleGlmPSJodHRwOi8vbnMuYWRvYmUuY29tL2V4aWYvMS4wLyI+CiAgICAgICAgIDxleGlmOlBp
- eGVsWERpbWVuc2lvbj4xNjQ8L2V4aWY6UGl4ZWxYRGltZW5zaW9uPgogICAgICAgICA8ZXhpZjpQaXhl
- bFlEaW1lbnNpb24+Mzg3PC9leGlmOlBpeGVsWURpbWVuc2lvbj4KICAgICAgICAgPGV4aWY6Q29sb3JT
- cGFjZT4xPC9leGlmOkNvbG9yU3BhY2U+CiAgICAgICAgIDxleGlmOk5hdGl2ZURpZ2VzdD4zNjg2NCw0
- MDk2MCw0MDk2MSwzNzEyMSwzNzEyMiw0MDk2Miw0MDk2MywzNzUxMCw0MDk2NCwzNjg2NywzNjg2OCwz
- MzQzNCwzMzQzNywzNDg1MCwzNDg1MiwzNDg1NSwzNDg1NiwzNzM3NywzNzM3OCwzNzM3OSwzNzM4MCwz
- NzM4MSwzNzM4MiwzNzM4MywzNzM4NCwzNzM4NSwzNzM4NiwzNzM5Niw0MTQ4Myw0MTQ4NCw0MTQ4Niw0
- MTQ4Nyw0MTQ4OCw0MTQ5Miw0MTQ5Myw0MTQ5NSw0MTcyOCw0MTcyOSw0MTczMCw0MTk4NSw0MTk4Niw0
- MTk4Nyw0MTk4OCw0MTk4OSw0MTk5MCw0MTk5MSw0MTk5Miw0MTk5Myw0MTk5NCw0MTk5NSw0MTk5Niw0
- MjAxNiwwLDIsNCw1LDYsNyw4LDksMTAsMTEsMTIsMTMsMTQsMTUsMTYsMTcsMTgsMjAsMjIsMjMsMjQs
- MjUsMjYsMjcsMjgsMzA7QTFDOEE5NEU5MzZBMkZEMERFREFENzBFMzdGQkNDMEE8L2V4aWY6TmF0aXZl
- RGlnZXN0PgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4K
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAog
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- IAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAK
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA...
[truncated message content] |
|
From: Chris M. <cm...@us...> - 2006-06-11 22:20:30
|
User: cmicali
Date: 06/06/11 15:20:29
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs
MDASolutionWizard.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
WizardSolutionProcessor.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer AndroMDA
VS2005 Add-In Setup.exe
Log:
- Fixed bug with rendering of the web site path in project.properties when configuring an existing web site
Revision Changes Path
1.10 +6 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDASolutionWizard.cs
Index: MDASolutionWizard.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDASolutionWizard.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- MDASolutionWizard.cs 11 Jun 2006 15:35:23 -0000 1.9
+++ MDASolutionWizard.cs 11 Jun 2006 22:20:28 -0000 1.10
@@ -400,7 +400,12 @@
config["projects.schemaexport.create"] = BoolToString(cbCreateSchemaExport.Checked);
config["projects.web.configure"] = BoolToString(cbConfigureWebProject.Checked);
- config["projects.web.name"] = usrWebProject.ProjectName;
+ string webname = usrWebProject.ProjectName.Trim('\\');
+ if (!usrWebProject.CreateNewProject)
+ {
+ webname = webname.Substring(webname.LastIndexOf('\\') + 1);
+ }
+ config["projects.web.name"] = webname;
config["projects.web.dir"] = usrWebProject.ProjectName;
config["projects.web.create"] = BoolToString(usrWebProject.CreateNewProject);
config["projects.web.usenhibernateconfig"] = BoolToString(rbNHibernateConfig.Checked);
1.11 +1 -1 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.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- WizardSolutionProcessor.cs 11 Jun 2006 15:35:24 -0000 1.10
+++ WizardSolutionProcessor.cs 11 Jun 2006 22:20:28 -0000 1.11
@@ -198,7 +198,7 @@
else
{
AddToStatus("Using existing web project " + m_configuration["projects.web.name"] + "...");
- webProject = VSSolutionUtils.FindProjectByName(m_configuration["projects.web.name"], m_applicationObject.Solution);
+ webProject = VSSolutionUtils.FindProjectByName(m_configuration["projects.web.dir"], m_applicationObject.Solution);
}
// Write the nhibernate.config if required
No revision
No revision
No revision
No revision
|
|
From: Martin W. <ama...@us...> - 2006-06-11 20:24:01
|
User: amartinwest
Date: 06/06/11 13:23:57
Modified: . pom.xml
Log:
Correct scm line
Revision Changes Path
1.9 +2 -2 plugins/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/pom.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- pom.xml 27 May 2006 17:47:19 -0000 1.8
+++ pom.xml 11 Jun 2006 20:23:57 -0000 1.9
@@ -17,8 +17,8 @@
<url>http://jira.andromda.org/</url>
</issueManagement>
<scm>
- <connection>scm:cvs:pserver:anonymous:@andromdaplugins.cvs.sourceforge.net:/cvsroot/andromdaplugins:andromda-plugins</connection>
- <developerConnection>scm:cvs:ext:${maven.username}@andromdaplugins.cvs.sourceforge.net:/cvsroot/andromdaplugins:andromda-plugins</developerConnection>
+ <connection>scm:cvs:ext:${cvs_username}@andromdaplugins.cvs.sourceforge.net:/cvsroot/andromdaplugins:andromda-plugins</connection>
+ <developerConnection>scm:cvs:ext:${cvs_username}@andromdaplugins.cvs.sourceforge.net:/cvsroot/andromdaplugins:andromda-plugins</developerConnection>
<url>http://andromdaplugins.cvs.sourceforge.net/andromdaplugins</url>
</scm>
<organization>
|
