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: Vance K. <va...@us...> - 2006-05-29 01:44:28
|
User: vancek
Date: 06/05/28 18:44:27
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3FinderMethodFacadeLogicImpl.java
Log:
getQuery must ignore args in where clause if stereotyped to be firstResult or maxResults
Revision Changes Path
1.10 +19 -10 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3FinderMethodFacadeLogicImpl.java
Index: EJB3FinderMethodFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3FinderMethodFacadeLogicImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- EJB3FinderMethodFacadeLogicImpl.java 15 May 2006 12:30:17 -0000 1.9
+++ EJB3FinderMethodFacadeLogicImpl.java 29 May 2006 01:44:27 -0000 1.10
@@ -102,6 +102,8 @@
// translation
String queryString = this.getTranslatedQuery();
+ boolean whereClauseExists = false;
+
// otherwise see if there is a query stored as a tagged value
if (StringUtils.isEmpty(queryString))
{
@@ -130,14 +132,20 @@
queryString = "from " + owner.getName() + " as " + variableName;
if (this.getArguments().size() > 0)
{
- queryString = queryString + " where";
Collection arguments = this.getArguments();
if (arguments != null && !arguments.isEmpty())
{
Iterator argumentIt = arguments.iterator();
for (int ctr = 0; argumentIt.hasNext(); ctr++)
{
- ParameterFacade argument = (ParameterFacade)argumentIt.next();
+ EJB3FinderMethodArgumentFacade argument = (EJB3FinderMethodArgumentFacade)argumentIt.next();
+ if (!argument.isFirstResult() && !argument.isMaxResults())
+ {
+ if (!whereClauseExists)
+ {
+ queryString = queryString + " where";
+ whereClauseExists = true;
+ }
String parameter = "?";
if (this.isUseNamedParameters())
{
@@ -152,6 +160,7 @@
}
}
}
+ }
return queryString;
}
|
|
From: Vance K. <va...@us...> - 2006-05-29 01:42:34
|
User: vancek
Date: 06/05/28 18:42:33
Modified: andromda-ejb3/src/main/resources/templates/ejb3
MessageDrivenBean.vsl
Log:
fix packages for PostConstruct and PreDestroy lifecycle methods from javax.ejb to javax.annotation for EJB 3.0 FR
Revision Changes Path
1.13 +2 -2 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/MessageDrivenBean.vsl
Index: MessageDrivenBean.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/MessageDrivenBean.vsl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- MessageDrivenBean.vsl 24 Apr 2006 02:28:53 -0000 1.12
+++ MessageDrivenBean.vsl 29 May 2006 01:42:33 -0000 1.13
@@ -130,9 +130,9 @@
$operation.getDocumentation(" * ")
*/
#* *##if ($operation.postConstruct)
- @javax.ejb.PostConstruct
+ @javax.annotation.PostConstruct
#* *##elseif ($operation.preDestroy)
- @javax.ejb.PreDestroy
+ @javax.annotation.PreDestroy
#* *##end
#* *##set ($returnType = $operation.returnType.fullyQualifiedName)
#* *##if ($operation.exceptionsPresent)
|
|
From: Vance K. <va...@us...> - 2006-05-29 01:41:21
|
User: vancek
Date: 06/05/28 18:41:19
Modified: andromda-ejb3/src/main/resources/templates/ejb3
SessionBeanBase.vsl MessageDrivenListener.vsl
Interceptor.vsl
Log:
fix interceptor related package names i.e. javax.ejb to javax.interceptor for later EJB 3.0 FR
Revision Changes Path
1.4 +5 -5 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.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- SessionBeanBase.vsl 4 May 2006 02:48:36 -0000 1.3
+++ SessionBeanBase.vsl 29 May 2006 01:41:19 -0000 1.4
@@ -59,10 +59,10 @@
#* *##set ($lifecycleCallback = "")
#**##end
// Lifecycle callback listeners and interceptors are defined in ejb-jar.xml
-// @javax.ejb.Interceptors({$transform.getInterceptorsAsList(${interceptors}, ${lifecycleCallback})})
+// @javax.interceptor.Interceptors({$transform.getInterceptorsAsList(${interceptors}, ${lifecycleCallback})})
#end
#if ($service.excludeDefaultInterceptors)
-// @javax.ejb.ExcludeDefaultInterceptors
+// @javax.interceptor.ExcludeDefaultInterceptors
#end
public abstract class ${service.serviceBaseName}
#if($service.generalization)
@@ -340,15 +340,15 @@
#* *##set ($interceptors = $operation.interceptorReferences)
#* *##if ($collectionUtils.size($interceptors) >= 1)
// Interceptors are defined in ejb-jar.xml
- // @javax.ejb.Interceptors({$transform.getInterceptorsAsList(${interceptors}, "")})
+ // @javax.interceptor.Interceptors({$transform.getInterceptorsAsList(${interceptors}, "")})
#* *##end
#* *##if ($operation.excludeDefaultInterceptors)
// Interceptor default exclusions are defined in ejb-jar.xml
- // @javax.ejb.ExcludeDefaultInterceptors
+ // @javax.interceptor.ExcludeDefaultInterceptors
#* *##end
#* *##if ($operation.excludeClassInterceptors)
// Interceptor class exclusions are defined in ejb-jar.xm
- // @javax.ejb.ExcludeClassInterceptors
+ // @javax.interceptor.ExcludeClassInterceptors
#* *##end
$operation.visibility $operation.returnType.fullyQualifiedName $operation.signature
#* *##if ($operation.exceptionsPresent)
1.5 +2 -2 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/MessageDrivenListener.vsl
Index: MessageDrivenListener.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/MessageDrivenListener.vsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- MessageDrivenListener.vsl 9 Mar 2006 04:30:12 -0000 1.4
+++ MessageDrivenListener.vsl 29 May 2006 01:41:19 -0000 1.5
@@ -19,7 +19,7 @@
// empty constructor
}
- @javax.ejb.PostConstruct
+ @javax.annotation.PostConstruct
public void postConstruct(javax.ejb.InvocationContext ctx)
{
try
@@ -33,7 +33,7 @@
}
}
- @javax.ejb.PreDestroy
+ @javax.annotation.PreDestroy
public void preDestroy(javax.ejb.InvocationContext ctx)
{
try
1.3 +1 -1 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/Interceptor.vsl
Index: Interceptor.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/Interceptor.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- Interceptor.vsl 6 Feb 2006 03:04:29 -0000 1.2
+++ Interceptor.vsl 29 May 2006 01:41:19 -0000 1.3
@@ -15,7 +15,7 @@
* @param ctx the invocation context
* @return
*/
- @javax.ejb.AroundInvoke
+ @javax.interceptor.AroundInvoke
public Object execute(javax.ejb.InvocationContext ctx)
throws Exception
{
|
|
From: Vance K. <va...@us...> - 2006-05-29 01:40:16
|
User: vancek
Date: 06/05/28 18:40:15
Modified: andromda-ejb3/src/main/resources/templates/ejb3 DaoBase.vsl
DaoLocal.vsl
Log:
create methods of DAO must account for overriding lob type defined
Revision Changes Path
1.7 +2 -2 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/DaoBase.vsl
Index: DaoBase.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/DaoBase.vsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- DaoBase.vsl 15 May 2006 12:43:11 -0000 1.6
+++ DaoBase.vsl 29 May 2006 01:40:14 -0000 1.7
@@ -278,7 +278,7 @@
*/
public $rootEntityType create(
#* *##foreach($property in $requiredProperties)
- $property.getterSetterTypeName $property.name#if($velocityCount != $requiredProperties.size()),#else)
+ #if ($stringUtils.isNotBlank($property.lobType))${property.lobType}#else$property.getterSetterTypeName#end $property.name#if($velocityCount != $requiredProperties.size()),#else)
throws ${entity.fullyQualifiedDaoDefaultExceptionName}#end
#* *##end
@@ -292,7 +292,7 @@
public Object create(
final int transform,
#* *##foreach($property in $requiredProperties)
- $property.getterSetterTypeName $property.name#if($velocityCount != $requiredProperties.size()),#else)
+ #if ($stringUtils.isNotBlank($property.lobType))${property.lobType}#else$property.getterSetterTypeName#end $property.name#if($velocityCount != $requiredProperties.size()),#else)
throws ${entity.fullyQualifiedDaoDefaultExceptionName}#end
#* *##end
1.4 +2 -2 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/DaoLocal.vsl
Index: DaoLocal.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/DaoLocal.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- DaoLocal.vsl 4 May 2006 02:46:52 -0000 1.3
+++ DaoLocal.vsl 29 May 2006 01:40:15 -0000 1.4
@@ -259,7 +259,7 @@
*/
public $rootEntityType create(
#* *##foreach($property in $requiredProperties)
- $property.getterSetterTypeName $property.name#if($velocityCount != $requiredProperties.size()),#else)
+ #if ($stringUtils.isNotBlank($property.lobType))${property.lobType}#else$property.getterSetterTypeName#end $property.name#if($velocityCount != $requiredProperties.size()),#else)
throws ${entity.fullyQualifiedDaoDefaultExceptionName};#end
#* *##end
@@ -279,7 +279,7 @@
public Object create(
int transform,
#* *##foreach($property in $requiredProperties)
- $property.getterSetterTypeName $property.name#if($velocityCount != $requiredProperties.size()),#else)
+ #if ($stringUtils.isNotBlank($property.lobType))${property.lobType}#else$property.getterSetterTypeName#end $property.name#if($velocityCount != $requiredProperties.size()),#else)
throws ${entity.fullyQualifiedDaoDefaultExceptionName};#end
#* *##end
|
|
From: Vance K. <va...@us...> - 2006-05-29 01:37:59
|
User: vancek
Date: 06/05/28 18:37:57
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3AssociationEndFacadeLogicImpl.java
andromda-ejb3/src/main/resources/templates/ejb3
EntityEmbeddable.vsl
Log:
fixed EJB-25 - Many-To-Many JoinTable issue for name property of JoinColum annotation - set name property to foreign key constraint name.
Revision Changes Path
1.9 +68 -0 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3AssociationEndFacadeLogicImpl.java
Index: EJB3AssociationEndFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3AssociationEndFacadeLogicImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- EJB3AssociationEndFacadeLogicImpl.java 14 Mar 2006 06:22:21 -0000 1.8
+++ EJB3AssociationEndFacadeLogicImpl.java 29 May 2006 01:37:57 -0000 1.9
@@ -9,6 +9,8 @@
import org.andromda.cartridges.ejb3.EJB3Globals;
import org.andromda.cartridges.ejb3.EJB3Profile;
import org.andromda.metafacades.uml.ClassifierFacade;
+import org.andromda.metafacades.uml.Entity;
+import org.andromda.metafacades.uml.EntityMetafacadeUtils;
import org.andromda.metafacades.uml.TaggedValueFacade;
import org.andromda.metafacades.uml.TypeMappings;
import org.andromda.metafacades.uml.UMLMetafacadeProperties;
@@ -650,4 +652,70 @@
{
return BooleanUtils.toBoolean(String.valueOf(this.getConfiguredProperty(HIBERNATE_ASSOCIATION_ENABLE_CACHE)));
}
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3AssociationEndFacadeLogic#
+ * handleGetForeignKeyConstraintName(java.lang.String)
+ */
+ protected String handleGetForeignKeyConstraintName(String suffix)
+ {
+ String constraintName;
+
+ final Object taggedValueObject = findTaggedValue(
+ UMLProfile.TAGGEDVALUE_PERSISTENCE_FOREIGN_KEY_CONSTRAINT_NAME);
+
+ /**
+ * Construct our own foreign key constraint name here
+ */
+ StringBuffer buffer = new StringBuffer();
+
+ if (taggedValueObject == null)
+ {
+ final ClassifierFacade type = getOtherEnd().getType();
+ if (type instanceof Entity)
+ {
+ Entity entity = (Entity)type;
+ buffer.append(entity.getTableName());
+ }
+ else
+ {
+ // should not happen
+ buffer.append(type.getName().toUpperCase());
+ }
+ }
+ else
+ {
+ // use the tagged value
+ buffer.append(taggedValueObject.toString());
+ }
+
+ buffer.append(this.getConfiguredProperty(UMLMetafacadeProperties.SQL_NAME_SEPARATOR));
+
+ /**
+ * Add the suffix - which is the name of the identifier pk column if not blank
+ * otherwise use the column name of the relationship
+ */
+ if (StringUtils.isNotBlank(suffix))
+ {
+ buffer.append(suffix);
+ }
+ else
+ {
+ buffer.append(this.getColumnName());
+ }
+ constraintName = buffer.toString();
+
+ final String constraintSuffix =
+ ObjectUtils.toString(this.getConfiguredProperty(UMLMetafacadeProperties.CONSTRAINT_SUFFIX)).trim();
+
+ /**
+ * we take into consideration the maximum length allowed
+ */
+ final String maxLengthString = (String)getConfiguredProperty(UMLMetafacadeProperties.MAX_SQL_NAME_LENGTH);
+ final short maxLength = (short)(Short.valueOf(maxLengthString).shortValue() - constraintSuffix.length());
+ buffer = new StringBuffer(
+ EntityMetafacadeUtils.ensureMaximumNameLength(constraintName, new Short(maxLength)));
+ buffer.append(constraintSuffix);
+ return buffer.toString();
+ }
}
\ No newline at end of file
1.29 +2 -2 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.28
retrieving revision 1.29
diff -u -w -r1.28 -r1.29
--- EntityEmbeddable.vsl 15 May 2006 12:42:07 -0000 1.28
+++ EntityEmbeddable.vsl 29 May 2006 01:37:57 -0000 1.29
@@ -642,8 +642,8 @@
@javax.persistence.JoinTable
(
name = "${associationEnd.association.tableName}",
- joinColumns = {#set ($identifiers = $entity.getIdentifiers())#foreach ($attribute in $identifiers)@javax.persistence.JoinColumn(name = "${attribute.columnName}")#if($velocityCount != $identifiers.size()), #end#end#**#},
- inverseJoinColumns = {#set ($identifiers = $target.type.getIdentifiers())#foreach ($attribute in $identifiers)@javax.persistence.JoinColumn(name = "${attribute.columnName}")#if($velocityCount != $identifiers.size()), #end#end#**#}
+ joinColumns = {#set ($identifiers = $entity.getIdentifiers())#foreach ($attribute in $identifiers)@javax.persistence.JoinColumn(name = "$target.getForeignKeyConstraintName(${attribute.columnName})", referencedColumnName = "${attribute.columnName}")#if($velocityCount != $identifiers.size()), #end#end#**#},
+ inverseJoinColumns = {#set ($identifiers = $target.type.getIdentifiers())#foreach ($attribute in $identifiers)@javax.persistence.JoinColumn(name = "$associationEnd.getForeignKeyConstraintName(${attribute.columnName})", referencedColumnName = "${attribute.columnName}")#if($velocityCount != $identifiers.size()), #end#end#**#}
)
#* *##end
#* *##end
|
|
From: Chris M. <cm...@us...> - 2006-05-28 19:34:10
|
User: cmicali
Date: 06/05/28 12:34:05
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer AndroMDA
VS2005 Add-In Setup.exe
Log:
- Updated latest version of add-in
Revision Changes Path
No revision
No revision
No revision
No revision
|
|
From: Chris M. <cm...@us...> - 2006-05-28 19:32:29
|
User: cmicali
Date: 06/05/28 12:32:27
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
AndroMDA.VS80AddIn.csproj Resource1.Designer.cs
Resource1.resx WizardSolutionProcessor.cs
Added: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Web
web.config web.config.nhibernate
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources
nhibernate.config
Removed: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/SchemaExport
nhibernate.config
Log:
- Added web.config export for web site generation in solution wizard
Revision Changes Path
1.11 +4 -2 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.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- AndroMDA.VS80AddIn.csproj 28 May 2006 15:49:55 -0000 1.10
+++ AndroMDA.VS80AddIn.csproj 28 May 2006 19:32:27 -0000 1.11
@@ -35,6 +35,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Extensibility, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <Reference Include="Microsoft.VisualStudio.VCCodeModel, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.VCProject, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.VCProjectEngine, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="System" />
@@ -277,6 +278,7 @@
<None Include="Resources\cvsignore" />
<None Include="Resources\maven.xml" />
<None Include="Resources\mda\cvsignore" />
+ <None Include="Resources\nhibernate.config" />
<None Include="Resources\project.properties" />
<None Include="Resources\project.xml" />
<None Include="Resources\mda\maven.xml" />
@@ -288,7 +290,6 @@
<None Include="Resources\Core\project.xml" />
<None Include="Resources\SchemaExport\App.config" />
<None Include="Resources\SchemaExport\cvsignore" />
- <None Include="Resources\SchemaExport\nhibernate.config" />
<None Include="Resources\SchemaExport\Program.cs" />
<None Include="Resources\Lib\AndroMDA.NHibernateSupport.dll" />
<None Include="Resources\Lib\Bamboo.Prevalence.dll" />
@@ -302,7 +303,8 @@
<None Include="Resources\Lib\NHibernate.Nullables2.dll" />
<None Include="Resources\Web\Bin\cvsignore" />
<None Include="Resources\Web\cvsignore" />
- <None Include="Resources\Web\nhibernate.config" />
+ <None Include="Resources\Web\web.config" />
+ <None Include="Resources\Web\web.config.nhibernate" />
</ItemGroup>
<ItemGroup>
<Folder Include="MavenProxy\" />
1.5 +28 -26 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.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- Resource1.Designer.cs 28 May 2006 15:49:55 -0000 1.4
+++ Resource1.Designer.cs 28 May 2006 19:32:27 -0000 1.5
@@ -339,6 +339,22 @@
}
/// <summary>
+ /// Looks up a localized string similar to <?xml version="1.0" encoding="utf-8" ?>
+ ///<hibernate-configuration xmlns="urn:nhibernate-configuration-2.0" >
+ /// <session-factory name="nhibernator">
+ /// <!-- properties -->
+ /// <property name="hibernate.connection.provider">NHibernate.Connection.DriverConnectionProvider</property>
+ /// <property name="hibernate.dialect">${wizard.database.nhibernatedialect}</property>
+ /// <property name="hibernate.connection.driver_class">${wizard.hibernate.connection.driver_class}</property>
+ /// < [rest of string was truncated]";.
+ /// </summary>
+ internal static string nhibernate_config {
+ get {
+ return ResourceManager.GetString("nhibernate_config", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to # ---------- Default Build Properties ----------
///# Change this to generate to the correct MDA database mappings
///# For SQL Server use: MSSQL
@@ -416,22 +432,6 @@
}
/// <summary>
- /// Looks up a localized string similar to <?xml version="1.0" encoding="utf-8" ?>
- ///<hibernate-configuration xmlns="urn:nhibernate-configuration-2.0" >
- /// <session-factory name="nhibernator">
- /// <!-- properties -->
- /// <property name="hibernate.connection.provider">NHibernate.Connection.DriverConnectionProvider</property>
- /// <property name="hibernate.dialect">${wizard.database.nhibernatedialect}</property>
- /// <property name="hibernate.connection.driver_class">${wizard.hibernate.connection.driver_class}</property>
- /// < [rest of string was truncated]";.
- /// </summary>
- internal static string SchemaExport_nhibernate_config {
- get {
- return ResourceManager.GetString("SchemaExport_nhibernate_config", resourceCulture);
- }
- }
-
- /// <summary>
/// Looks up a localized string similar to using System;
///using NHibernate;
///using AndroMDA.NHibernateSupport;
@@ -475,18 +475,20 @@
}
/// <summary>
- /// Looks up a localized string similar to <?xml version="1.0" encoding="utf-8" ?>
- ///<hibernate-configuration xmlns="urn:nhibernate-configuration-2.0" >
- /// <session-factory name="nhibernator">
- /// <!-- properties -->
- /// <property name="hibernate.connection.provider">NHibernate.Connection.DriverConnectionProvider</property>
- /// <property name="hibernate.dialect">${wizard.database.nhibernatedialect}</property>
- /// <property name="hibernate.connection.driver_class">${wizard.hibernate.connection.driver_class}</property>
- /// < [rest of string was truncated]";.
+ /// Looks up a localized string similar to .
+ /// </summary>
+ internal static string web_web_config {
+ get {
+ return ResourceManager.GetString("web_web_config", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to .
/// </summary>
- internal static string web_nhibernate_config {
+ internal static string web_web_config_nhibernate {
get {
- return ResourceManager.GetString("web_nhibernate_config", resourceCulture);
+ return ResourceManager.GetString("web_web_config_nhibernate", resourceCulture);
}
}
}
1.5 +7 -4 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.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- Resource1.resx 28 May 2006 15:49:55 -0000 1.4
+++ Resource1.resx 28 May 2006 19:32:27 -0000 1.5
@@ -196,8 +196,8 @@
<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="SchemaExport_nhibernate_config" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\SchemaExport\nhibernate.config;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</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="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>
@@ -208,7 +208,10 @@
<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_nhibernate_config" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\Web\nhibernate.config;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</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="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>
</root>
\ No newline at end of file
1.6 +8 -5 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.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- WizardSolutionProcessor.cs 28 May 2006 15:49:55 -0000 1.5
+++ WizardSolutionProcessor.cs 28 May 2006 19:32:27 -0000 1.6
@@ -156,7 +156,7 @@
AddToStatus("Creating schema export project " + m_configuration["projects.schemaexport.name"] + "...");
schemaExportProject = VSSolutionUtils.AddConsoleAppProjectToSolution(m_configuration["projects.schemaexport.name"], (Solution2)m_applicationObject.Solution);
WriteFile(basePath + "\\" + m_configuration["projects.schemaexport.dir"] + "\\App.config", ParseVariables(Resource1.SchemaExport_App_config));
- WriteFile(basePath + "\\" + m_configuration["projects.schemaexport.dir"] + "\\nhibernate.config", ParseVariables(Resource1.SchemaExport_nhibernate_config));
+ WriteFile(basePath + "\\" + m_configuration["projects.schemaexport.dir"] + "\\nhibernate.config", ParseVariables(Resource1.nhibernate_config));
WriteFile(basePath + "\\" + m_configuration["projects.schemaexport.dir"] + "\\Program.cs", ParseVariables(Resource1.SchemaExport_Program_cs));
ProjectItem appConfig = schemaExportProject.ProjectItems.AddFromFile(basePath + "\\" + m_configuration["projects.schemaexport.dir"] + "\\App.config");
ProjectItem nhibernateConfig = schemaExportProject.ProjectItems.AddFromFile(basePath + "\\" + m_configuration["projects.schemaexport.dir"] + "\\nhibernate.config");
@@ -183,17 +183,20 @@
webProject = VSSolutionUtils.AddWebProjectToSolution(m_configuration["projects.web.name"], (Solution2)m_applicationObject.Solution);
VsWebSite.VSWebSite webSite = webProject.Object as VsWebSite.VSWebSite;
- // TODO: Create or modify web.config to include AndroMDA.NHibernateSupport
-
+ string webconfig;
if (m_configuration["projects.web.usenhibernateconfig"] == "true")
{
- WriteFile(basePath + "\\" + m_configuration["projects.web.dir"] + "\\nhibernate.config", ParseVariables(Resource1.web_nhibernate_config));
+ WriteFile(basePath + "\\" + m_configuration["projects.web.dir"] + "\\nhibernate.config", ParseVariables(Resource1.nhibernate_config));
+ webconfig = Resource1.web_web_config;
}
else
{
- // TODO: Add NHibernate settings to web.config
+ webconfig = Resource1.web_web_config_nhibernate;
}
+ WriteFile(basePath + "\\" + m_configuration["projects.web.dir"] + "\\Web.config", ParseVariables(webconfig));
+ webProject.ProjectItems.AddFromFile(basePath + "\\" + m_configuration["projects.web.dir"] + "\\Web.config");
+
// TODO: Render Global.asax (if applicable)
// Write Web/cvsignore and Web\Bin\cvsignore
1.1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Web/web.config
Index: web.config
===================================================================
<?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>
<appSettings>
<add key="nhibernate.config" value="~/nhibernate.config"/>
</appSettings>
<connectionStrings/>
<system.web>
<!--
Set compilation debug="true" to insert debugging
symbols into the compiled page. Because this
affects performance, set this value to true only
during development.
-->
<compilation debug="true" />
<!--
The <authentication> section enables configuration
of the security authentication mode used by
ASP.NET to identify an incoming user.
-->
<authentication mode="Windows" />
<!--
<authentication mode="Forms">
<forms name="FormsAuth"
timeout="30"
loginUrl="~/Public/Login.aspx"
defaultUrl="~/Default.aspx"
path="/"
protection="All"/>
</authentication>
<authorization>
<deny users="?"/>
</authorization>
-->
<!--
<membership defaultProvider="DomainMembershipProvider">
<providers>
<clear/>
<add name="DomainMembershipProvider"
type="MembershipExample.Web.Shared.DomainMembershipProvider, MembershipExample.Web.Shared"
enablePasswordRetrieval="false"
enablePasswordReset="false"
requiresUniqueEmail="true"
requiresQuestionAndAnswer="false"
minRequiredPasswordLength="1"
minRequiredNonalphanumericCharacters="0"
hashAlgorithmType="SHA1" passwordFormat="Hashed"/>
</providers>
</membership>
<roleManager enabled="true" cacheRolesInCookie="true" cookieName=".DRPRoles" defaultProvider="DomainRoleProvider">
<providers>
<add name="DomainRoleProvider" type="MembershipExample.Web.Shared.DomainRoleProvider, MembershipExample.Web.Shared" />
</providers>
</roleManager>
-->
<httpModules>
<add type="AndroMDA.NHibernateSupport.HttpSessionManagerModule, AndroMDA.NHibernateSupport" name="HttpSessionManagerModule"/>
</httpModules>
<!--
The <customErrors> section enables configuration
of what to do if/when an unhandled error occurs
during the execution of a request. Specifically,
it enables developers to configure html error pages
to be displayed in place of a error stack trace.
<customErrors mode="RemoteOnly" defaultRedirect="GenericErrorPage.htm">
<error statusCode="403" redirect="NoAccess.htm" />
<error statusCode="404" redirect="FileNotFound.htm" />
</customErrors>
-->
</system.web>
<!--
<location path="Public">
<system.web>
<authorization>
<allow users="*"/>
</authorization>
</system.web>
</location>
-->
</configuration>
1.1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Web/web.config.nhibernate
Index: web.config.nhibernate
===================================================================
<?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.NameValueSectionHandler, System, Version=1.0.5000.0,Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
</configSections>
<appSettings/>
<connectionStrings/>
<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 key="hibernate.query.substitutions" value="true 1, false 0, yes 'Y', no 'N'"/>
<add key="hibernate.cache.provider_class" value="NHibernate.Caches.SysCache.SysCacheProvider, NHibernate.Caches.SysCache"/>
<add key="hibernate.show_sql" value="false"/>
<add key="nhibernate.mapping_assembly" value="${wizard.projects.core.name}"/>
</nhibernate>
<system.web>
<!--
Set compilation debug="true" to insert debugging
symbols into the compiled page. Because this
affects performance, set this value to true only
during development.
-->
<compilation debug="true" />
<!--
The <authentication> section enables configuration
of the security authentication mode used by
ASP.NET to identify an incoming user.
-->
<authentication mode="Windows" />
<!--
The <customErrors> section enables configuration
of what to do if/when an unhandled error occurs
during the execution of a request. Specifically,
it enables developers to configure html error pages
to be displayed in place of a error stack trace.
<customErrors mode="RemoteOnly" defaultRedirect="GenericErrorPage.htm">
<error statusCode="403" redirect="NoAccess.htm" />
<error statusCode="404" redirect="FileNotFound.htm" />
</customErrors>
-->
<!--
<authentication mode="Forms">
<forms name="FormsAuth"
timeout="30"
loginUrl="~/Public/Login.aspx"
defaultUrl="~/Default.aspx"
path="/"
protection="All"/>
</authentication>
<authorization>
<deny users="?"/>
</authorization>
-->
<!--
<membership defaultProvider="DomainMembershipProvider">
<providers>
<clear/>
<add name="DomainMembershipProvider"
type="MembershipExample.Web.Shared.DomainMembershipProvider, MembershipExample.Web.Shared"
enablePasswordRetrieval="false"
enablePasswordReset="false"
requiresUniqueEmail="true"
requiresQuestionAndAnswer="false"
minRequiredPasswordLength="1"
minRequiredNonalphanumericCharacters="0"
hashAlgorithmType="SHA1" passwordFormat="Hashed"/>
</providers>
</membership>
<roleManager enabled="true" cacheRolesInCookie="true" cookieName=".DRPRoles" defaultProvider="DomainRoleProvider">
<providers>
<add name="DomainRoleProvider" type="MembershipExample.Web.Shared.DomainRoleProvider, MembershipExample.Web.Shared" />
</providers>
</roleManager>
-->
<httpModules>
<add type="AndroMDA.NHibernateSupport.HttpSessionManagerModule, AndroMDA.NHibernateSupport" name="HttpSessionManagerModule"/>
</httpModules>
</system.web>
<!--
<location path="Public">
<system.web>
<authorization>
<allow users="*"/>
</authorization>
</system.web>
</location>
-->
</configuration>
1.1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/nhibernate.config
Index: nhibernate.config
===================================================================
<?xml version="1.0" encoding="utf-8" ?>
<hibernate-configuration xmlns="urn:nhibernate-configuration-2.0" >
<session-factory name="nhibernator">
<!-- properties -->
<property name="hibernate.connection.provider">NHibernate.Connection.DriverConnectionProvider</property>
<property name="hibernate.dialect">${wizard.database.nhibernatedialect}</property>
<property name="hibernate.connection.driver_class">${wizard.hibernate.connection.driver_class}</property>
<property name="hibernate.connection.connection_string">server=localhost;database=${wizard.database.name};Integrated Security=SSPI;</property>
<property name="hibernate.use_outer_join">true</property>
<property name="hibernate.query.substitutions">true 1, false 0, yes 'Y', no 'N'</property>
<property name="hibernate.cache.provider_class">NHibernate.Caches.SysCache.SysCacheProvider, NHibernate.Caches.SysCache</property>
<property name="hibernate.show_sql">false</property>
<!-- mapping files -->
<mapping assembly="${wizard.projects.core.name}" />
</session-factory>
</hibernate-configuration>
|
|
From: Chris M. <cm...@us...> - 2006-05-28 15:49:57
|
User: cmicali
Date: 06/05/28 08:49:55
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn AndroMDA VS2005
Add-In Readme.rtf
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
AndroMDA.VS80AddIn.csproj Resource1.Designer.cs
Resource1.resx WizardSolutionProcessor.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs
MDASolutionWizard.cs MDASolutionWizard.designer.cs
MDASolutionWizard.resx
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/conf
andromda.xml
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda
project.xml
Log:
- Added web project generation to the solution wizard
Revision Changes Path
No revision
No revision
No revision
No revision
1.10 +1 -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.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- AndroMDA.VS80AddIn.csproj 28 May 2006 05:54:01 -0000 1.9
+++ AndroMDA.VS80AddIn.csproj 28 May 2006 15:49:55 -0000 1.10
@@ -302,6 +302,7 @@
<None Include="Resources\Lib\NHibernate.Nullables2.dll" />
<None Include="Resources\Web\Bin\cvsignore" />
<None Include="Resources\Web\cvsignore" />
+ <None Include="Resources\Web\nhibernate.config" />
</ItemGroup>
<ItemGroup>
<Folder Include="MavenProxy\" />
1.4 +18 -2 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.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- Resource1.Designer.cs 28 May 2006 05:54:01 -0000 1.3
+++ Resource1.Designer.cs 28 May 2006 15:49:55 -0000 1.4
@@ -300,7 +300,7 @@
///
///<project>
/// <extend>../project.xml</extend>
- /// <name>Whatever MDA</name>
+ /// <name>${wizard.application.name} MDA</name>
/// <artifactId>${pom.groupId}-mda</artifactId>
/// <shortDescription>${pom.name} Component</shortDescription>
/// <description>Contains the ${pom.name} module</description>
@@ -309,7 +309,7 @@
/// <groupId>andromda</groupId>
/// <artifactId>andromda-profile</artifactId>
/// <version>${andromda.version}</version>
- /// <type>xml.zi [rest of string was truncated]";.
+ /// [rest of string was truncated]";.
/// </summary>
internal static string mda_project_xml {
get {
@@ -473,5 +473,21 @@
return ResourceManager.GetString("web_cvsignore", resourceCulture);
}
}
+
+ /// <summary>
+ /// Looks up a localized string similar to <?xml version="1.0" encoding="utf-8" ?>
+ ///<hibernate-configuration xmlns="urn:nhibernate-configuration-2.0" >
+ /// <session-factory name="nhibernator">
+ /// <!-- properties -->
+ /// <property name="hibernate.connection.provider">NHibernate.Connection.DriverConnectionProvider</property>
+ /// <property name="hibernate.dialect">${wizard.database.nhibernatedialect}</property>
+ /// <property name="hibernate.connection.driver_class">${wizard.hibernate.connection.driver_class}</property>
+ /// < [rest of string was truncated]";.
+ /// </summary>
+ internal static string web_nhibernate_config {
+ get {
+ return ResourceManager.GetString("web_nhibernate_config", resourceCulture);
+ }
+ }
}
}
1.4 +3 -0 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.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- Resource1.resx 28 May 2006 05:54:01 -0000 1.3
+++ Resource1.resx 28 May 2006 15:49:55 -0000 1.4
@@ -208,4 +208,7 @@
<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_nhibernate_config" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Web\nhibernate.config;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ </data>
</root>
\ No newline at end of file
1.5 +19 -0 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.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- WizardSolutionProcessor.cs 28 May 2006 05:54:01 -0000 1.4
+++ WizardSolutionProcessor.cs 28 May 2006 15:49:55 -0000 1.5
@@ -181,6 +181,21 @@
{
AddToStatus("Creating web project " + m_configuration["projects.web.name"] + "...");
webProject = VSSolutionUtils.AddWebProjectToSolution(m_configuration["projects.web.name"], (Solution2)m_applicationObject.Solution);
+ VsWebSite.VSWebSite webSite = webProject.Object as VsWebSite.VSWebSite;
+
+ // TODO: Create or modify web.config to include AndroMDA.NHibernateSupport
+
+ if (m_configuration["projects.web.usenhibernateconfig"] == "true")
+ {
+ WriteFile(basePath + "\\" + m_configuration["projects.web.dir"] + "\\nhibernate.config", ParseVariables(Resource1.web_nhibernate_config));
+ }
+ else
+ {
+ // TODO: Add NHibernate settings to web.config
+ }
+
+ // TODO: Render Global.asax (if applicable)
+
// Write Web/cvsignore and Web\Bin\cvsignore
if (versionControl)
{
@@ -188,6 +203,10 @@
CreateDirectory(basePath + "\\" + m_configuration["projects.web.dir"] + "\\Bin");
WriteFile(basePath + "\\" + m_configuration["projects.web.dir"] + "\\Bin\\" + ignoreFile, ParseVariables(Resource1.web_bin_cvsignore));
}
+
+ // Refresh folder view
+ webSite.Refresh();
+
}
AddToStatus("Creating AndroMDA configuration files...");
1.6 +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.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- MDASolutionWizard.cs 28 May 2006 05:54:02 -0000 1.5
+++ MDASolutionWizard.cs 28 May 2006 15:49:55 -0000 1.6
@@ -79,6 +79,8 @@
txtWebProject.Text = solutionName + ".Web";
cbCreateSchemaExport.Checked = true;
cbCreateWebProject.Checked = false;
+ rbNHibernateConfig.Enabled = cbCreateWebProject.Checked;
+ rbWebConfig.Enabled = cbCreateWebProject.Checked;
// Give the wizard a reference to this form so it can
// set this.AcceptButton to the Next button
@@ -99,6 +101,8 @@
private void cbCreateWebProject_CheckedChanged(object sender, EventArgs e)
{
txtWebProject.Enabled = cbCreateWebProject.Checked;
+ rbNHibernateConfig.Enabled = cbCreateWebProject.Checked;
+ rbWebConfig.Enabled = cbCreateWebProject.Checked;
}
/// <summary>
@@ -346,6 +350,7 @@
config["projects.web.name"] = txtWebProject.Text;
config["projects.web.dir"] = txtWebProject.Text;
config["projects.web.create"] = cbCreateWebProject.Checked ? "true" : "false";
+ config["projects.web.usenhibernateconfig"] = rbNHibernateConfig.Checked ? "true" : "false";
config["database.name"] = txtApplicationName.Text.Replace(" ", string.Empty).Replace(".", string.Empty);
1.4 +369 -341 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.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- MDASolutionWizard.designer.cs 28 May 2006 05:54:02 -0000 1.3
+++ MDASolutionWizard.designer.cs 28 May 2006 15:49:55 -0000 1.4
@@ -30,6 +30,7 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MDASolutionWizard));
+ this.imageList1 = new System.Windows.Forms.ImageList(this.components);
this.wizard1 = new Gui.Wizard.Wizard();
this.wizardPageSolutionInfo = new Gui.Wizard.WizardPage();
this.ddlVersionControl = new System.Windows.Forms.ComboBox();
@@ -41,21 +42,21 @@
this.txtApplicationName = new System.Windows.Forms.TextBox();
this.label12 = new System.Windows.Forms.Label();
this.header6 = new Gui.Wizard.Header();
- this.wizardPageCommonProject = new Gui.Wizard.WizardPage();
- this.usrCommonProject = new AndroMDA.VS80AddIn.Dialogs.MDAProjectSetupControl();
- this.header1 = new Gui.Wizard.Header();
- this.wizardPageCoreProject = new Gui.Wizard.WizardPage();
- this.header2 = new Gui.Wizard.Header();
- this.usrCoreProject = new AndroMDA.VS80AddIn.Dialogs.MDAProjectSetupControl();
- this.wizardPageSchemaExportProject = new Gui.Wizard.WizardPage();
- this.cbCreateSchemaExport = new System.Windows.Forms.CheckBox();
- this.txtSchemaExportProject = new System.Windows.Forms.TextBox();
- this.lblDescription = new System.Windows.Forms.Label();
- this.header3 = new Gui.Wizard.Header();
- this.wizardPageWebProject = new Gui.Wizard.WizardPage();
- this.cbCreateWebProject = new System.Windows.Forms.CheckBox();
- this.txtWebProject = new System.Windows.Forms.TextBox();
- this.header7 = new Gui.Wizard.Header();
+ this.wizardPageWelcome = new Gui.Wizard.WizardPage();
+ this.label9 = new System.Windows.Forms.Label();
+ this.label8 = new System.Windows.Forms.Label();
+ this.pictureBoxWelcome = new System.Windows.Forms.PictureBox();
+ this.wizardPageComplete = new Gui.Wizard.WizardPage();
+ 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.wizardPageProcessing = new Gui.Wizard.WizardPage();
+ this.lstStatus = new System.Windows.Forms.ListBox();
+ this.label7 = new System.Windows.Forms.Label();
+ this.header5 = new Gui.Wizard.Header();
+ this.pictureBoxThrobber = new System.Windows.Forms.PictureBox();
this.wizardPageConfirmChoices = new Gui.Wizard.WizardPage();
this.lblWebProject = new System.Windows.Forms.Label();
this.lblSchemaExportProject = new System.Windows.Forms.Label();
@@ -76,29 +77,25 @@
this.label4 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.header4 = new Gui.Wizard.Header();
- this.wizardPageWelcome = new Gui.Wizard.WizardPage();
- this.label9 = new System.Windows.Forms.Label();
- this.label8 = new System.Windows.Forms.Label();
- this.pictureBoxWelcome = new System.Windows.Forms.PictureBox();
- this.wizardPageComplete = new Gui.Wizard.WizardPage();
- 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.imageList1 = new System.Windows.Forms.ImageList(this.components);
- this.txtErrorMessage = new System.Windows.Forms.TextBox();
- this.wizardPageProcessing = new Gui.Wizard.WizardPage();
- this.lstStatus = new System.Windows.Forms.ListBox();
- this.label7 = new System.Windows.Forms.Label();
- this.header5 = new Gui.Wizard.Header();
- this.pictureBoxThrobber = new System.Windows.Forms.PictureBox();
+ this.wizardPageWebProject = new Gui.Wizard.WizardPage();
+ this.cbCreateWebProject = new System.Windows.Forms.CheckBox();
+ this.txtWebProject = new System.Windows.Forms.TextBox();
+ this.header7 = new Gui.Wizard.Header();
+ this.wizardPageSchemaExportProject = new Gui.Wizard.WizardPage();
+ this.cbCreateSchemaExport = new System.Windows.Forms.CheckBox();
+ this.txtSchemaExportProject = new System.Windows.Forms.TextBox();
+ this.lblDescription = new System.Windows.Forms.Label();
+ this.header3 = new Gui.Wizard.Header();
+ this.wizardPageCoreProject = new Gui.Wizard.WizardPage();
+ this.header2 = new Gui.Wizard.Header();
+ this.usrCoreProject = new AndroMDA.VS80AddIn.Dialogs.MDAProjectSetupControl();
+ this.wizardPageCommonProject = new Gui.Wizard.WizardPage();
+ this.usrCommonProject = new AndroMDA.VS80AddIn.Dialogs.MDAProjectSetupControl();
+ this.header1 = new Gui.Wizard.Header();
+ this.rbNHibernateConfig = new System.Windows.Forms.RadioButton();
+ this.rbWebConfig = new System.Windows.Forms.RadioButton();
this.wizard1.SuspendLayout();
this.wizardPageSolutionInfo.SuspendLayout();
- this.wizardPageCommonProject.SuspendLayout();
- this.wizardPageCoreProject.SuspendLayout();
- this.wizardPageSchemaExportProject.SuspendLayout();
- this.wizardPageWebProject.SuspendLayout();
- this.wizardPageConfirmChoices.SuspendLayout();
this.wizardPageWelcome.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxWelcome)).BeginInit();
this.wizardPageComplete.SuspendLayout();
@@ -106,20 +103,32 @@
this.wizardPageProcessing.SuspendLayout();
this.header5.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxThrobber)).BeginInit();
+ this.wizardPageConfirmChoices.SuspendLayout();
+ this.wizardPageWebProject.SuspendLayout();
+ this.wizardPageSchemaExportProject.SuspendLayout();
+ this.wizardPageCoreProject.SuspendLayout();
+ this.wizardPageCommonProject.SuspendLayout();
this.SuspendLayout();
//
+ // imageList1
+ //
+ this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream")));
+ this.imageList1.TransparentColor = System.Drawing.Color.Transparent;
+ this.imageList1.Images.SetKeyName(0, "INFO.ICO");
+ this.imageList1.Images.SetKeyName(1, "error.ico");
+ //
// wizard1
//
this.wizard1.ContainingForm = null;
+ this.wizard1.Controls.Add(this.wizardPageWebProject);
+ this.wizard1.Controls.Add(this.wizardPageSchemaExportProject);
+ this.wizard1.Controls.Add(this.wizardPageCoreProject);
+ 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.Controls.Add(this.wizardPageProcessing);
this.wizard1.Controls.Add(this.wizardPageConfirmChoices);
- this.wizard1.Controls.Add(this.wizardPageWebProject);
- this.wizard1.Controls.Add(this.wizardPageSchemaExportProject);
- this.wizard1.Controls.Add(this.wizardPageCoreProject);
- this.wizard1.Controls.Add(this.wizardPageCommonProject);
this.wizard1.Dock = System.Windows.Forms.DockStyle.Fill;
this.wizard1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.wizard1.Location = new System.Drawing.Point(0, 0);
@@ -250,182 +259,176 @@
this.header6.TabIndex = 26;
this.header6.Title = "Application Information";
//
- // wizardPageCommonProject
- //
- this.wizardPageCommonProject.Controls.Add(this.usrCommonProject);
- this.wizardPageCommonProject.Controls.Add(this.header1);
- this.wizardPageCommonProject.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageCommonProject.IsFinishPage = false;
- this.wizardPageCommonProject.Location = new System.Drawing.Point(0, 0);
- this.wizardPageCommonProject.Name = "wizardPageCommonProject";
- this.wizardPageCommonProject.Size = new System.Drawing.Size(525, 297);
- this.wizardPageCommonProject.TabIndex = 2;
- this.wizardPageCommonProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageCommonProject_CloseFromNext);
- this.wizardPageCommonProject.ShowFromNext += new System.EventHandler(this.wizardPageCommonProject_ShowFromNext);
- //
- // usrCommonProject
+ // wizardPageWelcome
//
- this.usrCommonProject.Location = new System.Drawing.Point(12, 79);
- this.usrCommonProject.Name = "usrCommonProject";
- this.usrCommonProject.ProjectName = "";
- this.usrCommonProject.Size = new System.Drawing.Size(384, 156);
- this.usrCommonProject.TabIndex = 0;
+ this.wizardPageWelcome.BackColor = System.Drawing.Color.White;
+ this.wizardPageWelcome.Controls.Add(this.label9);
+ this.wizardPageWelcome.Controls.Add(this.label8);
+ this.wizardPageWelcome.Controls.Add(this.pictureBoxWelcome);
+ this.wizardPageWelcome.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageWelcome.IsFinishPage = false;
+ this.wizardPageWelcome.Location = new System.Drawing.Point(0, 0);
+ this.wizardPageWelcome.Name = "wizardPageWelcome";
+ this.wizardPageWelcome.Size = new System.Drawing.Size(525, 297);
+ this.wizardPageWelcome.TabIndex = 1;
//
- // header1
+ // label9
//
- this.header1.BackColor = System.Drawing.SystemColors.Control;
- this.header1.CausesValidation = false;
- this.header1.Description = "The common project contains value objects, enumerations, and other non-entity cla" +
- "sses that are generated from your model.";
- this.header1.Dock = System.Windows.Forms.DockStyle.Top;
- this.header1.Image = ((System.Drawing.Image)(resources.GetObject("header1.Image")));
- this.header1.Location = new System.Drawing.Point(0, 0);
- this.header1.Name = "header1";
- this.header1.Size = new System.Drawing.Size(525, 65);
- this.header1.TabIndex = 0;
- this.header1.Title = "Common Project";
+ this.label9.Location = new System.Drawing.Point(174, 61);
+ this.label9.Name = "label9";
+ this.label9.Size = new System.Drawing.Size(339, 220);
+ this.label9.TabIndex = 9;
+ this.label9.Text = resources.GetString("label9.Text");
//
- // wizardPageCoreProject
+ // label8
//
- this.wizardPageCoreProject.Controls.Add(this.header2);
- this.wizardPageCoreProject.Controls.Add(this.usrCoreProject);
- this.wizardPageCoreProject.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageCoreProject.IsFinishPage = false;
- this.wizardPageCoreProject.Location = new System.Drawing.Point(0, 0);
- this.wizardPageCoreProject.Name = "wizardPageCoreProject";
- this.wizardPageCoreProject.Size = new System.Drawing.Size(525, 297);
- this.wizardPageCoreProject.TabIndex = 3;
- this.wizardPageCoreProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageCoreProject_CloseFromNext);
- this.wizardPageCoreProject.ShowFromNext += new System.EventHandler(this.wizardPageCoreProject_ShowFromNext);
+ this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.label8.FlatStyle = System.Windows.Forms.FlatStyle.System;
+ this.label8.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label8.Location = new System.Drawing.Point(170, 9);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(304, 48);
+ this.label8.TabIndex = 8;
+ this.label8.Text = "Welcome to the AndroMDA Solution Wizard";
//
- // header2
+ // pictureBoxWelcome
//
- this.header2.BackColor = System.Drawing.SystemColors.Control;
- this.header2.CausesValidation = false;
- this.header2.Description = "The core project, also known as the domain project, contains all entities and dat" +
- "a access objects generated from your model.";
- this.header2.Dock = System.Windows.Forms.DockStyle.Top;
- this.header2.Image = ((System.Drawing.Image)(resources.GetObject("header2.Image")));
- this.header2.Location = new System.Drawing.Point(0, 0);
- this.header2.Name = "header2";
- this.header2.Size = new System.Drawing.Size(525, 65);
- this.header2.TabIndex = 3;
- this.header2.Title = "Core Project";
+ this.pictureBoxWelcome.Dock = System.Windows.Forms.DockStyle.Left;
+ this.pictureBoxWelcome.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxWelcome.Image")));
+ this.pictureBoxWelcome.Location = new System.Drawing.Point(0, 0);
+ this.pictureBoxWelcome.Name = "pictureBoxWelcome";
+ this.pictureBoxWelcome.Size = new System.Drawing.Size(164, 297);
+ this.pictureBoxWelcome.TabIndex = 1;
+ this.pictureBoxWelcome.TabStop = false;
//
- // usrCoreProject
+ // wizardPageComplete
//
- this.usrCoreProject.Location = new System.Drawing.Point(12, 79);
- this.usrCoreProject.Name = "usrCoreProject";
- this.usrCoreProject.ProjectName = "";
- this.usrCoreProject.Size = new System.Drawing.Size(384, 156);
- this.usrCoreProject.TabIndex = 0;
+ this.wizardPageComplete.BackColor = System.Drawing.Color.White;
+ this.wizardPageComplete.Controls.Add(this.lblFinishPageTitle);
+ this.wizardPageComplete.Controls.Add(this.pictureBoxComplete);
+ this.wizardPageComplete.Controls.Add(this.lblFinishPageDescription);
+ this.wizardPageComplete.Controls.Add(this.lblFinishPageTitleImage);
+ this.wizardPageComplete.Controls.Add(this.txtErrorMessage);
+ this.wizardPageComplete.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageComplete.IsFinishPage = true;
+ this.wizardPageComplete.Location = new System.Drawing.Point(0, 0);
+ this.wizardPageComplete.Name = "wizardPageComplete";
+ this.wizardPageComplete.Size = new System.Drawing.Size(525, 297);
+ this.wizardPageComplete.TabIndex = 7;
+ this.wizardPageComplete.ShowFromNext += new System.EventHandler(this.wizardPageComplete_ShowFromNext);
//
- // wizardPageSchemaExportProject
+ // lblFinishPageTitle
//
- this.wizardPageSchemaExportProject.Controls.Add(this.cbCreateSchemaExport);
- this.wizardPageSchemaExportProject.Controls.Add(this.txtSchemaExportProject);
- this.wizardPageSchemaExportProject.Controls.Add(this.lblDescription);
- this.wizardPageSchemaExportProject.Controls.Add(this.header3);
- this.wizardPageSchemaExportProject.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageSchemaExportProject.IsFinishPage = false;
- this.wizardPageSchemaExportProject.Location = new System.Drawing.Point(0, 0);
- this.wizardPageSchemaExportProject.Name = "wizardPageSchemaExportProject";
- this.wizardPageSchemaExportProject.Size = new System.Drawing.Size(525, 297);
- this.wizardPageSchemaExportProject.TabIndex = 4;
- this.wizardPageSchemaExportProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageSchemaExportProject_CloseFromNext);
- this.wizardPageSchemaExportProject.ShowFromBack += new System.EventHandler(this.wizardPageSchemaExportProject_ShowFromNext);
- this.wizardPageSchemaExportProject.ShowFromNext += new System.EventHandler(this.wizardPageSchemaExportProject_ShowFromNext);
+ this.lblFinishPageTitle.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.lblFinishPageTitle.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lblFinishPageTitle.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
+ this.lblFinishPageTitle.Location = new System.Drawing.Point(209, 9);
+ this.lblFinishPageTitle.Name = "lblFinishPageTitle";
+ this.lblFinishPageTitle.Size = new System.Drawing.Size(299, 36);
+ this.lblFinishPageTitle.TabIndex = 15;
+ this.lblFinishPageTitle.Text = "Solution Update Complete";
+ this.lblFinishPageTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
- // cbCreateSchemaExport
+ // pictureBoxComplete
//
- this.cbCreateSchemaExport.AutoSize = true;
- this.cbCreateSchemaExport.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.cbCreateSchemaExport.Location = new System.Drawing.Point(11, 79);
- this.cbCreateSchemaExport.Name = "cbCreateSchemaExport";
- this.cbCreateSchemaExport.Size = new System.Drawing.Size(196, 17);
- this.cbCreateSchemaExport.TabIndex = 0;
- this.cbCreateSchemaExport.Text = "Create schema export project";
- this.cbCreateSchemaExport.UseVisualStyleBackColor = true;
- this.cbCreateSchemaExport.CheckedChanged += new System.EventHandler(this.cbCreateSchemaExport_CheckedChanged);
+ this.pictureBoxComplete.Dock = System.Windows.Forms.DockStyle.Left;
+ this.pictureBoxComplete.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxComplete.Image")));
+ this.pictureBoxComplete.Location = new System.Drawing.Point(0, 0);
+ this.pictureBoxComplete.Name = "pictureBoxComplete";
+ this.pictureBoxComplete.Size = new System.Drawing.Size(164, 297);
+ this.pictureBoxComplete.TabIndex = 13;
+ this.pictureBoxComplete.TabStop = false;
//
- // txtSchemaExportProject
+ // lblFinishPageDescription
//
- this.txtSchemaExportProject.Enabled = false;
- this.txtSchemaExportProject.Location = new System.Drawing.Point(30, 99);
- this.txtSchemaExportProject.Name = "txtSchemaExportProject";
- this.txtSchemaExportProject.Size = new System.Drawing.Size(320, 21);
- this.txtSchemaExportProject.TabIndex = 1;
- this.txtSchemaExportProject.Text = "SchemaExport";
+ this.lblFinishPageDescription.Location = new System.Drawing.Point(210, 49);
+ this.lblFinishPageDescription.Name = "lblFinishPageDescription";
+ this.lblFinishPageDescription.Size = new System.Drawing.Size(298, 72);
+ this.lblFinishPageDescription.TabIndex = 12;
+ this.lblFinishPageDescription.Text = "Your solution has been updated successfully and now supports AndroMDA code genera" +
+ "tion. You can now add classes to the solution model file and generate code base" +
+ "d on the model.\r\n";
//
- // lblDescription
+ // lblFinishPageTitleImage
//
- this.lblDescription.Location = new System.Drawing.Point(13, 92);
- this.lblDescription.Name = "lblDescription";
- this.lblDescription.Size = new System.Drawing.Size(507, 26);
- this.lblDescription.TabIndex = 24;
+ this.lblFinishPageTitleImage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.lblFinishPageTitleImage.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lblFinishPageTitleImage.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
+ this.lblFinishPageTitleImage.ImageIndex = 0;
+ this.lblFinishPageTitleImage.ImageList = this.imageList1;
+ this.lblFinishPageTitleImage.Location = new System.Drawing.Point(170, 9);
+ this.lblFinishPageTitleImage.Name = "lblFinishPageTitleImage";
+ this.lblFinishPageTitleImage.Size = new System.Drawing.Size(49, 36);
+ this.lblFinishPageTitleImage.TabIndex = 11;
+ this.lblFinishPageTitleImage.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
- // header3
+ // txtErrorMessage
//
- this.header3.BackColor = System.Drawing.SystemColors.Control;
- this.header3.CausesValidation = false;
- this.header3.Description = "Check the box below if you would like to create a project that contains a console" +
- " application that generates database schema from your model. ";
- this.header3.Dock = System.Windows.Forms.DockStyle.Top;
- this.header3.Image = ((System.Drawing.Image)(resources.GetObject("header3.Image")));
- this.header3.Location = new System.Drawing.Point(0, 0);
- this.header3.Name = "header3";
- this.header3.Size = new System.Drawing.Size(525, 65);
- this.header3.TabIndex = 4;
- this.header3.Title = "Schema Export Project";
+ this.txtErrorMessage.BackColor = System.Drawing.Color.White;
+ this.txtErrorMessage.Location = new System.Drawing.Point(174, 49);
+ this.txtErrorMessage.Multiline = true;
+ this.txtErrorMessage.Name = "txtErrorMessage";
+ this.txtErrorMessage.ReadOnly = true;
+ this.txtErrorMessage.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+ this.txtErrorMessage.Size = new System.Drawing.Size(334, 230);
+ this.txtErrorMessage.TabIndex = 14;
//
- // wizardPageWebProject
+ // wizardPageProcessing
//
- this.wizardPageWebProject.Controls.Add(this.cbCreateWebProject);
- this.wizardPageWebProject.Controls.Add(this.txtWebProject);
- this.wizardPageWebProject.Controls.Add(this.header7);
- this.wizardPageWebProject.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageWebProject.IsFinishPage = false;
- this.wizardPageWebProject.Location = new System.Drawing.Point(0, 0);
- this.wizardPageWebProject.Name = "wizardPageWebProject";
- this.wizardPageWebProject.Size = new System.Drawing.Size(525, 297);
- this.wizardPageWebProject.TabIndex = 9;
- this.wizardPageWebProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageWebProject_CloseFromNext);
- this.wizardPageWebProject.ShowFromNext += new System.EventHandler(this.wizardPageWebProject_ShowFromNext);
+ this.wizardPageProcessing.Controls.Add(this.lstStatus);
+ this.wizardPageProcessing.Controls.Add(this.label7);
+ this.wizardPageProcessing.Controls.Add(this.header5);
+ this.wizardPageProcessing.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageProcessing.IsFinishPage = false;
+ this.wizardPageProcessing.Location = new System.Drawing.Point(0, 0);
+ this.wizardPageProcessing.Name = "wizardPageProcessing";
+ this.wizardPageProcessing.Size = new System.Drawing.Size(525, 297);
+ this.wizardPageProcessing.TabIndex = 6;
+ this.wizardPageProcessing.ShowFromNext += new System.EventHandler(this.wizardPageProcessing_ShowFromNext);
//
- // cbCreateWebProject
+ // lstStatus
//
- this.cbCreateWebProject.AutoSize = true;
- this.cbCreateWebProject.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.cbCreateWebProject.Location = new System.Drawing.Point(11, 79);
- this.cbCreateWebProject.Name = "cbCreateWebProject";
- this.cbCreateWebProject.Size = new System.Drawing.Size(134, 17);
- this.cbCreateWebProject.TabIndex = 25;
- this.cbCreateWebProject.Text = "Create web project";
- this.cbCreateWebProject.UseVisualStyleBackColor = true;
- this.cbCreateWebProject.CheckedChanged += new System.EventHandler(this.cbCreateWebProject_CheckedChanged);
+ this.lstStatus.FormattingEnabled = true;
+ this.lstStatus.Location = new System.Drawing.Point(12, 100);
+ this.lstStatus.Name = "lstStatus";
+ this.lstStatus.Size = new System.Drawing.Size(501, 186);
+ this.lstStatus.TabIndex = 9;
//
- // txtWebProject
+ // label7
//
- this.txtWebProject.Enabled = false;
- this.txtWebProject.Location = new System.Drawing.Point(30, 99);
- this.txtWebProject.Name = "txtWebProject";
- this.txtWebProject.Size = new System.Drawing.Size(320, 21);
- this.txtWebProject.TabIndex = 26;
- this.txtWebProject.Text = "Web";
+ this.label7.AutoSize = true;
+ this.label7.Location = new System.Drawing.Point(12, 77);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(273, 13);
+ this.label7.TabIndex = 8;
+ this.label7.Text = "Updating solution to support AndroMDA. Please wait...";
//
- // header7
+ // header5
//
- this.header7.BackColor = System.Drawing.SystemColors.Control;
- this.header7.CausesValidation = false;
- this.header7.Description = "Check the box below if you would like to create a web site project that is config" +
- "ured to work with NHibernate and your generated objects.";
- this.header7.Dock = System.Windows.Forms.DockStyle.Top;
- this.header7.Image = ((System.Drawing.Image)(resources.GetObject("header7.Image")));
- this.header7.Location = new System.Drawing.Point(0, 0);
- this.header7.Name = "header7";
- this.header7.Size = new System.Drawing.Size(525, 65);
- this.header7.TabIndex = 27;
- this.header7.Title = "Web Project";
+ this.header5.BackColor = System.Drawing.SystemColors.Control;
+ this.header5.CausesValidation = false;
+ this.header5.Controls.Add(this.pictureBoxThrobber);
+ this.header5.Description = "Please wait...";
+ this.header5.Dock = System.Windows.Forms.DockStyle.Top;
+ this.header5.Image = ((System.Drawing.Image)(resources.GetObject("header5.Image")));
+ this.header5.Location = new System.Drawing.Point(0, 0);
+ this.header5.Name = "header5";
+ this.header5.Size = new System.Drawing.Size(525, 65);
+ this.header5.TabIndex = 6;
+ this.header5.Title = "Processing Solution";
+ //
+ // pictureBoxThrobber
+ //
+ this.pictureBoxThrobber.BackColor = System.Drawing.Color.White;
+ this.pictureBoxThrobber.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxThrobber.Image")));
+ this.pictureBoxThrobber.Location = new System.Drawing.Point(8, 40);
+ this.pictureBoxThrobber.Name = "pictureBoxThrobber";
+ this.pictureBoxThrobber.Size = new System.Drawing.Size(31, 22);
+ this.pictureBoxThrobber.TabIndex = 10;
+ this.pictureBoxThrobber.TabStop = false;
//
// wizardPageConfirmChoices
//
@@ -641,183 +644,206 @@
this.header4.TabIndex = 5;
this.header4.Title = "Confirm Choices";
//
- // wizardPageWelcome
+ // wizardPageWebProject
//
- this.wizardPageWelcome.BackColor = System.Drawing.Color.White;
- this.wizardPageWelcome.Controls.Add(this.label9);
- this.wizardPageWelcome.Controls.Add(this.label8);
- this.wizardPageWelcome.Controls.Add(this.pictureBoxWelcome);
- this.wizardPageWelcome.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageWelcome.IsFinishPage = false;
- this.wizardPageWelcome.Location = new System.Drawing.Point(0, 0);
- this.wizardPageWelcome.Name = "wizardPageWelcome";
- this.wizardPageWelcome.Size = new System.Drawing.Size(525, 297);
- this.wizardPageWelcome.TabIndex = 1;
+ this.wizardPageWebProject.Controls.Add(this.rbWebConfig);
+ this.wizardPageWebProject.Controls.Add(this.rbNHibernateConfig);
+ this.wizardPageWebProject.Controls.Add(this.cbCreateWebProject);
+ this.wizardPageWebProject.Controls.Add(this.txtWebProject);
+ this.wizardPageWebProject.Controls.Add(this.header7);
+ this.wizardPageWebProject.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageWebProject.IsFinishPage = false;
+ this.wizardPageWebProject.Location = new System.Drawing.Point(0, 0);
+ this.wizardPageWebProject.Name = "wizardPageWebProject";
+ this.wizardPageWebProject.Size = new System.Drawing.Size(525, 297);
+ this.wizardPageWebProject.TabIndex = 9;
+ this.wizardPageWebProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageWebProject_CloseFromNext);
+ this.wizardPageWebProject.ShowFromNext += new System.EventHandler(this.wizardPageWebProject_ShowFromNext);
//
- // label9
+ // cbCreateWebProject
//
- this.label9.Location = new System.Drawing.Point(174, 61);
- this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(339, 220);
- this.label9.TabIndex = 9;
- this.label9.Text = resources.GetString("label9.Text");
+ this.cbCreateWebProject.AutoSize = true;
+ this.cbCreateWebProject.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.cbCreateWebProject.Location = new System.Drawing.Point(11, 79);
+ this.cbCreateWebProject.Name = "cbCreateWebProject";
+ this.cbCreateWebProject.Size = new System.Drawing.Size(134, 17);
+ this.cbCreateWebProject.TabIndex = 25;
+ this.cbCreateWebProject.Text = "Create web project";
+ this.cbCreateWebProject.UseVisualStyleBackColor = true;
+ this.cbCreateWebProject.CheckedChanged += new System.EventHandler(this.cbCreateWebProject_CheckedChanged);
//
- // label8
+ // txtWebProject
//
- this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.label8.FlatStyle = System.Windows.Forms.FlatStyle.System;
- this.label8.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label8.Location = new System.Drawing.Point(170, 9);
- this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(304, 48);
- this.label8.TabIndex = 8;
- this.label8.Text = "Welcome to the AndroMDA Solution Wizard";
+ this.txtWebProject.Enabled = false;
+ this.txtWebProject.Location = new System.Drawing.Point(30, 99);
+ this.txtWebProject.Name = "txtWebProject";
+ this.txtWebProject.Size = new System.Drawing.Size(320, 21);
+ this.txtWebProject.TabIndex = 26;
+ this.txtWebProject.Text = "Web";
//
- // pictureBoxWelcome
+ // header7
//
- this.pictureBoxWelcome.Dock = System.Windows.Forms.DockStyle.Left;
- this.pictureBoxWelcome.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxWelcome.Image")));
- this.pictureBoxWelcome.Location = new System.Drawing.Point(0, 0);
- this.pictureBoxWelcome.Name = "pictureBoxWelcome";
- this.pictureBoxWelcome.Size = new System.Drawing.Size(164, 297);
- this.pictureBoxWelcome.TabIndex = 1;
- this.pictureBoxWelcome.TabStop = false;
+ this.header7.BackColor = System.Drawing.SystemColors.Control;
+ this.header7.CausesValidation = false;
+ this.header7.Description = "Check the box below if you would like to create a web site project that is config" +
+ "ured to work with NHibernate and your generated objects.";
+ this.header7.Dock = System.Windows.Forms.DockStyle.Top;
+ this.header7.Image = ((System.Drawing.Image)(resources.GetObject("header7.Image")));
+ this.header7.Location = new System.Drawing.Point(0, 0);
+ this.header7.Name = "header7";
+ this.header7.Size = new System.Drawing.Size(525, 65);
+ this.header7.TabIndex = 27;
+ this.header7.Title = "Web Project";
//
- // wizardPageComplete
+ // wizardPageSchemaExportProject
//
- this.wizardPageComplete.BackColor = System.Drawing.Color.White;
- this.wizardPageComplete.Controls.Add(this.lblFinishPageTitle);
- this.wizardPageComplete.Controls.Add(this.pictureBoxComplete);
- this.wizardPageComplete.Controls.Add(this.lblFinishPageDescription);
- this.wizardPageComplete.Controls.Add(this.lblFinishPageTitleImage);
- this.wizardPageComplete.Controls.Add(this.txtErrorMessage);
- this.wizardPageComplete.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageComplete.IsFinishPage = true;
- this.wizardPageComplete.Location = new System.Drawing.Point(0, 0);
- this.wizardPageComplete.Name = "wizardPageComplete";
- this.wizardPageComplete.Size = new System.Drawing.Size(525, 297);
- this.wizardPageComplete.TabIndex = 7;
- this.wizardPageComplete.ShowFromNext += new System.EventHandler(this.wizardPageComplete_ShowFromNext);
+ this.wizardPageSchemaExportProject.Controls.Add(this.cbCreateSchemaExport);
+ this.wizardPageSchemaExportProject.Controls.Add(this.txtSchemaExportProject);
+ this.wizardPageSchemaExportProject.Controls.Add(this.lblDescription);
+ this.wizardPageSchemaExportProject.Controls.Add(this.header3);
+ this.wizardPageSchemaExportProject.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageSchemaExportProject.IsFinishPage = false;
+ this.wizardPageSchemaExportProject.Location = new System.Drawing.Point(0, 0);
+ this.wizardPageSchemaExportProject.Name = "wizardPageSchemaExportProject";
+ this.wizardPageSchemaExportProject.Size = new System.Drawing.Size(525, 297);
+ this.wizardPageSchemaExportProject.TabIndex = 4;
+ this.wizardPageSchemaExportProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageSchemaExportProject_CloseFromNext);
+ this.wizardPageSchemaExportProject.ShowFromBack += new System.EventHandler(this.wizardPageSchemaExportProject_ShowFromNext);
+ this.wizardPageSchemaExportProject.ShowFromNext += new System.EventHandler(this.wizardPageSchemaExportProject_ShowFromNext);
//
- // lblFinishPageTitle
+ // cbCreateSchemaExport
//
- this.lblFinishPageTitle.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.lblFinishPageTitle.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lblFinishPageTitle.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
- this.lblFinishPageTitle.Location = new System.Drawing.Point(209, 9);
- this.lblFinishPageTitle.Name = "lblFinishPageTitle";
- this.lblFinishPageTitle.Size = new System.Drawing.Size(299, 36);
- this.lblFinishPageTitle.TabIndex = 15;
- this.lblFinishPageTitle.Text = "Solution Update Complete";
- this.lblFinishPageTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.cbCreateSchemaExport.AutoSize = true;
+ this.cbCreateSchemaExport.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.cbCreateSchemaExport.Location = new System.Drawing.Point(11, 79);
+ this.cbCreateSchemaExport.Name = "cbCreateSchemaExport";
+ this.cbCreateSchemaExport.Size = new System.Drawing.Size(196, 17);
+ this.cbCreateSchemaExport.TabIndex = 0;
+ this.cbCreateSchemaExport.Text = "Create schema export project";
+ this.cbCreateSchemaExport.UseVisualStyleBackColor = true;
+ this.cbCreateSchemaExport.CheckedChanged += new System.EventHandler(this.cbCreateSchemaExport_CheckedChanged);
//
- // pictureBoxComplete
+ // txtSchemaExportProject
//
- this.pictureBoxComplete.Dock = System.Windows.Forms.DockStyle.Left;
- this.pictureBoxComplete.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxComplete.Image")));
- this.pictureBoxComplete.Location = new System.Drawing.Point(0, 0);
- this.pictureBoxComplete.Name = "pictureBoxComplete";
- this.pictureBoxComplete.Size = new System.Drawing.Size(164, 297);
- this.pictureBoxComplete.TabIndex = 13;
- this.pictureBoxComplete.TabStop = false;
+ this.txtSchemaExportProject.Enabled = false;
+ this.txtSchemaExportProject.Location = new System.Drawing.Point(30, 99);
+ this.txtSchemaExportProject.Name = "txtSchemaExportProject";
+ this.txtSchemaExportProject.Size = new System.Drawing.Size(320, 21);
+ this.txtSchemaExportProject.TabIndex = 1;
+ this.txtSchemaExportProject.Text = "SchemaExport";
//
- // lblFinishPageDescription
+ // lblDescription
//
- this.lblFinishPageDescription.Location = new System.Drawing.Point(210, 49);
- this.lblFinishPageDescription.Name = "lblFinishPageDescription";
- this.lblFinishPageDescription.Size = new System.Drawing.Size(298, 72);
- this.lblFinishPageDescription.TabIndex = 12;
- this.lblFinishPageDescription.Text = "Your solution has been updated successfully and now supports AndroMDA code genera" +
- "tion. You can now add classes to the solution model file and generate code base" +
- "d on the model.\r\n";
+ this.lblDescription.Location = new System.Drawing.Point(13, 92);
+ this.lblDescription.Name = "lblDescription";
+ this.lblDescription.Size = new System.Drawing.Size(507, 26);
+ this.lblDescription.TabIndex = 24;
//
- // lblFinishPageTitleImage
+ // header3
//
- this.lblFinishPageTitleImage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.lblFinishPageTitleImage.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lblFinishPageTitleImage.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
- this.lblFinishPageTitleImage.ImageIndex = 0;
- this.lblFinishPageTitleImage.ImageList = this.imageList1;
- this.lblFinishPageTitleImage.Location = new System.Drawing.Point(170, 9);
- this.lblFinishPageTitleImage.Name = "lblFinishPageTitleImage";
- this.lblFinishPageTitleImage.Size = new System.Drawing.Size(49, 36);
- this.lblFinishPageTitleImage.TabIndex = 11;
- this.lblFinishPageTitleImage.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+ this.header3.BackColor = System.Drawing.SystemColors.Control;
+ this.header3.CausesValidation = false;
+ this.header3.Description = "Check the box below if you would like to create a project that contains a console" +
+ " application that generates database schema from your model. ";
+ this.header3.Dock = System.Windows.Forms.DockStyle.Top;
+ this.header3.Image = ((System.Drawing.Image)(resources.GetObject("header3.Image")));
+ this.header3.Location = new System.Drawing.Point(0, 0);
+ this.header3.Name = "header3";
+ this.header3.Size = new System.Drawing.Size(525, 65);
+ this.header3.TabIndex = 4;
+ this.header3.Title = "Schema Export Project";
//
- // imageList1
+ // wizardPageCoreProject
//
- this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream")));
- this.imageList1.TransparentColor = System.Drawing.Color.Transparent;
- this.imageList1.Images.SetKeyName(0, "INFO.ICO");
- this.imageList1.Images.SetKeyName(1, "error.ico");
+ this.wizardPageCoreProject.Controls.Add(this.header2);
+ this.wizardPageCoreProject.Controls.Add(this.usrCoreProject);
+ this.wizardPageCoreProject.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageCoreProject.IsFinishPage = false;
+ this.wizardPageCoreProject.Location = new System.Drawing.Point(0, 0);
+ this.wizardPageCoreProject.Name = "wizardPageCoreProject";
+ this.wizardPageCoreProject.Size = new System.Drawing.Size(525, 297);
+ this.wizardPageCoreProject.TabIndex = 3;
+ this.wizardPageCoreProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageCoreProject_CloseFromNext);
+ this.wizardPageCoreProject.ShowFromNext += new System.EventHandler(this.wizardPageCoreProject_ShowFromNext);
//
- // txtErrorMessage
+ // header2
//
- this.txtErrorMessage.BackColor = System.Drawing.Color.White;
- this.txtErrorMessage.Location = new System.Drawing.Point(174, 49);
- this.txtErrorMessage.Multiline = true;
- this.txtErrorMessage.Name = "txtErrorMessage";
- this.txtErrorMessage.ReadOnly = true;
- this.txtErrorMessage.ScrollBars = System.Windows.Forms.ScrollBars.Both;
- this.txtErrorMessage.Size = new System.Drawing.Size(334, 230);
- this.txtErrorMessage.TabIndex = 14;
+ this.header2.BackColor = System.Drawing.SystemColors.Control;
+ this.header2.CausesValidation = false;
+ this.header2.Description = "The core project, also known as the domain project, contains all entities and dat" +
+ "a access objects generated from your model.";
+ this.header2.Dock = System.Windows.Forms.DockStyle.Top;
+ this.header2.Image = ((System.Drawing.Image)(resources.GetObject("header2.Image")));
+ this.header2.Location = new System.Drawing.Point(0, 0);
+ this.header2.Name = "header2";
+ this.header2.Size = new System.Drawing.Size(525, 65);
+ this.header2.TabIndex = 3;
+ this.header2.Title = "Core Project";
//
- // wizardPageProcessing
+ // usrCoreProject
//
- this.wizardPageProcessing.Controls.Add(this.lstStatus);
- this.wizardPageProcessing.Controls.Add(this.label7);
- this.wizardPageProcessing.Controls.Add(this.header5);
- this.wizardPageProcessing.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageProcessing.IsFinishPage = false;
- this.wizardPageProcessing.Location = new System.Drawing.Point(0, 0);
- this.wizardPageProcessing.Name = "wizardPageProcessing";
- this.wizardPageProcessing.Size = new System.Drawing.Size(525, 297);
- this.wizardPageProcessing.TabIndex = 6;
- this.wizardPageProcessing.ShowFromNext += new System.EventHandler(this.wizardPageProcessing_ShowFromNext);
+ this.usrCoreProject.Location = new System.Drawing.Point(12, 79);
+ this.usrCoreProject.Name = "usrCoreProject";
+ this.usrCoreProject.ProjectName = "";
+ this.usrCoreProject.Size = new System.Drawing.Size(384, 156);
+ this.usrCoreProject.TabIndex = 0;
//
- // lstStatus
+ // wizardPageCommonProject
//
- this.lstStatus.FormattingEnabled = true;
- this.lstStatus.Location = new System.Drawing.Point(12, 100);
- this.lstStatus.Name = "lstStatus";
- this.lstStatus.Size = new System.Drawing.Size(501, 186);
- this.lstStatus.TabIndex = 9;
+ this.wizardPageCommonProject.Controls.Add(this.usrCommonProject);
+ this.wizardPageCommonProject.Controls.Add(this.header1);
+ this.wizardPageCommonProject.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageCommonProject.IsFinishPage = false;
+ this.wizardPageCommonProject.Location = new System.Drawing.Point(0, 0);
+ this.wizardPageCommonProject.Name = "wizardPageCommonProject";
+ this.wizardPageCommonProject.Size = new System.Drawing.Size(525, 297);
+ this.wizardPageCommonProject.TabIndex = 2;
+ this.wizardPageCommonProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageCommonProject_CloseFromNext);
+ this.wizardPageCommonProject.ShowFromNext += new System.EventHandler(this.wizardPageCommonProject_ShowFromNext);
//
- // label7
+ // usrCommonProject
//
- this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(12, 77);
- this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(273, 13);
- this.label7.TabIndex = 8;
- this.label7.Text = "Updating solution to support AndroMDA. Please wait...";
+ this.usrCommonProject.Location = new System.Drawing.Point(12, 79);
+ this.usrCommonProject.Name = "usrCommonProject";
+ this.usrCommonProject.ProjectName = "";
+ this.usrCommonProject.Size = new System.Drawing.Size(384, 156);
+ this.usrCommonProject.TabIndex = 0;
//
- // header5
+ // header1
//
- this.header5.BackColor = System.Drawing.SystemColors.Control;
- this.header5.CausesValidation = false;
- this.header5.Controls.Add(this.pictureBoxThrobber);
- this.header5.Description = "Please wait...";
- this.header5.Dock = System.Windows.Forms.DockStyle.Top;
- this.header5.Image = ((System.Drawing.Image)(resources.GetObject("header5.Image")));
- this.header5.Location = new System.Drawing.Point(0, 0);
- this.header5.Name = "header5";
- this.header5.Size = new System.Drawing.Size(525, 65);
- this.header5.TabIndex = 6;
- this.header5.Title = "Processing Solution";
+ this.header1.BackColor = System.Drawing.SystemColors.Control;
+ this.header1.CausesValidation = false;
+ this.header1.Description = "The common project contains value objects, enumerations, and other non-entity cla" +
+ "sses that are generated from your model.";
+ this.header1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.header1.Image = ((System.Drawing.Image)(resources.GetObject("header1.Image")));
+ this.header1.Location = new System.Drawing.Point(0, 0);
+ this.header1.Name = "header1";
+ this.header1.Size = new System.Drawing.Size(525, 65);
+ this.header1.TabIndex = 0;
+ this.header1.Title = "Common Project";
//
- // pictureBoxThrobber
+ // rbNHibernateConfig
//
- this.pictureBoxThrobber.BackColor = System.Drawing.Color.White;
- this.pictureBoxThrobber.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxThrobber.Image")));
- this.pictureBoxThrobber.Location = new System.Drawing.Point(8, 40);
- this.pictureBoxThrobber.Name = "pictureBoxThrobber";
- this.pictureBoxThrobber.Size = new System.Drawing.Size(31, 22);
- this.pictureBoxThrobber.TabIndex = 10;
- this.pictureBoxThrobber.TabStop = false;
+ this.rbNHibernateConfig.AutoSize = true;
+ this.rbNHibernateConfig.Checked = true;
+ this.rbNHibernateConfig.Location = new System.Drawing.Point(30, 126);
+ this.rbNHibernateConfig.Name = "rbNHibernateConfig";
+ this.rbNHibernateConfig.Size = new System.Drawing.Size(249, 17);
+ this.rbNHibernateConfig.TabIndex = 28;
+ this.rbNHibernateConfig.TabStop = true;
+ this.rbNHibernateConfig.Text = "Store persistance settings in nhibernate.config";
+ this.rbNHibernateConfig.UseVisualStyleBackColor = true;
+ //
+ // rbWebConfig
+ //
+ this.rbWebConfig.AutoSize = true;
+ this.rbWebConfig.Location = new System.Drawing.Point(30, 149);
+ this.rbWebConfig.Name = "rbWebConfig";
+ this.rbWebConfig.Size = new System.Drawing.Size(217, 17);
+ this.rbWebConfig.TabIndex = 29;
+ this.rbWebConfig.Text = "Store persistance settings in web.config";
+ this.rbWebConfig.UseVisualStyleBackColor = true;
//
// MDASolutionWizard
//
@@ -836,14 +862,6 @@
this.wizard1.ResumeLayout(false);
this.wizardPageSolutionInfo.ResumeLayout(false);
this.wizardPageSolutionInfo.PerformLayout();
- this.wizardPageCommonProject.ResumeLayout(false);
- this.wizardPageCoreProject.ResumeLayout(false);
- this.wizardPageSchemaExportProject.ResumeLayout(false);
- this.wizardPageSchemaExportProject.PerformLayout();
- this.wizardPageWebProject.ResumeLayout(false);
- this.wizardPageWebProject.PerformLayout();
- this.wizardPageConfirmChoices.ResumeLayout(false);
- this.wizardPageConfirmChoices.PerformLayout();
this.wizardPageWelcome.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pictureBoxWelcome)).EndInit();
this.wizardPageComplete.ResumeLayout(false);
@@ -853,6 +871,14 @@
this.wizardPageProcessing.PerformLayout();
this.header5.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pictureBoxThrobber)).EndInit();
+ this.wizardPageConfirmChoices.ResumeLayout(false);
+ this.wizardPageConfirmChoices.PerformLayout();
+ this.wizardPageWebProject.ResumeLayout(false);
+ this.wizardPageWebProject.PerformLayout();
+ this.wizardPageSchemaExportProject.ResumeLayout(false);
+ this.wizardPageSchemaExportProject.PerformLayout();
+ this.wizardPageCoreProject.ResumeLayout(false);
+ this.wizardPageCommonProject.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -921,5 +947,7 @@
private System.Windows.Forms.Label lblFinishPageTitle;
private System.Windows.Forms.ComboBox ddlVersionControl;
private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.RadioButton rbWebConfig;
+ private System.Windows.Forms.RadioButton rbNHibernateConfig;
}
}
\ No newline at end of file
1.4 +2191 -2191plugins/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.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- MDASolutionWizard.resx 28 May 2006 05:54:02 -0000 1.3
+++ MDASolutionWizard.resx 28 May 2006 15:49:55 -0000 1.4
@@ -117,8 +117,151 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+ <data name="imageList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
+ LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
+ ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAY
+ HwAAAk1TRnQBSQFMAgEBAgEAAQQBAAEEAQABIAEAASABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAGA
+ AwABIAMAAQEBAAEYBgABMEsAAVABIgE0ATkBBAEZPAAB0QIAAbECAAGHAgABYAIAAUICAAEzAgABLAIA
+ ASsCAAEtAgABMwIAAUICAAFhAgABhQIAAa8CAAHQ/wARAAHCAY8BYwF6AUMBMgE5AQQBGTkAAbcCAAF1
+ AgABNgEAARUBCQEAAUQCAQFdAgEBbAIAAXQCAAF1AgABbAIBAV4CAQFFAgABIAEKAQABAQEbAgABQwIA
+ AXoCAAG0/wALAAHLAZ8BcgHbAa8BgwF6AUMBMgE5AQQBGTYAAY0CAAExAQEBLwIBAXUCAQGGAgEBiQIA
+ AYUCAA...
[truncated message content] |
|
From: Chris M. <cm...@us...> - 2006-05-28 05:54:07
|
User: cmicali
Date: 06/05/27 22:54:04
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
AndroMDA.VS80AddIn.csproj Resource1.Designer.cs
Resource1.resx WizardSolutionProcessor.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs
MDASolutionWizard.cs MDASolutionWizard.designer.cs
MDASolutionWizard.resx
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils
VSSolutionUtils.cs
Added: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Common
cvsignore
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Core
cvsignore
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/SchemaExport
cvsignore
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Web/Bin
cvsignore
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Web
cvsignore
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources
cvsignore
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda
cvsignore
Log:
- Added source control .cvsignore/.svnignore output to solution wizard
Revision Changes Path
1.9 +7 -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.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- AndroMDA.VS80AddIn.csproj 27 May 2006 22:31:46 -0000 1.8
+++ AndroMDA.VS80AddIn.csproj 28 May 2006 05:54:01 -0000 1.9
@@ -272,7 +272,11 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="AddIn.ico" />
+ <None Include="Resources\Common\cvsignore" />
+ <None Include="Resources\Core\cvsignore" />
+ <None Include="Resources\cvsignore" />
<None Include="Resources\maven.xml" />
+ <None Include="Resources\mda\cvsignore" />
<None Include="Resources\project.properties" />
<None Include="Resources\project.xml" />
<None Include="Resources\mda\maven.xml" />
@@ -283,6 +287,7 @@
<None Include="Resources\Common\project.xml" />
<None Include="Resources\Core\project.xml" />
<None Include="Resources\SchemaExport\App.config" />
+ <None Include="Resources\SchemaExport\cvsignore" />
<None Include="Resources\SchemaExport\nhibernate.config" />
<None Include="Resources\SchemaExport\Program.cs" />
<None Include="Resources\Lib\AndroMDA.NHibernateSupport.dll" />
@@ -295,6 +300,8 @@
<None Include="Resources\Lib\NHibernate.Caches.SysCache.dll" />
<None Include="Resources\Lib\NHibernate.dll" />
<None Include="Resources\Lib\NHibernate.Nullables2.dll" />
+ <None Include="Resources\Web\Bin\cvsignore" />
+ <None Include="Resources\Web\cvsignore" />
</ItemGroup>
<ItemGroup>
<Folder Include="MavenProxy\" />
1.3 +86 -13 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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- Resource1.Designer.cs 18 Apr 2006 17:18:51 -0000 1.2
+++ Resource1.Designer.cs 28 May 2006 05:54:01 -0000 1.3
@@ -61,6 +61,18 @@
}
/// <summary>
+ /// Looks up a localized string similar to bin
+ ///obj
+ ///target
+ ///*.user.
+ /// </summary>
+ internal static string common_cvsignore {
+ get {
+ return ResourceManager.GetString("common_cvsignore", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to <?xml version="1.0" encoding="UTF-8"?>
///
///<project>
@@ -80,6 +92,18 @@
}
/// <summary>
+ /// Looks up a localized string similar to bin
+ ///obj
+ ///target
+ ///*.user.
+ /// </summary>
+ internal static string core_cvsignore {
+ get {
+ return ResourceManager.GetString("core_cvsignore", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to <?xml version="1.0" encoding="UTF-8"?>
///
///<project>
@@ -98,6 +122,19 @@
}
}
+ /// <summary>
+ /// Looks up a localized string similar to *.suo
+ ///*.log
+ ///PrecompiledWeb
+ ///target
+ ///.
+ /// </summary>
+ internal static string cvsignore {
+ get {
+ return ResourceManager.GetString("cvsignore", resourceCulture);
+ }
+ }
+
internal static byte[] lib_AndroMDA_NHibernateSupport_dll {
get {
object obj = ResourceManager.GetObject("lib_AndroMDA_NHibernateSupport_dll", resourceCulture);
@@ -183,7 +220,7 @@
/// ================================================================== -->
/// <goal name="clean">
/// <attainGoal name="multiproject:clean"/>
- /// <!-- get rid of a [rest of string was truncated]";.
+ /// <!- [rest of string was truncated]";.
/// </summary>
internal static string maven_xml {
get {
@@ -216,6 +253,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to vsmdaaddin.properties.
+ /// </summary>
+ internal static string mda_cvsignore {
+ get {
+ return ResourceManager.GetString("mda_cvsignore", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to <project default="pom:install">
/// <preGoal name="pom:install">
/// <attainGoal name="andromda:run"/>
@@ -241,8 +287,7 @@
///maven.andromda.run.without.ant=true
///
///# Define the assembly names for Common and Core projects
- ///maven.andromda.commonAssemblyName=${wizard.projects.common.name}
- ///maven. [rest of string was truncated]";.
+ ///maven.andromda.commonAssemblyName=${wizard.projects.common.n [rest of string was truncated]";.
/// </summary>
internal static string mda_project_properties {
get {
@@ -264,8 +309,7 @@
/// <groupId>andromda</groupId>
/// <artifactId>andromda-profile</artifactId>
/// <version>${andromda.version}</version>
- /// <type>xml.zip</type>
- /// [rest of string was truncated]";.
+ /// <type>xml.zi [rest of string was truncated]";.
/// </summary>
internal static string mda_project_xml {
get {
@@ -286,7 +330,7 @@
/// <XMI.metamodel xmi.name='UML' xmi.version='1.4'/>
/// </XMI.header>
/// <XMI.content>
- /// <UML:Model xmi.id='eee_1045467100313_135436_1' name='Data' isRoot='false' isLeaf='false' isA [rest of string was truncated]";.
+ /// <UML:Model xmi.id='eee_1045467100313_135436_1' name='Data' isRoot='false' isLeaf [rest of string was truncated]";.
/// </summary>
internal static string mda_src_uml_empty_model_xml {
get {
@@ -306,8 +350,7 @@
///# For SQL Server use: net.sf.hibernate.dialect.SQLServerDialect
///# For MySql use: net.sf.hibernate.dialect.MySQLDialect
///# For Hypersonic use: net.sf.hibernate.dialect.HSQLDialect
- ///# For Oracle9i use: net.sf.hibernate.dialect.Oracle9Dialect
- ///h [rest of string was truncated]";.
+ ///# For Oracle9i use: net.sf.hibernate.dialect.Oracl [rest of string was truncated]";.
/// </summary>
internal static string project_properties {
get {
@@ -331,7 +374,7 @@
/// <developers>
/// </developers>
/// <dependencies>
- /// <dependen [rest of string was truncated]";.
+ /// [rest of string was truncated]";.
/// </summary>
internal static string project_xml {
get {
@@ -353,7 +396,7 @@
/// <rollingStyle value="Size" />
/// <maxSizeRollBackups value="10" />
/// <maximumFileSize value="1MB" />
- /// <staticLogFileName value="true" / [rest of string was truncated]";.
+ /// <staticLogFileName v [rest of string was truncated]";.
/// </summary>
internal static string SchemaExport_App_config {
get {
@@ -362,6 +405,17 @@
}
/// <summary>
+ /// Looks up a localized string similar to bin
+ ///obj
+ ///*.user.
+ /// </summary>
+ internal static string SchemaExport_cvsignore {
+ get {
+ return ResourceManager.GetString("SchemaExport_cvsignore", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to <?xml version="1.0" encoding="utf-8" ?>
///<hibernate-configuration xmlns="urn:nhibernate-configuration-2.0" >
/// <session-factory name="nhibernator">
@@ -369,7 +423,7 @@
/// <property name="hibernate.connection.provider">NHibernate.Connection.DriverConnectionProvider</property>
/// <property name="hibernate.dialect">${wizard.database.nhibernatedialect}</property>
/// <property name="hibernate.connection.driver_class">${wizard.hibernate.connection.driver_class}</property>
- /// <propert [rest of string was truncated]";.
+ /// < [rest of string was truncated]";.
/// </summary>
internal static string SchemaExport_nhibernate_config {
get {
@@ -393,12 +447,31 @@
/// Console.WriteLine("Usage:");
/// Console.WriteLine(" SchemaExport [script] [export]");
/// Console.WriteLine(" script=t outputs DDL to the console");
- /// Console.WriteLine(" export=t exports schema [rest of string was truncated]";.
+ /// Console.WriteLine(" export=t [rest of string was truncated]";.
/// </summary>
internal static string SchemaExport_Program_cs {
get {
return ResourceManager.GetString("SchemaExport_Program_cs", resourceCulture);
}
}
+
+ /// <summary>
+ /// Looks up a localized string similar to *.dll
+ ///*.pdb.
+ /// </summary>
+ internal static string web_bin_cvsignore {
+ get {
+ return ResourceManager.GetString("web_bin_cvsignore", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to App_WebReferences.
+ /// </summary>
+ internal static string web_cvsignore {
+ get {
+ return ResourceManager.GetString("web_cvsignore", resourceCulture);
+ }
+ }
}
}
1.3 +21 -0 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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- Resource1.resx 18 Apr 2006 17:18:51 -0000 1.2
+++ Resource1.resx 28 May 2006 05:54:01 -0000 1.3
@@ -118,12 +118,21 @@
<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>
<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>
@@ -160,6 +169,9 @@
<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>
<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>
@@ -181,10 +193,19 @@
<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="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="SchemaExport_nhibernate_config" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\SchemaExport\nhibernate.config;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>
+ <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>
</root>
\ No newline at end of file
1.4 +57 -26 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.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- WizardSolutionProcessor.cs 27 May 2006 22:31:46 -0000 1.3
+++ WizardSolutionProcessor.cs 28 May 2006 05:54:01 -0000 1.4
@@ -94,6 +94,19 @@
Project schemaExportProject = null;
Project webProject = null;
+ string versionControlType = m_configuration["application.versioncontrol"];
+ bool versionControl = versionControlType != "None";
+ string ignoreFile = string.Empty;
+ switch (versionControlType)
+ {
+ case "CVS":
+ ignoreFile = ".cvsignore";
+ break;
+ case "Subversion":
+ ignoreFile = ".svnignore";
+ break;
+ }
+
// Create/find the common project
if (m_configuration["projects.common.create"] == "true")
{
@@ -106,14 +119,17 @@
commonProject = VSSolutionUtils.FindProjectByName(m_configuration["projects.common.name"], m_applicationObject.Solution);
}
- //CreateDirectory(basePath + "\\" + m_configuration["projects.common.dir"] + "\\src");
- //CreateDirectory(basePath + "\\" + m_configuration["projects.common.dir"] + "\\target");
commonProject.ProjectItems.AddFolder("src", Constants.vsProjectItemKindPhysicalFolder);
commonProject.ProjectItems.AddFolder("target", Constants.vsProjectItemKindPhysicalFolder);
-
WriteFile(basePath + "\\" + m_configuration["projects.common.dir"] + "\\project.xml", ParseVariables(Resource1.common_project_xml));
- // Create/find the common project
+ // Write common/cvsignore
+ if (versionControl)
+ {
+ WriteFile(basePath + "\\" + m_configuration["projects.common.dir"] + "\\" + ignoreFile, ParseVariables(Resource1.common_cvsignore));
+ }
+
+ // Create/find the core project
if (m_configuration["projects.core.create"] == "true")
{
AddToStatus("Creating core project " + m_configuration["projects.core.name"] + "...");
@@ -124,11 +140,15 @@
AddToStatus("Using existing core project " + m_configuration["projects.core.name"] + "...");
coreProject = VSSolutionUtils.FindProjectByName(m_configuration["projects.core.name"], m_applicationObject.Solution);
}
- //CreateDirectory(basePath + "\\" + m_configuration["projects.core.dir"] + "\\src");
- //CreateDirectory(basePath + "\\" + m_configuration["projects.core.dir"] + "\\target");
coreProject.ProjectItems.AddFolder("src", Constants.vsProjectItemKindPhysicalFolder);
coreProject.ProjectItems.AddFolder("target", Constants.vsProjectItemKindPhysicalFolder);
WriteFile(basePath + "\\" + m_configuration["projects.core.dir"] + "\\project.xml", ParseVariables(Resource1.core_project_xml));
+ // Write core/cvsignore
+ if (versionControl)
+ {
+ WriteFile(basePath + "\\" + m_configuration["projects.core.dir"] + "\\" + ignoreFile, ParseVariables(Resource1.core_cvsignore));
+ }
+
// Create the schema export project
if (m_configuration["projects.schemaexport.create"] == "true")
@@ -148,30 +168,29 @@
nhibernateConfig.Properties.Item("BuildAction").Value = VSLangProj.prjBuildAction.prjBuildActionContent;
schemaExportProject.ProjectItems.AddFromFile(basePath + "\\" + m_configuration["projects.schemaexport.dir"] + "\\Program.cs");
+
+ // Write SchemaExport/cvsignore
+ if (versionControl)
+ {
+ WriteFile(basePath + "\\" + m_configuration["projects.schemaexport.dir"] + "\\" + ignoreFile, ParseVariables(Resource1.SchemaExport_cvsignore));
+ }
}
- // Create the schema export project
+ // Create the web project
if (m_configuration["projects.web.create"] == "true")
{
AddToStatus("Creating web project " + m_configuration["projects.web.name"] + "...");
webProject = VSSolutionUtils.AddWebProjectToSolution(m_configuration["projects.web.name"], (Solution2)m_applicationObject.Solution);
- /*
- WriteFile(basePath + "\\" + m_configuration["projects.schemaexport.dir"] + "\\App.config", ParseVariables(Resource1.SchemaExport_App_config));
- WriteFile(basePath + "\\" + m_configuration["projects.schemaexport.dir"] + "\\nhibernate.config", ParseVariables(Resource1.SchemaExport_nhibernate_config));
- WriteFile(basePath + "\\" + m_configuration["projects.schemaexport.dir"] + "\\Program.cs", ParseVariables(Resource1.SchemaExport_Program_cs));
- ProjectItem appConfig = schemaExportProject.ProjectItems.AddFromFile(basePath + "\\" + m_configuration["projects.schemaexport.dir"] + "\\App.config");
- ProjectItem nhibernateConfig = schemaExportProject.ProjectItems.AddFromFile(basePath + "\\" + m_configuration["projects.schemaexport.dir"] + "\\nhibernate.config");
-
- // Set the config files 'Copy to Output Directory' property to 'Copy if Newer'
- appConfig.Properties.Item("CopyToOutputDirectory").Value = 2;
- appConfig.Properties.Item("BuildAction").Value = VSLangProj.prjBuildAction.prjBuildActionContent;
- nhibernateConfig.Properties.Item("CopyToOutputDirectory").Value = 2;
- nhibernateConfig.Properties.Item("BuildAction").Value = VSLangProj.prjBuildAction.prjBuildActionContent;
-
- schemaExportProject.ProjectItems.AddFromFile(basePath + "\\" + m_configuration["projects.schemaexport.dir"] + "\\Program.cs");
- */
+ // Write Web/cvsignore and Web\Bin\cvsignore
+ if (versionControl)
+ {
+ WriteFile(basePath + "\\" + m_configuration["projects.web.dir"] + "\\" + ignoreFile, ParseVariables(Resource1.web_cvsignore));
+ CreateDirectory(basePath + "\\" + m_configuration["projects.web.dir"] + "\\Bin");
+ WriteFile(basePath + "\\" + m_configuration["projects.web.dir"] + "\\Bin\\" + ignoreFile, ParseVariables(Resource1.web_bin_cvsignore));
+ }
}
+ AddToStatus("Creating AndroMDA configuration files...");
// Render /maven.xml
WriteFile(basePath + "\\maven.xml", ParseVariables(Resource1.maven_xml));
// Render /project.properties
@@ -179,6 +198,12 @@
// Render /project.xml
WriteFile(basePath + "\\project.xml", ParseVariables(Resource1.project_xml));
+ // Render /cvsignore
+ if (versionControl)
+ {
+ WriteFile(basePath + "\\" + ignoreFile, ParseVariables(Resource1.cvsignore));
+ }
+
// Create mda directory
CreateDirectory(basePath + "\\mda");
// Render /mda/maven.xml
@@ -193,6 +218,13 @@
// Render /mda/conf/andromda.xml
WriteFile(basePath + "\\mda\\conf\\andromda.xml", ParseVariables(Resource1.mda_conf_andromda_xml));
+ // Write mda/cvsignore
+ if (versionControl)
+ {
+ WriteFile(basePath + "\\mda\\" + ignoreFile, ParseVariables(Resource1.mda_cvsignore));
+ }
+
+ AddToStatus("Creating empty model file...");
// Create mda/src directory
System.IO.Directory.CreateDirectory(basePath + "\\mda\\src");
// Create mda/uml directory
@@ -214,7 +246,6 @@
WriteFile(basePath + "\\Lib\\NHibernate.dll", Resource1.lib_NHibernate_dll);
WriteFile(basePath + "\\Lib\\NHibernate.Nullables2.dll", Resource1.lib_NHibernate_Nullables2_dll);
-
// Add the references to all the DLLs we just put in /Lib
AddToStatus("Adding project references to common project...");
AddBinaryReferences(commonProject, basePath);
1.5 +2 -0 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.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- MDASolutionWizard.cs 27 May 2006 22:31:46 -0000 1.4
+++ MDASolutionWizard.cs 28 May 2006 05:54:02 -0000 1.5
@@ -72,6 +72,7 @@
string solutionName = VSSolutionUtils.GetSolutionName(m_applicationObject.Solution);
txtApplicationName.Text = solutionName;
txtApplicationVersion.Text = "1.0";
+ ddlVersionControl.SelectedIndex = 0;
usrCommonProject.ProjectName = solutionName + ".Common";
usrCoreProject.ProjectName = solutionName + ".Core";
txtSchemaExportProject.Text = solutionName + ".SchemaExport";
@@ -325,6 +326,7 @@
config["application.name"] = txtApplicationName.Text;
config["application.name.nospaces"] = txtApplicationName.Text.Replace(" ", string.Empty);
config["application.version"] = txtApplicationVersion.Text;
+ config["application.versioncontrol"] = ddlVersionControl.SelectedItem.ToString();
config["application.model.filename"] = config["application.name.nospaces"] + ".Model.xml.zip";
config["application.model.filename.unzipped"] = config["application.name.nospaces"] + ".Model.xml";
1.3 +169 -141 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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- MDASolutionWizard.designer.cs 27 May 2006 22:31:46 -0000 1.2
+++ MDASolutionWizard.designer.cs 28 May 2006 05:54:02 -0000 1.3
@@ -31,12 +31,10 @@
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MDASolutionWizard));
this.wizard1 = new Gui.Wizard.Wizard();
- this.wizardPageWelcome = new Gui.Wizard.WizardPage();
- this.label9 = new System.Windows.Forms.Label();
- this.label8 = new System.Windows.Forms.Label();
- this.pictureBoxWelcome = new System.Windows.Forms.PictureBox();
this.wizardPageSolutionInfo = new Gui.Wizard.WizardPage();
+ this.ddlVersionControl = new System.Windows.Forms.ComboBox();
this.ddlDatabaseType = new System.Windows.Forms.ComboBox();
+ this.label1 = new System.Windows.Forms.Label();
this.txtApplicationVersion = new System.Windows.Forms.TextBox();
this.label17 = new System.Windows.Forms.Label();
this.label14 = new System.Windows.Forms.Label();
@@ -78,37 +76,43 @@
this.label4 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.header4 = new Gui.Wizard.Header();
- this.wizardPageProcessing = new Gui.Wizard.WizardPage();
- this.lstStatus = new System.Windows.Forms.ListBox();
- this.label7 = new System.Windows.Forms.Label();
- this.header5 = new Gui.Wizard.Header();
- this.pictureBoxThrobber = new System.Windows.Forms.PictureBox();
+ this.wizardPageWelcome = new Gui.Wizard.WizardPage();
+ this.label9 = new System.Windows.Forms.Label();
+ this.label8 = new System.Windows.Forms.Label();
+ this.pictureBoxWelcome = new System.Windows.Forms.PictureBox();
this.wizardPageComplete = new Gui.Wizard.WizardPage();
+ 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.imageList1 = new System.Windows.Forms.ImageList(this.components);
this.txtErrorMessage = new System.Windows.Forms.TextBox();
- this.lblFinishPageTitle = new System.Windows.Forms.Label();
+ this.wizardPageProcessing = new Gui.Wizard.WizardPage();
+ this.lstStatus = new System.Windows.Forms.ListBox();
+ this.label7 = new System.Windows.Forms.Label();
+ this.header5 = new Gui.Wizard.Header();
+ this.pictureBoxThrobber = new System.Windows.Forms.PictureBox();
this.wizard1.SuspendLayout();
- this.wizardPageWelcome.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWelcome)).BeginInit();
this.wizardPageSolutionInfo.SuspendLayout();
this.wizardPageCommonProject.SuspendLayout();
this.wizardPageCoreProject.SuspendLayout();
this.wizardPageSchemaExportProject.SuspendLayout();
this.wizardPageWebProject.SuspendLayout();
this.wizardPageConfirmChoices.SuspendLayout();
+ this.wizardPageWelcome.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWelcome)).BeginInit();
+ this.wizardPageComplete.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxComplete)).BeginInit();
this.wizardPageProcessing.SuspendLayout();
this.header5.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxThrobber)).BeginInit();
- this.wizardPageComplete.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxComplete)).BeginInit();
this.SuspendLayout();
//
// wizard1
//
this.wizard1.ContainingForm = null;
+ this.wizard1.Controls.Add(this.wizardPageSolutionInfo);
+ this.wizard1.Controls.Add(this.wizardPageWelcome);
this.wizard1.Controls.Add(this.wizardPageComplete);
this.wizard1.Controls.Add(this.wizardPageProcessing);
this.wizard1.Controls.Add(this.wizardPageConfirmChoices);
@@ -116,8 +120,6 @@
this.wizard1.Controls.Add(this.wizardPageSchemaExportProject);
this.wizard1.Controls.Add(this.wizardPageCoreProject);
this.wizard1.Controls.Add(this.wizardPageCommonProject);
- this.wizard1.Controls.Add(this.wizardPageSolutionInfo);
- this.wizard1.Controls.Add(this.wizardPageWelcome);
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);
@@ -136,52 +138,11 @@
this.wizard1.TabIndex = 0;
this.wizard1.Load += new System.EventHandler(this.wizard1_Load);
//
- // wizardPageWelcome
- //
- this.wizardPageWelcome.BackColor = System.Drawing.Color.White;
- this.wizardPageWelcome.Controls.Add(this.label9);
- this.wizardPageWelcome.Controls.Add(this.label8);
- this.wizardPageWelcome.Controls.Add(this.pictureBoxWelcome);
- this.wizardPageWelcome.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageWelcome.IsFinishPage = false;
- this.wizardPageWelcome.Location = new System.Drawing.Point(0, 0);
- this.wizardPageWelcome.Name = "wizardPageWelcome";
- this.wizardPageWelcome.Size = new System.Drawing.Size(525, 297);
- this.wizardPageWelcome.TabIndex = 1;
- //
- // label9
- //
- this.label9.Location = new System.Drawing.Point(174, 61);
- this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(339, 220);
- this.label9.TabIndex = 9;
- this.label9.Text = resources.GetString("label9.Text");
- //
- // label8
- //
- this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.label8.FlatStyle = System.Windows.Forms.FlatStyle.System;
- this.label8.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label8.Location = new System.Drawing.Point(170, 9);
- this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(304, 48);
- this.label8.TabIndex = 8;
- this.label8.Text = "Welcome to the AndroMDA Solution Wizard";
- //
- // pictureBoxWelcome
- //
- this.pictureBoxWelcome.Dock = System.Windows.Forms.DockStyle.Left;
- this.pictureBoxWelcome.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxWelcome.Image")));
- this.pictureBoxWelcome.Location = new System.Drawing.Point(0, 0);
- this.pictureBoxWelcome.Name = "pictureBoxWelcome";
- this.pictureBoxWelcome.Size = new System.Drawing.Size(164, 297);
- this.pictureBoxWelcome.TabIndex = 1;
- this.pictureBoxWelcome.TabStop = false;
- //
// wizardPageSolutionInfo
//
+ this.wizardPageSolutionInfo.Controls.Add(this.ddlVersionControl);
this.wizardPageSolutionInfo.Controls.Add(this.ddlDatabaseType);
+ this.wizardPageSolutionInfo.Controls.Add(this.label1);
this.wizardPageSolutionInfo.Controls.Add(this.txtApplicationVersion);
this.wizardPageSolutionInfo.Controls.Add(this.label17);
this.wizardPageSolutionInfo.Controls.Add(this.label14);
@@ -198,6 +159,19 @@
this.wizardPageSolutionInfo.ShowFromBack += new System.EventHandler(this.wizardPageSolutionInfo_ShowFromNext);
this.wizardPageSolutionInfo.ShowFromNext += new System.EventHandler(this.wizardPageSolutionInfo_ShowFromNext);
//
+ // ddlVersionControl
+ //
+ this.ddlVersionControl.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.ddlVersionControl.FormattingEnabled = true;
+ this.ddlVersionControl.Items.AddRange(new object[] {
+ "None",
+ "CVS",
+ "Subversion"});
+ this.ddlVersionControl.Location = new System.Drawing.Point(15, 234);
+ this.ddlVersionControl.Name = "ddlVersionControl";
+ this.ddlVersionControl.Size = new System.Drawing.Size(335, 21);
+ this.ddlVersionControl.TabIndex = 7;
+ //
// ddlDatabaseType
//
this.ddlDatabaseType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@@ -207,43 +181,52 @@
"MySQL",
"Oracle 9i",
"Hypersonic"});
- this.ddlDatabaseType.Location = new System.Drawing.Point(15, 187);
+ this.ddlDatabaseType.Location = new System.Drawing.Point(15, 189);
this.ddlDatabaseType.Name = "ddlDatabaseType";
- this.ddlDatabaseType.Size = new System.Drawing.Size(320, 21);
- this.ddlDatabaseType.TabIndex = 2;
+ this.ddlDatabaseType.Size = new System.Drawing.Size(335, 21);
+ this.ddlDatabaseType.TabIndex = 5;
+ //
+ // label1
+ //
+ this.label1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label1.Location = new System.Drawing.Point(12, 214);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(507, 16);
+ this.label1.TabIndex = 6;
+ this.label1.Text = "Which version control system will you be using, if any?";
//
// txtApplicationVersion
//
- this.txtApplicationVersion.Location = new System.Drawing.Point(15, 141);
+ this.txtApplicationVersion.Location = new System.Drawing.Point(15, 144);
this.txtApplicationVersion.Name = "txtApplicationVersion";
- this.txtApplicationVersion.Size = new System.Drawing.Size(320, 21);
- this.txtApplicationVersion.TabIndex = 1;
+ this.txtApplicationVersion.Size = new System.Drawing.Size(335, 21);
+ this.txtApplicationVersion.TabIndex = 3;
//
// label17
//
this.label17.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label17.Location = new System.Drawing.Point(12, 168);
+ this.label17.Location = new System.Drawing.Point(12, 169);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(507, 16);
- this.label17.TabIndex = 29;
- this.label17.Text = "Which database will your application use?";
+ this.label17.TabIndex = 4;
+ this.label17.Text = "Which database server will your application use?";
//
// label14
//
this.label14.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label14.Location = new System.Drawing.Point(12, 123);
+ this.label14.Location = new System.Drawing.Point(12, 124);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(507, 16);
- this.label14.TabIndex = 29;
+ this.label14.TabIndex = 2;
this.label14.Text = "What is the version number of your application? (Example: 1.1-Release)";
//
// txtApplicationName
//
this.txtApplicationName.BackColor = System.Drawing.SystemColors.Window;
- this.txtApplicationName.Location = new System.Drawing.Point(15, 97);
+ this.txtApplicationName.Location = new System.Drawing.Point(15, 99);
this.txtApplicationName.Name = "txtApplicationName";
- this.txtApplicationName.Size = new System.Drawing.Size(320, 21);
- this.txtApplicationName.TabIndex = 0;
+ this.txtApplicationName.Size = new System.Drawing.Size(335, 21);
+ this.txtApplicationName.TabIndex = 1;
//
// label12
//
@@ -251,14 +234,14 @@
this.label12.Location = new System.Drawing.Point(12, 79);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(507, 16);
- this.label12.TabIndex = 29;
+ this.label12.TabIndex = 0;
this.label12.Text = "What is the name of your application? (Example: Time Tracker)";
//
// header6
//
this.header6.BackColor = System.Drawing.SystemColors.Control;
this.header6.CausesValidation = false;
- this.header6.Description = "Please enter the general information about your applicaiton.";
+ this.header6.Description = "Please enter the following general information about your applicaiton.";
this.header6.Dock = System.Windows.Forms.DockStyle.Top;
this.header6.Image = ((System.Drawing.Image)(resources.GetObject("header6.Image")));
this.header6.Location = new System.Drawing.Point(0, 0);
@@ -357,7 +340,7 @@
//
this.cbCreateSchemaExport.AutoSize = true;
this.cbCreateSchemaExport.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.cbCreateSchemaExport.Location = new System.Drawing.Point(12, 79);
+ this.cbCreateSchemaExport.Location = new System.Drawing.Point(11, 79);
this.cbCreateSchemaExport.Name = "cbCreateSchemaExport";
this.cbCreateSchemaExport.Size = new System.Drawing.Size(196, 17);
this.cbCreateSchemaExport.TabIndex = 0;
@@ -368,7 +351,7 @@
// txtSchemaExportProject
//
this.txtSchemaExportProject.Enabled = false;
- this.txtSchemaExportProject.Location = new System.Drawing.Point(30, 102);
+ this.txtSchemaExportProject.Location = new System.Drawing.Point(30, 99);
this.txtSchemaExportProject.Name = "txtSchemaExportProject";
this.txtSchemaExportProject.Size = new System.Drawing.Size(320, 21);
this.txtSchemaExportProject.TabIndex = 1;
@@ -413,7 +396,7 @@
//
this.cbCreateWebProject.AutoSize = true;
this.cbCreateWebProject.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.cbCreateWebProject.Location = new System.Drawing.Point(12, 79);
+ this.cbCreateWebProject.Location = new System.Drawing.Point(11, 79);
this.cbCreateWebProject.Name = "cbCreateWebProject";
this.cbCreateWebProject.Size = new System.Drawing.Size(134, 17);
this.cbCreateWebProject.TabIndex = 25;
@@ -424,7 +407,7 @@
// txtWebProject
//
this.txtWebProject.Enabled = false;
- this.txtWebProject.Location = new System.Drawing.Point(30, 102);
+ this.txtWebProject.Location = new System.Drawing.Point(30, 99);
this.txtWebProject.Name = "txtWebProject";
this.txtWebProject.Size = new System.Drawing.Size(320, 21);
this.txtWebProject.TabIndex = 26;
@@ -658,59 +641,48 @@
this.header4.TabIndex = 5;
this.header4.Title = "Confirm Choices";
//
- // wizardPageProcessing
- //
- this.wizardPageProcessing.Controls.Add(this.lstStatus);
- this.wizardPageProcessing.Controls.Add(this.label7);
- this.wizardPageProcessing.Controls.Add(this.header5);
- this.wizardPageProcessing.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageProcessing.IsFinishPage = false;
- this.wizardPageProcessing.Location = new System.Drawing.Point(0, 0);
- this.wizardPageProcessing.Name = "wizardPageProcessing";
- this.wizardPageProcessing.Size = new System.Drawing.Size(525, 297);
- this.wizardPageProcessing.TabIndex = 6;
- this.wizardPageProcessing.ShowFromNext += new System.EventHandler(this.wizardPageProcessing_ShowFromNext);
- //
- // lstStatus
+ // wizardPageWelcome
//
- this.lstStatus.FormattingEnabled = true;
- this.lstStatus.Location = new System.Drawing.Point(12, 100);
- this.lstStatus.Name = "lstStatus";
- this.lstStatus.Size = new System.Drawing.Size(501, 186);
- this.lstStatus.TabIndex = 9;
+ this.wizardPageWelcome.BackColor = System.Drawing.Color.White;
+ this.wizardPageWelcome.Controls.Add(this.label9);
+ this.wizardPageWelcome.Controls.Add(this.label8);
+ this.wizardPageWelcome.Controls.Add(this.pictureBoxWelcome);
+ this.wizardPageWelcome.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageWelcome.IsFinishPage = false;
+ this.wizardPageWelcome.Location = new System.Drawing.Point(0, 0);
+ this.wizardPageWelcome.Name = "wizardPageWelcome";
+ this.wizardPageWelcome.Size = new System.Drawing.Size(525, 297);
+ this.wizardPageWelcome.TabIndex = 1;
//
- // label7
+ // label9
//
- this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(12, 77);
- this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(273, 13);
- this.label7.TabIndex = 8;
- this.label7.Text = "Updating solution to support AndroMDA. Please wait...";
+ this.label9.Location = new System.Drawing.Point(174, 61);
+ this.label9.Name = "label9";
+ this.label9.Size = new System.Drawing.Size(339, 220);
+ this.label9.TabIndex = 9;
+ this.label9.Text = resources.GetString("label9.Text");
//
- // header5
+ // label8
//
- this.header5.BackColor = System.Drawing.SystemColors.Control;
- this.header5.CausesValidation = false;
- this.header5.Controls.Add(this.pictureBoxThrobber);
- this.header5.Description = "Please wait...";
- this.header5.Dock = System.Windows.Forms.DockStyle.Top;
- this.header5.Image = ((System.Drawing.Image)(resources.GetObject("header5.Image")));
- this.header5.Location = new System.Drawing.Point(0, 0);
- this.header5.Name = "header5";
- this.header5.Size = new System.Drawing.Size(525, 65);
- this.header5.TabIndex = 6;
- this.header5.Title = "Processing Solution";
+ this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.label8.FlatStyle = System.Windows.Forms.FlatStyle.System;
+ this.label8.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label8.Location = new System.Drawing.Point(170, 9);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(304, 48);
+ this.label8.TabIndex = 8;
+ this.label8.Text = "Welcome to the AndroMDA Solution Wizard";
//
- // pictureBoxThrobber
+ // pictureBoxWelcome
//
- this.pictureBoxThrobber.BackColor = System.Drawing.Color.White;
- this.pictureBoxThrobber.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxThrobber.Image")));
- this.pictureBoxThrobber.Location = new System.Drawing.Point(8, 40);
- this.pictureBoxThrobber.Name = "pictureBoxThrobber";
- this.pictureBoxThrobber.Size = new System.Drawing.Size(31, 22);
- this.pictureBoxThrobber.TabIndex = 10;
- this.pictureBoxThrobber.TabStop = false;
+ this.pictureBoxWelcome.Dock = System.Windows.Forms.DockStyle.Left;
+ this.pictureBoxWelcome.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxWelcome.Image")));
+ this.pictureBoxWelcome.Location = new System.Drawing.Point(0, 0);
+ this.pictureBoxWelcome.Name = "pictureBoxWelcome";
+ this.pictureBoxWelcome.Size = new System.Drawing.Size(164, 297);
+ this.pictureBoxWelcome.TabIndex = 1;
+ this.pictureBoxWelcome.TabStop = false;
//
// wizardPageComplete
//
@@ -728,6 +700,19 @@
this.wizardPageComplete.TabIndex = 7;
this.wizardPageComplete.ShowFromNext += new System.EventHandler(this.wizardPageComplete_ShowFromNext);
//
+ // lblFinishPageTitle
+ //
+ this.lblFinishPageTitle.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.lblFinishPageTitle.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lblFinishPageTitle.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
+ this.lblFinishPageTitle.Location = new System.Drawing.Point(209, 9);
+ this.lblFinishPageTitle.Name = "lblFinishPageTitle";
+ this.lblFinishPageTitle.Size = new System.Drawing.Size(299, 36);
+ this.lblFinishPageTitle.TabIndex = 15;
+ this.lblFinishPageTitle.Text = "Solution Update Complete";
+ this.lblFinishPageTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
// pictureBoxComplete
//
this.pictureBoxComplete.Dock = System.Windows.Forms.DockStyle.Left;
@@ -780,18 +765,59 @@
this.txtErrorMessage.Size = new System.Drawing.Size(334, 230);
this.txtErrorMessage.TabIndex = 14;
//
- // lblFinishPageTitle
+ // wizardPageProcessing
//
- this.lblFinishPageTitle.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.lblFinishPageTitle.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lblFinishPageTitle.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
- this.lblFinishPageTitle.Location = new System.Drawing.Point(209, 9);
- this.lblFinishPageTitle.Name = "lblFinishPageTitle";
- this.lblFinishPageTitle.Size = new System.Drawing.Size(299, 36);
- this.lblFinishPageTitle.TabIndex = 15;
- this.lblFinishPageTitle.Text = "Solution Update Complete";
- this.lblFinishPageTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.wizardPageProcessing.Controls.Add(this.lstStatus);
+ this.wizardPageProcessing.Controls.Add(this.label7);
+ this.wizardPageProcessing.Controls.Add(this.header5);
+ this.wizardPageProcessing.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageProcessing.IsFinishPage = false;
+ this.wizardPageProcessing.Location = new System.Drawing.Point(0, 0);
+ this.wizardPageProcessing.Name = "wizardPageProcessing";
+ this.wizardPageProcessing.Size = new System.Drawing.Size(525, 297);
+ this.wizardPageProcessing.TabIndex = 6;
+ this.wizardPageProcessing.ShowFromNext += new System.EventHandler(this.wizardPageProcessing_ShowFromNext);
+ //
+ // lstStatus
+ //
+ this.lstStatus.FormattingEnabled = true;
+ this.lstStatus.Location = new System.Drawing.Point(12, 100);
+ this.lstStatus.Name = "lstStatus";
+ this.lstStatus.Size = new System.Drawing.Size(501, 186);
+ this.lstStatus.TabIndex = 9;
+ //
+ // label7
+ //
+ this.label7.AutoSize = true;
+ this.label7.Location = new System.Drawing.Point(12, 77);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(273, 13);
+ this.label7.TabIndex = 8;
+ this.label7.Text = "Updating solution to support AndroMDA. Please wait...";
+ //
+ // header5
+ //
+ this.header5.BackColor = System.Drawing.SystemColors.Control;
+ this.header5.CausesValidation = false;
+ this.header5.Controls.Add(this.pictureBoxThrobber);
+ this.header5.Description = "Please wait...";
+ this.header5.Dock = System.Windows.Forms.DockStyle.Top;
+ this.header5.Image = ((System.Drawing.Image)(resources.GetObject("header5.Image")));
+ this.header5.Location = new System.Drawing.Point(0, 0);
+ this.header5.Name = "header5";
+ this.header5.Size = new System.Drawing.Size(525, 65);
+ this.header5.TabIndex = 6;
+ this.header5.Title = "Processing Solution";
+ //
+ // pictureBoxThrobber
+ //
+ this.pictureBoxThrobber.BackColor = System.Drawing.Color.White;
+ this.pictureBoxThrobber.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxThrobber.Image")));
+ this.pictureBoxThrobber.Location = new System.Drawing.Point(8, 40);
+ this.pictureBoxThrobber.Name = "pictureBoxThrobber";
+ this.pictureBoxThrobber.Size = new System.Drawing.Size(31, 22);
+ this.pictureBoxThrobber.TabIndex = 10;
+ this.pictureBoxThrobber.TabStop = false;
//
// MDASolutionWizard
//
@@ -808,8 +834,6 @@
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "AndroMDA Solution Wizard";
this.wizard1.ResumeLayout(false);
- this.wizardPageWelcome.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWelcome)).EndInit();
this.wizardPageSolutionInfo.ResumeLayout(false);
this.wizardPageSolutionInfo.PerformLayout();
this.wizardPageCommonProject.ResumeLayout(false);
@@ -820,13 +844,15 @@
this.wizardPageWebProject.PerformLayout();
this.wizardPageConfirmChoices.ResumeLayout(false);
this.wizardPageConfirmChoices.PerformLayout();
+ this.wizardPageWelcome.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWelcome)).EndInit();
+ this.wizardPageComplete.ResumeLayout(false);
+ this.wizardPageComplete.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxComplete)).EndInit();
this.wizardPageProcessing.ResumeLayout(false);
this.wizardPageProcessing.PerformLayout();
this.header5.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pictureBoxThrobber)).EndInit();
- this.wizardPageComplete.ResumeLayout(false);
- this.wizardPageComplete.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxComplete)).EndInit();
this.ResumeLayout(false);
}
@@ -893,5 +919,7 @@
private System.Windows.Forms.Label label20;
private System.Windows.Forms.Label label19;
private System.Windows.Forms.Label lblFinishPageTitle;
+ private System.Windows.Forms.ComboBox ddlVersionControl;
+ private System.Windows.Forms.Label label1;
}
}
\ No newline at end of file
1.3 +678 -678 plugins/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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- MDASolutionWizard.resx 27 May 2006 22:31:46 -0000 1.2
+++ MDASolutionWizard.resx 28 May 2006 05:54:02 -0000 1.3
@@ -118,266 +118,160 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<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">
+ <data name="header6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
- /9j/4AAQSkZJRgABAgEASABIAAD/4QpURXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB
+ /9j/4AAQSkZJRgABAgEASABIAAD/4QadRXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB
AAAAYgEbAAUAAAABAAAAagEoAAMAAAABAAIAAAExAAIAAAAcAAAAcgEyAAIAAAAUAAAAjodpAAQAAAAB
AAAApAAAANAACvyAAAAnEAAK/IAAACcQQWRvYmUgUGhvdG9zaG9wIENTMiBXaW5kb3dzADIwMDY6MDQ6
- MDIgMjM6MTU6NTYAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAApKADAAQAAAABAAABgwAAAAAAAAAG
+ MDIgMjM6MTk6NDQAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAM6ADAAQAAAABAAAAMwAAAAAAAAAG
AQMAAwAAAAEABgAAARoABQAAAAEAAAEeARsABQAAAAEAAAEmASgAAwAAAAEAAgAAAgEABAAAAAEAAAEu
- AgIABAAAAAEAAAkeAAAAAAAAAEgAAAABAAAASAAAAAH/2P/gABBKRklGAAECAABIAEgAAP/tAAxBZG9i
+ AgIABAAAAAEAAAVnAAAAAAAAAEgAAAABAAAASAAAAAH/2P/gABBKRklGAAECAABIAEgAAP/tAAxBZG9i
ZV9DTQAB/+4ADkFkb2JlAGSAAAAAAf/bAIQADAgICAkIDAkJDBELCgsRFQ8MDA8VGBMTFRMTGBEMDAwM
DAwRDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAENCwsNDg0QDg4QFA4ODhQUDg4ODhQRDAwMDAwR
- EQwMDAwMDBEMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwM/8AAEQgAoABEAwEiAAIRAQMRAf/dAAQA
- Bf/EAT8AAAEFAQEBAQEBAAAAAAAAAAMAAQIEBQYHCAkKCwEAAQUBAQEBAQEAAAAAAAAAAQACAwQFBgcI
+ EQwMDAwMDBEMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwM/8AAEQgAMwAzAwEiAAIRAQMRAf/dAAQA
+ BP/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
- AAAAAAAGAAEAAAAEOEJJTQQIAAAAAAAQAAAAAQAAAkAAAAJAAAAAADhCSU0EH...
[truncated message content] |
|
From: Chris M. <cm...@us...> - 2006-05-28 05:29:23
|
User: cmicali Date: 06/05/27 22:29:22 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Web/Bin - New directory |
|
From: Chris M. <cm...@us...> - 2006-05-28 05:29:17
|
User: cmicali Date: 06/05/27 22:29:17 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Web - New directory |
|
From: Chris M. <cm...@us...> - 2006-05-27 22:31:47
|
User: cmicali
Date: 06/05/27 15:31:46
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn AndroMDA VS2005
Add-In Readme.rtf
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
AndroMDA.VS80AddIn.csproj
WizardSolutionProcessor.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs
MDAProjectSetupControl.cs
MDAProjectSetupControl.designer.cs
MDASolutionWizard.cs MDASolutionWizard.designer.cs
MDASolutionWizard.resx
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Lib
AndroMDA.NHibernateSupport.dll
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils
VSSolutionUtils.cs
Log:
- Cleaned up solution wizard
- Added web project generation to the solution wizard
Revision Changes Path
No revision
No revision
No revision
No revision
1.8 +1 -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.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- AndroMDA.VS80AddIn.csproj 27 May 2006 15:05:58 -0000 1.7
+++ AndroMDA.VS80AddIn.csproj 27 May 2006 22:31:46 -0000 1.8
@@ -44,6 +44,7 @@
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="VSLangProj, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <Reference Include="VsWebSite.Interop, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
</ItemGroup>
<ItemGroup>
<Compile Include="AssemblyInfo.cs">
1.3 +43 -5 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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- WizardSolutionProcessor.cs 3 May 2006 20:23:05 -0000 1.2
+++ WizardSolutionProcessor.cs 27 May 2006 22:31:46 -0000 1.3
@@ -92,6 +92,7 @@
Project commonProject = null;
Project coreProject = null;
Project schemaExportProject = null;
+ Project webProject = null;
// Create/find the common project
if (m_configuration["projects.common.create"] == "true")
@@ -149,6 +150,28 @@
schemaExportProject.ProjectItems.AddFromFile(basePath + "\\" + m_configuration["projects.schemaexport.dir"] + "\\Program.cs");
}
+ // Create the schema export project
+ if (m_configuration["projects.web.create"] == "true")
+ {
+ AddToStatus("Creating web project " + m_configuration["projects.web.name"] + "...");
+ webProject = VSSolutionUtils.AddWebProjectToSolution(m_configuration["projects.web.name"], (Solution2)m_applicationObject.Solution);
+ /*
+ WriteFile(basePath + "\\" + m_configuration["projects.schemaexport.dir"] + "\\App.config", ParseVariables(Resource1.SchemaExport_App_config));
+ WriteFile(basePath + "\\" + m_configuration["projects.schemaexport.dir"] + "\\nhibernate.config", ParseVariables(Resource1.SchemaExport_nhibernate_config));
+ WriteFile(basePath + "\\" + m_configuration["projects.schemaexport.dir"] + "\\Program.cs", ParseVariables(Resource1.SchemaExport_Program_cs));
+ ProjectItem appConfig = schemaExportProject.ProjectItems.AddFromFile(basePath + "\\" + m_configuration["projects.schemaexport.dir"] + "\\App.config");
+ ProjectItem nhibernateConfig = schemaExportProject.ProjectItems.AddFromFile(basePath + "\\" + m_configuration["projects.schemaexport.dir"] + "\\nhibernate.config");
+
+ // Set the config files 'Copy to Output Directory' property to 'Copy if Newer'
+ appConfig.Properties.Item("CopyToOutputDirectory").Value = 2;
+ appConfig.Properties.Item("BuildAction").Value = VSLangProj.prjBuildAction.prjBuildActionContent;
+ nhibernateConfig.Properties.Item("CopyToOutputDirectory").Value = 2;
+ nhibernateConfig.Properties.Item("BuildAction").Value = VSLangProj.prjBuildAction.prjBuildActionContent;
+
+ schemaExportProject.ProjectItems.AddFromFile(basePath + "\\" + m_configuration["projects.schemaexport.dir"] + "\\Program.cs");
+ */
+ }
+
// Render /maven.xml
WriteFile(basePath + "\\maven.xml", ParseVariables(Resource1.maven_xml));
// Render /project.properties
@@ -191,10 +214,11 @@
WriteFile(basePath + "\\Lib\\NHibernate.dll", Resource1.lib_NHibernate_dll);
WriteFile(basePath + "\\Lib\\NHibernate.Nullables2.dll", Resource1.lib_NHibernate_Nullables2_dll);
- AddToStatus("Adding project references...");
// Add the references to all the DLLs we just put in /Lib
+ AddToStatus("Adding project references to common project...");
AddBinaryReferences(commonProject, basePath);
+ AddToStatus("Adding project references to core project...");
AddBinaryReferences(coreProject, basePath);
// Add a reference from the core project to the common project
@@ -203,6 +227,7 @@
// If we created the schema export project
if (schemaExportProject != null)
{
+ AddToStatus("Adding project references to schema export project...");
// Add the references to the DLLs
AddBinaryReferences(schemaExportProject, basePath);
@@ -211,6 +236,19 @@
AddProjectReference(schemaExportProject, coreProject);
}
+ if (webProject != null)
+ {
+ AddToStatus("Adding project references to web project...");
+
+ VsWebSite.VSWebSite proj = webProject.Object as VsWebSite.VSWebSite;
+
+ proj.References.AddFromFile(basePath + "\\Lib\\AndroMDA.NHibernateSupport.dll");
+
+ proj.References.AddFromProject(commonProject);
+ proj.References.AddFromProject(coreProject);
+
+ }
+
}
#region Helper methods
1.2 +2 -2 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDAProjectSetupControl.cs
Index: MDAProjectSetupControl.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDAProjectSetupControl.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- MDAProjectSetupControl.cs 18 Apr 2006 16:14:44 -0000 1.1
+++ MDAProjectSetupControl.cs 27 May 2006 22:31:46 -0000 1.2
@@ -28,7 +28,7 @@
#endregion
#region Properties
-
+ /*
[Category("Appearance")]
[LocalizableAttribute(true)]
[BindableAttribute(true)]
@@ -46,7 +46,7 @@
get { return lblDescription.Text; }
set { lblDescription.Text = value; }
}
-
+ */
public bool CreateNewProject
{
get { return rbCreate.Checked; }
1.2 +63 -96 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDAProjectSetupControl.designer.cs
Index: MDAProjectSetupControl.designer.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDAProjectSetupControl.designer.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- MDAProjectSetupControl.designer.cs 18 Apr 2006 16:14:44 -0000 1.1
+++ MDAProjectSetupControl.designer.cs 27 May 2006 22:31:46 -0000 1.2
@@ -30,11 +30,8 @@
{
this.ddlExistingProject = new System.Windows.Forms.ComboBox();
this.txtNewProject = new System.Windows.Forms.TextBox();
- this.lblDescription = new System.Windows.Forms.Label();
this.rbExisting = new System.Windows.Forms.RadioButton();
this.rbCreate = new System.Windows.Forms.RadioButton();
- this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.lblTitle = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// ddlExistingProject
@@ -42,32 +39,25 @@
this.ddlExistingProject.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.ddlExistingProject.Enabled = false;
this.ddlExistingProject.FormattingEnabled = true;
- this.ddlExistingProject.Location = new System.Drawing.Point(32, 120);
+ this.ddlExistingProject.Location = new System.Drawing.Point(18, 66);
this.ddlExistingProject.Name = "ddlExistingProject";
this.ddlExistingProject.Size = new System.Drawing.Size(320, 21);
this.ddlExistingProject.TabIndex = 6;
//
// txtNewProject
//
- this.txtNewProject.Location = new System.Drawing.Point(32, 74);
+ this.txtNewProject.Location = new System.Drawing.Point(18, 20);
this.txtNewProject.Name = "txtNewProject";
this.txtNewProject.Size = new System.Drawing.Size(320, 20);
this.txtNewProject.TabIndex = 4;
//
- // lblDescription
- //
- this.lblDescription.Location = new System.Drawing.Point(11, 21);
- this.lblDescription.Name = "lblDescription";
- this.lblDescription.Size = new System.Drawing.Size(507, 26);
- this.lblDescription.TabIndex = 2;
- this.lblDescription.Text = "<description>";
- //
// rbExisting
//
this.rbExisting.AutoSize = true;
- this.rbExisting.Location = new System.Drawing.Point(14, 99);
+ this.rbExisting.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold);
+ this.rbExisting.Location = new System.Drawing.Point(0, 45);
this.rbExisting.Name = "rbExisting";
- this.rbExisting.Size = new System.Drawing.Size(117, 17);
+ this.rbExisting.Size = new System.Drawing.Size(138, 17);
this.rbExisting.TabIndex = 5;
this.rbExisting.Text = "Use existing project";
this.rbExisting.UseVisualStyleBackColor = true;
@@ -77,46 +67,26 @@
//
this.rbCreate.AutoSize = true;
this.rbCreate.Checked = true;
- this.rbCreate.Location = new System.Drawing.Point(14, 54);
+ this.rbCreate.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold);
+ this.rbCreate.Location = new System.Drawing.Point(0, 0);
this.rbCreate.Name = "rbCreate";
- this.rbCreate.Size = new System.Drawing.Size(114, 17);
+ this.rbCreate.Size = new System.Drawing.Size(133, 17);
this.rbCreate.TabIndex = 3;
this.rbCreate.TabStop = true;
this.rbCreate.Text = "Create new project";
this.rbCreate.UseVisualStyleBackColor = true;
this.rbCreate.CheckedChanged += new System.EventHandler(this.checkChanged);
//
- // groupBox1
- //
- this.groupBox1.Location = new System.Drawing.Point(32, 3);
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(486, 7);
- this.groupBox1.TabIndex = 1;
- this.groupBox1.TabStop = false;
- //
- // lblTitle
- //
- this.lblTitle.AutoSize = true;
- this.lblTitle.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lblTitle.Location = new System.Drawing.Point(3, 2);
- this.lblTitle.Name = "lblTitle";
- this.lblTitle.Size = new System.Drawing.Size(48, 13);
- this.lblTitle.TabIndex = 0;
- this.lblTitle.Text = "<title>";
- //
// MDAProjectSetupControl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.Controls.Add(this.lblTitle);
- this.Controls.Add(this.groupBox1);
this.Controls.Add(this.ddlExistingProject);
this.Controls.Add(this.txtNewProject);
- this.Controls.Add(this.lblDescription);
this.Controls.Add(this.rbExisting);
this.Controls.Add(this.rbCreate);
this.Name = "MDAProjectSetupControl";
- this.Size = new System.Drawing.Size(529, 156);
+ this.Size = new System.Drawing.Size(369, 99);
this.ResumeLayout(false);
this.PerformLayout();
@@ -126,10 +96,7 @@
private System.Windows.Forms.ComboBox ddlExistingProject;
private System.Windows.Forms.TextBox txtNewProject;
- private System.Windows.Forms.Label lblDescription;
private System.Windows.Forms.RadioButton rbExisting;
private System.Windows.Forms.RadioButton rbCreate;
- private System.Windows.Forms.GroupBox groupBox1;
- private System.Windows.Forms.Label lblTitle;
}
}
1.4 +70 -10 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.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- MDASolutionWizard.cs 3 May 2006 20:23:06 -0000 1.3
+++ MDASolutionWizard.cs 27 May 2006 22:31:46 -0000 1.4
@@ -75,7 +75,9 @@
usrCommonProject.ProjectName = solutionName + ".Common";
usrCoreProject.ProjectName = solutionName + ".Core";
txtSchemaExportProject.Text = solutionName + ".SchemaExport";
+ txtWebProject.Text = solutionName + ".Web";
cbCreateSchemaExport.Checked = true;
+ cbCreateWebProject.Checked = false;
// Give the wizard a reference to this form so it can
// set this.AcceptButton to the Next button
@@ -93,6 +95,11 @@
txtSchemaExportProject.Enabled = cbCreateSchemaExport.Checked;
}
+ private void cbCreateWebProject_CheckedChanged(object sender, EventArgs e)
+ {
+ txtWebProject.Enabled = cbCreateWebProject.Checked;
+ }
+
/// <summary>
/// Fired when the confirm choices screen of the wizard is shown.
/// </summary>
@@ -115,6 +122,16 @@
lblGenerateSchemaExportProject.Text = "No";
lblSchemaExportProject.Text = "n/a";
}
+ if (cbCreateWebProject.Checked)
+ {
+ lblGenerateWebProject.Text = "Yes";
+ lblWebProject.Text = txtWebProject.Text;
+ }
+ else
+ {
+ lblGenerateWebProject.Text = "No";
+ lblWebProject.Text = "n/a";
+ }
}
/// <summary>
@@ -244,6 +261,43 @@
}
/// <summary>
+ /// Handles the CloseFromNext event of the wizardPageWebProject control.
+ /// </summary>
+ /// <param name="sender">The source of the event.</param>
+ /// <param name="e">The <see cref="T:Gui.Wizard.PageEventArgs"/> instance containing the event data.</param>
+ private void wizardPageWebProject_CloseFromNext(object sender, Gui.Wizard.PageEventArgs e)
+ {
+ bool v1 = true;
+ if (cbCreateWebProject.Checked)
+ {
+ v1 = ValidationUtils.ValidateRequiredTextBox(txtWebProject);
+ }
+ bool pageValid = v1;
+ if (!pageValid)
+ {
+ e.Page = wizardPageWebProject;
+ }
+ }
+
+ /// <summary>
+ /// Handles the ShowFromNext event of the wizardPageWebProject control.
+ /// </summary>
+ /// <param name="sender">The source of the event.</param>
+ /// <param name="e">The <see cref="T:System.EventArgs"/> instance containing the event data.</param>
+ private void wizardPageWebProject_ShowFromNext(object sender, EventArgs e)
+ {
+ if (cbCreateWebProject.Checked)
+ {
+ txtWebProject.Focus();
+ }
+ else
+ {
+ cbCreateWebProject.Focus();
+ }
+ }
+
+
+ /// <summary>
/// Handles the ShowFromNext event of the wizardPageSolutionInfo control.
/// </summary>
/// <param name="sender">The source of the event.</param>
@@ -287,9 +341,15 @@
config["projects.schemaexport.dir"] = txtSchemaExportProject.Text;
config["projects.schemaexport.create"] = cbCreateSchemaExport.Checked ? "true" : "false";
+ config["projects.web.name"] = txtWebProject.Text;
+ config["projects.web.dir"] = txtWebProject.Text;
+ config["projects.web.create"] = cbCreateWebProject.Checked ? "true" : "false";
+
config["database.name"] = txtApplicationName.Text.Replace(" ", string.Empty).Replace(".", string.Empty);
- // TODO: Support more database types
+ config["solution.path"] = VSSolutionUtils.GetSolutionPath(m_applicationObject.Solution);
+
+ // TODO: Support all database types that NHibernate supports
switch (ddlDatabaseType.SelectedItem.ToString())
{
case "Microsoft SQL Server":
@@ -317,9 +377,9 @@
config["hibernate.connection.driver_class"] = "NHibernate.Driver.OracleClientDriver";
break;
}
- config["solution.path"] = VSSolutionUtils.GetSolutionPath(m_applicationObject.Solution);
return config;
+
}
/// <summary>
@@ -364,14 +424,15 @@
m_solutionManager.OnSolutionOpened();
AddStatusText("Processing complete.");
txtErrorMessage.Visible = false;
- lblFinishPageTitle.ImageIndex = 0;
+ lblFinishPageTitleImage.ImageIndex = 0;
}
else
{
lblFinishPageTitle.Text = "Solution Update Error";
- lblFinishPageDescription.Text = errorMessage;
- lblFinishPageTitle.ImageIndex = 1;
+ lblFinishPageDescription.Visible = false;
+ lblFinishPageTitleImage.ImageIndex = 1;
txtErrorMessage.Visible = true;
+ txtErrorMessage.Text = errorMessage;
}
wizard1.NextEnabled = true;
wizard1.Next();
@@ -391,6 +452,5 @@
System.Threading.Thread.Sleep(0);
}
-
}
}
\ No newline at end of file
1.2 +801 -760 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.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- MDASolutionWizard.designer.cs 18 Apr 2006 16:14:44 -0000 1.1
+++ MDASolutionWizard.designer.cs 27 May 2006 22:31:46 -0000 1.2
@@ -31,74 +31,77 @@
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MDASolutionWizard));
this.wizard1 = new Gui.Wizard.Wizard();
- this.wizardPageProcessing = new Gui.Wizard.WizardPage();
- this.lstStatus = new System.Windows.Forms.ListBox();
- this.label7 = new System.Windows.Forms.Label();
- this.header5 = new Gui.Wizard.Header();
- this.pictureBoxThrobber = new System.Windows.Forms.PictureBox();
+ this.wizardPageWelcome = new Gui.Wizard.WizardPage();
+ this.label9 = new System.Windows.Forms.Label();
+ this.label8 = new System.Windows.Forms.Label();
+ this.pictureBoxWelcome = new System.Windows.Forms.PictureBox();
+ this.wizardPageSolutionInfo = new Gui.Wizard.WizardPage();
+ this.ddlDatabaseType = new System.Windows.Forms.ComboBox();
+ this.txtApplicationVersion = new System.Windows.Forms.TextBox();
+ this.label17 = new System.Windows.Forms.Label();
+ this.label14 = new System.Windows.Forms.Label();
+ this.txtApplicationName = new System.Windows.Forms.TextBox();
+ this.label12 = new System.Windows.Forms.Label();
+ this.header6 = new Gui.Wizard.Header();
+ this.wizardPageCommonProject = new Gui.Wizard.WizardPage();
+ this.usrCommonProject = new AndroMDA.VS80AddIn.Dialogs.MDAProjectSetupControl();
+ this.header1 = new Gui.Wizard.Header();
+ this.wizardPageCoreProject = new Gui.Wizard.WizardPage();
+ this.header2 = new Gui.Wizard.Header();
+ this.usrCoreProject = new AndroMDA.VS80AddIn.Dialogs.MDAProjectSetupControl();
+ this.wizardPageSchemaExportProject = new Gui.Wizard.WizardPage();
+ this.cbCreateSchemaExport = new System.Windows.Forms.CheckBox();
+ this.txtSchemaExportProject = new System.Windows.Forms.TextBox();
+ this.lblDescription = new System.Windows.Forms.Label();
+ this.header3 = new Gui.Wizard.Header();
+ this.wizardPageWebProject = new Gui.Wizard.WizardPage();
+ this.cbCreateWebProject = new System.Windows.Forms.CheckBox();
+ this.txtWebProject = new System.Windows.Forms.TextBox();
+ this.header7 = new Gui.Wizard.Header();
this.wizardPageConfirmChoices = new Gui.Wizard.WizardPage();
+ this.lblWebProject = new System.Windows.Forms.Label();
this.lblSchemaExportProject = new System.Windows.Forms.Label();
+ this.lblGenerateWebProject = new System.Windows.Forms.Label();
this.lblGenerateSchemaExportProject = new System.Windows.Forms.Label();
this.lblDatabaseType = new System.Windows.Forms.Label();
this.lblApplicationVersion = new System.Windows.Forms.Label();
this.lblCoreProject = new System.Windows.Forms.Label();
this.lblApplicationName = new System.Windows.Forms.Label();
this.lblCommonProject = new System.Windows.Forms.Label();
+ this.label20 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
this.label18 = new System.Windows.Forms.Label();
this.label16 = new System.Windows.Forms.Label();
+ this.label19 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.label15 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
- this.label2 = new System.Windows.Forms.Label();
- this.label1 = new System.Windows.Forms.Label();
- this.groupBox2 = new System.Windows.Forms.GroupBox();
this.header4 = new Gui.Wizard.Header();
- this.wizardPageSchemaExportProject = new Gui.Wizard.WizardPage();
- this.cbCreateSchemaExport = new System.Windows.Forms.CheckBox();
- this.lblTitle = new System.Windows.Forms.Label();
- this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.txtSchemaExportProject = new System.Windows.Forms.TextBox();
- this.lblDescription = new System.Windows.Forms.Label();
- this.header3 = new Gui.Wizard.Header();
- this.wizardPageCoreProject = new Gui.Wizard.WizardPage();
- this.header2 = new Gui.Wizard.Header();
- this.usrCoreProject = new AndroMDA.VS80AddIn.Dialogs.MDAProjectSetupControl();
- this.wizardPageCommonProject = new Gui.Wizard.WizardPage();
- this.usrCommonProject = new AndroMDA.VS80AddIn.Dialogs.MDAProjectSetupControl();
- this.header1 = new Gui.Wizard.Header();
- this.wizardPageSolutionInfo = new Gui.Wizard.WizardPage();
- this.ddlDatabaseType = new System.Windows.Forms.ComboBox();
- this.txtApplicationVersion = new System.Windows.Forms.TextBox();
- this.label17 = new System.Windows.Forms.Label();
- this.label14 = new System.Windows.Forms.Label();
- this.txtApplicationName = new System.Windows.Forms.TextBox();
- this.label12 = new System.Windows.Forms.Label();
- this.label13 = new System.Windows.Forms.Label();
- this.groupBox3 = new System.Windows.Forms.GroupBox();
- this.header6 = new Gui.Wizard.Header();
- this.wizardPageWelcome = new Gui.Wizard.WizardPage();
- this.label9 = new System.Windows.Forms.Label();
- this.label8 = new System.Windows.Forms.Label();
- this.pictureBoxWelcome = new System.Windows.Forms.PictureBox();
+ this.wizardPageProcessing = new Gui.Wizard.WizardPage();
+ this.lstStatus = new System.Windows.Forms.ListBox();
+ this.label7 = new System.Windows.Forms.Label();
+ this.header5 = new Gui.Wizard.Header();
+ this.pictureBoxThrobber = new System.Windows.Forms.PictureBox();
this.wizardPageComplete = new Gui.Wizard.WizardPage();
this.pictureBoxComplete = new System.Windows.Forms.PictureBox();
this.lblFinishPageDescription = new System.Windows.Forms.Label();
- this.lblFinishPageTitle = new System.Windows.Forms.Label();
+ this.lblFinishPageTitleImage = new System.Windows.Forms.Label();
this.imageList1 = new System.Windows.Forms.ImageList(this.components);
this.txtErrorMessage = new System.Windows.Forms.TextBox();
+ this.lblFinishPageTitle = new System.Windows.Forms.Label();
this.wizard1.SuspendLayout();
+ this.wizardPageWelcome.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWelcome)).BeginInit();
+ this.wizardPageSolutionInfo.SuspendLayout();
+ this.wizardPageCommonProject.SuspendLayout();
+ this.wizardPageCoreProject.SuspendLayout();
+ this.wizardPageSchemaExportProject.SuspendLayout();
+ this.wizardPageWebProject.SuspendLayout();
+ this.wizardPageConfirmChoices.SuspendLayout();
this.wizardPageProcessing.SuspendLayout();
this.header5.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxThrobber)).BeginInit();
- this.wizardPageConfirmChoices.SuspendLayout();
- this.wizardPageSchemaExportProject.SuspendLayout();
- this.wizardPageCoreProject.SuspendLayout();
- this.wizardPageCommonProject.SuspendLayout();
- this.wizardPageSolutionInfo.SuspendLayout();
- this.wizardPageWelcome.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWelcome)).BeginInit();
this.wizardPageComplete.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxComplete)).BeginInit();
this.SuspendLayout();
@@ -109,6 +112,7 @@
this.wizard1.Controls.Add(this.wizardPageComplete);
this.wizard1.Controls.Add(this.wizardPageProcessing);
this.wizard1.Controls.Add(this.wizardPageConfirmChoices);
+ this.wizard1.Controls.Add(this.wizardPageWebProject);
this.wizard1.Controls.Add(this.wizardPageSchemaExportProject);
this.wizard1.Controls.Add(this.wizardPageCoreProject);
this.wizard1.Controls.Add(this.wizardPageCommonProject);
@@ -124,6 +128,7 @@
this.wizardPageCommonProject,
this.wizardPageCoreProject,
this.wizardPageSchemaExportProject,
+ this.wizardPageWebProject,
this.wizardPageConfirmChoices,
this.wizardPageProcessing,
this.wizardPageComplete});
@@ -131,267 +136,210 @@
this.wizard1.TabIndex = 0;
this.wizard1.Load += new System.EventHandler(this.wizard1_Load);
//
- // wizardPageProcessing
- //
- this.wizardPageProcessing.Controls.Add(this.lstStatus);
- this.wizardPageProcessing.Controls.Add(this.label7);
- this.wizardPageProcessing.Controls.Add(this.header5);
- this.wizardPageProcessing.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageProcessing.IsFinishPage = false;
- this.wizardPageProcessing.Location = new System.Drawing.Point(0, 0);
- this.wizardPageProcessing.Name = "wizardPageProcessing";
- this.wizardPageProcessing.Size = new System.Drawing.Size(525, 297);
- this.wizardPageProcessing.TabIndex = 6;
- this.wizardPageProcessing.ShowFromNext += new System.EventHandler(this.wizardPageProcessing_ShowFromNext);
- //
- // lstStatus
- //
- this.lstStatus.FormattingEnabled = true;
- this.lstStatus.Location = new System.Drawing.Point(12, 100);
- this.lstStatus.Name = "lstStatus";
- this.lstStatus.Size = new System.Drawing.Size(501, 186);
- this.lstStatus.TabIndex = 9;
- //
- // label7
- //
- this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(12, 77);
- this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(273, 13);
- this.label7.TabIndex = 8;
- this.label7.Text = "Updating solution to support AndroMDA. Please wait...";
- //
- // header5
- //
- this.header5.BackColor = System.Drawing.SystemColors.Control;
- this.header5.CausesValidation = false;
- this.header5.Controls.Add(this.pictureBoxThrobber);
- this.header5.Description = "Processing Solution...";
- this.header5.Dock = System.Windows.Forms.DockStyle.Top;
- this.header5.Image = ((System.Drawing.Image)(resources.GetObject("header5.Image")));
- this.header5.Location = new System.Drawing.Point(0, 0);
- this.header5.Name = "header5";
- this.header5.Size = new System.Drawing.Size(525, 65);
- this.header5.TabIndex = 6;
- this.header5.Title = "AndroMDA Solution Wizard";
- //
- // pictureBoxThrobber
+ // wizardPageWelcome
//
- this.pictureBoxThrobber.BackColor = System.Drawing.Color.White;
- this.pictureBoxThrobber.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxThrobber.Image")));
- this.pictureBoxThrobber.Location = new System.Drawing.Point(8, 40);
- this.pictureBoxThrobber.Name = "pictureBoxThrobber";
- this.pictureBoxThrobber.Size = new System.Drawing.Size(31, 22);
- this.pictureBoxThrobber.TabIndex = 10;
- this.pictureBoxThrobber.TabStop = false;
+ this.wizardPageWelcome.BackColor = System.Drawing.Color.White;
+ this.wizardPageWelcome.Controls.Add(this.label9);
+ this.wizardPageWelcome.Controls.Add(this.label8);
+ this.wizardPageWelcome.Controls.Add(this.pictureBoxWelcome);
+ this.wizardPageWelcome.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageWelcome.IsFinishPage = false;
+ this.wizardPageWelcome.Location = new System.Drawing.Point(0, 0);
+ this.wizardPageWelcome.Name = "wizardPageWelcome";
+ this.wizardPageWelcome.Size = new System.Drawing.Size(525, 297);
+ this.wizardPageWelcome.TabIndex = 1;
//
- // wizardPageConfirmChoices
+ // label9
//
- this.wizardPageConfirmChoices.Controls.Add(this.lblSchemaExportProject);
- this.wizardPageConfirmChoices.Controls.Add(this.lblGenerateSchemaExportProject);
- this.wizardPageConfirmChoices.Controls.Add(this.lblDatabaseType);
- this.wizardPageConfirmChoices.Controls.Add(this.lblApplicationVersion);
- this.wizardPageConfirmChoices.Controls.Add(this.lblCoreProject);
- this.wizardPageConfirmChoices.Controls.Add(this.lblApplicationName);
- this.wizardPageConfirmChoices.Controls.Add(this.lblCommonProject);
- this.wizardPageConfirmChoices.Controls.Add(this.label6);
- this.wizardPageConfirmChoices.Controls.Add(this.label18);
- this.wizardPageConfirmChoices.Controls.Add(this.label16);
- this.wizardPageConfirmChoices.Controls.Add(this.label5);
- this.wizardPageConfirmChoices.Controls.Add(this.label15);
- this.wizardPageConfirmChoices.Controls.Add(this.label4);
- this.wizardPageConfirmChoices.Controls.Add(this.label3);
- this.wizardPageConfirmChoices.Controls.Add(this.label2);
- this.wizardPageConfirmChoices.Controls.Add(this.label1);
- this.wizardPageConfirmChoices.Controls.Add(this.groupBox2);
- this.wizardPageConfirmChoices.Controls.Add(this.header4);
- this.wizardPageConfirmChoices.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageConfirmChoices.IsFinishPage = false;
- this.wizardPageConfirmChoices.Location = new System.Drawing.Point(0, 0);
- this.wizardPageConfirmChoices.Name = "wizardPageConfirmChoices";
- this.wizardPageConfirmChoices.Size = new System.Drawing.Size(525, 297);
- this.wizardPageConfirmChoices.TabIndex = 5;
- this.wizardPageConfirmChoices.ShowFromNext += new System.EventHandler(this.wizardPageConfirmChoices_ShowFromNext);
+ this.label9.Location = new System.Drawing.Point(174, 61);
+ this.label9.Name = "label9";
+ this.label9.Size = new System.Drawing.Size(339, 220);
+ this.label9.TabIndex = 9;
+ this.label9.Text = resources.GetString("label9.Text");
//
- // lblSchemaExportProject
+ // label8
//
- this.lblSchemaExportProject.AutoSize = true;
- this.lblSchemaExportProject.Location = new System.Drawing.Point(242, 256);
- this.lblSchemaExportProject.Name = "lblSchemaExportProject";
- this.lblSchemaExportProject.Size = new System.Drawing.Size(23, 13);
- this.lblSchemaExportProject.TabIndex = 26;
- this.lblSchemaExportProject.Text = "n/a";
+ this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.label8.FlatStyle = System.Windows.Forms.FlatStyle.System;
+ this.label8.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label8.Location = new System.Drawing.Point(170, 9);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(304, 48);
+ this.label8.TabIndex = 8;
+ this.label8.Text = "Welcome to the AndroMDA Solution Wizard";
//
- // lblGenerateSchemaExportProject
+ // pictureBoxWelcome
//
- this.lblGenerateSchemaExportProject.AutoSize = true;
- this.lblGenerateSchemaExportProject.Location = new System.Drawing.Point(242, 237);
- this.lblGenerateSchemaExportProject.Name = "lblGenerateSchemaExportProject";
- this.lblGenerateSchemaExportProject.Size = new System.Drawing.Size(20, 13);
- this.lblGenerateSchemaExportProject.TabIndex = 26;
- this.lblGenerateSchemaExportProject.Text = "No";
+ this.pictureBoxWelcome.Dock = System.Windows.Forms.DockStyle.Left;
+ this.pictureBoxWelcome.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxWelcome.Image")));
+ this.pictureBoxWelcome.Location = new System.Drawing.Point(0, 0);
+ this.pictureBoxWelcome.Name = "pictureBoxWelcome";
+ this.pictureBoxWelcome.Size = new System.Drawing.Size(164, 297);
+ this.pictureBoxWelcome.TabIndex = 1;
+ this.pictureBoxWelcome.TabStop = false;
//
- // lblDatabaseType
+ // wizardPageSolutionInfo
//
- this.lblDatabaseType.AutoSize = true;
- this.lblDatabaseType.Location = new System.Drawing.Point(242, 180);
- this.lblDatabaseType.Name = "lblDatabaseType";
- this.lblDatabaseType.Size = new System.Drawing.Size(50, 13);
- this.lblDatabaseType.TabIndex = 26;
- this.lblDatabaseType.Text = "unknown";
+ this.wizardPageSolutionInfo.Controls.Add(this.ddlDatabaseType);
+ this.wizardPageSolutionInfo.Controls.Add(this.txtApplicationVersion);
+ this.wizardPageSolutionInfo.Controls.Add(this.label17);
+ this.wizardPageSolutionInfo.Controls.Add(this.label14);
+ this.wizardPageSolutionInfo.Controls.Add(this.txtApplicationName);
+ this.wizardPageSolutionInfo.Controls.Add(this.label12);
+ this.wizardPageSolutionInfo.Controls.Add(this.header6);
+ this.wizardPageSolutionInfo.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageSolutionInfo.IsFinishPage = false;
+ this.wizardPageSolutionInfo.Location = new System.Drawing.Point(0, 0);
+ this.wizardPageSolutionInfo.Name = "wizardPageSolutionInfo";
+ this.wizardPageSolutionInfo.Size = new System.Drawing.Size(525, 297);
+ this.wizardPageSolutionInfo.TabIndex = 8;
+ this.wizardPageSolutionInfo.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageSolutionInfo_CloseFromNext);
+ this.wizardPageSolutionInfo.ShowFromBack += new System.EventHandler(this.wizardPageSolutionInfo_ShowFromNext);
+ this.wizardPageSolutionInfo.ShowFromNext += new System.EventHandler(this.wizardPageSolutionInfo_ShowFromNext);
//
- // lblApplicationVersion
+ // ddlDatabaseType
//
- this.lblApplicationVersion.AutoSize = true;
- this.lblApplicationVersion.Location = new System.Drawing.Point(242, 161);
- this.lblApplicationVersion.Name = "lblApplicationVersion";
- this.lblApplicationVersion.Size = new System.Drawing.Size(50, 13);
- this.lblApplicationVersion.TabIndex = 26;
- this.lblApplicationVersion.Text = "unknown";
+ this.ddlDatabaseType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.ddlDatabaseType.FormattingEnabled = true;
+ this.ddlDatabaseType.Items.AddRange(new object[] {
+ "Microsoft SQL Server",
+ "MySQL",
+ "Oracle 9i",
+ "Hypersonic"});
+ this.ddlDatabaseType.Location = new System.Drawing.Point(15, 187);
+ this.ddlDatabaseType.Name = "ddlDatabaseType";
+ this.ddlDatabaseType.Size = new System.Drawing.Size(320, 21);
+ this.ddlDatabaseType.TabIndex = 2;
//
- // lblCoreProject
+ // txtApplicationVersion
//
- this.lblCoreProject.AutoSize = true;
- this.lblCoreProject.Location = new System.Drawing.Point(242, 218);
- this.lblCoreProject.Name = "lblCoreProject";
- this.lblCoreProject.Size = new System.Drawing.Size(28, 13);
- this.lblCoreProject.TabIndex = 26;
- this.lblCoreProject.Text = "core";
+ this.txtApplicationVersion.Location = new System.Drawing.Point(15, 141);
+ this.txtApplicationVersion.Name = "txtApplicationVersion";
+ this.txtApplicationVersion.Size = new System.Drawing.Size(320, 21);
+ this.txtApplicationVersion.TabIndex = 1;
//
- // lblApplicationName
+ // label17
//
- this.lblApplicationName.AutoSize = true;
- this.lblApplicationName.Location = new System.Drawing.Point(242, 142);
- this.lblApplicationName.Name = "lblApplicationName";
- this.lblApplicationName.Size = new System.Drawing.Size(50, 13);
- this.lblApplicationName.TabIndex = 26;
- this.lblApplicationName.Text = "unknown";
+ this.label17.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label17.Location = new System.Drawing.Point(12, 168);
+ this.label17.Name = "label17";
+ this.label17.Size = new System.Drawing.Size(507, 16);
+ this.label17.TabIndex = 29;
+ this.label17.Text = "Which database will your application use?";
//
- // lblCommonProject
+ // label14
//
- this.lblCommonProject.AutoSize = true;
- this.lblCommonProject.Location = new System.Drawing.Point(242, 199);
- this.lblCommonProject.Name = "lblCommonProject";
- this.lblCommonProject.Size = new System.Drawing.Size(46, 13);
- this.lblCommonProject.TabIndex = 26;
- this.lblCommonProject.Text = "common";
+ this.label14.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label14.Location = new System.Drawing.Point(12, 123);
+ this.label14.Name = "label14";
+ this.label14.Size = new System.Drawing.Size(507, 16);
+ this.label14.TabIndex = 29;
+ this.label14.Text = "What is the version number of your application? (Example: 1.1-Release)";
//
- // label6
+ // txtApplicationName
//
- this.label6.AutoSize = true;
- this.label6.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label6.Location = new System.Drawing.Point(97, 256);
- this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(139, 13);
- this.label6.TabIndex = 25;
- this.label6.Text = "Schema Export Project:";
+ this.txtApplicationName.BackColor = System.Drawing.SystemColors.Window;
+ this.txtApplicationName.Location = new System.Drawing.Point(15, 97);
+ this.txtApplicationName.Name = "txtApplicationName";
+ this.txtApplicationName.Size = new System.Drawing.Size(320, 21);
+ this.txtApplicationName.TabIndex = 0;
//
- // label18
+ // label12
//
- this.label18.AutoSize = true;
- this.label18.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label18.Location = new System.Drawing.Point(141, 180);
- this.label18.Name = "label18";
- this.label18.Size = new System.Drawing.Size(95, 13);
- this.label18.TabIndex = 25;
- this.label18.Text = "Database Type:";
+ this.label12.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label12.Location = new System.Drawing.Point(12, 79);
+ this.label12.Name = "label12";
+ this.label12.Size = new System.Drawing.Size(507, 16);
+ this.label12.TabIndex = 29;
+ this.label12.Text = "What is the name of your application? (Example: Time Tracker)";
//
- // label16
+ // header6
//
- this.label16.AutoSize = true;
- this.label16.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label16.Location = new System.Drawing.Point(118, 161);
- this.label16.Name = "label16";
- this.label16.Size = new System.Drawing.Size(118, 13);
- this.label16.TabIndex = 25;
- this.label16.Text = "Application Version:";
+ this.header6.BackColor = System.Drawing.SystemColors.Control;
+ this.header6.CausesValidation = false;
+ this.header6.Description = "Please enter the general information about your applicaiton.";
+ this.header6.Dock = System.Windows.Forms.DockStyle.Top;
+ this.header6.Image = ((System.Drawing.Image)(resources.GetObject("header6.Image")));
+ this.header6.Location = new System.Drawing.Point(0, 0);
+ this.header6.Name = "header6";
+ this.header6.Size = new System.Drawing.Size(525, 65);
+ this.header6.TabIndex = 26;
+ this.header6.Title = "Application Information";
//
- // label5
+ // wizardPageCommonProject
//
- this.label5.AutoSize = true;
- this.label5.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label5.Location = new System.Drawing.Point(41, 237);
- this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(195, 13);
- this.label5.TabIndex = 25;
- this.label5.Text = "Generate Schema Export Project:";
+ this.wizardPageCommonProject.Controls.Add(this.usrCommonProject);
+ this.wizardPageCommonProject.Controls.Add(this.header1);
+ this.wizardPageCommonProject.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageCommonProject.IsFinishPage = false;
+ this.wizardPageCommonProject.Location = new System.Drawing.Point(0, 0);
+ this.wizardPageCommonProject.Name = "wizardPageCommonProject";
+ this.wizardPageCommonProject.Size = new System.Drawing.Size(525, 297);
+ this.wizardPageCommonProject.TabIndex = 2;
+ this.wizardPageCommonProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageCommonProject_CloseFromNext);
+ this.wizardPageCommonProject.ShowFromNext += new System.EventHandler(this.wizardPageCommonProject_ShowFromNext);
//
- // label15
+ // usrCommonProject
//
- this.label15.AutoSize = true;
- this.label15.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label15.Location = new System.Drawing.Point(128, 142);
- this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(108, 13);
- this.label15.TabIndex = 25;
- this.label15.Text = "Application Name:";
+ this.usrCommonProject.Location = new System.Drawing.Point(12, 79);
+ this.usrCommonProject.Name = "usrCommonProject";
+ this.usrCommonProject.ProjectName = "";
+ this.usrCommonProject.Size = new System.Drawing.Size(384, 156);
+ this.usrCommonProject.TabIndex = 0;
//
- // label4
+ // header1
//
- this.label4.AutoSize = true;
- this.label4.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label4.Location = new System.Drawing.Point(156, 218);
- this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(80, 13);
- this.label4.TabIndex = 25;
- this.label4.Text = "Core Project:";
+ this.header1.BackColor = System.Drawing.SystemColors.Control;
+ this.header1.CausesValidation = false;
+ this.header1.Description = "The common project contains value objects, enumerations, and other non-entity cla" +
+ "sses that are generated from your model.";
+ this.header1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.header1.Image = ((System.Drawing.Image)(resources.GetObject("header1.Image")));
+ this.header1.Location = new System.Drawing.Point(0, 0);
+ this.header1.Name = "header1";
+ this.header1.Size = new System.Drawing.Size(525, 65);
+ this.header1.TabIndex = 0;
+ this.header1.Title = "Common Project";
//
- // label3
+ // wizardPageCoreProject
//
- this.label3.AutoSize = true;
- this.label3.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label3.Location = new System.Drawing.Point(132, 199);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(104, 13);
- this.label3.TabIndex = 25;
- this.label3.Text = "Common Project:";
+ this.wizardPageCoreProject.Controls.Add(this.header2);
+ this.wizardPageCoreProject.Controls.Add(this.usrCoreProject);
+ this.wizardPageCoreProject.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageCoreProject.IsFinishPage = false;
+ this.wizardPageCoreProject.Location = new System.Drawing.Point(0, 0);
+ this.wizardPageCoreProject.Name = "wizardPageCoreProject";
+ this.wizardPageCoreProject.Size = new System.Drawing.Size(525, 297);
+ this.wizardPageCoreProject.TabIndex = 3;
+ this.wizardPageCoreProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageCoreProject_CloseFromNext);
+ this.wizardPageCoreProject.ShowFromNext += new System.EventHandler(this.wizardPageCoreProject_ShowFromNext);
//
- // label2
+ // header2
//
- this.label2.Location = new System.Drawing.Point(13, 92);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(507, 26);
- this.label2.TabIndex = 25;
- this.label2.Text = "Hibernate can generate database schema from your UML model automatically. Check " +
- "the box below if you would like to create a project that generates database sche" +
- "ma from your model.";
- //
- // label1
- //
- this.label1.AutoSize = true;
- this.label1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label1.Location = new System.Drawing.Point(5, 73);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(97, 13);
- this.label1.TabIndex = 23;
- this.label1.Text = "Confirm Choices";
- //
- // groupBox2
- //
- this.groupBox2.Location = new System.Drawing.Point(34, 74);
- this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(486, 7);
- this.groupBox2.TabIndex = 24;
- this.groupBox2.TabStop = false;
+ this.header2.BackColor = System.Drawing.SystemColors.Control;
+ this.header2.CausesValidation = false;
+ this.header2.Description = "The core project, also known as the domain project, contains all entities and dat" +
+ "a access objects generated from your model.";
+ this.header2.Dock = System.Windows.Forms.DockStyle.Top;
+ this.header2.Image = ((System.Drawing.Image)(resources.GetObject("header2.Image")));
+ this.header2.Location = new System.Drawing.Point(0, 0);
+ this.header2.Name = "header2";
+ this.header2.Size = new System.Drawing.Size(525, 65);
+ this.header2.TabIndex = 3;
+ this.header2.Title = "Core Project";
//
- // header4
+ // usrCoreProject
//
- this.header4.BackColor = System.Drawing.SystemColors.Control;
- this.header4.CausesValidation = false;
- this.header4.Description = "Confirm Choices";
- this.header4.Dock = System.Windows.Forms.DockStyle.Top;
- this.header4.Image = ((System.Drawing.Image)(resources.GetObject("header4.Image")));
- this.header4.Location = new System.Drawing.Point(0, 0);
- this.header4.Name = "header4";
- this.header4.Size = new System.Drawing.Size(525, 65);
- this.header4.TabIndex = 5;
- this.header4.Title = "AndroMDA Solution Wizard";
+ this.usrCoreProject.Location = new System.Drawing.Point(12, 79);
+ this.usrCoreProject.Name = "usrCoreProject";
+ this.usrCoreProject.ProjectName = "";
+ this.usrCoreProject.Size = new System.Drawing.Size(384, 156);
+ this.usrCoreProject.TabIndex = 0;
//
// wizardPageSchemaExportProject
//
this.wizardPageSchemaExportProject.Controls.Add(this.cbCreateSchemaExport);
- this.wizardPageSchemaExportProject.Controls.Add(this.lblTitle);
- this.wizardPageSchemaExportProject.Controls.Add(this.groupBox1);
this.wizardPageSchemaExportProject.Controls.Add(this.txtSchemaExportProject);
this.wizardPageSchemaExportProject.Controls.Add(this.lblDescription);
this.wizardPageSchemaExportProject.Controls.Add(this.header3);
@@ -408,36 +356,19 @@
// cbCreateSchemaExport
//
this.cbCreateSchemaExport.AutoSize = true;
- this.cbCreateSchemaExport.Location = new System.Drawing.Point(16, 125);
+ this.cbCreateSchemaExport.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.cbCreateSchemaExport.Location = new System.Drawing.Point(12, 79);
this.cbCreateSchemaExport.Name = "cbCreateSchemaExport";
- this.cbCreateSchemaExport.Size = new System.Drawing.Size(170, 17);
+ this.cbCreateSchemaExport.Size = new System.Drawing.Size(196, 17);
this.cbCreateSchemaExport.TabIndex = 0;
this.cbCreateSchemaExport.Text = "Create schema export project";
this.cbCreateSchemaExport.UseVisualStyleBackColor = true;
this.cbCreateSchemaExport.CheckedChanged += new System.EventHandler(this.cbCreateSchemaExport_CheckedChanged);
//
- // lblTitle
- //
- this.lblTitle.AutoSize = true;
- this.lblTitle.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lblTitle.Location = new System.Drawing.Point(5, 73);
- this.lblTitle.Name = "lblTitle";
- this.lblTitle.Size = new System.Drawing.Size(136, 13);
- this.lblTitle.TabIndex = 21;
- this.lblTitle.Text = "Schema Export Project";
- //
- // groupBox1
- //
- this.groupBox1.Location = new System.Drawing.Point(34, 74);
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(486, 7);
- this.groupBox1.TabIndex = 22;
- this.groupBox1.TabStop = false;
- //
// txtSchemaExportProject
//
this.txtSchemaExportProject.Enabled = false;
- this.txtSchemaExportProject.Location = new System.Drawing.Point(34, 145);
+ this.txtSchemaExportProject.Location = new System.Drawing.Point(30, 102);
this.txtSchemaExportProject.Name = "txtSchemaExportProject";
this.txtSchemaExportProject.Size = new System.Drawing.Size(320, 21);
this.txtSchemaExportProject.TabIndex = 1;
@@ -449,251 +380,345 @@
this.lblDescription.Name = "lblDescription";
this.lblDescription.Size = new System.Drawing.Size(507, 26);
this.lblDescription.TabIndex = 24;
- this.lblDescription.Text = "Hibernate can generate database schema from your UML model automatically. Check " +
- "the box below if you would like to create a project that generates database sche" +
- "ma from your model.";
//
// header3
//
this.header3.BackColor = System.Drawing.SystemColors.Control;
this.header3.CausesValidation = false;
- this.header3.Description = "Schema Export Project";
+ this.header3.Description = "Check the box below if you would like to create a project that contains a console" +
+ " application that generates database schema from your model. ";
this.header3.Dock = System.Windows.Forms.DockStyle.Top;
this.header3.Image = ((System.Drawing.Image)(resources.GetObject("header3.Image")));
this.header3.Location = new System.Drawing.Point(0, 0);
this.header3.Name = "header3";
this.header3.Size = new System.Drawing.Size(525, 65);
this.header3.TabIndex = 4;
- this.header3.Title = "AndroMDA Solution Wizard";
+ this.header3.Title = "Schema Export Project";
//
- // wizardPageCoreProject
+ // wizardPageWebProject
//
- this.wizardPageCoreProject.Controls.Add(this.header2);
- this.wizardPageCoreProject.Controls.Add(this.usrCoreProject);
- this.wizardPageCoreProject.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageCoreProject.IsFinishPage = false;
- this.wizardPageCoreProject.Location = new System.Drawing.Point(0, 0);
- this.wizardPageCoreProject.Name = "wizardPageCoreProject";
- this.wizardPageCoreProject.Size = new System.Drawing.Size(525, 297);
- this.wizardPageCoreProject.TabIndex = 3;
- this.wizardPageCoreProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageCoreProject_CloseFromNext);
- this.wizardPageCoreProject.ShowFromNext += new System.EventHandler(this.wizardPageCoreProject_ShowFromNext);
+ this.wizardPageWebProject.Controls.Add(this.cbCreateWebProject);
+ this.wizardPageWebProject.Controls.Add(this.txtWebProject);
+ this.wizardPageWebProject.Controls.Add(this.header7);
+ this.wizardPageWebProject.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageWebProject.IsFinishPage = false;
+ this.wizardPageWebProject.Location = new System.Drawing.Point(0, 0);
+ this.wizardPageWebProject.Name = "wizardPageWebProject";
+ this.wizardPageWebProject.Size = new System.Drawing.Size(525, 297);
+ this.wizardPageWebProject.TabIndex = 9;
+ this.wizardPageWebProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageWebProject_CloseFromNext);
+ this.wizardPageWebProject.ShowFromNext += new System.EventHandler(this.wizardPageWebProject_ShowFromNext);
+ //
+ // cbCreateWebProject
+ //
+ this.cbCreateWebProject.AutoSize = true;
+ this.cbCreateWebProject.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Po...
[truncated message content] |
|
From: Martin W. <ama...@us...> - 2006-05-27 17:47:26
|
User: amartinwest
Date: 06/05/27 10:47:19
Modified: . pom.xml
Log:
correct cvs url in 2nd place
Revision Changes Path
1.8 +1 -1 plugins/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/pom.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- pom.xml 14 May 2006 09:05:41 -0000 1.7
+++ pom.xml 27 May 2006 17:47:19 -0000 1.8
@@ -17,7 +17,7 @@
<url>http://jira.andromda.org/</url>
</issueManagement>
<scm>
- <connection>scm:cvs:pserver:anonymous:@cvs.sourceforge.net:/cvsroot/andromdaplugins:andromda-plugins</connection>
+ <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>
<url>http://andromdaplugins.cvs.sourceforge.net/andromdaplugins</url>
</scm>
|
|
From: Chris M. <cm...@us...> - 2006-05-27 15:06:04
|
User: cmicali
Date: 06/05/27 08:05:59
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn AndroMDA VS2005
Add-In Readme.rtf
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
AddInSettings.cs AndroMDA.VS80AddIn.csproj
MDAProject.cs MDASolutionManager.cs VS80AddIn.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands
OpenModelCommand.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs
ExternalToolsOptionsPage.cs
GeneralOptionsPage.Designer.cs
GeneralOptionsPage.cs GeneralOptionsPage.resx
etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer AndroMDA
VS2005 Add-In Setup.exe
Log:
- Updated version number to 1.2
- Changed resync code to compute solution hash in realtime, removes requirement to store hash codes in project files
- Added option for resync to exclude files that are marked as hidden in the file system
- Updated ignored files UI in options page to be more clear and easy to use (list box with add/remove instead of semicolon delimited list)
- Made ignore list case insensitive
- Updated compiled version in installer
Revision Changes Path
No revision
No revision
No revision
No revision
1.6 +30 -12 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.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- AddInSettings.cs 4 May 2006 18:55:35 -0000 1.5
+++ AddInSettings.cs 27 May 2006 15:05:58 -0000 1.6
@@ -42,12 +42,13 @@
{
FirstRun = false;
AddInBuild = ADDIN_SETTINGS_VERSION;
- ResyncIgnoreList = "CVS;.cvsignore;.svn;.svnignore";
+ ResyncIgnoreList = "CVS;.cvsignore;.svn;.svnignore;_svn";
+ ResyncIgnoreHiddenFiles = false;
MavenUseOfflineMode = true;
MavenCleanFirst = true;
MavenUseCustomCommandLine = false;
MavenCustomCommandLine = "-o clean mda";
- MagicDrawPath = "C:\\Program Files\\MagicDraw UML Community Edition\\bin\\mduml.exe";
+ UMLModellerPath = "C:\\Program Files\\MagicDraw UML Community Edition\\bin\\mduml.exe";
Dialogs.AddInWelcome welcome = new Dialogs.AddInWelcome();
welcome.ShowDialog();
}
@@ -80,13 +81,27 @@
set { m_settings.SetInt("AMDABuild", value); }
}
+ #endregion
+
+ #region Resync settings
+
public string ResyncIgnoreList
{
get { return m_settings["AMDAIgnoreLst"]; }
set { m_settings["AMDAIgnoreLst"] = value; }
}
- public string MagicDrawPath
+ public bool ResyncIgnoreHiddenFiles
+ {
+ get { return m_settings.GetBool("AMDARIHdnFl", false); }
+ set { m_settings.SetBool("AMDARIHdnFl", value); }
+ }
+
+ #endregion
+
+ #region External tool settings
+
+ public string UMLModellerPath
{
get { return m_settings["AMDAMgcDrawPth"]; }
set { m_settings["AMDAMgcDrawPth"] = value; }
@@ -176,7 +191,7 @@
#endregion
- #region Command settings
+ #region Tool bar button settings
public bool ShowAboutButton
{
@@ -215,10 +230,13 @@
{
// Get the list of files to ignore
string[] ignoreFiles = ResyncIgnoreList.Split(new char[] { ';' });
+ if (stripPath)
+ {
file = FileUtils.GetFilename(file);
+ }
foreach (string s in ignoreFiles)
{
- if (s.Equals(file))
+ if (s.ToLower().Equals(file.ToLower()))
{
return true;
}
1.7 +1 -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.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- AndroMDA.VS80AddIn.csproj 2 May 2006 21:33:42 -0000 1.6
+++ AndroMDA.VS80AddIn.csproj 27 May 2006 15:05:58 -0000 1.7
@@ -12,6 +12,7 @@
<AssemblyName>AndroMDA.VS80AddIn</AssemblyName>
<RootNamespace>AndroMDA.VS80AddIn</RootNamespace>
<ApplicationIcon>AddIn.ico</ApplicationIcon>
+ <SignAssembly>false</SignAssembly>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
1.2 +2 -50 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/MDAProject.cs
Index: MDAProject.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/MDAProject.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- MDAProject.cs 18 Apr 2006 16:14:43 -0000 1.1
+++ MDAProject.cs 27 May 2006 15:05:58 -0000 1.2
@@ -66,54 +66,6 @@
set { m_name = value; }
}
- public int FileListHashCodeSrc
- {
- get
- {
- if (m_project.Globals.get_VariableExists("AMDASrcHash"))
- {
- string value = m_project.Globals["AMDASrcHash"].ToString();
- return int.Parse(value);
- }
- else
- {
- return -1;
- }
- }
- set
- {
- if (value != FileListHashCodeSrc)
- {
- m_project.Globals["AMDASrcHash"] = value.ToString();
- m_project.Globals.set_VariablePersists("AMDASrcHash", true);
- }
- }
- }
-
- public int FileListHashCodeTarget
- {
- get
- {
- if (m_project.Globals.get_VariableExists("AMDATrgtHash"))
- {
- string value = m_project.Globals["AMDATrgtHash"].ToString();
- return int.Parse(value);
- }
- else
- {
- return -1;
- }
- }
- set
- {
- if (value != FileListHashCodeTarget)
- {
- m_project.Globals["AMDATrgtHash"] = value.ToString();
- m_project.Globals.set_VariablePersists("AMDATrgtHash", true);
- }
- }
- }
-
public Project Project
{
get { return m_project; }
1.9 +73 -44 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.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- MDASolutionManager.cs 16 May 2006 15:46:44 -0000 1.8
+++ MDASolutionManager.cs 27 May 2006 15:05:58 -0000 1.9
@@ -447,35 +447,24 @@
CheckGeneratedPaths(m_commonProject);
CheckGeneratedPaths(m_coreProject);
- m_commonProject.FileListHashCodeSrc = ResyncFolder(m_commonProject.FileListHashCodeSrc,
- m_commonProject.ManualPathProjectItem,
- m_commonProject.ManualPath,
- m_commonProject.Name);
-
- m_commonProject.FileListHashCodeTarget= ResyncFolder(m_commonProject.FileListHashCodeTarget,
- m_commonProject.GeneratedPathProjectItem,
- m_commonProject.GeneratedPath,
- m_commonProject.Name);
-
- m_coreProject.FileListHashCodeSrc = ResyncFolder(m_coreProject.FileListHashCodeSrc,
- m_coreProject.ManualPathProjectItem,
- m_coreProject.ManualPath,
- m_coreProject.Name);
-
- m_coreProject.FileListHashCodeTarget = ResyncFolder(m_coreProject.FileListHashCodeTarget,
- m_coreProject.GeneratedPathProjectItem,
- m_coreProject.GeneratedPath,
- m_coreProject.Name);
+ // Sync common/src
+ ResyncFolder(m_commonProject.ManualPathProjectItem, m_commonProject.ManualPath, m_commonProject.Name);
+ // Sync common/target
+ ResyncFolder(m_commonProject.GeneratedPathProjectItem, m_commonProject.GeneratedPath, m_commonProject.Name);
+ // Sync core/src
+ ResyncFolder(m_coreProject.ManualPathProjectItem, m_coreProject.ManualPath, m_coreProject.Name);
+ // Sync core/target
+ ResyncFolder(m_coreProject.GeneratedPathProjectItem, m_coreProject.GeneratedPath, m_coreProject.Name);
m_applicationObject.StatusBar.Progress(false, "AndroMDA: Resync complete", 1, 1);
}
- private int ResyncFolder(int fileListHashCode, ProjectItem item, string folderPath, string projectName)
+ private void ResyncFolder(ProjectItem item, string folderPath, string projectName)
{
if (item == null)
{
- return -1;
+ return;
}
/*
@@ -507,13 +496,14 @@
CollapseProject(uiCommonProject);
UpdateResyncProgressBar("Getting file list for " + projectName + "/" + item.Name);
- ArrayList newFiles = GetFileListFromFilesystem(folderPath);
- //ArrayList existingFiles = GetFileListFromProjectTree(item);
- int filesHash = GetArrayListHashCode(newFiles);
- if (filesHash == fileListHashCode)
+ ArrayList filesystemFileList = GetFileListFromFilesystem(folderPath);
+ ArrayList solutionTreeFileList = GetFileListFromProjectTree(item);
+ int filesHash = GetArrayListHashCode(filesystemFileList);
+ int solutionHash = GetArrayListHashCode(solutionTreeFileList);
+ if (filesHash == solutionHash)
{
UpdateResyncProgressBar("Files have not changed since last resync: " + projectName + "/" + item.Name);
- return GetArrayListHashCode(newFiles);
+ return;
}
UpdateResyncProgressBar("Removing all files from " + projectName + "/" + item.Name);
@@ -527,11 +517,10 @@
UpdateResyncProgressBar(projectName + "/" + item.Name);
- // Get all the files in the directory
+ // Add the files from the filesystem into the solution
+ // The filesystemFileList has already been filtered for ignored items
int fileNum = 0;
- foreach (string file in newFiles)
- {
- if (!m_addInSettings.IsInIgnoreList(file))
+ foreach (string file in filesystemFileList)
{
ProjectItem newItem = item.ProjectItems.AddFromFile(file);
Property prop = newItem.Properties.Item("BuildAction");
@@ -543,8 +532,7 @@
{
prop.Value = VSLangProj.prjBuildAction.prjBuildActionCompile;
}
- }
- UpdateResyncProgressBar(file, fileNum++, newFiles.Count);
+ UpdateResyncProgressBar(file, fileNum++, filesystemFileList.Count);
}
// Collapse the projects one more time
@@ -553,7 +541,6 @@
UpdateResyncProgressBar(projectName + "/" + item.Name);
- return GetArrayListHashCode(newFiles);
}
private int GetArrayListHashCode(ArrayList list)
@@ -574,7 +561,19 @@
ArrayList filesList = new ArrayList(files.Length);
foreach (string file in files)
{
- if (!m_addInSettings.IsInIgnoreList(file))
+ bool excludeFile = m_addInSettings.IsInIgnoreList(file);
+ // If we should ignore hidden files
+ if (m_addInSettings.ResyncIgnoreHiddenFiles)
+ {
+ // Get the file attributes
+ System.IO.FileAttributes attr = System.IO.File.GetAttributes(file);
+ // If it's hidden, exclude it
+ if ((attr & System.IO.FileAttributes.Hidden) > 0)
+ {
+ excludeFile = true;
+ }
+ }
+ if (!excludeFile)
{
filesList.Add(file);
}
@@ -582,10 +581,22 @@
string[] directories = System.IO.Directory.GetDirectories(directory);
foreach (string dir in directories)
{
- if (!m_addInSettings.IsInIgnoreList(dir))
+ bool excludeDirectory = m_addInSettings.IsInIgnoreList(dir);
+ // If we should ignore hidden files
+ if (m_addInSettings.ResyncIgnoreHiddenFiles)
+ {
+ // Get the file attributes
+ System.IO.FileAttributes attr = System.IO.File.GetAttributes(dir);
+ // If it's hidden, exclude it
+ if ((attr & System.IO.FileAttributes.Hidden) > 0)
+ {
+ excludeDirectory = true;
+ }
+ }
+ if (!excludeDirectory)
{
ArrayList newFiles = GetFileListFromFilesystem(dir);
- foreach(string n in newFiles) { filesList.Add(n); }
+ filesList.AddRange(newFiles);
}
}
return filesList;
@@ -596,6 +607,24 @@
}
}
+ private ArrayList GetFileListFromProjectTree(ProjectItem item)
+ {
+ ArrayList filesList = new ArrayList();
+ for (short i = 1; i <= item.FileCount; i++)
+ {
+ string filename = item.get_FileNames(i);
+ if (!m_addInSettings.IsInIgnoreList(filename))
+ {
+ filesList.Add(filename);
+ }
+ }
+ foreach (ProjectItem childItem in item.ProjectItems)
+ {
+ filesList.AddRange(GetFileListFromProjectTree(childItem));
+ }
+ return filesList;
+ }
+
private void RemoveAllChildren(ProjectItem item)
{
1.7 +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.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- VS80AddIn.cs 16 May 2006 15:46:44 -0000 1.6
+++ VS80AddIn.cs 27 May 2006 15:05:58 -0000 1.7
@@ -20,7 +20,7 @@
public class VS80AddIn
{
- public const string ADD_IN_VERSION = "1.1";
+ public const string ADD_IN_VERSION = "1.2";
#region Constants
1.6 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/OpenModelCommand.cs
Index: OpenModelCommand.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/OpenModelCommand.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- OpenModelCommand.cs 16 May 2006 15:46:44 -0000 1.5
+++ OpenModelCommand.cs 27 May 2006 15:05:59 -0000 1.6
@@ -25,7 +25,7 @@
public override void Exec(vsCommandExecOption executeOption, ref object varIn, ref object varOut)
{
- string magicDrawPath = m_addInSettings.MagicDrawPath;
+ string magicDrawPath = m_addInSettings.UMLModellerPath;
if (magicDrawPath != string.Empty && System.IO.File.Exists(magicDrawPath) && System.IO.File.Exists(m_solutionManager.ModelFilePath) )
{
try
1.3 +2 -2 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/ExternalToolsOptionsPage.cs
Index: ExternalToolsOptionsPage.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/ExternalToolsOptionsPage.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- ExternalToolsOptionsPage.cs 3 May 2006 20:23:06 -0000 1.2
+++ ExternalToolsOptionsPage.cs 27 May 2006 15:05:59 -0000 1.3
@@ -42,7 +42,7 @@
cbUseClean.Checked = m_settings.MavenCleanFirst;
cbUseCustomCommandLine.Checked = m_settings.MavenUseCustomCommandLine;
txtCustomCommandLine.Text = m_settings.MavenCustomCommandLine;
- txtMagicDrawPath.Text = m_settings.MagicDrawPath;
+ txtMagicDrawPath.Text = m_settings.UMLModellerPath;
cbMakeModelWritable.Checked = m_settings.AutoMakeModelFileWritable;
UpdateState();
}
@@ -53,7 +53,7 @@
m_settings.MavenCleanFirst = cbUseClean.Checked;
m_settings.MavenUseCustomCommandLine = cbUseCustomCommandLine.Checked;
m_settings.MavenCustomCommandLine = txtCustomCommandLine.Text;
- m_settings.MagicDrawPath = txtMagicDrawPath.Text;
+ m_settings.UMLModellerPath = txtMagicDrawPath.Text;
m_settings.AutoMakeModelFileWritable = cbMakeModelWritable.Checked;
}
1.4 +70 -10 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/GeneralOptionsPage.Designer.cs
Index: GeneralOptionsPage.Designer.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/GeneralOptionsPage.Designer.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- GeneralOptionsPage.Designer.cs 3 May 2006 20:23:06 -0000 1.3
+++ GeneralOptionsPage.Designer.cs 27 May 2006 15:05:59 -0000 1.4
@@ -28,6 +28,7 @@
/// </summary>
private void InitializeComponent()
{
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(GeneralOptionsPage));
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.cbHideSchemaExportButton = new System.Windows.Forms.CheckBox();
this.cbShowSchemaExportButton = new System.Windows.Forms.CheckBox();
@@ -36,6 +37,10 @@
this.label2 = new System.Windows.Forms.Label();
this.txtResyncIgnoreList = new System.Windows.Forms.TextBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.cbIgnoreHiddenFiles = new System.Windows.Forms.CheckBox();
+ this.btnDeleteResyncIgnoreItem = new System.Windows.Forms.Button();
+ this.btnAddResyncIgnoreItem = new System.Windows.Forms.Button();
+ this.lstResyncIgnoreList = new System.Windows.Forms.ListBox();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.SuspendLayout();
@@ -46,12 +51,12 @@
this.groupBox1.Controls.Add(this.cbShowSchemaExportButton);
this.groupBox1.Controls.Add(this.cbShowOpenModelButton);
this.groupBox1.Controls.Add(this.cbShowAboutButton);
- this.groupBox1.Location = new System.Drawing.Point(0, 77);
+ this.groupBox1.Location = new System.Drawing.Point(0, 157);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(395, 117);
this.groupBox1.TabIndex = 2;
this.groupBox1.TabStop = false;
- this.groupBox1.Text = "Appearance";
+ this.groupBox1.Text = "Toolbar Appearance";
//
// cbHideSchemaExportButton
//
@@ -59,7 +64,7 @@
this.cbHideSchemaExportButton.Location = new System.Drawing.Point(33, 65);
this.cbHideSchemaExportButton.Name = "cbHideSchemaExportButton";
this.cbHideSchemaExportButton.Size = new System.Drawing.Size(253, 17);
- this.cbHideSchemaExportButton.TabIndex = 0;
+ this.cbHideSchemaExportButton.TabIndex = 2;
this.cbHideSchemaExportButton.Text = "&Hide schema export button if project unavailable";
this.cbHideSchemaExportButton.UseVisualStyleBackColor = true;
//
@@ -69,7 +74,7 @@
this.cbShowSchemaExportButton.Location = new System.Drawing.Point(11, 42);
this.cbShowSchemaExportButton.Name = "cbShowSchemaExportButton";
this.cbShowSchemaExportButton.Size = new System.Drawing.Size(208, 17);
- this.cbShowSchemaExportButton.TabIndex = 0;
+ this.cbShowSchemaExportButton.TabIndex = 1;
this.cbShowSchemaExportButton.Text = "Show s&chema export button on toolbar";
this.cbShowSchemaExportButton.UseVisualStyleBackColor = true;
this.cbShowSchemaExportButton.CheckedChanged += new System.EventHandler(this.cbShowSchemaExportButton_CheckedChanged);
@@ -80,7 +85,7 @@
this.cbShowOpenModelButton.Location = new System.Drawing.Point(11, 88);
this.cbShowOpenModelButton.Name = "cbShowOpenModelButton";
this.cbShowOpenModelButton.Size = new System.Drawing.Size(194, 17);
- this.cbShowOpenModelButton.TabIndex = 0;
+ this.cbShowOpenModelButton.TabIndex = 3;
this.cbShowOpenModelButton.Text = "Show &open model button on toolbar";
this.cbShowOpenModelButton.UseVisualStyleBackColor = true;
//
@@ -99,28 +104,79 @@
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(8, 18);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(339, 13);
+ this.label2.Size = new System.Drawing.Size(266, 13);
this.label2.TabIndex = 1;
- this.label2.Text = "Files to ignore in solution explorer (separate each file with a semi-colon)";
+ this.label2.Text = "Files to exclude from solution explorer (case insensitive)";
//
// txtResyncIgnoreList
//
- this.txtResyncIgnoreList.Location = new System.Drawing.Point(11, 34);
+ this.txtResyncIgnoreList.Location = new System.Drawing.Point(186, 37);
this.txtResyncIgnoreList.Name = "txtResyncIgnoreList";
- this.txtResyncIgnoreList.Size = new System.Drawing.Size(359, 20);
+ this.txtResyncIgnoreList.Size = new System.Drawing.Size(166, 20);
this.txtResyncIgnoreList.TabIndex = 1;
+ this.txtResyncIgnoreList.TextChanged += new System.EventHandler(this.txtResyncIgnoreList_TextChanged);
//
// groupBox2
//
+ this.groupBox2.Controls.Add(this.cbIgnoreHiddenFiles);
+ this.groupBox2.Controls.Add(this.btnDeleteResyncIgnoreItem);
+ this.groupBox2.Controls.Add(this.btnAddResyncIgnoreItem);
+ this.groupBox2.Controls.Add(this.lstResyncIgnoreList);
this.groupBox2.Controls.Add(this.label2);
this.groupBox2.Controls.Add(this.txtResyncIgnoreList);
this.groupBox2.Location = new System.Drawing.Point(0, 0);
this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(395, 66);
+ this.groupBox2.Size = new System.Drawing.Size(395, 151);
this.groupBox2.TabIndex = 2;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "General";
//
+ // cbIgnoreHiddenFiles
+ //
+ this.cbIgnoreHiddenFiles.AutoSize = true;
+ this.cbIgnoreHiddenFiles.Location = new System.Drawing.Point(11, 125);
+ this.cbIgnoreHiddenFiles.Name = "cbIgnoreHiddenFiles";
+ this.cbIgnoreHiddenFiles.Size = new System.Drawing.Size(192, 17);
+ this.cbIgnoreHiddenFiles.TabIndex = 4;
+ this.cbIgnoreHiddenFiles.Text = "E&xclude hidden files and directories";
+ this.cbIgnoreHiddenFiles.UseVisualStyleBackColor = true;
+ //
+ // btnDeleteResyncIgnoreItem
+ //
+ this.btnDeleteResyncIgnoreItem.Enabled = false;
+ this.btnDeleteResyncIgnoreItem.Image = ((System.Drawing.Image)(resources.GetObject("btnDeleteResyncIgnoreItem.Image")));
+ this.btnDeleteResyncIgnoreItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.btnDeleteResyncIgnoreItem.Location = new System.Drawing.Point(247, 63);
+ this.btnDeleteResyncIgnoreItem.Name = "btnDeleteResyncIgnoreItem";
+ this.btnDeleteResyncIgnoreItem.Size = new System.Drawing.Size(65, 23);
+ this.btnDeleteResyncIgnoreItem.TabIndex = 3;
+ this.btnDeleteResyncIgnoreItem.Text = "&Delete";
+ this.btnDeleteResyncIgnoreItem.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+ this.btnDeleteResyncIgnoreItem.UseVisualStyleBackColor = true;
+ this.btnDeleteResyncIgnoreItem.Click += new System.EventHandler(this.btnDeleteResyncIgnoreItem_Click);
+ //
+ // btnAddResyncIgnoreItem
+ //
+ this.btnAddResyncIgnoreItem.Image = ((System.Drawing.Image)(resources.GetObject("btnAddResyncIgnoreItem.Image")));
+ this.btnAddResyncIgnoreItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.btnAddResyncIgnoreItem.Location = new System.Drawing.Point(186, 63);
+ this.btnAddResyncIgnoreItem.Name = "btnAddResyncIgnoreItem";
+ this.btnAddResyncIgnoreItem.Size = new System.Drawing.Size(55, 23);
+ this.btnAddResyncIgnoreItem.TabIndex = 2;
+ this.btnAddResyncIgnoreItem.Text = "&Add";
+ this.btnAddResyncIgnoreItem.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+ this.btnAddResyncIgnoreItem.UseVisualStyleBackColor = true;
+ this.btnAddResyncIgnoreItem.Click += new System.EventHandler(this.btnAddResyncIgnoreItem_Click);
+ //
+ // lstResyncIgnoreList
+ //
+ this.lstResyncIgnoreList.FormattingEnabled = true;
+ this.lstResyncIgnoreList.Location = new System.Drawing.Point(11, 37);
+ this.lstResyncIgnoreList.Name = "lstResyncIgnoreList";
+ this.lstResyncIgnoreList.Size = new System.Drawing.Size(166, 82);
+ this.lstResyncIgnoreList.TabIndex = 0;
+ this.lstResyncIgnoreList.SelectedIndexChanged += new System.EventHandler(this.lstResyncIgnoreList_SelectedIndexChanged);
+ //
// GeneralOptionsPage
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -147,5 +203,9 @@
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.CheckBox cbShowSchemaExportButton;
private System.Windows.Forms.CheckBox cbHideSchemaExportButton;
+ private System.Windows.Forms.CheckBox cbIgnoreHiddenFiles;
+ private System.Windows.Forms.Button btnDeleteResyncIgnoreItem;
+ private System.Windows.Forms.Button btnAddResyncIgnoreItem;
+ private System.Windows.Forms.ListBox lstResyncIgnoreList;
}
}
1.4 +42 -2 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/GeneralOptionsPage.cs
Index: GeneralOptionsPage.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/GeneralOptionsPage.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- GeneralOptionsPage.cs 3 May 2006 20:23:06 -0000 1.3
+++ GeneralOptionsPage.cs 27 May 2006 15:05:59 -0000 1.4
@@ -42,7 +42,19 @@
cbShowOpenModelButton.Checked = m_settings.ShowOpenModelButton;
cbShowSchemaExportButton.Checked = m_settings.ShowSchemaExportButton;
cbHideSchemaExportButton.Checked = m_settings.HideSchemaExportButtonIfProjectUnavailable;
- txtResyncIgnoreList.Text = m_settings.ResyncIgnoreList;
+ lstResyncIgnoreList.Items.Clear();
+ if (m_settings.ResyncIgnoreList.Length > 0)
+ {
+ string[] list = m_settings.ResyncIgnoreList.Split(new char[] { ';' });
+ foreach (string item in list)
+ {
+ if (item.Length > 0) lstResyncIgnoreList.Items.Add(item);
+ }
+ }
+ txtResyncIgnoreList.Text = string.Empty;
+ btnAddResyncIgnoreItem.Enabled = false;
+ btnDeleteResyncIgnoreItem.Enabled = false;
+ cbIgnoreHiddenFiles.Checked = m_settings.ResyncIgnoreHiddenFiles;
UpdateState();
}
@@ -52,7 +64,13 @@
m_settings.ShowOpenModelButton = cbShowOpenModelButton.Checked;
m_settings.ShowSchemaExportButton = cbShowSchemaExportButton.Checked;
m_settings.HideSchemaExportButtonIfProjectUnavailable = cbHideSchemaExportButton.Checked;
- m_settings.ResyncIgnoreList = txtResyncIgnoreList.Text;
+ string ignoreList = string.Empty;
+ foreach (string item in lstResyncIgnoreList.Items)
+ {
+ ignoreList = ignoreList + item + ";";
+ }
+ m_settings.ResyncIgnoreList = ignoreList;
+ m_settings.ResyncIgnoreHiddenFiles = cbIgnoreHiddenFiles.Checked;
}
public void OnEnter()
@@ -84,5 +102,27 @@
UpdateState();
}
+ private void lstResyncIgnoreList_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ btnDeleteResyncIgnoreItem.Enabled = lstResyncIgnoreList.SelectedIndex != -1;
+ }
+
+ private void btnAddResyncIgnoreItem_Click(object sender, EventArgs e)
+ {
+ lstResyncIgnoreList.Items.Add(txtResyncIgnoreList.Text);
+ txtResyncIgnoreList.Text = string.Empty;
+ }
+
+ private void txtResyncIgnoreList_TextChanged(object sender, EventArgs e)
+ {
+ btnAddResyncIgnoreItem.Enabled = txtResyncIgnoreList.Text.Length > 0;
+ }
+
+ private void btnDeleteResyncIgnoreItem_Click(object sender, EventArgs e)
+ {
+ lstResyncIgnoreList.Items.Remove(lstResyncIgnoreList.SelectedItem);
+ lstResyncIgnoreList.SelectedIndex = -1;
+ }
+
}
}
1.2 +32 -0 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/GeneralOptionsPage.resx
Index: GeneralOptionsPage.resx
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/GeneralOptionsPage.resx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- GeneralOptionsPage.resx 18 Apr 2006 17:18:51 -0000 1.1
+++ GeneralOptionsPage.resx 27 May 2006 15:05:59 -0000 1.2
@@ -117,4 +117,36 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="btnDeleteResyncIgnoreItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALEwAA
+ CxMBAJqcGAAAAjVJREFUOE9j/P//P4O3l5fBP0aGHob/DG1MjAwHtm7d9o+BWODo6MLs7OKaDqT/Ozk7
+ f/P28g709vFmBhmMjq1sHViCAgOU3N3d8mByDECNLECcZGfvtM3c0va/vYPLHw8Pzypfb1RDVDQNOazt
+ nZyArv3u4OA0B24AiAE0QBKILRwcXbZZ2dj/t7N3+O/v673R19eHGyRvamHL6e7pucLW3um3qal5t5ae
+ CQ+KATAO0BA2IC6wd3D+bWfn9N/H13eZpZW9npWV3WRbG5v/eoYmk9W0DPiRvYbhT2tbW0Z7eydNoJfO
+ m5lb/zcyNvtuaGz0Xk1Ld52yui4nerhgGABToG9g4qCnb/LT0sr2v56+0T0FZU0hbAGL1QBjExMFNXWd
+ S7p6hv+ABv03MbX4r6Wte4soAwyNTOXVNLSvAg34o6GpvUZETNJETl5lm4Gh8X9Vde1MvF7Q0NaVkFVQ
+ PiWnqPofaPshSQkpIR4+Pm5+IRFueSW16QYGxl9UtQxksQaihoEFh5yi2iIJacWPOrqGT7R19bVgCnkE
+ BDg4Obn5dPUNz0rKKEySUVSDJzR4GEjJKniLSSj8V1XT/q+iptHKyc0LTgMwzMLCzAQUV1FRUb3PKyAo
+ r65rwgSSAysQEBBiExERaxUSFv8vr6C8i4OLR42HTwCsABkLCAgym5lZTubm5TJV1zNHGABSJCOvasTK
+ xj6RgZHJjpmFhRdbiINtZGBgYWJi4sKaEnFpwieOMyERaxgAd/H0VrlTD2AAAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="btnAddResyncIgnoreItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALEwAA
+ CxMBAJqcGAAAAfBJREFUOE+Nkl1IU2Ecxo/3fZhBVyEF3dRNFkgZWkGlfUCf2AcVyExaZhAFeZF1YQjG
+ lKKCTOrCEbVSUQhWWbNlMkoG2uykKX7UbGduQyym29k589fOZBEIe/vDc/N/eX7Py/O+GYBkzPdOE6oe
+ lSKzE1JsZkLKPTmakTwQjQEwNOQwEVd70cPNuGzrE6v5vUjSaMcxRrrM9Dp3EY860ULV2JvWcrt6BfVX
+ soQgSbafIK550NUetNlW9N/XCI8fJyAXUnVupRjQ15aHPv0YNWhBna5BC5r4NbiDr505FBdligGuxuXY
+ G7JpvZNNRClj6ksBZw8vZeuGxRzIXyIGpEpqrF1NaGA3/a9WsW7NIqEx5fvbcu3FTC6cyuL03mUc3Tlf
+ Xn1LEMvzQFI3bQEqH/o5f0+hpM7H9koveZd+RNI+kwGwfoBH7+ZoeKNjaY9xo1ml6kkU8/0ZNld4xIA6
+ I/1ZgOvWSUpv+Siu+UnR1UT6ZS85Z9zpAU/tbvQ5fYEiMY0xf4T8g+Xpf1oK4OwZxpABe909mNA35BGF
+ bUcq/g/w7y2M9Kmwhlv2igFN7a5kqpHu+DiEYW57209Lh4fuvjEx4IHNkQRMBkOM+wJ4hv18khXef1Z4
+ 0TVAwSFBB3etL9lYWMKmfWXk7ildoC37zfwBYOvcL3dylzIAAAAASUVORK5CYII=
+</value>
+ </data>
</root>
\ No newline at end of file
No revision
No revision
No revision
No revision
|
|
From: Chris M. <cm...@us...> - 2006-05-16 15:53:47
|
User: cmicali
Date: 06/05/16 08:53:46
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn AndroMDA VS2005
Add-In Readme.rtf
etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer AndroMDA
VS2005 Add-In Setup.exe AndroMDA VS2005 Add-In
Setup.nsi
Log:
- Fix of version number to readme and setup
Revision Changes Path
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
|
|
From: Chris M. <cm...@us...> - 2006-05-16 15:46:49
|
User: cmicali
Date: 06/05/16 08:46:44
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn AndroMDA VS2005
Add-In Readme.rtf
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands
AboutCommand.cs AddInCommandBase.cs
AndroMDALogoCommand.cs GenerateCodeCommand.cs
OpenModelCommand.cs ReloadMDAConfigCommand.cs
ResyncCommand.cs RunSchemaExportCommand.cs
RunSolutionWizardCommand.cs StopCommand.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
MDASolutionManager.cs VS80AddIn.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer AndroMDA
VS2005 Add-In Setup.exe
Log:
- Updated version number
- Updated readme
- Updated AddInCommandType enumeration to be more clear
Revision Changes Path
No revision
No revision
No revision
No revision
1.4 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/AboutCommand.cs
Index: AboutCommand.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/AboutCommand.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- AboutCommand.cs 2 May 2006 21:33:43 -0000 1.3
+++ AboutCommand.cs 16 May 2006 15:46:44 -0000 1.4
@@ -18,7 +18,7 @@
{
public AboutCommand()
{
- Init("About", "About", "About AndroMDA Add-In", 487, AddInCommandBase.AddInCommandType.AlwaysEnabled);
+ Init("About", "About", "About AndroMDA Add-In", 487, AddInCommandType.AlwaysEnabled);
m_isStartOfGroup = true;
}
1.5 +9 -9 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/AddInCommandBase.cs
Index: AddInCommandBase.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/AddInCommandBase.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- AddInCommandBase.cs 2 May 2006 21:33:43 -0000 1.4
+++ AddInCommandBase.cs 16 May 2006 15:46:44 -0000 1.5
@@ -20,7 +20,7 @@
#region Enumerations
- public enum AddInCommandType { AlwaysEnabled, AlwaysDisabled, NoMDAAlwaysEnabled, MDADisabled, MDAAlwaysEnabled, MDAEnabledWhileMavenNotRunning, MDAEnabledWhileMavenRunning }
+ public enum AddInCommandType { AlwaysEnabled, AlwaysDisabled, EnabledWhenMdaInactive, EnabledWhenMdaActiveButDisabled, EnabledWhenMdaActive, EnabledWhenMdaActiveAndMavenNotRunning, EnabledWhenMdaActiveAndMavenRunning }
#endregion
@@ -174,7 +174,7 @@
case AddInCommandType.AlwaysEnabled:
status = (vsCommandStatus)vsCommandStatus.vsCommandStatusSupported | vsCommandStatus.vsCommandStatusEnabled;
break;
- case AddInCommandType.MDADisabled:
+ case AddInCommandType.EnabledWhenMdaActiveButDisabled:
if (!m_solutionManager.IsEnabled && m_solutionManager.IsSolutionUsingMDA && m_application.Solution.IsOpen)
{
status = vsCommandStatus.vsCommandStatusSupported | vsCommandStatus.vsCommandStatusEnabled;
@@ -184,7 +184,7 @@
status = vsCommandStatus.vsCommandStatusSupported | vsCommandStatus.vsCommandStatusInvisible;
}
break;
- case AddInCommandType.NoMDAAlwaysEnabled:
+ case AddInCommandType.EnabledWhenMdaInactive:
if (!m_solutionManager.IsEnabled && !m_solutionManager.IsSolutionUsingMDA && m_application.Solution.IsOpen)
{
status = vsCommandStatus.vsCommandStatusSupported | vsCommandStatus.vsCommandStatusEnabled;
@@ -195,7 +195,7 @@
}
break;
- case AddInCommandType.MDAAlwaysEnabled:
+ case AddInCommandType.EnabledWhenMdaActive:
if (m_solutionManager.IsEnabled && m_application.Solution.IsOpen)
{
status = vsCommandStatus.vsCommandStatusSupported | vsCommandStatus.vsCommandStatusEnabled;
@@ -206,7 +206,7 @@
}
break;
- case AddInCommandType.MDAEnabledWhileMavenNotRunning:
+ case AddInCommandType.EnabledWhenMdaActiveAndMavenNotRunning:
if (m_solutionManager.IsEnabled && m_application.Solution.IsOpen && !m_solutionManager.IsMavenRunning)
{
status = vsCommandStatus.vsCommandStatusSupported | vsCommandStatus.vsCommandStatusEnabled;
@@ -221,7 +221,7 @@
}
break;
- case AddInCommandType.MDAEnabledWhileMavenRunning:
+ case AddInCommandType.EnabledWhenMdaActiveAndMavenRunning:
if (m_solutionManager.IsEnabled && m_application.Solution.IsOpen && m_solutionManager.IsMavenRunning)
{
status = vsCommandStatus.vsCommandStatusSupported | vsCommandStatus.vsCommandStatusEnabled;
1.2 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/AndroMDALogoCommand.cs
Index: AndroMDALogoCommand.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/AndroMDALogoCommand.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- AndroMDALogoCommand.cs 2 May 2006 21:33:43 -0000 1.1
+++ AndroMDALogoCommand.cs 16 May 2006 15:46:44 -0000 1.2
@@ -34,7 +34,7 @@
public AndroMDALogoCommand()
{
- Init("AndroMDALogo", "AndroMDA", "AndroMDA", -1, AddInCommandBase.AddInCommandType.AlwaysDisabled);
+ Init("AndroMDALogo", "AndroMDA", "AndroMDA", -1, AddInCommandType.AlwaysDisabled);
m_isStartOfGroup = true;
}
1.2 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/GenerateCodeCommand.cs
Index: GenerateCodeCommand.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/GenerateCodeCommand.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- GenerateCodeCommand.cs 2 May 2006 21:33:43 -0000 1.1
+++ GenerateCodeCommand.cs 16 May 2006 15:46:44 -0000 1.2
@@ -17,7 +17,7 @@
{
public RunMavenCommand()
{
- Init("GenerateCode", "Generate", "Generate Code From Model", 2138, AddInCommandBase.AddInCommandType.MDAEnabledWhileMavenNotRunning);
+ Init("GenerateCode", "Generate", "Generate Code From Model", 2138, AddInCommandType.EnabledWhenMdaActiveAndMavenNotRunning);
}
public override void Exec(vsCommandExecOption executeOption, ref object varIn, ref object varOut)
1.5 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/OpenModelCommand.cs
Index: OpenModelCommand.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/OpenModelCommand.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- OpenModelCommand.cs 2 May 2006 21:33:43 -0000 1.4
+++ OpenModelCommand.cs 16 May 2006 15:46:44 -0000 1.5
@@ -19,7 +19,7 @@
{
public OpenModelCommand()
{
- Init("OpenModel", "Open Model", "Open Model", 589, AddInCommandBase.AddInCommandType.MDAAlwaysEnabled);
+ Init("OpenModel", "Open Model", "Open Model", 589, AddInCommandType.EnabledWhenMdaActive);
m_isStartOfGroup = true;
}
1.2 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/ReloadMDAConfigCommand.cs
Index: ReloadMDAConfigCommand.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/ReloadMDAConfigCommand.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- ReloadMDAConfigCommand.cs 28 Apr 2006 04:41:17 -0000 1.1
+++ ReloadMDAConfigCommand.cs 16 May 2006 15:46:44 -0000 1.2
@@ -17,7 +17,7 @@
{
public ReloadMDAConfigCommand()
{
- Init("ReloadMDAConfig", "Reload MDA Config", "Reload MDA Config", 1020, AddInCommandBase.AddInCommandType.MDADisabled);
+ Init("ReloadMDAConfig", "Reload MDA Config", "Reload MDA Config", 1020, AddInCommandType.EnabledWhenMdaActiveButDisabled);
}
public override void Exec(vsCommandExecOption executeOption, ref object varIn, ref object varOut)
1.3 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/ResyncCommand.cs
Index: ResyncCommand.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/ResyncCommand.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- ResyncCommand.cs 2 May 2006 21:33:43 -0000 1.2
+++ ResyncCommand.cs 16 May 2006 15:46:44 -0000 1.3
@@ -17,7 +17,7 @@
{
public ResyncCommand()
{
- Init("ResyncFiles", "Resync", "Resync Generated Files", 37, AddInCommandBase.AddInCommandType.MDAEnabledWhileMavenNotRunning);
+ Init("ResyncFiles", "Resync", "Resync Generated Files", 37, AddInCommandType.EnabledWhenMdaActiveAndMavenNotRunning);
}
public override void Exec(vsCommandExecOption executeOption, ref object varIn, ref object varOut)
1.4 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/RunSchemaExportCommand.cs
Index: RunSchemaExportCommand.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/RunSchemaExportCommand.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- RunSchemaExportCommand.cs 3 May 2006 20:23:05 -0000 1.3
+++ RunSchemaExportCommand.cs 16 May 2006 15:46:44 -0000 1.4
@@ -20,7 +20,7 @@
{
public RunSchemaExportCommand()
{
- Init("ExportSchema", "Export Schema", "Export Database Schema", 4005, AddInCommandBase.AddInCommandType.MDAEnabledWhileMavenNotRunning);
+ Init("ExportSchema", "Export Schema", "Export Database Schema", 4005, AddInCommandType.EnabledWhenMdaActiveAndMavenNotRunning);
m_isStartOfGroup = true;
}
1.2 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/RunSolutionWizardCommand.cs
Index: RunSolutionWizardCommand.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/RunSolutionWizardCommand.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- RunSolutionWizardCommand.cs 18 Apr 2006 16:14:44 -0000 1.1
+++ RunSolutionWizardCommand.cs 16 May 2006 15:46:44 -0000 1.2
@@ -17,7 +17,7 @@
{
public RunSolutionWizardCommand()
{
- Init("RunSolutionWizard", "Run MDA Solution Wizard", "Run MDA Solution Wizard", 2138, AddInCommandBase.AddInCommandType.NoMDAAlwaysEnabled);
+ Init("RunSolutionWizard", "Run MDA Solution Wizard", "Run MDA Solution Wizard", 2138, AddInCommandType.EnabledWhenMdaInactive);
}
public override void Exec(vsCommandExecOption executeOption, ref object varIn, ref object varOut)
1.3 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/StopCommand.cs
Index: StopCommand.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/StopCommand.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- StopCommand.cs 2 May 2006 21:33:43 -0000 1.2
+++ StopCommand.cs 16 May 2006 15:46:44 -0000 1.3
@@ -18,7 +18,7 @@
public StopCommand()
{
- Init("StopGeneration", "Stop", "Stop Code Generation", 1670, AddInCommandBase.AddInCommandType.MDAEnabledWhileMavenRunning);
+ Init("StopGeneration", "Stop", "Stop Code Generation", 1670, AddInCommandType.EnabledWhenMdaActiveAndMavenRunning);
}
public override void Exec(vsCommandExecOption executeOption, ref object varIn, ref object varOut)
1.8 +30 -24 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.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- MDASolutionManager.cs 4 May 2006 21:13:24 -0000 1.7
+++ MDASolutionManager.cs 16 May 2006 15:46:44 -0000 1.8
@@ -269,7 +269,15 @@
//BuildEvents
public void OnBuildBegin(EnvDTE.vsBuildScope scope, EnvDTE.vsBuildAction action)
{
- if (IsEnabled && action != vsBuildAction.vsBuildActionClean)
+ if (IsEnabled)
+ {
+ if (this.IsMavenRunning)
+ {
+ m_applicationObject.ExecuteCommand("Build.Cancel", string.Empty);
+ m_applicationObject.StatusBar.Highlight(true);
+ m_applicationObject.StatusBar.Text = "Build canceled. Please stop AndroMDA before building.";
+ }
+ else if (action != vsBuildAction.vsBuildActionClean)
{
if (!AreGeneratedFilesUpToDate)
{
@@ -287,12 +295,10 @@
}
}
}
+ }
public void OnBuildDone(EnvDTE.vsBuildScope Scope, EnvDTE.vsBuildAction Action)
{
- if (IsEnabled)
- {
- }
}
public void OnBuildProjConfigBegin(string project, string projectConfig, string platform, string solutionConfig)
@@ -501,8 +507,8 @@
CollapseProject(uiCommonProject);
UpdateResyncProgressBar("Getting file list for " + projectName + "/" + item.Name);
- ArrayList newFiles = GetFiles(folderPath);
-
+ ArrayList newFiles = GetFileListFromFilesystem(folderPath);
+ //ArrayList existingFiles = GetFileListFromProjectTree(item);
int filesHash = GetArrayListHashCode(newFiles);
if (filesHash == fileListHashCode)
{
@@ -560,7 +566,7 @@
return hashCode;
}
- private ArrayList GetFiles(string directory)
+ private ArrayList GetFileListFromFilesystem(string directory)
{
if (System.IO.Directory.Exists(directory))
{
@@ -578,7 +584,7 @@
{
if (!m_addInSettings.IsInIgnoreList(dir))
{
- ArrayList newFiles = GetFiles(dir);
+ ArrayList newFiles = GetFileListFromFilesystem(dir);
foreach(string n in newFiles) { filesList.Add(n); }
}
}
1.6 +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.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- VS80AddIn.cs 2 May 2006 21:33:42 -0000 1.5
+++ VS80AddIn.cs 16 May 2006 15:46:44 -0000 1.6
@@ -20,7 +20,7 @@
public class VS80AddIn
{
- public const string ADD_IN_VERSION = "1.0.2";
+ public const string ADD_IN_VERSION = "1.1";
#region Constants
No revision
No revision
No revision
No revision
|
|
From: Vance K. <va...@us...> - 2006-05-16 14:46:52
|
User: vancek
Date: 06/05/16 07:45:53
Modified: andromda-ejb3/src/site site.xml
Log:
removed bannerLeft
Revision Changes Path
1.13 +0 -5 cartridges/andromda-ejb3/src/site/site.xml
Index: site.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/site.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- site.xml 13 May 2006 02:37:28 -0000 1.12
+++ site.xml 16 May 2006 14:45:53 -0000 1.13
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project name="EJB3 Cartridge Plugin">
<title>EJB3 Cartridge</title>
- <bannerLeft>
- <name>AndroMDA</name>
- <href>http://team.andromda.org/</href>
- <src>images/banner.jpg</src>
- </bannerLeft>
<publishDate format="dd MMM yyyy hh:mm"/>
<body>
<links>
|
|
From: Vance K. <va...@us...> - 2006-05-16 13:48:48
|
User: vancek
Date: 06/05/16 06:07:49
Added: andromda-ejb3/src/site/resources/css printer.css
maven-andromda.css
Removed: andromda-ejb3/src/site/resources/css site.css print.css
maven-theme.css
Log:
update css inline with current site
Revision Changes Path
1.1 cartridges/andromda-ejb3/src/site/resources/css/printer.css
Index: printer.css
===================================================================
#banner, #leftColumn, #breadcrumbs, #pdf, #serverLink { display: none; }
#bodyColumn
{
background-color: #fff;
padding: 20px 25px 25px 10px;
margin: 0;
}
1.1 cartridges/andromda-ejb3/src/site/resources/css/maven-andromda.css
Index: maven-andromda.css
===================================================================
body
{
margin: 0;
}
#bodyColumn a:link { color: #043DBC; border-bottom: 1px dotted #3D7DC7; text-decoration: none; }
#bodyColumn a:visited { color: #2277D9; border-bottom: 1px dotted #3D7DC7; text-decoration: none; }
#bodyColumn a:hover { color: #51A2FF; border-bottom: 1px solid #2C8AF7; text-decoration: none; }
#search { text-align: center; }
#search input { font-size: 90%; margin: 0 3px 0 0; }
#banner
{
background-image: url(images/banner.jpg);
background-position: top left;
background-repeat: no-repeat;
background-color: #fff;
height: 110px;
border-bottom: 1px solid #93A6B4;
}
#banner a#serverLink
{
font-size: 86%;
position: absolute;
top: 10px;
right: 20px;
}
#banner #printerFriendly
{
position: absolute;
top: 34px;
right: 28px;
width: 30px;
height: 30px;
background: url(images/printer.gif) no-repeat;
}
#organizationLogo, #projectLogo
{
display: none;
}
#leftColumn
{
position: absolute;
top: 140px;
left: 0;
width: 180px;
padding: 20px 5px 0 25px;
background-color: #fff;
margin: 0;
}
#navcolumn ul { margin-top: 0; }
#navcolumn li { list-style-image: url(images/square.gif); }
#navcolumn li.expanded { list-style-image: url(images/triangledown.gif); }
#navcolumn li.collapsed { list-style-image: url(images/triangleright.gif); }
#leftColumn h5
{
margin: 0;
padding: 0;
font-size: 96%;
font-weight: bold;
color: #333;
}
#leftColumn a, #leftColumn a:link, #leftColumn a:active, #leftColumn a:visited
{
color: #043dbc;
text-decoration: none;
}
#leftColumn a:hover
{
color: #51a2ff;
border-bottom: 1px dotted;
}
#bodyColumn
{
position: absolute;
top: 140px;
left: 215px;
right: 0;
background-color: #fff;
padding: 20px 25px 25px 10px;
margin: 0;
}
.clear
{
display: none;
}
#breadcrumbs
{
position: absolute;
top: 110px;
padding: 5px 20px 5px 20px;
vertical-align: middle;
background-color: #E6E5E1;
border-top: 1px solid #93A6B4;
border-bottom: 1px solid #93A6B4;
}
#breadcrumbs .xleft
{
float: left;
}
#breadcrumbs .xright
{
float: right;
}
#breadcrumbs a
{
margin: 0;
padding: 0px 15px 0px 15px;
text-decoration: none;
}
#footer
{
display: none;
border-top: 1px solid #93A6B4;
text-align: center;
}
#footer xright {}
.highlight
{
border: 2px dotted;
background-color: #eee;
padding: 6px;
margin: 0 10px 0 10px;
font-weight: bold;
}
.section
{
margin-bottom: 25px;
}
#poweredBy
{
display: none;
margin: 40px 0 0 40px;
}
a:hover #poweredBy
{
display: none;
text-decoration: none;
border: 0;
}
tr.a
{
background-color: #eee;
}
a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover
{
/* background-image: url(images/external.gif);
background-position: right center;
background-repeat: no-repeat;
padding-right: 18px;
*/}
a.newWindow, a.newWindow:link, a.newWindow:visited, a.newWindow:active, a.newWindow:hover
{
background: url(images/newwindow.gif);
background-position: right center;
background-repeat: no-repeat;
padding-right: 18px;
}
pre.console
{
margin: 10px;
border: 1px solid;
border-right: 0px;
}
img { vertical-align: bottom; }
li.gen { list-style: url(images/gen-file.gif) inside; }
li.impl { list-style: url(images/impl-file.gif) inside; }
li.changed { list-style: url(images/changed-file.gif) inside; }
li a { vertical-align: top; }
li a.changed { padding-right: 20px; background: url(images/changed-file.gif) no-repeat right; }
.textList li { margin-bottom: 10px; }
div.redirect { margin-left: 25px; }
div.redirect h3
{
background: url(images/redirect.gif);
background-position: left center;
background-repeat: no-repeat;
padding-left: 34px;
}
div.screenshot { margin: 0 20px 0 20px; }
div.screenshot tr.a td, div.screenshot tr.b td
{
border-width:0;
background-color: white;
}
.indented { padding: 25px; }
.new
{
margin: 10px 40px;
padding: 20px;
border: 1px dotted #666;
};
/* syntax highlighting */
div.source { font-size: 92%; }
div.jk, div.vk { color: #008; display: inline; font-size: 92%; font-weight: bold; } /* java,velocity reserved keyword */
div.jl, div.vl { color: #080; display: inline; font-size: 92%; font-weight: bold; } /* java,velocity literal */
div.jc, div.vc { color: #888; display: inline; font-size: 92%; font-style: italic; } /* java,velocity comment */
div.jn, div.vn { color: #00F; display: inline; font-size: 92%; } /* java,velocity number */
div.xe { color: #008; display: inline; font-size: 92%; font-weight: bold; } /* xml element */
div.xl { color: #080; display: inline; font-size: 92%; font-weight: bold; } /* xml attribute literal (value) */
div.xa { color: #00F; display: inline; font-size: 92%; font-weight: bold; } /* xml attribute name */
div.xc { color: #888; display: inline; font-size: 92%; font-style: italic; } /* xml CDATA and comment sections */
div#pdf
{
position: absolute; top: 20px; right: 0;
font-size: 68%; text-align: right;
background-color: white;
width: 60px; height: 40px;
padding-right: 80px;
!important;
}
div#pdf img { width: 13px; height: 16px; display: block; margin-left: 45px; }
/* styles related to the namespace.xml xdoc */
a.namespacePropertyGroupTitle, a.namespacePropertyTitle, a.profileElementGroupTitle, a.profileElementTitle
{
font-size: 120%;
font-weight: bold;
margin-right: 12px;
}
.namespacePropertyGroup, .profileElementGroup
{
border: 0;
vertical-align: top;
}
.namespacePropertyGroupDocumentation, .profileElementGroupDocumentation
{
color: #666;
font-size: 86%;
line-height: 12px;
font-style: italic;
margin: 12px 6px;
}
.namespaceProperty table, .profileElement table { margin: 0 0 20px 20px; }
.namespaceProperty table td, .profileElement table td { border: 0; padding: 10px 10px 0 10px; background-color: white; }
.namespaceProperty table td.namespacePropertyTitle, .profileElement table td.profileElementTitle { padding: 10px 0;}
.namespaceProperty .required, .profileElement .required { color: red; font-weight: bold; }
.namespaceProperty .optional, .profileElement .optional { color: green; font-weight: bold; }
.namespaceProperty code.defaultValue, .profileElement code.defaultValue { color: blue; }
.namespaceProperty .documentation, .profileElement .documentation { color: #666; font-style: italic; }
.namespaceProperty .documentation code, .profileElement documentation code { color: #222; font-style: normal; }
|
|
From: Vance K. <va...@us...> - 2006-05-16 08:13:29
|
User: vancek Date: 06/05/16 01:13:25 Modified: andromda-ejb3/src/main/uml EJB3MetafacadeModel.xml.zip Log: updated profiles to 3.2-SNAPSHOT Revision Changes Path 1.37 +210 -187 cartridges/andromda-ejb3/src/main/uml/EJB3MetafacadeModel.xml.zip <<Binary file>> |
|
From: Vance K. <va...@us...> - 2006-05-16 08:12:55
|
User: vancek
Date: 06/05/16 01:12:54
Modified: andromda-ejb3 pom.xml
Log:
changed version from 3.2-RC1-SNAPSHOT to 3.2-SNAPSHOT
added templateDirectory and template configuration properties for maven-site-plugin to pickup the andromda velocity template.
Revision Changes Path
1.4 +7 -4 cartridges/andromda-ejb3/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/pom.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- pom.xml 16 May 2006 04:07:09 -0000 1.3
+++ pom.xml 16 May 2006 08:12:54 -0000 1.4
@@ -10,7 +10,7 @@
<artifactId>andromda-ejb3-cartridge</artifactId>
<packaging>andromda-cartridge</packaging>
<name>AndroMDA EJB3 Cartridge</name>
- <description>Produces Entity and Session EJB 3.0 POJO from a model.</description>
+ <description>Produces EJB 3.0 persistence layer from a model.</description>
<developers>
<developer>
<id>vancek</id>
@@ -42,7 +42,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>
@@ -53,7 +53,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>
@@ -64,7 +64,7 @@
<plugin>
<groupId>org.andromda.maven.plugins</groupId>
<artifactId>andromda-site-plugin</artifactId>
- <version>3.2-RC1-SNAPSHOT</version>
+ <version>3.2-SNAPSHOT</version>
<executions>
<execution>
<id>profile-transform</id>
@@ -81,9 +81,12 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<locales>en</locales>
+ <templateDirectory>file:${user.home}/.m2/repository/org/andromda/maven/plugins/andromda-site-plugin/3.2-SNAPSHOT/andromda-site-plugin-3.2-SNAPSHOT.jar</templateDirectory>
+ <template>META-INF/template/andromda-site.vm</template>
</configuration>
</plugin>
</plugins>
|
|
From: Vance K. <va...@us...> - 2006-05-16 04:07:11
|
User: vancek
Date: 06/05/15 21:07:09
Modified: andromda-ejb3 pom.xml
Log:
added developers
configured m2 site plugin
Revision Changes Path
1.3 +45 -0 cartridges/andromda-ejb3/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/pom.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- pom.xml 1 Feb 2006 08:44:33 -0000 1.2
+++ pom.xml 16 May 2006 04:07:09 -0000 1.3
@@ -11,6 +11,28 @@
<packaging>andromda-cartridge</packaging>
<name>AndroMDA EJB3 Cartridge</name>
<description>Produces Entity and Session EJB 3.0 POJO from a model.</description>
+ <developers>
+ <developer>
+ <id>vancek</id>
+ <name>Vance Karimi</name>
+ <email>va...@an...</email>
+ <organization>AndroMDA</organization>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ <timezone>8</timezone>
+ </developer>
+ <developer>
+ <id>cwbrandon</id>
+ <name>Chad Brandon</name>
+ <email>ch...@an...</email>
+ <organization>AndroMDA</organization>
+ <roles>
+ <role>Project Admin</role>
+ </roles>
+ <timezone>-6</timezone>
+ </developer>
+ </developers>
<build>
<plugins>
<plugin>
@@ -36,6 +58,29 @@
</dependencies>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.andromda.maven.plugins</groupId>
+ <artifactId>andromda-site-plugin</artifactId>
+ <version>3.2-RC1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>profile-transform</id>
+ <goals>
+ <goal>profile-xsl</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>namespace-transform</id>
+ <goals>
+ <goal>namespace-xsl</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<locales>en</locales>
|
|
From: Vance K. <va...@us...> - 2006-05-15 12:44:39
|
User: vancek
Date: 06/05/15 05:44:38
Modified: andromda-ejb3/src/main/resources/templates/ejb3 Entity.vsl
Log:
enable cache support if required for mapped superclass with subclass hierarchy employed for entities.
only add 1 findAll named query definition.
Revision Changes Path
1.18 +14 -1 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.17
retrieving revision 1.18
diff -u -w -r1.17 -r1.18
--- Entity.vsl 26 Apr 2006 15:12:41 -0000 1.17
+++ Entity.vsl 15 May 2006 12:44:38 -0000 1.18
@@ -23,12 +23,25 @@
@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})
+ */
+#end
+#if ($entity.cacheEnabled)
+...@or...che(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})
+ */
#end
#set ($finders = $entity.getQueryOperations(false))
#if (!$finders.empty)
@javax.persistence.NamedQueries
({
-#**##if ($entity.genericFinders)
+#**##if ($entity.genericFinders && !$entity.finderFindAllExists)
@javax.persistence.NamedQuery(name = "${entity.name}.findAll", query = "select $stringUtils.uncapitalize(${entity.name}) from ${entity.name} AS $stringUtils.uncapitalize(${entity.name})")#if (!$finders.empty),#end
#**##end
|
|
From: Vance K. <va...@us...> - 2006-05-15 12:43:11
|
User: vancek
Date: 06/05/15 05:43:11
Modified: andromda-ejb3/src/main/resources/templates/ejb3/config/jboss
ejb3-entity-cache-service.xml.vsl
andromda-ejb3/src/main/resources/templates/ejb3 DaoBase.vsl
Log:
add support for query cache for findAll
Revision Changes Path
1.4 +10 -0 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/config/jboss/ejb3-entity-cache-service.xml.vsl
Index: ejb3-entity-cache-service.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/config/jboss/ejb3-entity-cache-service.xml.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- ejb3-entity-cache-service.xml.vsl 11 Apr 2006 15:51:59 -0000 1.3
+++ ejb3-entity-cache-service.xml.vsl 15 May 2006 12:43:11 -0000 1.4
@@ -96,6 +96,16 @@
#**##end
#end
#foreach ($entity in $entities)
+#**##if ($entity.useQueryCache && !$entity.useDefaultCacheRegion)
+#* *##if (!$entity.finderFindAllExists)
+
+ <!-- The ${entity.name} findAll query cache -->
+ <region name="/${entity.fullyQualifiedNamePath}_findAll">
+ <attribute name="maxNodes">1000</attribute>
+ <attribute name="timeToLiveSeconds">5000</attribute>
+ </region>
+#* *##end
+#**##end
#**##foreach ($finder in $entity.getQueryOperations(true))
#* *##if ($finder.useQueryCache && !$entity.useDefaultCacheRegion)
1.6 +3 -0 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/DaoBase.vsl
Index: DaoBase.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/DaoBase.vsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- DaoBase.vsl 4 May 2006 02:44:53 -0000 1.5
+++ DaoBase.vsl 15 May 2006 12:43:11 -0000 1.6
@@ -147,6 +147,9 @@
#else
javax.persistence.Query query = emanager.createQuery("from ${entity.entityName} as entity");
#end
+#if ($entity.useQueryCache && !$entity.useDefaultCacheRegion)
+ query.setHint("org.hibernate.cacheRegion", "/${entity.fullyQualifiedNamePath}_findAll");
+#end
java.util.List<${entity.fullyQualifiedEntityName}> results = query.getResultList();
this.transformEntities(transform, results);
return results;
|
|
From: Vance K. <va...@us...> - 2006-05-15 12:42:08
|
User: vancek
Date: 06/05/15 05:42:07
Modified: andromda-ejb3/src/main/resources/templates/ejb3
EntityEmbeddable.vsl
Log:
only add 1 findAll named query definition
Revision Changes Path
1.28 +1 -1 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.27
retrieving revision 1.28
diff -u -w -r1.27 -r1.28
--- EntityEmbeddable.vsl 30 Apr 2006 01:48:59 -0000 1.27
+++ EntityEmbeddable.vsl 15 May 2006 12:42:07 -0000 1.28
@@ -90,7 +90,7 @@
#**##if (!$finders.empty)
@javax.persistence.NamedQueries
({
-#* *##if ($entity.genericFinders)
+#* *##if ($entity.genericFinders && !$entity.finderFindAllExists)
@javax.persistence.NamedQuery(name = "${entity.name}.findAll", query = "select $stringUtils.uncapitalize(${entity.name}) from ${entity.name} AS $stringUtils.uncapitalize(${entity.name})")#if (!$finders.empty),#end
#* *##end
|
|
From: Vance K. <va...@us...> - 2006-05-15 12:39:17
|
User: vancek
Date: 06/05/15 05:39:16
Modified: andromda-ejb3/src/site/xdoc howto.xml
Log:
renamed HowToModel.xml.zip to HowToModel.xmi
Revision Changes Path
1.17 +1 -1 cartridges/andromda-ejb3/src/site/xdoc/howto.xml
Index: howto.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/xdoc/howto.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -w -r1.16 -r1.17
--- howto.xml 15 May 2006 12:25:17 -0000 1.16
+++ howto.xml 15 May 2006 12:39:16 -0000 1.17
@@ -200,7 +200,7 @@
</p>
<p>
You can download the UML model containing all models for all sections
- <a href="HowToModel.xml.zip">here</a>.
+ <a href="HowToModel.xmi">here</a>.
</p>
<p>
In order to start the tutorial click <a href="howto1.html">here</a>.
|
