Menu
▾
▴
[Andromdaplugins-cvs] CVS update: plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources pom.xml project.properties
|
From: Chris M. <cm...@us...> - 2006-10-02 01:57:11
|
User: cmicali
Date: 06/10/01 18:57:08
Modified: andromda-cs pom.xml
. pom.xml
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
AddInSettings.cs MDASolutionManager.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Membership
MembershipServiceImpl.cs UserDaoImpl.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/conf
andromda-m2.xml
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources
pom.xml project.properties
Log:
-Updates to Android/VS to support the 1.1-SNAPSHOT netcarts
Revision Changes Path
1.10 +1 -3 cartridges/andromda-cs/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/pom.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- pom.xml 2 Oct 2006 01:21:46 -0000 1.9
+++ pom.xml 2 Oct 2006 01:57:04 -0000 1.10
@@ -11,9 +11,7 @@
<packaging>andromda-cartridge</packaging>
<name>AndroMDA C# Cartridge</name>
<version>1.1-SNAPSHOT</version>
- <description>
- Produces C# objects from a model.
- </description>
+ <description>Produces C# objects from a model.</description>
<issueManagement>
<system>jira</system>
<url>http://galaxy.andromda.org/jira/browse/NETCART</url>
1.7 +1 -1 cartridges/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/pom.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
1.15 +5 -2 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.14
retrieving revision 1.15
diff -u -w -r1.14 -r1.15
--- AddInSettings.cs 28 Sep 2006 20:28:39 -0000 1.14
+++ AddInSettings.cs 2 Oct 2006 01:57:05 -0000 1.15
@@ -375,11 +375,14 @@
foreach (string folder in syncFolders)
{
string folderCleaned = folder.Trim().ToLower().Replace('\\', '/').Trim('/');
+ if (folderCleaned.Length > 0)
+ {
if (folderPath.EndsWith(folderCleaned))
{
return true;
}
}
+ }
return false;
}
#endregion
1.18 +8 -4 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.17
retrieving revision 1.18
diff -u -w -r1.17 -r1.18
--- MDASolutionManager.cs 28 Sep 2006 20:28:39 -0000 1.17
+++ MDASolutionManager.cs 2 Oct 2006 01:57:05 -0000 1.18
@@ -512,13 +512,17 @@
// Search for the existing
foreach (string folder in syncFolders)
{
+ string folderCleaned = folder.Replace('/', '\\').Trim('\\');
+ if (folderCleaned.Length > 0)
+ {
string folderPath = proj.Properties.Item("FullPath").Value.ToString().Trim('\\');
- folderPath = folderPath + "\\" + folder.Replace('/', '\\').Trim('\\');
+ folderPath = folderPath + "\\" + folderCleaned;
if (System.IO.Directory.Exists(folderPath))
{
proj.ProjectItems.AddFromDirectory(folderPath);
}
}
+ }
foreach (ProjectItem item in proj.ProjectItems)
{
1.4 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Membership/MembershipServiceImpl.cs
Index: MembershipServiceImpl.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Membership/MembershipServiceImpl.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- MembershipServiceImpl.cs 27 Jul 2006 03:55:47 -0000 1.3
+++ MembershipServiceImpl.cs 2 Oct 2006 01:57:05 -0000 1.4
@@ -152,7 +152,7 @@
UserRole role = RoleIsInList(entity.Roles, rolestring);
if (role == null)
{
- role = UserRole.Factory.newInstance();
+ role = UserRole.Factory.NewInstance();
role.Role = (Role)Enum.Parse(typeof(Role), rolestring);
role.User = entity;
entity.Roles.Add(role);
1.4 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Membership/UserDaoImpl.cs
Index: UserDaoImpl.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Membership/UserDaoImpl.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- UserDaoImpl.cs 27 Jul 2006 03:55:47 -0000 1.3
+++ UserDaoImpl.cs 2 Oct 2006 01:57:07 -0000 1.4
@@ -46,7 +46,7 @@
{
if (userVO == null) { return null; }
// VO to entity conversion
- User entity = User.Factory.newInstance();
+ User entity = User.Factory.NewInstance();
entity.Id = userVO.Id;
entity.UserName = userVO.UserName;
1.3 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/conf/andromda-m2.xml
Index: andromda-m2.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/conf/andromda-m2.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- andromda-m2.xml 28 Sep 2006 20:28:40 -0000 1.2
+++ andromda-m2.xml 2 Oct 2006 01:57:07 -0000 1.3
@@ -161,7 +161,7 @@
<property name="web">${web.dir}</property>
<property name="web_generated">${web.generated.dir}</property>
<property name="web_manual">${web.manual.dir}</property>
- <property name="webAssemblyName">${web.dir}</property>
+ <property name="webAssemblyName">${groupId}.Web</property>
<property name="AssemblyTitle">${web.dir}</property>
<property name="AssemblyDescription"></property>
<property name="AssemblyConfiguration"></property>
1.7 +3 -3 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/pom.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- pom.xml 28 Sep 2006 20:28:40 -0000 1.6
+++ pom.xml 2 Oct 2006 01:57:08 -0000 1.7
@@ -41,17 +41,17 @@
<dependency>
<groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-nspring-cartridge</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-nhibernate-cartridge</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-cs-cartridge</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
</dependency>
${wizard.cartridges.aspnet.rootpom.dependencies}
1.3 +3 -3 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/project.properties
Index: project.properties
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/project.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- project.properties 17 Aug 2006 03:56:57 -0000 1.2
+++ project.properties 2 Oct 2006 01:57:08 -0000 1.3
@@ -25,9 +25,9 @@
# AndroMDA dependencies version
andromda.version=3.2-SNAPSHOT
-andromda.cs.version=1.0
-andromda.nhibernate.version=1.0
-andromda.nspring.version=1.0
+andromda.cs.version=1.1-SNAPSHOT
+andromda.nhibernate.version=1.1-SNAPSHOT
+andromda.nspring.version=1.1-SNAPSHOT
andromda.aspdotnet.version=1.0-SNAPSHOT
# common dependency versions
|
