[jira] [Created] (NPANDAY-428) Issues while removing/adding a dependency in the project

2011-05-09 Thread Adelita L. Padilla (JIRA)
Issues while removing/adding a dependency in the project


 Key: NPANDAY-428
 URL: https://issues.apache.org/jira/browse/NPANDAY-428
 Project: NPanday
  Issue Type: Bug
  Components: Visual Studio Add-in
Affects Versions: 1.4-incubating
Reporter: Adelita L. Padilla
 Fix For: 1.4.1-incubating



Steps to reproduce:


1) Start NPanday
2) Open 'ProjectA'
3) Generate POMs
4) Right click on 'ProjectA', then select 'Current NPanday Project > Install'
5) Add a new 'ProjectB' to the solution
6) Generate POMs
7) Add 'ProjectA' as dependency to 'ProjectB' (Add Maven Artifact)
8) Build the whole solution
9) Remove 'ProjectA' as dependency to 'ProjectB'


Actual Behavior:


POM file for ProjectB was not updated correctly. Configuration for the 
dependency for 'ProjectA' was not removed in POM


Expected Behavior:


POM file for ProjectB should be updated properly. 

10) Add 'ProjectA' again to 'ProjectB'

Actual Behavior:

"Error in Adding Artifact Dependency.." pops up because the dependency was not 
removed in the POM.




--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


svn commit: r1101312 - in /incubator/npanday/npanday-its/trunk/src/test/resources: NPANDAY_377_WithCustomNPandaySettingsDirectoryTest/pom.xml NPANDAY_377_WithCustomNPandaySettingsFileTest/pom.xml

2011-05-09 Thread brett
Author: brett
Date: Tue May 10 05:24:47 2011
New Revision: 1101312

URL: http://svn.apache.org/viewvc?rev=1101312&view=rev
Log:
add missing parents

Modified:

incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_377_WithCustomNPandaySettingsDirectoryTest/pom.xml

incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_377_WithCustomNPandaySettingsFileTest/pom.xml

Modified: 
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_377_WithCustomNPandaySettingsDirectoryTest/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_377_WithCustomNPandaySettingsDirectoryTest/pom.xml?rev=1101312&r1=1101311&r2=1101312&view=diff
==
--- 
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_377_WithCustomNPandaySettingsDirectoryTest/pom.xml
 (original)
+++ 
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_377_WithCustomNPandaySettingsDirectoryTest/pom.xml
 Tue May 10 05:24:47 2011
@@ -19,6 +19,11 @@ under the License.
 -->
 http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns="http://maven.apache.org/POM/4.0.0";>
   4.0.0
+  
+NPanday.ITs
+NPanday.ITs.Parent
+1-SNAPSHOT
+  
   Microsoft.NPANDAY377WithCustomNPandaySettingsDirectoryTest
   
NPANDAY377WithCustomNPandaySettingsDirectoryTest-parent
   pom
@@ -27,4 +32,4 @@ under the License.
   
 NPANDAY_377_WithCustomNPandaySettingsDirectoryTest
   
-
\ No newline at end of file
+

Modified: 
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_377_WithCustomNPandaySettingsFileTest/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_377_WithCustomNPandaySettingsFileTest/pom.xml?rev=1101312&r1=1101311&r2=1101312&view=diff
==
--- 
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_377_WithCustomNPandaySettingsFileTest/pom.xml
 (original)
+++ 
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_377_WithCustomNPandaySettingsFileTest/pom.xml
 Tue May 10 05:24:47 2011
@@ -19,6 +19,11 @@ under the License.
 -->
 http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns="http://maven.apache.org/POM/4.0.0";>
   4.0.0
+  
+NPanday.ITs
+NPanday.ITs.Parent
+1-SNAPSHOT
+  
   Microsoft.NPANDAY377WithCustomNPandaySettingsFileTest
   NPANDAY377WithCustomNPandaySettingsFileTest-parent
   pom
@@ -27,4 +32,4 @@ under the License.
   
 NPANDAY_377_WithCustomNPandaySettingsFileTest
   
-
\ No newline at end of file
+




[jira] [Commented] (NPANDAY-426) unhandled exception when attempting to execute NPanday.Plugin.Loader.exe

2011-05-09 Thread Lars Corneliussen (JIRA)

[ 
https://issues.apache.org/jira/browse/NPANDAY-426?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13030905#comment-13030905
 ] 

Lars Corneliussen commented on NPANDAY-426:
---

The java binding only runs the loader, if it thinks it has to generate a new 
npanday-settings.xml

The error will occur for all netplugins (msbuild, ..)

So yes, this is the same as NPANDAY-427

> unhandled exception when attempting to execute NPanday.Plugin.Loader.exe
> 
>
> Key: NPANDAY-426
> URL: https://issues.apache.org/jira/browse/NPANDAY-426
> Project: NPanday
>  Issue Type: Bug
>  Components: Maven Plugins
>Affects Versions: 1.4-incubating
> Environment: Maven 2.2.1, Windows 7 64 bit, Java 1.6_23, Npanday 
> 1.3-incubating
>Reporter: Khai Do
>Priority: Critical
>  Labels: maven
> Attachments: npanday-settings.xml
>
>
> I get an unhandled exception when attempting to execute 
> NPanday.Plugin.Loader.exe. I've found that I get this exception when 
> npanday-settings.xml is missing from C:\Documents and Settings\\.m2 
> folder. The fialure goes away when the file is present.  The 
> Npanday-1.3-incubating.msi doesn't install this file. I've already posted 
> this issue on the npanday mailing list: 
> http://markmail.org/message/vw4dsxlbchcknbbz
> Here is the error..
> [INFO] [NPanday.Plugin.Settings.JavaBinding:generate-settings {execution:
> default-generate-settings}] NPanday: Start Process = 4/14/2011 2:47:26 PM
> "parameterFile=C:\Users\ADMINI~1\AppData\Local\Temp\Plugin2180957865136058399.xml"
> "assemblyFile=C:\source\DashboardSample\target\NPanday.Plugin.Settings.dll"
> "mojoName=NPanday.Plugin.Settings.Setting sGeneratorMojo"
> "startProcessAssembly=C:\source\DashboardSample\target\NPanday.Plugin.Loader.exe"
>  [INFO] [INFO] Unhandled Exception: System.TypeLoadException: The domain 
> manager
> specified by the host could not be instantiated. [INFO] at 
> System.AppDomain.CreateDomainManager(String
> domainManagerAssemblyName, String domainManagerTypeName) [INFO] at 
> System.AppDomain.SetDomainManager(Evidence providedSecurityInfo,
> Evidence creatorsSecurityInfo, IntPtr parentSecurityDescriptor, Boolean
> publishAppDomain) [INFO] at System.AppDomain.SetDefaultDomainManager(String 
> fullName, String[]
> manifestPaths, String[] activationData) NPanday: End Process = 4/14/2011 
> 2:47:30 PM; exit code = -532459699 [INFO]
>  
> [ERROR] BUILD ERROR [INFO] 
>  
> [INFO] NPANDAY-xxx-000
> Embedded error: NPANDAY-063-000: Execution Path =
> C:\source\DashboardSample\target, Command =
> [parameterFile=C:\Users\ADMINI~1\AppData\Local\Temp\Plugin2180957865136058399.xml,
> assemblyFile=C:\source\ DashboardSample\target\NPanday.Plugin.Settings.dll,
> mojoName=NPanday.Plugin.Settings.SettingsGeneratorMojo,
> startProcessAssembly=C:\source\DashboardSample\target\NPanday.Plugin.Loader.exe]
>  NPANDAY-040-001: Could not execute: Command = CMD.EXE /X /C
> NPanday.Plugin.Runner.exe
> parameterFile=C:\Users\ADMINI~1\AppData\Local\Temp\Plugin2180957865136058399.xml
> assemblyFile=C:\source\DashboardS ample\target\NPanday.Plugin.Settings.dll
> mojoName=NPanday.Plugin.Settings.SettingsGeneratorMojo
> startProcessAssembly=C:\source\DashboardSample\target\NPanday.Plugin.Loader.exe,
> Result = -532459699 

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (NPANDAY-427) unhandled exception when building with NPanday.Plugin.Msbuild.JavaBinding plugin

2011-05-09 Thread Lars Corneliussen (JIRA)

[ 
https://issues.apache.org/jira/browse/NPANDAY-427?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13030900#comment-13030900
 ] 

Lars Corneliussen commented on NPANDAY-427:
---

We have seen this issue before, but we did not reproduce it so far. 

I think it might have to do with 64bit/32bit. 

But I run Win 7 64bit, too - and it works. 

> unhandled exception when building with NPanday.Plugin.Msbuild.JavaBinding 
> plugin
> 
>
> Key: NPANDAY-427
> URL: https://issues.apache.org/jira/browse/NPANDAY-427
> Project: NPanday
>  Issue Type: Bug
>  Components: Maven Plugins
>Affects Versions: 1.4-incubating
> Environment: Maven 2.2.1, Windows 7 64 bit, Java 1.6_23, Npanday 
> 1.3-incubating
>Reporter: Khai Do
>Priority: Critical
>  Labels: maven
> Attachments: pom.zip
>
>
> Similar to NPANDAY-426.  However I'm getting the same behavior when building 
> WPF applications.  I believe the culprit is the 
> NPanday.Plugin.Msbuild.JavaBinding plugin.  The failure goes aways when i 
> remove this plugin from my pom.xml file.  The pom was created using npanday 
> from within visual studio.  I'm not sure what tihs plugin is doing but when i 
> remove it other build errors occur.  I have not been able to build a WPF 
> application due to this issue.  What i do know is that running msbuild or 
> building with VS IDE works.  I have also posted this issue on the npanday 
> mailing list here: http://markmail.org/message/vw4dsxlbchcknbbz

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Updated] (NPANDAY-427) unhandled exception when building with NPanday.Plugin.Msbuild.JavaBinding plugin

2011-05-09 Thread Khai Do (JIRA)

 [ 
https://issues.apache.org/jira/browse/NPANDAY-427?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Khai Do updated NPANDAY-427:


Description: 
Similar to NPANDAY-426.  However I'm getting the same behavior when building 
WPF applications.  I believe the culprit is the 
NPanday.Plugin.Msbuild.JavaBinding plugin.  The failure goes aways when i 
remove this plugin from my pom.xml file.  The pom was created using npanday 
from within visual studio.  I'm not sure what tihs plugin is doing but when i 
remove it other build errors occur.  I have not been able to build a WPF 
application due to this issue.  What i do know is that running msbuild or 
building with VS IDE works.  I have also posted this issue on the npanday 
mailing list here: http://markmail.org/message/vw4dsxlbchcknbbz


  was:
Similar to NPANDAY-426.  However I'm getting the same behavior when building 
WPF applications.  I believe the culprit is the 
NPanday.Plugin.Msbuild.JavaBinding plugin.  The failure goes aways when i 
remove this plugin from my pom.xml file.  I created my pom from within visual 
studio.   I have not been able to build a WPF application due to this issue. I 
have posted on the npanday mailing list here: 
http://markmail.org/message/vw4dsxlbchcknbbz



> unhandled exception when building with NPanday.Plugin.Msbuild.JavaBinding 
> plugin
> 
>
> Key: NPANDAY-427
> URL: https://issues.apache.org/jira/browse/NPANDAY-427
> Project: NPanday
>  Issue Type: Bug
>  Components: Maven Plugins
>Affects Versions: 1.4-incubating
> Environment: Maven 2.2.1, Windows 7 64 bit, Java 1.6_23, Npanday 
> 1.3-incubating
>Reporter: Khai Do
>Priority: Critical
>  Labels: maven
> Attachments: pom.zip
>
>
> Similar to NPANDAY-426.  However I'm getting the same behavior when building 
> WPF applications.  I believe the culprit is the 
> NPanday.Plugin.Msbuild.JavaBinding plugin.  The failure goes aways when i 
> remove this plugin from my pom.xml file.  The pom was created using npanday 
> from within visual studio.  I'm not sure what tihs plugin is doing but when i 
> remove it other build errors occur.  I have not been able to build a WPF 
> application due to this issue.  What i do know is that running msbuild or 
> building with VS IDE works.  I have also posted this issue on the npanday 
> mailing list here: http://markmail.org/message/vw4dsxlbchcknbbz

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Updated] (NPANDAY-427) unhandled exception when building with NPanday.Plugin.Msbuild.JavaBinding plugin

2011-05-09 Thread Khai Do (JIRA)

 [ 
https://issues.apache.org/jira/browse/NPANDAY-427?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Khai Do updated NPANDAY-427:


Attachment: pom.zip

> unhandled exception when building with NPanday.Plugin.Msbuild.JavaBinding 
> plugin
> 
>
> Key: NPANDAY-427
> URL: https://issues.apache.org/jira/browse/NPANDAY-427
> Project: NPanday
>  Issue Type: Bug
>  Components: Maven Plugins
>Affects Versions: 1.4-incubating
> Environment: Maven 2.2.1, Windows 7 64 bit, Java 1.6_23, Npanday 
> 1.3-incubating
>Reporter: Khai Do
>Priority: Critical
>  Labels: maven
> Attachments: pom.zip
>
>
> Similar to NPANDAY-426.  However I'm getting the same behavior when building 
> WPF applications.  I believe the culprit is the 
> NPanday.Plugin.Msbuild.JavaBinding plugin.  The failure goes aways when i 
> remove this plugin from my pom.xml file.  I created my pom from within visual 
> studio.   I have not been able to build a WPF application due to this issue. 
> I have posted on the npanday mailing list here: 
> http://markmail.org/message/vw4dsxlbchcknbbz

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Created] (NPANDAY-427) unhandled exception when building with NPanday.Plugin.Msbuild.JavaBinding plugin

2011-05-09 Thread Khai Do (JIRA)
unhandled exception when building with NPanday.Plugin.Msbuild.JavaBinding plugin


 Key: NPANDAY-427
 URL: https://issues.apache.org/jira/browse/NPANDAY-427
 Project: NPanday
  Issue Type: Bug
  Components: Maven Plugins
Affects Versions: 1.4-incubating
 Environment: Maven 2.2.1, Windows 7 64 bit, Java 1.6_23, Npanday 
1.3-incubating
Reporter: Khai Do
Priority: Critical


Similar to NPANDAY-426.  However I'm getting the same behavior when building 
WPF applications.  I believe the culprit is the 
NPanday.Plugin.Msbuild.JavaBinding plugin.  The failure goes aways when i 
remove this plugin from my pom.xml file.  I created my pom from within visual 
studio.   I have not been able to build a WPF application due to this issue. I 
have posted on the npanday mailing list here: 
http://markmail.org/message/vw4dsxlbchcknbbz


--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Updated] (NPANDAY-426) unhandled exception when attempting to execute NPanday.Plugin.Loader.exe

2011-05-09 Thread Khai Do (JIRA)

 [ 
https://issues.apache.org/jira/browse/NPANDAY-426?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Khai Do updated NPANDAY-426:


Attachment: npanday-settings.xml

This is my npanday-settings.xml that seems to fix the failure.  It came from a 
previous release of npanday.

> unhandled exception when attempting to execute NPanday.Plugin.Loader.exe
> 
>
> Key: NPANDAY-426
> URL: https://issues.apache.org/jira/browse/NPANDAY-426
> Project: NPanday
>  Issue Type: Bug
>  Components: Maven Plugins
>Affects Versions: 1.4-incubating
> Environment: Maven 2.2.1, Windows 7 64 bit, Java 1.6_23, Npanday 
> 1.3-incubating
>Reporter: Khai Do
>Priority: Critical
>  Labels: maven
> Attachments: npanday-settings.xml
>
>
> I get an unhandled exception when attempting to execute 
> NPanday.Plugin.Loader.exe. I've found that I get this exception when 
> npanday-settings.xml is missing from C:\Documents and Settings\\.m2 
> folder. The fialure goes away when the file is present.  The 
> Npanday-1.3-incubating.msi doesn't install this file. I've already posted 
> this issue on the npanday mailing list: 
> http://markmail.org/message/vw4dsxlbchcknbbz
> Here is the error..
> [INFO] [NPanday.Plugin.Settings.JavaBinding:generate-settings {execution:
> default-generate-settings}] NPanday: Start Process = 4/14/2011 2:47:26 PM
> "parameterFile=C:\Users\ADMINI~1\AppData\Local\Temp\Plugin2180957865136058399.xml"
> "assemblyFile=C:\source\DashboardSample\target\NPanday.Plugin.Settings.dll"
> "mojoName=NPanday.Plugin.Settings.Setting sGeneratorMojo"
> "startProcessAssembly=C:\source\DashboardSample\target\NPanday.Plugin.Loader.exe"
>  [INFO] [INFO] Unhandled Exception: System.TypeLoadException: The domain 
> manager
> specified by the host could not be instantiated. [INFO] at 
> System.AppDomain.CreateDomainManager(String
> domainManagerAssemblyName, String domainManagerTypeName) [INFO] at 
> System.AppDomain.SetDomainManager(Evidence providedSecurityInfo,
> Evidence creatorsSecurityInfo, IntPtr parentSecurityDescriptor, Boolean
> publishAppDomain) [INFO] at System.AppDomain.SetDefaultDomainManager(String 
> fullName, String[]
> manifestPaths, String[] activationData) NPanday: End Process = 4/14/2011 
> 2:47:30 PM; exit code = -532459699 [INFO]
>  
> [ERROR] BUILD ERROR [INFO] 
>  
> [INFO] NPANDAY-xxx-000
> Embedded error: NPANDAY-063-000: Execution Path =
> C:\source\DashboardSample\target, Command =
> [parameterFile=C:\Users\ADMINI~1\AppData\Local\Temp\Plugin2180957865136058399.xml,
> assemblyFile=C:\source\ DashboardSample\target\NPanday.Plugin.Settings.dll,
> mojoName=NPanday.Plugin.Settings.SettingsGeneratorMojo,
> startProcessAssembly=C:\source\DashboardSample\target\NPanday.Plugin.Loader.exe]
>  NPANDAY-040-001: Could not execute: Command = CMD.EXE /X /C
> NPanday.Plugin.Runner.exe
> parameterFile=C:\Users\ADMINI~1\AppData\Local\Temp\Plugin2180957865136058399.xml
> assemblyFile=C:\source\DashboardS ample\target\NPanday.Plugin.Settings.dll
> mojoName=NPanday.Plugin.Settings.SettingsGeneratorMojo
> startProcessAssembly=C:\source\DashboardSample\target\NPanday.Plugin.Loader.exe,
> Result = -532459699 

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Created] (NPANDAY-426) unhandled exception when attempting to execute NPanday.Plugin.Loader.exe

2011-05-09 Thread Khai Do (JIRA)
unhandled exception when attempting to execute NPanday.Plugin.Loader.exe


 Key: NPANDAY-426
 URL: https://issues.apache.org/jira/browse/NPANDAY-426
 Project: NPanday
  Issue Type: Bug
  Components: Maven Plugins
Affects Versions: 1.4-incubating
 Environment: Maven 2.2.1, Windows 7 64 bit, Java 1.6_23, Npanday 
1.3-incubating
Reporter: Khai Do
Priority: Critical


I get an unhandled exception when attempting to execute 
NPanday.Plugin.Loader.exe. I've found that I get this exception when 
npanday-settings.xml is missing from C:\Documents and Settings\\.m2 
folder. The fialure goes away when the file is present.  The 
Npanday-1.3-incubating.msi doesn't install this file. I've already posted this 
issue on the npanday mailing list: http://markmail.org/message/vw4dsxlbchcknbbz


Here is the error..

[INFO] [NPanday.Plugin.Settings.JavaBinding:generate-settings {execution:
default-generate-settings}] NPanday: Start Process = 4/14/2011 2:47:26 PM
"parameterFile=C:\Users\ADMINI~1\AppData\Local\Temp\Plugin2180957865136058399.xml"
"assemblyFile=C:\source\DashboardSample\target\NPanday.Plugin.Settings.dll"
"mojoName=NPanday.Plugin.Settings.Setting sGeneratorMojo"
"startProcessAssembly=C:\source\DashboardSample\target\NPanday.Plugin.Loader.exe"
 [INFO] [INFO] Unhandled Exception: System.TypeLoadException: The domain manager
specified by the host could not be instantiated. [INFO] at 
System.AppDomain.CreateDomainManager(String
domainManagerAssemblyName, String domainManagerTypeName) [INFO] at 
System.AppDomain.SetDomainManager(Evidence providedSecurityInfo,
Evidence creatorsSecurityInfo, IntPtr parentSecurityDescriptor, Boolean
publishAppDomain) [INFO] at System.AppDomain.SetDefaultDomainManager(String 
fullName, String[]
manifestPaths, String[] activationData) NPanday: End Process = 4/14/2011 
2:47:30 PM; exit code = -532459699 [INFO]
 
[ERROR] BUILD ERROR [INFO] 
 [INFO] 
NPANDAY-xxx-000

Embedded error: NPANDAY-063-000: Execution Path =
C:\source\DashboardSample\target, Command =
[parameterFile=C:\Users\ADMINI~1\AppData\Local\Temp\Plugin2180957865136058399.xml,
assemblyFile=C:\source\ DashboardSample\target\NPanday.Plugin.Settings.dll,
mojoName=NPanday.Plugin.Settings.SettingsGeneratorMojo,
startProcessAssembly=C:\source\DashboardSample\target\NPanday.Plugin.Loader.exe]
 NPANDAY-040-001: Could not execute: Command = CMD.EXE /X /C
NPanday.Plugin.Runner.exe
parameterFile=C:\Users\ADMINI~1\AppData\Local\Temp\Plugin2180957865136058399.xml
assemblyFile=C:\source\DashboardS ample\target\NPanday.Plugin.Settings.dll
mojoName=NPanday.Plugin.Settings.SettingsGeneratorMojo
startProcessAssembly=C:\source\DashboardSample\target\NPanday.Plugin.Loader.exe,
Result = -532459699 

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


svn commit: r1101017 - in /incubator/npanday/trunk: LICENSE.txt NOTICE.txt

2011-05-09 Thread brett
Author: brett
Date: Mon May  9 13:20:57 2011
New Revision: 1101017

URL: http://svn.apache.org/viewvc?rev=1101017&view=rev
Log:
remove some unnecessary portions of the license files

Modified:
incubator/npanday/trunk/LICENSE.txt
incubator/npanday/trunk/NOTICE.txt

Modified: incubator/npanday/trunk/LICENSE.txt
URL: 
http://svn.apache.org/viewvc/incubator/npanday/trunk/LICENSE.txt?rev=1101017&r1=1101016&r2=1101017&view=diff
==
--- incubator/npanday/trunk/LICENSE.txt (original)
+++ incubator/npanday/trunk/LICENSE.txt Mon May  9 13:20:57 2011
@@ -1,10 +1,3 @@
-
-=   The following libraries are licensed under the Apache License Version 2.0: 
=
-=  
=
-=   * org/apache/ant/ant/1.7.1/ant-1.7.1.jar   
=
-=   * org/apache/ant/ant-launcher/1.7.1/ant-launcher-1.7.1.jar 
=
-===
  === 
-
 
  Apache License
Version 2.0, January 2004
@@ -233,18 +226,10 @@
the original software.
 
3. This notice may not be removed or altered from any source distribution.
-
-   License Note
-
-   This license is based on the open source zlib/libpng license. The idea was 
to keep the license 
-   as simple as possible to encourage use of NUnit in free and commercial 
applications and libraries, 
-   but to keep the source code together and to give credit to the NUnit 
contributors for their efforts. 
-   While this license allows shipping NUnit in source and binary form, if 
shipping a NUnit variant is the 
-   sole purpose of your product, please let us know.
 
===
  
 
 
===
-=   The following librarie(s) are licensed under BSD License:  
   =
+=   The following libraries are licensed under BSD License:
 =
 =  
   =
 =   * info/aduna/aduna-collections/1.2/aduna-collections-1.2.jar   
   =
 =   * info/aduna/aduna-concurrent/1.2/aduna-concurrent-1.2.jar 
   =
@@ -283,4 +268,4 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 
THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-===
\ No newline at end of file
+===

Modified: incubator/npanday/trunk/NOTICE.txt
URL: 
http://svn.apache.org/viewvc/incubator/npanday/trunk/NOTICE.txt?rev=1101017&r1=1101016&r2=1101017&view=diff
==
--- incubator/npanday/trunk/NOTICE.txt (original)
+++ incubator/npanday/trunk/NOTICE.txt Mon May  9 13:20:57 2011
@@ -3,6 +3,3 @@ Copyright 2007-2011
 
 This product includes software developed by The Apache Software Foundation 
(http://www.apache.org/).
 
-This product includes software developed under zlib/libpng license 
(http://www.nunit.org/index.php?p=license&r=2.2.10).
-
-This product includes software developed under BSD License.