You are viewing a plain text version of this content. The canonical link for it is here.
Posted to npanday-commits@incubator.apache.org by br...@apache.org on 2010/09/08 12:38:52 UTC
svn commit: r995026 - in /incubator/npanday/trunk:
components/dotnet-core/src/main/java/npanday/
components/dotnet-core/src/main/java/npanday/lifecycle/
components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/
components/dotnet-repo...
Author: brett
Date: Wed Sep 8 12:38:51 2010
New Revision: 995026
URL: http://svn.apache.org/viewvc?rev=995026&view=rev
Log:
set native line endings where appropriate
Modified:
incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/ArtifactTypeHelper.java (contents, props changed)
incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/lifecycle/LifecycleMap.java (contents, props changed)
incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/lifecycle/LifecycleMapping.java (contents, props changed)
incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/lifecycle/LifecyclePhase.java (contents, props changed)
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/AspxCompiler.java (props changed)
incubator/npanday/trunk/components/dotnet-repository/src/test/java/npanday/repository/impl/ArtifactResolverTestStub.java (props changed)
incubator/npanday/trunk/dotnet/assemblies/NPanday.Model.Settings/src/test/csharp/NPanday.SettingsUtil-Test/SettingsUtilTest.cs (contents, props changed)
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.Utils-Test/MavenSettingsConfigurationTest.cs (contents, props changed)
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.Utils-Test/RenameWebReferenceTest.cs (contents, props changed)
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.Utils-Test/ResyncArtifactSnapshot.cs (contents, props changed)
incubator/npanday/trunk/plugins/maven-aspx-plugin/src/main/java/npanday/plugin/aspx/AspxBinDependencyResolver.java (props changed)
incubator/npanday/trunk/plugins/maven-aspx-plugin/src/main/java/npanday/plugin/aspx/AspxCompilerMojo.java (props changed)
incubator/npanday/trunk/plugins/maven-aspx-plugin/src/main/java/npanday/plugin/aspx/AspxPackageMojo.java (props changed)
incubator/npanday/trunk/plugins/maven-aspx-plugin/src/test/java/npanday/plugin/aspx/AspxBinDependencyResolverTest.java (contents, props changed)
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java (props changed)
incubator/npanday/trunk/plugins/maven-resgen-plugin/src/main/java/npanday/plugin/resgen/EmbeddedResource.java (contents, props changed)
incubator/npanday/trunk/plugins/maven-resgen-plugin/src/main/java/npanday/plugin/resgen/ExistingResxGenerator.java (props changed)
incubator/npanday/trunk/plugins/maven-wsdl-plugin/src/main/java/npanday/plugin/wsdl/WebReference.java (props changed)
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/javabinding/src/main/java/NPanday/Plugin/Msbuild/MsbuildMojo.java (props changed)
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.SysRef/javabinding/src/main/java/NPanday/Plugin/SysRef/SysRefMojo.java (props changed)
incubator/npanday/trunk/plugins/partcover-maven-plugin/src/main/java/npanday/plugin/partcover/AbstractPartCoverMojo.java (contents, props changed)
incubator/npanday/trunk/plugins/partcover-maven-plugin/src/main/java/npanday/plugin/partcover/PartCoverCompilerMojo.java (contents, props changed)
incubator/npanday/trunk/plugins/partcover-maven-plugin/src/main/java/npanday/plugin/partcover/PartCoverConverterMojo.java (props changed)
incubator/npanday/trunk/plugins/wix-maven-plugin/src/main/java/npanday/plugin/wix/CandleMojo.java (props changed)
incubator/npanday/trunk/plugins/wix-maven-plugin/src/main/java/npanday/plugin/wix/LightMojo.java (props changed)
Modified: incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/ArtifactTypeHelper.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/ArtifactTypeHelper.java?rev=995026&r1=995025&r2=995026&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/ArtifactTypeHelper.java (original)
+++ incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/ArtifactTypeHelper.java Wed Sep 8 12:38:51 2010
@@ -1,109 +1,109 @@
-/*
- * Copyright 2010 NPanday
- *
- * Licensed 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.
- */
-
-package npanday;
-
-/**
- * Some helper methods for classifying packaging types.
- *
- * @author <a href="mailto:me@lcorneliussen.de">Lars Corneliussen</a>
- */
-public class ArtifactTypeHelper
-{
- public static boolean isDotnetMavenPlugin(String packaging)
- {
- return isDotnetMavenPlugin( ArtifactType.getArtifactTypeForPackagingName( packaging ) );
- }
-
- public static boolean isDotnetMavenPlugin(ArtifactType packaging)
- {
- return packaging.equals( ArtifactType.DOTNET_MAVEN_PLUGIN )
- || packaging.equals( ArtifactType.NETPLUGIN );
- }
-
- public static boolean isDotnetExecutable(String packaging)
- {
- return isDotnetExecutable( ArtifactType.getArtifactTypeForPackagingName( packaging ) );
- }
-
- public static boolean isDotnetExecutable(ArtifactType packaging)
- {
- return packaging.equals( ArtifactType.DOTNET_EXECUTABLE )
- || packaging.equals( ArtifactType.EXE )
- || packaging.equals( ArtifactType.WINEXE );
- }
-
- public static boolean isDotnetLibrary(String packaging)
- {
- return isDotnetLibrary( ArtifactType.getArtifactTypeForPackagingName( packaging ) );
- }
-
- public static boolean isDotnetLibrary(ArtifactType packaging)
- {
- return packaging.equals( ArtifactType.DOTNET_LIBRARY )
- || packaging.equals( ArtifactType.LIBRARY );
- }
-
- public static boolean isDotnetModule(String packaging)
- {
- return isDotnetModule( ArtifactType.getArtifactTypeForPackagingName( packaging ) );
- }
-
- public static boolean isDotnetModule(ArtifactType packaging)
- {
- return packaging.equals( ArtifactType.DOTNET_MODULE )
- || packaging.equals( ArtifactType.MODULE );
- }
-
- public static boolean isDotnetExecutableConfig(String packaging)
- {
- return isDotnetExecutableConfig( ArtifactType.getArtifactTypeForPackagingName( packaging ) );
- }
-
- public static boolean isDotnetExecutableConfig(ArtifactType packaging)
- {
- return packaging.equals( ArtifactType.DOTNET_EXECUTABLE_CONFIG )
- || packaging.equals( ArtifactType.EXECONFIG );
- }
-
-
- public static boolean isDotnetGenericGac(String packaging)
- {
- return isDotnetGenericGac( ArtifactType.getArtifactTypeForPackagingName( packaging ) );
- }
-
- public static boolean isDotnetGenericGac(ArtifactType packaging)
- {
- // the new gac should always be generic.
- // GAC_MSIL, GAC32 and GAC should be deprecated without
- // any replacements.
- return packaging.equals( ArtifactType.DOTNET_GAC )
- || packaging.equals( ArtifactType.GAC_GENERIC );
- }
-
- public static boolean isDotnetAnyGac(String packaging)
- {
- return isDotnetAnyGac( ArtifactType.getArtifactTypeForPackagingName( packaging ) );
- }
-
- public static boolean isDotnetAnyGac(ArtifactType packaging)
- {
- return packaging.equals( ArtifactType.DOTNET_GAC )
- || packaging.equals( ArtifactType.GAC_GENERIC )
- || packaging.equals( ArtifactType.GAC )
- || packaging.equals( ArtifactType.GAC_32)
- || packaging.equals( ArtifactType.GAC_MSIL );
- }
-}
+/*
+ * Copyright 2010 NPanday
+ *
+ * Licensed 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.
+ */
+
+package npanday;
+
+/**
+ * Some helper methods for classifying packaging types.
+ *
+ * @author <a href="mailto:me@lcorneliussen.de">Lars Corneliussen</a>
+ */
+public class ArtifactTypeHelper
+{
+ public static boolean isDotnetMavenPlugin(String packaging)
+ {
+ return isDotnetMavenPlugin( ArtifactType.getArtifactTypeForPackagingName( packaging ) );
+ }
+
+ public static boolean isDotnetMavenPlugin(ArtifactType packaging)
+ {
+ return packaging.equals( ArtifactType.DOTNET_MAVEN_PLUGIN )
+ || packaging.equals( ArtifactType.NETPLUGIN );
+ }
+
+ public static boolean isDotnetExecutable(String packaging)
+ {
+ return isDotnetExecutable( ArtifactType.getArtifactTypeForPackagingName( packaging ) );
+ }
+
+ public static boolean isDotnetExecutable(ArtifactType packaging)
+ {
+ return packaging.equals( ArtifactType.DOTNET_EXECUTABLE )
+ || packaging.equals( ArtifactType.EXE )
+ || packaging.equals( ArtifactType.WINEXE );
+ }
+
+ public static boolean isDotnetLibrary(String packaging)
+ {
+ return isDotnetLibrary( ArtifactType.getArtifactTypeForPackagingName( packaging ) );
+ }
+
+ public static boolean isDotnetLibrary(ArtifactType packaging)
+ {
+ return packaging.equals( ArtifactType.DOTNET_LIBRARY )
+ || packaging.equals( ArtifactType.LIBRARY );
+ }
+
+ public static boolean isDotnetModule(String packaging)
+ {
+ return isDotnetModule( ArtifactType.getArtifactTypeForPackagingName( packaging ) );
+ }
+
+ public static boolean isDotnetModule(ArtifactType packaging)
+ {
+ return packaging.equals( ArtifactType.DOTNET_MODULE )
+ || packaging.equals( ArtifactType.MODULE );
+ }
+
+ public static boolean isDotnetExecutableConfig(String packaging)
+ {
+ return isDotnetExecutableConfig( ArtifactType.getArtifactTypeForPackagingName( packaging ) );
+ }
+
+ public static boolean isDotnetExecutableConfig(ArtifactType packaging)
+ {
+ return packaging.equals( ArtifactType.DOTNET_EXECUTABLE_CONFIG )
+ || packaging.equals( ArtifactType.EXECONFIG );
+ }
+
+
+ public static boolean isDotnetGenericGac(String packaging)
+ {
+ return isDotnetGenericGac( ArtifactType.getArtifactTypeForPackagingName( packaging ) );
+ }
+
+ public static boolean isDotnetGenericGac(ArtifactType packaging)
+ {
+ // the new gac should always be generic.
+ // GAC_MSIL, GAC32 and GAC should be deprecated without
+ // any replacements.
+ return packaging.equals( ArtifactType.DOTNET_GAC )
+ || packaging.equals( ArtifactType.GAC_GENERIC );
+ }
+
+ public static boolean isDotnetAnyGac(String packaging)
+ {
+ return isDotnetAnyGac( ArtifactType.getArtifactTypeForPackagingName( packaging ) );
+ }
+
+ public static boolean isDotnetAnyGac(ArtifactType packaging)
+ {
+ return packaging.equals( ArtifactType.DOTNET_GAC )
+ || packaging.equals( ArtifactType.GAC_GENERIC )
+ || packaging.equals( ArtifactType.GAC )
+ || packaging.equals( ArtifactType.GAC_32)
+ || packaging.equals( ArtifactType.GAC_MSIL );
+ }
+}
Propchange: incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/ArtifactTypeHelper.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/lifecycle/LifecycleMap.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/lifecycle/LifecycleMap.java?rev=995026&r1=995025&r2=995026&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/lifecycle/LifecycleMap.java (original)
+++ incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/lifecycle/LifecycleMap.java Wed Sep 8 12:38:51 2010
@@ -1,38 +1,38 @@
-/*
- * Copyright 2010 NPanday
- *
- * Licensed 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.
- */
-package npanday.lifecycle;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Abstract base class for npanday lifecycle plugin mappings.
- *
- * @author <a href="mailto:me@lcorneliussen.de">Lars Corneliussen</a>
- */
-public abstract class LifecycleMap {
- List<LifecycleMapping> map = new ArrayList<LifecycleMapping>();
-
- void add(LifecycleMapping mapping) {
- map.add(mapping);
- }
-
- protected abstract void defineMappings();
-
- public List<LifecycleMapping> buildMap() {
- defineMappings();
- return map;
- }
-}
+/*
+ * Copyright 2010 NPanday
+ *
+ * Licensed 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.
+ */
+package npanday.lifecycle;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Abstract base class for npanday lifecycle plugin mappings.
+ *
+ * @author <a href="mailto:me@lcorneliussen.de">Lars Corneliussen</a>
+ */
+public abstract class LifecycleMap {
+ List<LifecycleMapping> map = new ArrayList<LifecycleMapping>();
+
+ void add(LifecycleMapping mapping) {
+ map.add(mapping);
+ }
+
+ protected abstract void defineMappings();
+
+ public List<LifecycleMapping> buildMap() {
+ defineMappings();
+ return map;
+ }
+}
Propchange: incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/lifecycle/LifecycleMap.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/lifecycle/LifecycleMapping.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/lifecycle/LifecycleMapping.java?rev=995026&r1=995025&r2=995026&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/lifecycle/LifecycleMapping.java (original)
+++ incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/lifecycle/LifecycleMapping.java Wed Sep 8 12:38:51 2010
@@ -1,46 +1,46 @@
-/*
- * Copyright 2010 NPanday
- *
- * Licensed 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.
- */
-package npanday.lifecycle;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import npanday.ArtifactType;
-
-/**
- * @author <a href="mailto:me@lcorneliussen.de">Lars Corneliussen</a>
- */
-public class LifecycleMapping {
- ArtifactType type;
-
- List<LifecyclePhase> phases = new ArrayList<LifecyclePhase>();
-
- public ArtifactType getType() {
- return type;
- }
-
- public void setType(ArtifactType type) {
- this.type = type;
- }
-
- public List<LifecyclePhase> getPhases() {
- return phases;
- }
-
- public void setPhases(List<LifecyclePhase> phases) {
- this.phases = phases;
- }
-
-}
+/*
+ * Copyright 2010 NPanday
+ *
+ * Licensed 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.
+ */
+package npanday.lifecycle;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import npanday.ArtifactType;
+
+/**
+ * @author <a href="mailto:me@lcorneliussen.de">Lars Corneliussen</a>
+ */
+public class LifecycleMapping {
+ ArtifactType type;
+
+ List<LifecyclePhase> phases = new ArrayList<LifecyclePhase>();
+
+ public ArtifactType getType() {
+ return type;
+ }
+
+ public void setType(ArtifactType type) {
+ this.type = type;
+ }
+
+ public List<LifecyclePhase> getPhases() {
+ return phases;
+ }
+
+ public void setPhases(List<LifecyclePhase> phases) {
+ this.phases = phases;
+ }
+
+}
Propchange: incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/lifecycle/LifecycleMapping.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/lifecycle/LifecyclePhase.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/lifecycle/LifecyclePhase.java?rev=995026&r1=995025&r2=995026&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/lifecycle/LifecyclePhase.java (original)
+++ incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/lifecycle/LifecyclePhase.java Wed Sep 8 12:38:51 2010
@@ -1,42 +1,42 @@
-/*
- * Copyright 2010 NPanday
- *
- * Licensed 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.
- */
-package npanday.lifecycle;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author <a href="mailto:me@lcorneliussen.de">Lars Corneliussen</a>
- */
-public class LifecyclePhase {
- String name;
- List<String> goals = new ArrayList<String>();
-
- public String getPhase() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public List<String> getGoals() {
- return goals;
- }
-
- public void setGoals(List<String> goals) {
- this.goals = goals;
- }
-}
+/*
+ * Copyright 2010 NPanday
+ *
+ * Licensed 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.
+ */
+package npanday.lifecycle;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:me@lcorneliussen.de">Lars Corneliussen</a>
+ */
+public class LifecyclePhase {
+ String name;
+ List<String> goals = new ArrayList<String>();
+
+ public String getPhase() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public List<String> getGoals() {
+ return goals;
+ }
+
+ public void setGoals(List<String> goals) {
+ this.goals = goals;
+ }
+}
Propchange: incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/lifecycle/LifecyclePhase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/AspxCompiler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/npanday/trunk/components/dotnet-repository/src/test/java/npanday/repository/impl/ArtifactResolverTestStub.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.Model.Settings/src/test/csharp/NPanday.SettingsUtil-Test/SettingsUtilTest.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.Model.Settings/src/test/csharp/NPanday.SettingsUtil-Test/SettingsUtilTest.cs?rev=995026&r1=995025&r2=995026&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.Model.Settings/src/test/csharp/NPanday.SettingsUtil-Test/SettingsUtilTest.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.Model.Settings/src/test/csharp/NPanday.SettingsUtil-Test/SettingsUtilTest.cs Wed Sep 8 12:38:51 2010
@@ -1,90 +1,90 @@
-#region licence
-/*
- * 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.
- */
-#endregion
-
-using NUnit.Framework;
-using NPanday.Model.Setting;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-
-namespace NPanday.SettingsUtil_Test
-{
- [TestFixture]
- public class SettingsUtilTest
- {
- private string defaultProfileId = "npanday.test.id";
- private string repoUrl1 = "http://repo1.maven.org/maven2";
- private string repoUrl2 = "http://repo.exist.com/maven2";
- private string settingsPath;
- private Settings settings;
-
- [Test]
- public void AddRepositoryToEmptyProfileTest()
- {
- settings = GetSettings("test-settings.xml");
-
- NPanday.Model.Setting.Profile profile = new NPanday.Model.Setting.Profile();
- profile.id = defaultProfileId;
-
- SettingsUtil.AddRepositoryToProfile(profile, repoUrl1, true, false, settings);
-
- Assert.AreEqual(1, settings.profiles.Length, "Settings does not contain a profile");
-
- NPanday.Model.Setting.Repository repository = SettingsUtil.GetRepositoryFromProfile(profile, repoUrl1);
-
- Assert.IsNotNull(repository, "Repository '" + repoUrl1 + "' was not added to profile");
-
- Assert.AreEqual("npanday.repo.0", repository.id);
- Assert.AreEqual(repoUrl1, repository.url);
- }
-
- [Test]
- public void AddRepositoryToExistingProfileTest()
- {
- settings = GetSettings("test-settings-with-profile.xml");
-
- NPanday.Model.Setting.Profile profile = SettingsUtil.GetProfile(settings, defaultProfileId);
-
- SettingsUtil.AddRepositoryToProfile(profile, repoUrl2, true, false, settings);
-
- Assert.AreEqual(1, settings.profiles.Length, "Settings does not contain a profile");
- Assert.AreEqual(2, settings.profiles[0].repositories.Length);
-
- NPanday.Model.Setting.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);
-
- repository = SettingsUtil.GetRepositoryFromProfile(profile, repoUrl2);
- Assert.IsNotNull(repository, "Repository '" + repoUrl2 + "' was not added to profile");
- Assert.AreEqual("npanday.repo.1", repository.id);
- Assert.AreEqual(repoUrl2, repository.url);
- }
-
- private Settings GetSettings(string settingsXml)
- {
- settingsPath = (new FileInfo(Directory.GetCurrentDirectory().Substring(0, Directory.GetCurrentDirectory().LastIndexOf("target")) + "\\src\\test\\resource\\m2\\" + settingsXml)).FullName;
-
- return SettingsUtil.ReadSettings(settingsPath);
- }
- }
-}
+#region licence
+/*
+ * 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.
+ */
+#endregion
+
+using NUnit.Framework;
+using NPanday.Model.Setting;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+
+namespace NPanday.SettingsUtil_Test
+{
+ [TestFixture]
+ public class SettingsUtilTest
+ {
+ private string defaultProfileId = "npanday.test.id";
+ private string repoUrl1 = "http://repo1.maven.org/maven2";
+ private string repoUrl2 = "http://repo.exist.com/maven2";
+ private string settingsPath;
+ private Settings settings;
+
+ [Test]
+ public void AddRepositoryToEmptyProfileTest()
+ {
+ settings = GetSettings("test-settings.xml");
+
+ NPanday.Model.Setting.Profile profile = new NPanday.Model.Setting.Profile();
+ profile.id = defaultProfileId;
+
+ SettingsUtil.AddRepositoryToProfile(profile, repoUrl1, true, false, settings);
+
+ Assert.AreEqual(1, settings.profiles.Length, "Settings does not contain a profile");
+
+ NPanday.Model.Setting.Repository repository = SettingsUtil.GetRepositoryFromProfile(profile, repoUrl1);
+
+ Assert.IsNotNull(repository, "Repository '" + repoUrl1 + "' was not added to profile");
+
+ Assert.AreEqual("npanday.repo.0", repository.id);
+ Assert.AreEqual(repoUrl1, repository.url);
+ }
+
+ [Test]
+ public void AddRepositoryToExistingProfileTest()
+ {
+ settings = GetSettings("test-settings-with-profile.xml");
+
+ NPanday.Model.Setting.Profile profile = SettingsUtil.GetProfile(settings, defaultProfileId);
+
+ SettingsUtil.AddRepositoryToProfile(profile, repoUrl2, true, false, settings);
+
+ Assert.AreEqual(1, settings.profiles.Length, "Settings does not contain a profile");
+ Assert.AreEqual(2, settings.profiles[0].repositories.Length);
+
+ NPanday.Model.Setting.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);
+
+ repository = SettingsUtil.GetRepositoryFromProfile(profile, repoUrl2);
+ Assert.IsNotNull(repository, "Repository '" + repoUrl2 + "' was not added to profile");
+ Assert.AreEqual("npanday.repo.1", repository.id);
+ Assert.AreEqual(repoUrl2, repository.url);
+ }
+
+ private Settings GetSettings(string settingsXml)
+ {
+ settingsPath = (new FileInfo(Directory.GetCurrentDirectory().Substring(0, Directory.GetCurrentDirectory().LastIndexOf("target")) + "\\src\\test\\resource\\m2\\" + settingsXml)).FullName;
+
+ return SettingsUtil.ReadSettings(settingsPath);
+ }
+ }
+}
Propchange: incubator/npanday/trunk/dotnet/assemblies/NPanday.Model.Settings/src/test/csharp/NPanday.SettingsUtil-Test/SettingsUtilTest.cs
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.Utils-Test/MavenSettingsConfigurationTest.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.Utils-Test/MavenSettingsConfigurationTest.cs?rev=995026&r1=995025&r2=995026&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.Utils-Test/MavenSettingsConfigurationTest.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.Utils-Test/MavenSettingsConfigurationTest.cs Wed Sep 8 12:38:51 2010
@@ -1,43 +1,43 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-using System.Windows.Forms;
-using NUnit.Framework;
-using NPanday.VisualStudio.Addin;
-using NPanday.Utils;
-using NPanday.Model.Setting;
-
-namespace ConnectTest.UtilsTest
-{
- [TestFixture]
- class MavenSettingsConfigurationTest
- {
- private Settings settings;
- private string settingsPathOriginal;
- private string settingsPath;
-
- private AddArtifactsForm addArtifactsFrm;
-
- public MavenSettingsConfigurationTest()
- {
-
- settingsPathOriginal = (new FileInfo(Directory.GetCurrentDirectory().Substring(0, Directory.GetCurrentDirectory().LastIndexOf("target")) + "\\src\\test\\resource\\m2\\test-settings.xml")).FullName;
- settingsPath = settingsPathOriginal.Replace("test-settings.xml", "test-settings2.xml");
-
- File.Copy(settingsPathOriginal, settingsPath);
-
- addArtifactsFrm = new AddArtifactsForm();
- addArtifactsFrm.addProfilesTag(settingsPath);
-
- settings = SettingsUtil.ReadSettings(settingsPath);
- }
-
- [Test]
- public void CheckIfSettingsXMLIsValidTest()
- {
- Assert.IsNotNull(settings.profiles);
- File.Delete(settingsPath);
- }
- }
-}
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+using System.Windows.Forms;
+using NUnit.Framework;
+using NPanday.VisualStudio.Addin;
+using NPanday.Utils;
+using NPanday.Model.Setting;
+
+namespace ConnectTest.UtilsTest
+{
+ [TestFixture]
+ class MavenSettingsConfigurationTest
+ {
+ private Settings settings;
+ private string settingsPathOriginal;
+ private string settingsPath;
+
+ private AddArtifactsForm addArtifactsFrm;
+
+ public MavenSettingsConfigurationTest()
+ {
+
+ settingsPathOriginal = (new FileInfo(Directory.GetCurrentDirectory().Substring(0, Directory.GetCurrentDirectory().LastIndexOf("target")) + "\\src\\test\\resource\\m2\\test-settings.xml")).FullName;
+ settingsPath = settingsPathOriginal.Replace("test-settings.xml", "test-settings2.xml");
+
+ File.Copy(settingsPathOriginal, settingsPath);
+
+ addArtifactsFrm = new AddArtifactsForm();
+ addArtifactsFrm.addProfilesTag(settingsPath);
+
+ settings = SettingsUtil.ReadSettings(settingsPath);
+ }
+
+ [Test]
+ public void CheckIfSettingsXMLIsValidTest()
+ {
+ Assert.IsNotNull(settings.profiles);
+ File.Delete(settingsPath);
+ }
+ }
+}
Propchange: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.Utils-Test/MavenSettingsConfigurationTest.cs
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.Utils-Test/RenameWebReferenceTest.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.Utils-Test/RenameWebReferenceTest.cs?rev=995026&r1=995025&r2=995026&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.Utils-Test/RenameWebReferenceTest.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.Utils-Test/RenameWebReferenceTest.cs Wed Sep 8 12:38:51 2010
@@ -1,70 +1,70 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using NUnit.Framework;
-using System.IO;
-using NPanday.Utils;
-
-namespace ConnectTest.UtilsTest
-{
- [TestFixture]
- public class RenameWebReferenceTest
- {
- private PomHelperUtility pomCopy;
- private String pomPath;
- private String pomCopyPath;
- private String fullPath;
- private String fullPathCopy;
- private String path;
- private String output;
- private String oldName = "WebRef";
- private String newName = "WebRef2";
-
- private StringBuilder strLine;
- private String line;
- private StreamReader strm;
-
- public RenameWebReferenceTest()
- {
- pomPath = (new FileInfo(Directory.GetCurrentDirectory().Substring(0, Directory.GetCurrentDirectory().LastIndexOf("target")) + "\\src\\test\\resource\\ClassLibrary1\\ClassLibrary1\\pom.xml").FullName);
-
- pomCopyPath = pomPath.Replace("pom.xml", "pomCopy.xml");
-
- pomCopy = new PomHelperUtility(pomCopyPath);
-
- File.Copy(pomPath, pomCopyPath);
-
- fullPath = (new FileInfo(Directory.GetCurrentDirectory().Substring(0, Directory.GetCurrentDirectory().LastIndexOf("target")) + "\\src\\test\\resource\\ClassLibrary1\\ClassLibrary1\\Web References\\WebRef").FullName);
- fullPathCopy = fullPath.Replace(oldName, newName);
- path = "Web References\\" + oldName + "\\demoService.wsdl";
- }
-
- [Test]
- public void RenameExistingWebReferenceTest()
- {
- int ctr = 0;
-
- pomCopy.RenameWebReference(fullPath, oldName, newName, path, output);
-
- strm = new StreamReader(pomCopyPath);
- strLine = new StringBuilder();
-
- while ((line = strm.ReadLine()) != null)
- {
- strLine.Append(line);
-
- if (line.ToString().Contains("<webreference>"))
- {
- ctr++;
- }
- }
-
- strm.Close();
- File.Delete(pomCopyPath);
-
- Assert.AreEqual(1, ctr);
- Assert.IsFalse(strLine.ToString().Contains("<namespace>WebRef</namespace>"));
- }
-
- }
-}
+using System;
+using System.Collections.Generic;
+using System.Text;
+using NUnit.Framework;
+using System.IO;
+using NPanday.Utils;
+
+namespace ConnectTest.UtilsTest
+{
+ [TestFixture]
+ public class RenameWebReferenceTest
+ {
+ private PomHelperUtility pomCopy;
+ private String pomPath;
+ private String pomCopyPath;
+ private String fullPath;
+ private String fullPathCopy;
+ private String path;
+ private String output;
+ private String oldName = "WebRef";
+ private String newName = "WebRef2";
+
+ private StringBuilder strLine;
+ private String line;
+ private StreamReader strm;
+
+ public RenameWebReferenceTest()
+ {
+ pomPath = (new FileInfo(Directory.GetCurrentDirectory().Substring(0, Directory.GetCurrentDirectory().LastIndexOf("target")) + "\\src\\test\\resource\\ClassLibrary1\\ClassLibrary1\\pom.xml").FullName);
+
+ pomCopyPath = pomPath.Replace("pom.xml", "pomCopy.xml");
+
+ pomCopy = new PomHelperUtility(pomCopyPath);
+
+ File.Copy(pomPath, pomCopyPath);
+
+ fullPath = (new FileInfo(Directory.GetCurrentDirectory().Substring(0, Directory.GetCurrentDirectory().LastIndexOf("target")) + "\\src\\test\\resource\\ClassLibrary1\\ClassLibrary1\\Web References\\WebRef").FullName);
+ fullPathCopy = fullPath.Replace(oldName, newName);
+ path = "Web References\\" + oldName + "\\demoService.wsdl";
+ }
+
+ [Test]
+ public void RenameExistingWebReferenceTest()
+ {
+ int ctr = 0;
+
+ pomCopy.RenameWebReference(fullPath, oldName, newName, path, output);
+
+ strm = new StreamReader(pomCopyPath);
+ strLine = new StringBuilder();
+
+ while ((line = strm.ReadLine()) != null)
+ {
+ strLine.Append(line);
+
+ if (line.ToString().Contains("<webreference>"))
+ {
+ ctr++;
+ }
+ }
+
+ strm.Close();
+ File.Delete(pomCopyPath);
+
+ Assert.AreEqual(1, ctr);
+ Assert.IsFalse(strLine.ToString().Contains("<namespace>WebRef</namespace>"));
+ }
+
+ }
+}
Propchange: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.Utils-Test/RenameWebReferenceTest.cs
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.Utils-Test/ResyncArtifactSnapshot.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.Utils-Test/ResyncArtifactSnapshot.cs?rev=995026&r1=995025&r2=995026&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.Utils-Test/ResyncArtifactSnapshot.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.Utils-Test/ResyncArtifactSnapshot.cs Wed Sep 8 12:38:51 2010
@@ -1,35 +1,35 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using NUnit.Framework;
-using NPanday.VisualStudio.Addin;
-using NPanday.Artifact;
-using System.IO;
-
-namespace ClassLibrary1
-{
- [TestFixture]
- public class ResyncArtifactSnapshot
- {
- public void artifactSetUp()
- {
- ReferenceManager refMngr = new ReferenceManager();
- Artifact artifact = new Artifact();
-
- artifact.GroupId = "npanday.artifact";
- artifact.Version = "1.1-SNAPSHOT";
- artifact.ArtifactId = "NPanday.Artifact";
- artifact.Extension = "dll";
-
- refMngr.CopyArtifact(artifact,null);
- }
-
- [Test]
- public void downloadArtifact()
- {
- string user = System.Security.Principal.WindowsIdentity.GetCurrent().Name.ToString();
- Assert.IsNotNull(new FileInfo(string.Format("C:\\Documents and Settings\\{0}\\.m2\\uac\\gac_msil\\npanday.artifact\\1.1-SNAPSHOT__npanday.artifact\\NPanday.Artifact.dll", user)));
- }
-
- }
-}
+using System;
+using System.Collections.Generic;
+using System.Text;
+using NUnit.Framework;
+using NPanday.VisualStudio.Addin;
+using NPanday.Artifact;
+using System.IO;
+
+namespace ClassLibrary1
+{
+ [TestFixture]
+ public class ResyncArtifactSnapshot
+ {
+ public void artifactSetUp()
+ {
+ ReferenceManager refMngr = new ReferenceManager();
+ Artifact artifact = new Artifact();
+
+ artifact.GroupId = "npanday.artifact";
+ artifact.Version = "1.1-SNAPSHOT";
+ artifact.ArtifactId = "NPanday.Artifact";
+ artifact.Extension = "dll";
+
+ refMngr.CopyArtifact(artifact,null);
+ }
+
+ [Test]
+ public void downloadArtifact()
+ {
+ string user = System.Security.Principal.WindowsIdentity.GetCurrent().Name.ToString();
+ Assert.IsNotNull(new FileInfo(string.Format("C:\\Documents and Settings\\{0}\\.m2\\uac\\gac_msil\\npanday.artifact\\1.1-SNAPSHOT__npanday.artifact\\NPanday.Artifact.dll", user)));
+ }
+
+ }
+}
Propchange: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.Utils-Test/ResyncArtifactSnapshot.cs
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/npanday/trunk/plugins/maven-aspx-plugin/src/main/java/npanday/plugin/aspx/AspxBinDependencyResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/npanday/trunk/plugins/maven-aspx-plugin/src/main/java/npanday/plugin/aspx/AspxCompilerMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/npanday/trunk/plugins/maven-aspx-plugin/src/main/java/npanday/plugin/aspx/AspxPackageMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/npanday/trunk/plugins/maven-aspx-plugin/src/test/java/npanday/plugin/aspx/AspxBinDependencyResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-aspx-plugin/src/test/java/npanday/plugin/aspx/AspxBinDependencyResolverTest.java?rev=995026&r1=995025&r2=995026&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/maven-aspx-plugin/src/test/java/npanday/plugin/aspx/AspxBinDependencyResolverTest.java (original)
+++ incubator/npanday/trunk/plugins/maven-aspx-plugin/src/test/java/npanday/plugin/aspx/AspxBinDependencyResolverTest.java Wed Sep 8 12:38:51 2010
@@ -1,87 +1,87 @@
-package npanday.plugin.aspx;
-
-/*
-* Copyright 2009
-*
-* Licensed 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.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.versioning.VersionRange;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.util.FileUtils;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Collections;
-
-public class AspxBinDependencyResolverTest extends PlexusTestCase {
- private ArtifactFactory factory;
-
- public void setUp() throws Exception {
- super.setUp();
-
- factory = (ArtifactFactory) lookup(ArtifactFactory.ROLE);
- }
-
- public void testFinalNameChanged() throws MojoExecutionException, MojoFailureException, IOException {
- AspxBinDependencyResolver mojo = new AspxBinDependencyResolver();
-
- File binDir = getTestFile("target/bin-dir");
- FileUtils.deleteDirectory(binDir);
- binDir.mkdirs();
- mojo.setBinDir(binDir);
-
- VersionRange version = VersionRange.createFromVersion("1.0");
- Artifact artifact = factory.createDependencyArtifact("groupId", "artifactId", version, "dll", null,
- Artifact.SCOPE_RUNTIME);
- artifact.setFile(getTestFile("src/test/resources/artifactId-1.0.dll"));
-
- mojo.setDependencies(Collections.singleton(artifact));
-
- assertFalse(new File(binDir, "artifactId.dll").exists());
- assertFalse(new File(binDir, "artifactId-1.0.dll").exists());
- mojo.execute();
-
- assertTrue(new File(binDir, "artifactId.dll").exists());
- assertEquals("artifactId-1.0.dll", FileUtils.fileRead(new File(binDir, "artifactId.dll")).trim());
- assertFalse(new File(binDir, "artifactId-1.0.dll").exists());
- }
-
- public void testFinalNameMatches() throws MojoExecutionException, MojoFailureException, IOException {
- AspxBinDependencyResolver mojo = new AspxBinDependencyResolver();
-
- File binDir = getTestFile("target/bin-dir");
- FileUtils.deleteDirectory(binDir);
- binDir.mkdirs();
- mojo.setBinDir(binDir);
-
- VersionRange version = VersionRange.createFromVersion("1.0");
- Artifact artifact = factory.createDependencyArtifact("groupId", "artifactId", version, "dll", null,
- Artifact.SCOPE_RUNTIME);
- artifact.setFile(getTestFile("src/test/resources/artifactId.dll"));
-
- mojo.setDependencies(Collections.singleton(artifact));
-
- assertFalse(new File(binDir, "artifactId.dll").exists());
- assertFalse(new File(binDir, "artifactId-1.0.dll").exists());
- mojo.execute();
-
- assertTrue(new File(binDir, "artifactId.dll").exists());
- assertEquals("artifactId.dll", FileUtils.fileRead(new File(binDir, "artifactId.dll")).trim());
- assertFalse(new File(binDir, "artifactId-1.0.dll").exists());
- }
-}
+package npanday.plugin.aspx;
+
+/*
+* Copyright 2009
+*
+* Licensed 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.artifact.Artifact;
+import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.util.FileUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collections;
+
+public class AspxBinDependencyResolverTest extends PlexusTestCase {
+ private ArtifactFactory factory;
+
+ public void setUp() throws Exception {
+ super.setUp();
+
+ factory = (ArtifactFactory) lookup(ArtifactFactory.ROLE);
+ }
+
+ public void testFinalNameChanged() throws MojoExecutionException, MojoFailureException, IOException {
+ AspxBinDependencyResolver mojo = new AspxBinDependencyResolver();
+
+ File binDir = getTestFile("target/bin-dir");
+ FileUtils.deleteDirectory(binDir);
+ binDir.mkdirs();
+ mojo.setBinDir(binDir);
+
+ VersionRange version = VersionRange.createFromVersion("1.0");
+ Artifact artifact = factory.createDependencyArtifact("groupId", "artifactId", version, "dll", null,
+ Artifact.SCOPE_RUNTIME);
+ artifact.setFile(getTestFile("src/test/resources/artifactId-1.0.dll"));
+
+ mojo.setDependencies(Collections.singleton(artifact));
+
+ assertFalse(new File(binDir, "artifactId.dll").exists());
+ assertFalse(new File(binDir, "artifactId-1.0.dll").exists());
+ mojo.execute();
+
+ assertTrue(new File(binDir, "artifactId.dll").exists());
+ assertEquals("artifactId-1.0.dll", FileUtils.fileRead(new File(binDir, "artifactId.dll")).trim());
+ assertFalse(new File(binDir, "artifactId-1.0.dll").exists());
+ }
+
+ public void testFinalNameMatches() throws MojoExecutionException, MojoFailureException, IOException {
+ AspxBinDependencyResolver mojo = new AspxBinDependencyResolver();
+
+ File binDir = getTestFile("target/bin-dir");
+ FileUtils.deleteDirectory(binDir);
+ binDir.mkdirs();
+ mojo.setBinDir(binDir);
+
+ VersionRange version = VersionRange.createFromVersion("1.0");
+ Artifact artifact = factory.createDependencyArtifact("groupId", "artifactId", version, "dll", null,
+ Artifact.SCOPE_RUNTIME);
+ artifact.setFile(getTestFile("src/test/resources/artifactId.dll"));
+
+ mojo.setDependencies(Collections.singleton(artifact));
+
+ assertFalse(new File(binDir, "artifactId.dll").exists());
+ assertFalse(new File(binDir, "artifactId-1.0.dll").exists());
+ mojo.execute();
+
+ assertTrue(new File(binDir, "artifactId.dll").exists());
+ assertEquals("artifactId.dll", FileUtils.fileRead(new File(binDir, "artifactId.dll")).trim());
+ assertFalse(new File(binDir, "artifactId-1.0.dll").exists());
+ }
+}
Propchange: incubator/npanday/trunk/plugins/maven-aspx-plugin/src/test/java/npanday/plugin/aspx/AspxBinDependencyResolverTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/npanday/trunk/plugins/maven-resgen-plugin/src/main/java/npanday/plugin/resgen/EmbeddedResource.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-resgen-plugin/src/main/java/npanday/plugin/resgen/EmbeddedResource.java?rev=995026&r1=995025&r2=995026&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/maven-resgen-plugin/src/main/java/npanday/plugin/resgen/EmbeddedResource.java (original)
+++ incubator/npanday/trunk/plugins/maven-resgen-plugin/src/main/java/npanday/plugin/resgen/EmbeddedResource.java Wed Sep 8 12:38:51 2010
@@ -1,69 +1,69 @@
-/**
- * Copyright 2005 Exist Global
- *
- * Licensed 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.
- */
-
-package npanday.plugin.resgen;
-
-/*
- * 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.
- */
-
-
-/**
- * Webreference Pojo
- *
- * @author Shein Ernacio
- */
-public class EmbeddedResource
-{
- public String getName()
- {
- return name;
- }
-
- public void setName( String name )
- {
- this.name = name;
- }
-
- public String getSourceFile()
- {
- return sourceFile;
- }
-
- public void setSourceFile( String sourceFile )
- {
- this.sourceFile = sourceFile;
- }
-
- private String name;
-
- private String sourceFile;
-}
+/**
+ * Copyright 2005 Exist Global
+ *
+ * Licensed 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.
+ */
+
+package npanday.plugin.resgen;
+
+/*
+ * 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.
+ */
+
+
+/**
+ * Webreference Pojo
+ *
+ * @author Shein Ernacio
+ */
+public class EmbeddedResource
+{
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName( String name )
+ {
+ this.name = name;
+ }
+
+ public String getSourceFile()
+ {
+ return sourceFile;
+ }
+
+ public void setSourceFile( String sourceFile )
+ {
+ this.sourceFile = sourceFile;
+ }
+
+ private String name;
+
+ private String sourceFile;
+}
Propchange: incubator/npanday/trunk/plugins/maven-resgen-plugin/src/main/java/npanday/plugin/resgen/EmbeddedResource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/npanday/trunk/plugins/maven-resgen-plugin/src/main/java/npanday/plugin/resgen/ExistingResxGenerator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/npanday/trunk/plugins/maven-wsdl-plugin/src/main/java/npanday/plugin/wsdl/WebReference.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/javabinding/src/main/java/NPanday/Plugin/Msbuild/MsbuildMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.SysRef/javabinding/src/main/java/NPanday/Plugin/SysRef/SysRefMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/npanday/trunk/plugins/partcover-maven-plugin/src/main/java/npanday/plugin/partcover/AbstractPartCoverMojo.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/partcover-maven-plugin/src/main/java/npanday/plugin/partcover/AbstractPartCoverMojo.java?rev=995026&r1=995025&r2=995026&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/partcover-maven-plugin/src/main/java/npanday/plugin/partcover/AbstractPartCoverMojo.java (original)
+++ incubator/npanday/trunk/plugins/partcover-maven-plugin/src/main/java/npanday/plugin/partcover/AbstractPartCoverMojo.java Wed Sep 8 12:38:51 2010
@@ -1,37 +1,37 @@
-package npanday.plugin.partcover;
-
-/*
- * Copyright ---
- *
- * Licensed 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.commons.exec.CommandLine;
-import org.apache.commons.exec.DefaultExecutor;
-import org.apache.commons.exec.ExecuteException;
-import org.apache.maven.plugin.AbstractMojo;
-
-import java.io.IOException;
-
-public abstract class AbstractPartCoverMojo
- extends AbstractMojo
-{
- protected int executeCommandLine( String line )
- throws ExecuteException, IOException
- {
- CommandLine commandLine = CommandLine.parse( line );
- DefaultExecutor executor = new DefaultExecutor();
- return executor.execute( commandLine );
- }
-
-}
+package npanday.plugin.partcover;
+
+/*
+ * Copyright ---
+ *
+ * Licensed 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.commons.exec.CommandLine;
+import org.apache.commons.exec.DefaultExecutor;
+import org.apache.commons.exec.ExecuteException;
+import org.apache.maven.plugin.AbstractMojo;
+
+import java.io.IOException;
+
+public abstract class AbstractPartCoverMojo
+ extends AbstractMojo
+{
+ protected int executeCommandLine( String line )
+ throws ExecuteException, IOException
+ {
+ CommandLine commandLine = CommandLine.parse( line );
+ DefaultExecutor executor = new DefaultExecutor();
+ return executor.execute( commandLine );
+ }
+
+}
Propchange: incubator/npanday/trunk/plugins/partcover-maven-plugin/src/main/java/npanday/plugin/partcover/AbstractPartCoverMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/npanday/trunk/plugins/partcover-maven-plugin/src/main/java/npanday/plugin/partcover/PartCoverCompilerMojo.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/partcover-maven-plugin/src/main/java/npanday/plugin/partcover/PartCoverCompilerMojo.java?rev=995026&r1=995025&r2=995026&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/partcover-maven-plugin/src/main/java/npanday/plugin/partcover/PartCoverCompilerMojo.java (original)
+++ incubator/npanday/trunk/plugins/partcover-maven-plugin/src/main/java/npanday/plugin/partcover/PartCoverCompilerMojo.java Wed Sep 8 12:38:51 2010
@@ -1,123 +1,123 @@
-package npanday.plugin.partcover;
-
-/*
- * Copyright ---
- *
- * Licensed 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.commons.exec.ExecuteException;
-import org.apache.commons.io.FileUtils;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.project.MavenProject;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * Goal which generates the xml report of Part Cover
- *
- * @goal generate
- *
- * @phase package
- */
-public class PartCoverCompilerMojo
- extends AbstractPartCoverMojo
-{
- /**
- * Location of the assembly files.
- * @parameter expression="${assemblyName}"
- * @required
- */
- private File assemblyName;
-
- /**
- * Directory where all reports will be generated.
- * @parameter expression="${outputDirectory}" default-value="${project.build.directory}/partcover-reports"
- */
- private File outputDirectory;
-
- /**
- * The path where the nunit-console executable is located.
- * The version should be 2.5 up so that partcover will run successfully.
- *
- * @parameter expression="${nUnit}" default-value="C:\\Program Files\\NUnit 2.5.7\\bin\\net-2.0\\nunit-console.exe"
- */
- private String nUnit;
-
- /**
- * The path where the partcover executable is located.
- *
- * @parameter expression="${partCover}" default-value="C:\\Program Files\\PartCover\\PartCover .NET 4.0\\PartCover.exe"
- */
- private String partCover;
-
- /**
- * The maven project
- * @parameter expression="${project}"
- * @readonly
- */
- protected MavenProject project;
-
- /**
- * @parameter expression="${include}" default-value="[*]*"
- * @required
- */
- private String include;
-
- /**
- * @parameter expression="${exclude}" default-value="[nunit*]*"
- */
- private String exclude;
-
- public void execute()
- throws MojoExecutionException
- {
- try
- {
- if ( !outputDirectory.exists() )
- {
- outputDirectory.mkdirs();
- }
-
- StringBuilder line = new StringBuilder();
- line.append( " \"" ).append( partCover ).append( "\" --target \"" ).append( nUnit ).append( "\" --target-args " ).append( assemblyName );
-
- if ( include != null && include.length() > 0 )
- {
- line.append( " --include " ).append( include );
- }
- if ( exclude != null && exclude.length() > 0 )
- {
- line.append( " --exclude " ).append( exclude );
- }
-
- line.append( " --output " ).append( outputDirectory ).append( "/coverage.xml" );
-
- int exitValue = executeCommandLine( line.toString() );
-
- // clean up
- FileUtils.forceDeleteOnExit( new File( project.getBasedir(), "partcover.driver.log" ) );
- FileUtils.forceDeleteOnExit( new File( project.getBasedir(), "TestResult.xml" ) );
- }
- catch ( ExecuteException e )
- {
- throw new MojoExecutionException( "Problem executing coverage", e );
- }
- catch ( IOException e )
- {
- throw new MojoExecutionException( "Problem executing coverage", e );
- }
- }
+package npanday.plugin.partcover;
+
+/*
+ * Copyright ---
+ *
+ * Licensed 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.commons.exec.ExecuteException;
+import org.apache.commons.io.FileUtils;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.project.MavenProject;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * Goal which generates the xml report of Part Cover
+ *
+ * @goal generate
+ *
+ * @phase package
+ */
+public class PartCoverCompilerMojo
+ extends AbstractPartCoverMojo
+{
+ /**
+ * Location of the assembly files.
+ * @parameter expression="${assemblyName}"
+ * @required
+ */
+ private File assemblyName;
+
+ /**
+ * Directory where all reports will be generated.
+ * @parameter expression="${outputDirectory}" default-value="${project.build.directory}/partcover-reports"
+ */
+ private File outputDirectory;
+
+ /**
+ * The path where the nunit-console executable is located.
+ * The version should be 2.5 up so that partcover will run successfully.
+ *
+ * @parameter expression="${nUnit}" default-value="C:\\Program Files\\NUnit 2.5.7\\bin\\net-2.0\\nunit-console.exe"
+ */
+ private String nUnit;
+
+ /**
+ * The path where the partcover executable is located.
+ *
+ * @parameter expression="${partCover}" default-value="C:\\Program Files\\PartCover\\PartCover .NET 4.0\\PartCover.exe"
+ */
+ private String partCover;
+
+ /**
+ * The maven project
+ * @parameter expression="${project}"
+ * @readonly
+ */
+ protected MavenProject project;
+
+ /**
+ * @parameter expression="${include}" default-value="[*]*"
+ * @required
+ */
+ private String include;
+
+ /**
+ * @parameter expression="${exclude}" default-value="[nunit*]*"
+ */
+ private String exclude;
+
+ public void execute()
+ throws MojoExecutionException
+ {
+ try
+ {
+ if ( !outputDirectory.exists() )
+ {
+ outputDirectory.mkdirs();
+ }
+
+ StringBuilder line = new StringBuilder();
+ line.append( " \"" ).append( partCover ).append( "\" --target \"" ).append( nUnit ).append( "\" --target-args " ).append( assemblyName );
+
+ if ( include != null && include.length() > 0 )
+ {
+ line.append( " --include " ).append( include );
+ }
+ if ( exclude != null && exclude.length() > 0 )
+ {
+ line.append( " --exclude " ).append( exclude );
+ }
+
+ line.append( " --output " ).append( outputDirectory ).append( "/coverage.xml" );
+
+ int exitValue = executeCommandLine( line.toString() );
+
+ // clean up
+ FileUtils.forceDeleteOnExit( new File( project.getBasedir(), "partcover.driver.log" ) );
+ FileUtils.forceDeleteOnExit( new File( project.getBasedir(), "TestResult.xml" ) );
+ }
+ catch ( ExecuteException e )
+ {
+ throw new MojoExecutionException( "Problem executing coverage", e );
+ }
+ catch ( IOException e )
+ {
+ throw new MojoExecutionException( "Problem executing coverage", e );
+ }
+ }
}
\ No newline at end of file
Propchange: incubator/npanday/trunk/plugins/partcover-maven-plugin/src/main/java/npanday/plugin/partcover/PartCoverCompilerMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/npanday/trunk/plugins/partcover-maven-plugin/src/main/java/npanday/plugin/partcover/PartCoverConverterMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/npanday/trunk/plugins/wix-maven-plugin/src/main/java/npanday/plugin/wix/CandleMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/npanday/trunk/plugins/wix-maven-plugin/src/main/java/npanday/plugin/wix/LightMojo.java
------------------------------------------------------------------------------
svn:eol-style = native