svn commit: r1453190 [1/4] - in /incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine: ./ src/main/csharp/ src/main/csharp/Converter/Algorithms/ src/main/csharp/Digest/Algorithms/
Author: brett Date: Wed Mar 6 08:05:56 2013 New Revision: 1453190 URL: http://svn.apache.org/r1453190 Log: [NPANDAY-254] use MSBuild for culture resources Preliminary step to generate satellite resources using MSBuild, until NPANDAY-254 is completed and they are generated natively using AL. This should be altered once that is the case. At the moment, the assemblies are not relocated to the target directory or attached to the project - each project will need to handle them individually Added: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Algorithms/DigestingBuildEngine.cs incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/WebAppWithCultureResTest.cs - copied, changed from r1453189, incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Model/EmbeddedResource.cs incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebAppWithCultureRes/ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebAppWithCultureRes/WebAppWithCultureRes/ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebAppWithCultureRes/WebAppWithCultureRes.sln incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebAppWithCultureRes/WebAppWithCultureRes/Default.aspx incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebAppWithCultureRes/WebAppWithCultureRes/Default.aspx.cs incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebAppWithCultureRes/WebAppWithCultureRes/Default.aspx.designer.cs incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebAppWithCultureRes/WebAppWithCultureRes/Properties/ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebAppWithCultureRes/WebAppWithCultureRes/Properties/AssemblyInfo.cs incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebAppWithCultureRes/WebAppWithCultureRes/Resource1.en-GB.resx incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebAppWithCultureRes/WebAppWithCultureRes/Resource1.es-ES.resx incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebAppWithCultureRes/WebAppWithCultureRes/Scripts/ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebAppWithCultureRes/WebAppWithCultureRes/Scripts/jquery-1.4.1-vsdoc.js incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebAppWithCultureRes/WebAppWithCultureRes/Scripts/jquery-1.4.1.js incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebAppWithCultureRes/WebAppWithCultureRes/Scripts/jquery-1.4.1.min.js incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebAppWithCultureRes/WebAppWithCultureRes/Web.Debug.config incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebAppWithCultureRes/WebAppWithCultureRes/Web.Release.config incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebAppWithCultureRes/WebAppWithCultureRes/Web.config incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebAppWithCultureRes/WebAppWithCultureRes/WebAppWithCultureRes.csproj incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebAppWithCultureRes/WebAppWithCultureRes/pom.test incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebAppWithCultureRes/pom.test Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/pom.xml incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Algorithms/NormalProjectDigestAlgorithm.cs incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Model/EmbeddedResource.cs incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday.ProjectImporterEngine.csproj incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/NPanday.ProjectImporterEngine-Test.csproj Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/pom.xml URL:
svn commit: r1453289 - /incubator/npanday/trunk/plugins/azure-maven-plugin/src/main/java/npanday/plugin/azure/CreateCloudServicePackageMojo.java
Author: brett Date: Wed Mar 6 11:05:06 2013 New Revision: 1453289 URL: http://svn.apache.org/r1453289 Log: avoid NPE if not set Modified: incubator/npanday/trunk/plugins/azure-maven-plugin/src/main/java/npanday/plugin/azure/CreateCloudServicePackageMojo.java Modified: incubator/npanday/trunk/plugins/azure-maven-plugin/src/main/java/npanday/plugin/azure/CreateCloudServicePackageMojo.java URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/azure-maven-plugin/src/main/java/npanday/plugin/azure/CreateCloudServicePackageMojo.java?rev=1453289r1=1453288r2=1453289view=diff == --- incubator/npanday/trunk/plugins/azure-maven-plugin/src/main/java/npanday/plugin/azure/CreateCloudServicePackageMojo.java (original) +++ incubator/npanday/trunk/plugins/azure-maven-plugin/src/main/java/npanday/plugin/azure/CreateCloudServicePackageMojo.java Wed Mar 6 11:05:06 2013 @@ -102,7 +102,7 @@ public class CreateCloudServicePackageMo * * @parameter */ -private Properties aliases; +private Properties aliases = new Properties(); @Override protected void afterCommandExecution() throws MojoExecutionException
svn commit: r1453324 - in /incubator/npanday/npanday-its/trunk/src/test: java/npanday/its/ resources/NPANDAY_580_WpfBrowserTest/ resources/NPANDAY_580_WpfBrowserTest/Properties/
Author: brett
Date: Wed Mar 6 13:22:40 2013
New Revision: 1453324
URL: http://svn.apache.org/r1453324
Log:
[NPANDAY-580] test that XBAP is attached
Added:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_580_WpfBrowserTest.java
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_580_WpfBrowserTest/
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_580_WpfBrowserTest/App.xaml
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_580_WpfBrowserTest/App.xaml.cs
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_580_WpfBrowserTest/NPANDAY_580_WpfBrowserTest.csproj
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_580_WpfBrowserTest/NPANDAY_580_WpfBrowserTest_TemporaryKey.pfx
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_580_WpfBrowserTest/Page1.xaml
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_580_WpfBrowserTest/Page1.xaml.cs
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_580_WpfBrowserTest/Properties/
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_580_WpfBrowserTest/Properties/AssemblyInfo.cs
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_580_WpfBrowserTest/Properties/Resources.Designer.cs
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_580_WpfBrowserTest/Properties/Resources.resx
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_580_WpfBrowserTest/Properties/Settings.Designer.cs
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_580_WpfBrowserTest/Properties/Settings.settings
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_580_WpfBrowserTest/Properties/app.manifest
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_580_WpfBrowserTest/pom.xml
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/IntegrationTestSuite.java
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/IntegrationTestSuite.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/IntegrationTestSuite.java?rev=1453324r1=1453323r2=1453324view=diff
==
---
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/IntegrationTestSuite.java
(original)
+++
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/IntegrationTestSuite.java
Wed Mar 6 13:22:40 2013
@@ -48,6 +48,7 @@ public class IntegrationTestSuite
// suite.addTestSuite( NPandayIT0002NetModuleDependencyTest.class );
// issue #11729
// suite.addTestSuite(
NPandayIT0003NetModuleTransitiveDependencyTest.class ); // issue #11729
+suite.addTestSuite( NPANDAY_580_WpfBrowserTest.class );
suite.addTestSuite( NPANDAY_254_WebAppWithCultureResTest.class );
suite.addTestSuite( NPANDAY_571_AzureSDKVersionTest.class );
suite.addTestSuite( NPANDAY_537_WindowsExecutableTest.class );
Added:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_580_WpfBrowserTest.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_580_WpfBrowserTest.java?rev=1453324view=auto
==
---
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_580_WpfBrowserTest.java
(added)
+++
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_580_WpfBrowserTest.java
Wed Mar 6 13:22:40 2013
@@ -0,0 +1,49 @@
+package npanday.its;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.it.Verifier;
+
+import java.io.File;
+
+public class NPANDAY_580_WpfBrowserTest
+extends AbstractNPandayIntegrationTestCase
+{
+public NPANDAY_580_WpfBrowserTest()
+{
+super( [1.5.0-incubating,), [v4.0.30319,) );
+}
+
+public void test()
+throws Exception
+{
+NPandayIntegrationTestContext context = createDefaultTestContext();
+Verifier verifier = context.getPreparedVerifier();
+
+
svn commit: r1453381 - /incubator/npanday/trunk/plugins/silverlight-maven-plugin/src/main/java/org/apache/npanday/plugins/silverlight/SilverlightPackageMojo.java
Author: brett
Date: Wed Mar 6 15:22:35 2013
New Revision: 1453381
URL: http://svn.apache.org/r1453381
Log:
[NPANDAY-452] Install Silverlight application DLL
This allows other projects to refer to the application as a dependency as if it
were another library.
Modified:
incubator/npanday/trunk/plugins/silverlight-maven-plugin/src/main/java/org/apache/npanday/plugins/silverlight/SilverlightPackageMojo.java
Modified:
incubator/npanday/trunk/plugins/silverlight-maven-plugin/src/main/java/org/apache/npanday/plugins/silverlight/SilverlightPackageMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/silverlight-maven-plugin/src/main/java/org/apache/npanday/plugins/silverlight/SilverlightPackageMojo.java?rev=1453381r1=1453380r2=1453381view=diff
==
---
incubator/npanday/trunk/plugins/silverlight-maven-plugin/src/main/java/org/apache/npanday/plugins/silverlight/SilverlightPackageMojo.java
(original)
+++
incubator/npanday/trunk/plugins/silverlight-maven-plugin/src/main/java/org/apache/npanday/plugins/silverlight/SilverlightPackageMojo.java
Wed Mar 6 15:22:35 2013
@@ -24,6 +24,7 @@ import org.apache.maven.plugin.AbstractM
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.MavenProjectHelper;
import java.io.File;
@@ -53,6 +54,11 @@ public class SilverlightPackageMojo
*/
protected MavenProject project;
+/**
+ * @component
+ */
+private MavenProjectHelper projectHelper;
+
public void execute()
throws MojoExecutionException, MojoFailureException
{
@@ -68,5 +74,13 @@ public class SilverlightPackageMojo
getLog().debug( Set the artifact file to ' +
artifact.getAbsolutePath() + '. );
project.getArtifact().setFile( artifact );
+
+// include the DLL for silverlight applications as well
+if ( !dll.equals( type.getExtension() ) )
+{
+File dllFile = new File( outputDirectory, project.getArtifactId()
+ .dll );
+getLog().debug( Attaching the DLL file ' +
dllFile.getAbsolutePath() + '. );
+projectHelper.attachArtifact( project, dll, dllFile );
+}
}
}
svn commit: r1453402 - /incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/SettingsUtil.cs
Author: brett
Date: Wed Mar 6 16:21:45 2013
New Revision: 1453402
URL: http://svn.apache.org/r1453402
Log:
[NPANDAY-572] avoid duplicating the profiles element
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/SettingsUtil.cs
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/SettingsUtil.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/SettingsUtil.cs?rev=1453402r1=1453401r2=1453402view=diff
==
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/SettingsUtil.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/SettingsUtil.cs
Wed Mar 6 16:21:45 2013
@@ -247,7 +247,7 @@ namespace NPanday.Utils
}
else
{
-XmlNode profilesNode =
settingsXmlDoc.SelectSingleNode(//*[local-name='profiles']);
+XmlNode profilesNode =
settingsXmlDoc.SelectSingleNode(//settings/profiles);
if (profilesNode == null)
{
// create profiles
[jira] [Resolved] (NPANDAY-572) When settings.xml already has a profiles section, configuring the remote repository from the AddIn creates an invalid settings file
[
https://issues.apache.org/jira/browse/NPANDAY-572?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Brett Porter resolved NPANDAY-572.
--
Resolution: Fixed
Fix Version/s: 1.5.0-incubating
Assignee: Brett Porter
Fixed, also made it set the mirror setting.
When settings.xml already has a profiles section, configuring the remote
repository from the AddIn creates an invalid settings file
---
Key: NPANDAY-572
URL: https://issues.apache.org/jira/browse/NPANDAY-572
Project: NPanday
Issue Type: Bug
Components: Visual Studio Add-in
Reporter: Brett Porter
Assignee: Brett Porter
Fix For: 1.5.0-incubating
# Create a {{settings.xml}} file with a {{profiles}} section
# Open an NPanday project in VS
# Select Add Maven Artifact... from the context menu on the project
# Go to the Configure Repository tab
# Type in {{http://repo.maven.apache.org/maven2/}} and press Update
The resulting {{settings.xml}} file has two {{profiles}} sections, one
before {{activeProfiles}} and one after.
A better alternative may be to use this field to set the mirror instead.
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira
svn commit: r1453403 - in /incubator/npanday/trunk/dotnet/assemblies: NPanday.Utils/src/main/csharp/SettingsUtil.cs NPanday.Utils/src/test/csharp/SettingsUtilTest.cs NPanday.VisualStudio.Addin/src/mai
Author: brett
Date: Wed Mar 6 16:22:59 2013
New Revision: 1453403
URL: http://svn.apache.org/r1453403
Log:
[NPANDAY-572] ensure repository is used
Consolidate to a single repository in the NPanday.id profile, and change any
relevant mirror entries to the specified URL also.
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/SettingsUtil.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/test/csharp/SettingsUtilTest.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/AddArtifactsForm.cs
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/SettingsUtil.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/SettingsUtil.cs?rev=1453403r1=1453402r2=1453403view=diff
==
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/SettingsUtil.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/SettingsUtil.cs
Wed Mar 6 16:22:59 2013
@@ -288,6 +288,15 @@ namespace NPanday.Utils
}
}
+if (settings.mirrors != null)
+{
+foreach (Mirror mirror in settings.mirrors)
+{
+// assumes you only changed url of existing ones
+
settingsXmlDoc.SelectSingleNode(//settings/mirrors/mirror[id = ' + mirror.id
+ ']/url).InnerText = mirror.url;
+}
+}
+
settingsXmlDoc.Save(path);
}
@@ -504,7 +513,7 @@ namespace NPanday.Utils
/// param name=isSnapshotEnabledTrue if snapshot is enabled/param
/// param name=settingsThe settings/param
/// returnsThe repository/returns
-public static Repository AddRepositoryToProfile(Profile profile,
string url, bool isReleaseEnabled, bool isSnapshotEnabled)
+public static Repository SetProfileRepository(Profile profile, string
url, bool isReleaseEnabled, bool isSnapshotEnabled)
{
Repository repository = GetRepositoryFromProfile(profile, url);
@@ -514,18 +523,8 @@ namespace NPanday.Utils
repository.url = url;
UpdateRepository(profile, repository, isReleaseEnabled,
isSnapshotEnabled);
-// add repository to profile
-if (profile.repositories == null)
-{
-profile.repositories = new Repository[] { repository };
-}
-else
-{
-ListRepository repositories = new ListRepository();
-repositories.AddRange(profile.repositories);
-repositories.Insert(0, repository);
-profile.repositories = repositories.ToArray();
-}
+// set repository on profile
+profile.repositories = new Repository[] { repository };
}
return repository;
}
@@ -568,32 +567,11 @@ namespace NPanday.Utils
repository.snapshots = snapshotsPolicy;
if (repository.id == null)
{
-repository.id = generateRepositoryId(profile);
+repository.id = npanday.repo;
}
}
#endregion
-private static string generateRepositoryId(Profile profile)
-{
-int ctr = 0;
-if (profile.repositories != null)
-{
-foreach (Repository repo in profile.repositories)
-{
-if (repo.id != null repo.id.StartsWith(npanday.repo.))
-{
-int index = int.Parse(repo.id.Substring(13));
-
-if (index = ctr)
-{
-ctr = index + 1;
-}
-}
-}
-}
-return npanday.repo. + ctr;
-}
-
public static Dictionarystring,string GetSettingsRepositories()
{
Settings settings = ReadSettings(GetUserSettingsPath());
@@ -670,6 +648,21 @@ namespace NPanday.Utils
{
return GetProfile(settings, SettingsUtil.defaultProfileID, create);
}
+
+public static void SetMirrorUrl(Settings settings, string selectedUrl)
+{
+// set the mirror, if it already exists
+if (settings.mirrors != null)
+{
+foreach (Mirror mirror in settings.mirrors)
+{
+if (mirror.mirrorOf.Contains(central) ||
mirror.mirrorOf.EndsWith(*))
+{
+mirror.url = selectedUrl;
+}
+}
+}
+}
}
#endregion
Modified:
svn commit: r1453629 - in /incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src: main/csharp/SettingsUtil.cs test/csharp/SettingsUtilTest.cs
Author: brett
Date: Thu Mar 7 00:41:59 2013
New Revision: 1453629
URL: http://svn.apache.org/r1453629
Log:
fix tests
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/SettingsUtil.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/test/csharp/SettingsUtilTest.cs
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/SettingsUtil.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/SettingsUtil.cs?rev=1453629r1=1453628r2=1453629view=diff
==
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/SettingsUtil.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/SettingsUtil.cs
Thu Mar 7 00:41:59 2013
@@ -293,7 +293,9 @@ namespace NPanday.Utils
foreach (Mirror mirror in settings.mirrors)
{
// assumes you only changed url of existing ones
-
settingsXmlDoc.SelectSingleNode(//settings/mirrors/mirror[id = ' + mirror.id
+ ']/url).InnerText = mirror.url;
+XmlNode node =
settingsXmlDoc.SelectSingleNode(//settings/mirrors/mirror[id = ' + mirror.id
+ ']/url);
+if (node != null)
+node.InnerText = mirror.url;
}
}
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/test/csharp/SettingsUtilTest.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/test/csharp/SettingsUtilTest.cs?rev=1453629r1=1453628r2=1453629view=diff
==
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/test/csharp/SettingsUtilTest.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/test/csharp/SettingsUtilTest.cs
Thu Mar 7 00:41:59 2013
@@ -60,7 +60,7 @@ namespace NPanday.Utils_Test
Assert.IsNotNull(repository, Repository ' + _repoUrl1 + ' was
not added to profile);
-Assert.AreEqual(npanday.repo.0, repository.id);
+Assert.AreEqual(npanday.repo, repository.id);
Assert.AreEqual(_repoUrl1, repository.url);
}
@@ -75,16 +75,14 @@ namespace NPanday.Utils_Test
SettingsUtil.SetProfileRepository(profile, _repoUrl2, true, false);
Assert.AreEqual(1, _settings.profiles.Length, Settings does not
contain a profile);
-Assert.AreEqual(2, _settings.profiles[0].repositories.Length);
+Assert.AreEqual(1, _settings.profiles[0].repositories.Length);
Repository repository =
SettingsUtil.GetRepositoryFromProfile(profile, _repoUrl1);
-Assert.IsNotNull(repository, Repository ' + _repoUrl1 + ' was
not in the profile);
-Assert.AreEqual(npanday.repo.0, repository.id);
-Assert.AreEqual(_repoUrl1, repository.url);
+Assert.IsNull(repository, Repository ' + _repoUrl1 + ' was in
the profile);
repository = SettingsUtil.GetRepositoryFromProfile(profile,
_repoUrl2);
Assert.IsNotNull(repository, Repository ' + _repoUrl2 + ' was
not added to profile);
-Assert.AreEqual(npanday.repo.1, repository.id);
+Assert.AreEqual(npanday.repo, repository.id);
Assert.AreEqual(_repoUrl2, repository.url);
}
svn commit: r1453663 - /incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.Designer.cs
Author: brett Date: Thu Mar 7 02:37:40 2013 New Revision: 1453663 URL: http://svn.apache.org/r1453663 Log: bind default buttons Press Enter to Generate and ESC to cancel Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.Designer.cs Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.Designer.cs URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.Designer.cs?rev=1453663r1=1453662r2=1453663view=diff == --- incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.Designer.cs (original) +++ incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.Designer.cs Thu Mar 7 02:37:40 2013 @@ -280,8 +280,10 @@ namespace NPanday.VisualStudio.Addin // // NPandayImportProjectForm // +this.AcceptButton = this.btnGenerate; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; +this.CancelButton = this.btnCancel; this.ClientSize = new System.Drawing.Size(734, 280); this.ControlBox = false; this.Controls.Add(this.copyToMavenCheckBox);
svn commit: r1453666 - /incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.Designer.cs
Author: brett Date: Thu Mar 7 02:38:30 2013 New Revision: 1453666 URL: http://svn.apache.org/r1453666 Log: improve title of dialog box Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.Designer.cs Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.Designer.cs URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.Designer.cs?rev=1453666r1=1453665r2=1453666view=diff == --- incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.Designer.cs (original) +++ incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.Designer.cs Thu Mar 7 02:38:30 2013 @@ -308,7 +308,7 @@ namespace NPanday.VisualStudio.Addin this.Name = NPandayImportProjectForm; this.ShowInTaskbar = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; -this.Text = NPanday Import Dot Net Solution; +this.Text = NPanday Generate Maven POMs From Solution; this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); this.ResumeLayout(false);
svn commit: r1453671 - in /incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src: main/csharp/Converter/Algorithms/ test/resource/InterModuleDependency/SA110/ test/resource/Samp
Author: brett
Date: Thu Mar 7 03:11:58 2013
New Revision: 1453671
URL: http://svn.apache.org/r1453671
Log:
update remaining references to dotnet-library
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AzurePomConverter.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/InterModuleDependency/SA110/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SampleVBDependency/Project2/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication1/SilverlightApplication1/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-multi-module-web-application-vb/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/sample_web_project/SampleWeb/pom.test
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs?rev=1453671r1=1453670r2=1453671view=diff
==
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
Thu Mar 7 03:11:58 2013
@@ -467,7 +467,10 @@ namespace NPanday.ProjectImporter.Conver
if (digest != null
!string.IsNullOrEmpty(digest.OutputType))
{
-interDependency.type = digest.OutputType.ToLower();
+string type = digest.OutputType.ToLower();
+if (npandayTypeMap.ContainsKey(type))
+type = npandayTypeMap[type];
+interDependency.type = type;
}
return interDependency;
}
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AzurePomConverter.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AzurePomConverter.cs?rev=1453671r1=1453670r2=1453671view=diff
==
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AzurePomConverter.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AzurePomConverter.cs
Thu Mar 7 03:11:58 2013
@@ -114,7 +114,10 @@ namespace NPanday.ProjectImporter.Conver
if (projectRef.ProjectReferenceDigest != null
!string.IsNullOrEmpty(projectRef.ProjectReferenceDigest.OutputType))
{
-dependency.type =
projectRef.ProjectReferenceDigest.OutputType.ToLower();
+string type =
projectRef.ProjectReferenceDigest.OutputType.ToLower();
+if (npandayTypeMap.ContainsKey(type))
+type = npandayTypeMap[type];
+dependency.type = type;
}
if (projectRef.RoleType != null)
{
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/InterModuleDependency/SA110/pom.test
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/InterModuleDependency/SA110/pom.test?rev=1453671r1=1453670r2=1453671view=diff
==
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/InterModuleDependency/SA110/pom.test
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/InterModuleDependency/SA110/pom.test
Thu Mar 7 03:11:58 2013
@@ -32,7 +32,7 @@
groupIdtest.group/groupId
artifactIdSAClassLibrary/artifactId
version1.2.3-SNAPSHOT/version
- typelibrary/type
+ typedotnet-library/type
/dependency
/dependencies
/project
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SampleVBDependency/Project2/pom.test
URL:
svn commit: r1453678 - in /incubator/npanday/trunk/dotnet/assemblies: NPanday.ProjectImporter/Engine/src/main/csharp/DependencySearchConfiguration.cs NPanday.VisualStudio.Addin/src/main/csharp/NPanday
Author: brett
Date: Thu Mar 7 04:04:12 2013
New Revision: 1453678
URL: http://svn.apache.org/r1453678
Log:
[NPANDAY-578] default all options to on
This maximises the chance of finding the right library, and copying it to the
local repository if applicable, producing POMs better suited for future
NPanday resolution techniques
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/DependencySearchConfiguration.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.Designer.cs
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/DependencySearchConfiguration.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/DependencySearchConfiguration.cs?rev=1453678r1=1453677r2=1453678view=diff
==
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/DependencySearchConfiguration.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/DependencySearchConfiguration.cs
Thu Mar 7 04:04:12 2013
@@ -27,16 +27,16 @@ namespace NPanday.ProjectImporter
{
public class DependencySearchConfiguration
{
-private bool searchFramework = false;
+private bool searchFramework = true;
public bool SearchFramework { get { return searchFramework; } set {
searchFramework = value; } }
-private bool searchAssemblyFoldersEx = false;
+private bool searchAssemblyFoldersEx = true;
public bool SearchAssemblyFoldersEx { get { return
searchAssemblyFoldersEx; } set { searchAssemblyFoldersEx = value; } }
private bool searchGac = true;
public bool SearchGac { get { return searchGac; } set { searchGac =
value; } }
-private bool copyToMaven = false;
+private bool copyToMaven = true;
public bool CopyToMaven { get { return copyToMaven; } set {
copyToMaven = value; } }
}
}
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.Designer.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.Designer.cs?rev=1453678r1=1453677r2=1453678view=diff
==
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.Designer.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.Designer.cs
Thu Mar 7 04:04:12 2013
@@ -251,6 +251,8 @@ namespace NPanday.VisualStudio.Addin
// searchAssemblyFoldersExCheckBox
//
this.searchAssemblyFoldersExCheckBox.AutoSize = true;
+this.searchAssemblyFoldersExCheckBox.Checked = true;
+this.searchAssemblyFoldersExCheckBox.CheckState =
System.Windows.Forms.CheckState.Checked;
this.searchAssemblyFoldersExCheckBox.Location = new
System.Drawing.Point(15, 47);
this.searchAssemblyFoldersExCheckBox.Name =
searchAssemblyFoldersExCheckBox;
this.searchAssemblyFoldersExCheckBox.Size = new
System.Drawing.Size(134, 17);
@@ -261,6 +263,8 @@ namespace NPanday.VisualStudio.Addin
// searchFrameworkCheckBox
//
this.searchFrameworkCheckBox.AutoSize = true;
+this.searchFrameworkCheckBox.Checked = true;
+this.searchFrameworkCheckBox.CheckState =
System.Windows.Forms.CheckState.Checked;
this.searchFrameworkCheckBox.Location = new
System.Drawing.Point(15, 24);
this.searchFrameworkCheckBox.Name = searchFrameworkCheckBox;
this.searchFrameworkCheckBox.Size = new System.Drawing.Size(78,
17);
@@ -271,6 +275,8 @@ namespace NPanday.VisualStudio.Addin
// copyToMavenCheckBox
//
this.copyToMavenCheckBox.AutoSize = true;
+this.copyToMavenCheckBox.Checked = true;
+this.copyToMavenCheckBox.CheckState =
System.Windows.Forms.CheckState.Checked;
this.copyToMavenCheckBox.Location = new System.Drawing.Point(549,
118);
this.copyToMavenCheckBox.Name = copyToMavenCheckBox;
this.copyToMavenCheckBox.Size = new System.Drawing.Size(180, 17);
svn commit: r1453696 - /incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
Author: brett
Date: Thu Mar 7 06:14:53 2013
New Revision: 1453696
URL: http://svn.apache.org/r1453696
Log:
[NPANDAY-578] remove properties
These seemed like a good idea, but system properties will not resolve correctly
when used as transitive dependencies, so they are not effective to retain
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs?rev=1453696r1=1453695r2=1453696view=diff
==
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
Thu Mar 7 06:14:53 2013
@@ -862,9 +862,12 @@ namespace NPanday.ProjectImporter.Conver
// Note that a provided scope may be more appropriate
here, if NPanday were to support it
// This could likewise replace the GAC types as all of
that lookup should occur at build time
-string var = npanday. + entry.Key;
-AddProperty(var, directory);
-Dependency refDependency =
CreateDependencyFromSystemPath(reference, ${ + var + }/ + reference.Name +
.dll);
+// While it would be nice to introduce properties to make
them replacable and reduce repetition, these will not resolve correctly
+// for transitive dependencies in Maven, so we need to
remove them.
+// string var = npanday. + entry.Key;
+// AddProperty(var, directory);
+// Dependency refDependency =
CreateDependencyFromSystemPath(reference, ${ + var + }/ + reference.Name +
.dll);
+Dependency refDependency =
CreateDependencyFromSystemPath(reference, path);
// We do not list these as non-portable, for two reasons:
// - they should not be copied to the local repository,
because there can be multiple conflicting versions in different SDKs
@@ -1054,15 +1057,17 @@ namespace NPanday.ProjectImporter.Conver
else
{
// if it is in the project, we still consider it non-portable
because packaging plugins will exclude system dependencies
-// however, we can adjust the path to be a bit more portable
across different checkouts
+// it would be nice to adjust the path to be a bit more
portable across different checkouts like below, however basedir
+// will not resolve correctly as a transitive dependency
+// logic retained in case other opportunities return in the
future
// first, check if the library is somewhere inside the
solution (mainPomFile is top-most POM)
-string projectRoot = new
DirectoryInfo(mainPomFile).Parent.FullName;
-if (PathUtility.IsSubdirectoryOf(projectRoot, path))
-{
+// string projectRoot = new
DirectoryInfo(mainPomFile).Parent.FullName;
+// if (PathUtility.IsSubdirectoryOf(projectRoot, path))
+// {
// if so, adjust path to be relative to this project's POM
file
-path = ${basedir}\\ +
PathUtility.MakeRelative(projectDigest.FullDirectoryName + \\, path);
-refDependency.systemPath = path;
-}
+// path = ${basedir}\\ +
PathUtility.MakeRelative(projectDigest.FullDirectoryName + \\, path);
+// refDependency.systemPath = path;
+// }
log.WarnFormat(Adding non-portable reference to POM: {0},
path);
}
svn commit: r1453697 - /incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
Author: brett
Date: Thu Mar 7 06:15:57 2013
New Revision: 1453697
URL: http://svn.apache.org/r1453697
Log:
[NPANDAY-578] return AssemblyFoldersEx to non-portable list
We typically need these to be packaged and used, which won't happen for system
dependencies - therefore only the framework ones should be a system path. When
this option is enabled, it is recommended that you copy them to a Maven
repository in the final dialog.
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs?rev=1453697r1=1453696r2=1453697view=diff
==
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
Thu Mar 7 06:15:57 2013
@@ -790,11 +790,11 @@ namespace NPanday.ProjectImporter.Conver
// resolve from target framework directories
if (refDependency == null
projectDigest.DependencySearchConfig.SearchFramework)
-refDependency = ResolveDependencyFromDirectories(reference,
GetTargetFrameworkDirectories(), target framework);
+refDependency = ResolveDependencyFromDirectories(reference,
GetTargetFrameworkDirectories(), target framework, false);
// resolve from registered assembly directories
if (refDependency == null
projectDigest.DependencySearchConfig.SearchAssemblyFoldersEx)
-refDependency = ResolveDependencyFromDirectories(reference,
GetTargetFrameworkAssemblyFoldersEx(), extra assembly folder);
+refDependency = ResolveDependencyFromDirectories(reference,
GetTargetFrameworkAssemblyFoldersEx(), extra assembly folder, true);
// resolve from GAC
if (refDependency == null
projectDigest.DependencySearchConfig.SearchGac)
@@ -851,7 +851,7 @@ namespace NPanday.ProjectImporter.Conver
}
}
-private Dependency ResolveDependencyFromDirectories(Reference
reference, Dictionarystring, string directories, string label)
+private Dependency ResolveDependencyFromDirectories(Reference
reference, Dictionarystring, string directories, string label, bool
warnNonPortable)
{
foreach (KeyValuePairstring, string entry in directories)
{
@@ -869,10 +869,17 @@ namespace NPanday.ProjectImporter.Conver
// Dependency refDependency =
CreateDependencyFromSystemPath(reference, ${ + var + }/ + reference.Name +
.dll);
Dependency refDependency =
CreateDependencyFromSystemPath(reference, path);
-// We do not list these as non-portable, for two reasons:
-// - they should not be copied to the local repository,
because there can be multiple conflicting versions in different SDKs
-//(any copying would require a rigorous use of
classifiers)
-// - they should not be included in packages (e.g. for
MSDeploy), which the system packaging currently avoids
+if (warnNonPortable)
+{
+WarnNonPortableReference(path, refDependency);
+}
+else
+{
+// We do not list these as non-portable, for two
reasons:
+// - they should not be copied to the local
repository, because there can be multiple conflicting versions in different SDKs
+//(any copying would require a rigorous use of
classifiers)
+// - they should not be included in packages (e.g.
for MSDeploy), which the system packaging currently avoids
+}
log.DebugFormat(Resolved {0} from {1} directories:
{2}:{3}:{4},
reference.Name, label, refDependency.groupId,
refDependency.artifactId, refDependency.version);
svn commit: r1453698 - /incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
Author: brett
Date: Thu Mar 7 06:16:58 2013
New Revision: 1453698
URL: http://svn.apache.org/r1453698
Log:
[NPANDAY-578] fix determination of framework versions
This will attempt to discover them in both v4.0 and v2.0 Microsoft.Build
libraries, so we need to make sure it doesn't throw an exception looking for
newer versions in old libraries and instead just skips them.
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs?rev=1453698r1=1453697r2=1453698view=diff
==
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
Thu Mar 7 06:16:58 2013
@@ -1015,15 +1015,19 @@ namespace NPanday.ProjectImporter.Conver
log.DebugFormat(Using ToolLocationHelper from {0};
TargetDotNetFrameworkVersion from {1},
helperType.Assembly.GetName(),
versionType.Assembly.GetName());
-string value = (string)helperType.InvokeMember(method,
-System.Reflection.BindingFlags.InvokeMethod,
System.Type.DefaultBinder, ,
-new object[] { Enum.Parse(versionType, version) });
-
-log.DebugFormat(Adding target directory {0} = {1},
key, value);
-if (!string.IsNullOrEmpty(value))
+if (Enum.IsDefined(versionType, version))
{
-directories.Add(key, value);
-found = true;
+string value =
(string)helperType.InvokeMember(method,
+System.Reflection.BindingFlags.InvokeMethod,
System.Type.DefaultBinder, ,
+new object[] { Enum.Parse(versionType,
version) });
+
+log.DebugFormat(Adding target directory {0} =
{1}, key, value);
+if (!string.IsNullOrEmpty(value))
+{
+directories.Add(key, value);
+found = true;
+break;
+}
}
}
}
svn commit: r1453700 - /incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPandayImporter.cs
Author: brett
Date: Thu Mar 7 06:18:36 2013
New Revision: 1453700
URL: http://svn.apache.org/r1453700
Log:
[NPANDAY-578] highlight implication of system dependencies
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPandayImporter.cs
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPandayImporter.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPandayImporter.cs?rev=1453700r1=1453699r2=1453700view=diff
==
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPandayImporter.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPandayImporter.cs
Thu Mar 7 06:18:36 2013
@@ -275,13 +275,14 @@ namespace NPanday.ProjectImporter
{
warningMsg += The following artifacts were copied to the
local Maven repository:
+ \n\t + string.Join(\n\t,
nonPortableReferences.ToArray())
- + \nDeploying the reference to a Repository will
make the code portable to other machines;
+ + \nDeploying the reference to a Repository will
make the code portable to other machines.;
}
else
{
warningMsg += \nThe build may not be portable if local
references are used:
+ \n\t + string.Join(\n\t,
nonPortableReferences.ToArray())
- + \nDeploying the reference to a Repository will
make the code portable to other machines;
+ + \nDeploying the reference to a Repository will
make the code portable to other machines.
+ + \n\nNote: artifacts with a system path will not be
packaged or used as a runtime dependency by Maven;
}
}
return result;
