svn commit: r1005320 - /incubator/npanday/site/pom.xml
Author: brett Date: Thu Oct 7 02:48:18 2010 New Revision: 1005320 URL: http://svn.apache.org/viewvc?rev=1005320view=rev Log: tracker location Modified: incubator/npanday/site/pom.xml Modified: incubator/npanday/site/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/site/pom.xml?rev=1005320r1=1005319r2=1005320view=diff == --- incubator/npanday/site/pom.xml (original) +++ incubator/npanday/site/pom.xml Thu Oct 7 02:48:18 2010 @@ -75,13 +75,10 @@ urlhttp://svn.apache.org/viewvc/incubator/npanday/site/url /scm -!-- - Update when JIRA is set up issueManagement -systemCodeplex Issue Tracker/system -urlhttp://www.codeplex.com/npanday/WorkItem/List.aspx/url +systemjira/system +urlhttp://issues.apache.org/jira/browse/NPANDAY/url /issueManagement --- developers developer
svn propchange: r1002923 - svn:log
Author: brett Revision: 1002923 Modified property: svn:log Modified: svn:log at Fri Oct 8 03:48:36 2010 -- --- svn:log (original) +++ svn:log Fri Oct 8 03:48:36 2010 @@ -1,4 +1,4 @@ -Added patch for VS 2010 support - http://npanday.codeplex.com/workitem/13479 +[NPANDAY-288] Added patch for VS 2010 support (originally http://npanday.codeplex.com/workitem/13479) * added patch submitted by crimmc for VS 2010 support * revised vsinstaller plugin to enable auto generation of addin file in VS2010 * revised addin in template/NPanday.VisualStudio.Addin so that addin file will be available in VS 2010 Addin Manager
svn commit: r1035865 - /incubator/npanday/site/src/site/resources/.htaccess
Author: brett Date: Wed Nov 17 00:02:59 2010 New Revision: 1035865 URL: http://svn.apache.org/viewvc?rev=1035865view=rev Log: redirect /docs/current to the current version Added: incubator/npanday/site/src/site/resources/.htaccess (with props) Added: incubator/npanday/site/src/site/resources/.htaccess URL: http://svn.apache.org/viewvc/incubator/npanday/site/src/site/resources/.htaccess?rev=1035865view=auto == --- incubator/npanday/site/src/site/resources/.htaccess (added) +++ incubator/npanday/site/src/site/resources/.htaccess Wed Nov 17 00:02:59 2010 @@ -0,0 +1 @@ +RedirectMatch permanent ^/npanday/docs/current/(.*)$ http://incubator.apache.org/npanday/docs/1.2.2-incubating-SNAPSHOT/$1 Propchange: incubator/npanday/site/src/site/resources/.htaccess -- svn:eol-style = native
svn commit: r1035872 - /incubator/npanday/site/pom.xml
Author: brett Date: Wed Nov 17 00:15:47 2010 New Revision: 1035872 URL: http://svn.apache.org/viewvc?rev=1035872view=rev Log: update committers and contributors Modified: incubator/npanday/site/pom.xml Modified: incubator/npanday/site/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/site/pom.xml?rev=1035872r1=1035871r2=1035872view=diff == --- incubator/npanday/site/pom.xml (original) +++ incubator/npanday/site/pom.xml Wed Nov 17 00:15:47 2010 @@ -81,14 +81,44 @@ /issueManagement developers +developer + nameCraig Bachelor/name + idcraig/id +/developer +developer + nameMarecor Baclay/name + idmbaclay/id + emailmbac...@exist.com/email +/developer +developer + nameMaria Odea Ching/name + idoching/id + roles +roleMentor/role + /roles +/developer developer nameLars Corneliussen/name idlcorneliussen/id /developer +developer + nameDennis Lundberg/name + iddennisl/id + roles +roleMentor/role + /roles +/developer +developer + nameGavin McDonald/name + idgmcdonald/id + roles +roleMentor/role + /roles +/developer developer nameJoe Ocaba/name idjocaba/id - emailjoc...@exist.com/email + emailjoc...@maestrodev.com/email /developer developer nameAdelita Padilla/name @@ -98,11 +128,7 @@ developer nameBrett Porter/name idbrett/id -/developer -developer - nameMarecor Baclay/name - idmbaclay/id - emailmbac...@exist.com/email + emailbr...@apache.org/email /developer developer nameWendy Smoak/name @@ -149,7 +175,30 @@ emailewor...@apache.org/email /developer /developers - + contributors +contributor + nameChris Bown/name +/contributor +contributor + nameJohn Fallows/name +/contributor +contributor + nameArtem Fedorenko/name +/contributor +contributor + nameKurt Harriger/name +/contributor +contributor + nameThorsten Kamann/name +/contributor +contributor + nameNap Ramirez/name +/contributor +contributor + nameFranz Allan Valencia See/name +/contributor + /contributors + reporting plugins plugin
svn commit: r1035886 - /incubator/npanday/site/pom.xml
Author: brett Date: Wed Nov 17 00:44:00 2010 New Revision: 1035886 URL: http://svn.apache.org/viewvc?rev=1035886view=rev Log: update emeritus committers Modified: incubator/npanday/site/pom.xml Modified: incubator/npanday/site/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/site/pom.xml?rev=1035886r1=1035885r2=1035886view=diff == --- incubator/npanday/site/pom.xml (original) +++ incubator/npanday/site/pom.xml Wed Nov 17 00:44:00 2010 @@ -176,7 +176,6 @@ nameShane Isbell/name idsisbell/id emailsisb...@apache.org/email - urlhttp://jroller.com/page/random7/url roles roleEmeritus/role /roles @@ -226,6 +225,7 @@ reportindex/report reportmailing-list/report reportissue-tracking/report + reportproject-team/report /reports /reportSet /reportSets
svn commit: r1037995 [2/2] - in /incubator/npanday/trunk: ./ archetypes/ archetypes/maven-archetype-dotnet-simple/ archetypes/maven-archetype-netexecutable/ archetypes/maven-archetype-vb-simple/ compo
Modified: incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/pom.xml?rev=1037995r1=1037994r2=1037995view=diff == --- incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/pom.xml (original) +++ incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/pom.xml Tue Nov 23 05:05:32 2010 @@ -21,7 +21,7 @@ under the License. project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; parent groupIdnpanday.plugin/groupId -version1.2.2-incubating-SNAPSHOT/version +version1.3-incubating-SNAPSHOT/version artifactIdnpanday.plugins/artifactId /parent modelVersion4.0.0/modelVersion @@ -33,25 +33,25 @@ under the License. dependency groupIdnpanday.artifact/groupId artifactIdNPanday.Artifact/artifactId - version1.2.2-incubating-SNAPSHOT/version + version1.3-incubating-SNAPSHOT/version typelibrary/type /dependency dependency groupIdnpanday.model/groupId artifactIdNPanday.Model.AutomationExtensibility/artifactId - version1.2.2-incubating-SNAPSHOT/version + version1.3-incubating-SNAPSHOT/version typelibrary/type /dependency dependency groupIdnpanday.plugin/groupId artifactIdNPanday.Plugin/artifactId - version1.2.2-incubating-SNAPSHOT/version + version1.3-incubating-SNAPSHOT/version typelibrary/type /dependency dependency groupIdnpanday.model/groupId artifactIdNPanday.Model.Pom/artifactId - version1.2.2-incubating-SNAPSHOT/version + version1.3-incubating-SNAPSHOT/version typelibrary/type /dependency /dependencies Modified: incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Resx/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Resx/pom.xml?rev=1037995r1=1037994r2=1037995view=diff == --- incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Resx/pom.xml (original) +++ incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Resx/pom.xml Tue Nov 23 05:05:32 2010 @@ -21,7 +21,7 @@ under the License. project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; parent groupIdnpanday.plugin/groupId -version1.2.2-incubating-SNAPSHOT/version +version1.3-incubating-SNAPSHOT/version artifactIdnpanday.plugins/artifactId /parent modelVersion4.0.0/modelVersion Modified: incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/javabinding/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/javabinding/pom.xml?rev=1037995r1=1037994r2=1037995view=diff == --- incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/javabinding/pom.xml (original) +++ incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/javabinding/pom.xml Tue Nov 23 05:05:32 2010 @@ -3,7 +3,7 @@ project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xmlns:xsd=http://www.w3.org/2001/XMLSchema; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; parent groupIdnpanday.plugin/groupId -version1.2.2-incubating-SNAPSHOT/version +version1.3-incubating-SNAPSHOT/version artifactIdmaven-dotnet-plugins/artifactId relativePath../../../pom.xml/relativePath /parent Modified: incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/pom.xml?rev=1037995r1=1037994r2=1037995view=diff == --- incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/pom.xml (original) +++ incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/pom.xml Tue Nov 23 05:05:32 2010 @@ -21,7 +21,7 @@ under the License. project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; parent groupIdnpanday.plugin/groupId -version1.2.2-incubating-SNAPSHOT/version +version1.3-incubating-SNAPSHOT/version artifactIdnpanday.plugins/artifactId
svn commit: r1038466 - /incubator/npanday/trunk/plugins/maven-test-plugin/src/main/java/npanday/plugin/test/TesterMojo.java
Author: brett
Date: Wed Nov 24 03:57:19 2010
New Revision: 1038466
URL: http://svn.apache.org/viewvc?rev=1038466view=rev
Log:
de-tabify
Modified:
incubator/npanday/trunk/plugins/maven-test-plugin/src/main/java/npanday/plugin/test/TesterMojo.java
Modified:
incubator/npanday/trunk/plugins/maven-test-plugin/src/main/java/npanday/plugin/test/TesterMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-test-plugin/src/main/java/npanday/plugin/test/TesterMojo.java?rev=1038466r1=1038465r2=1038466view=diff
==
---
incubator/npanday/trunk/plugins/maven-test-plugin/src/main/java/npanday/plugin/test/TesterMojo.java
(original)
+++
incubator/npanday/trunk/plugins/maven-test-plugin/src/main/java/npanday/plugin/test/TesterMojo.java
Wed Nov 24 03:57:19 2010
@@ -216,7 +216,7 @@ extends AbstractMojo
String switchChar = /;
- String vendorName = vendor.getVendorName();
+String vendorName = vendor.getVendorName();
if ( vendor != null MONO.equals( vendorName ) )
{
switchChar = -;
@@ -234,11 +234,11 @@ extends AbstractMojo
}
// Not supported on NUnit 2.5 - see NPANDAY-332
- // String frameworkVersion = vendorInfo.getFrameworkVersion();
- // getLog().debug( NPANDAY-1100-012: Framework version: +
frameworkVersion );
- // if (!MONO.equals( vendorName ) (frameworkVersion !=
null frameworkVersion.length() 0 )) {
- // commands.add( switchChar + framework: +
v+frameworkVersion);
- // }
+// String frameworkVersion = vendorInfo.getFrameworkVersion();
+// getLog().debug( NPANDAY-1100-012: Framework version: +
frameworkVersion );
+// if (!MONO.equals( vendorName ) (frameworkVersion != null
frameworkVersion.length() 0 )) {
+// commands.add( switchChar + framework: + v+frameworkVersion);
+// }
return commands;
}
@@ -363,14 +363,14 @@ extends AbstractMojo
FileUtils.mkdir( reportsDirectory );
VendorInfo vendorInfo = VendorInfo.Factory.createDefaultVendorInfo();
- getLog().debug( NPANDAY-1100-014.1: Vendor info: + vendorInfo
);
+getLog().debug( NPANDAY-1100-014.1: Vendor info: + vendorInfo );
vendorInfo.setVendorVersion( );
vendorInfo.setFrameworkVersion( executionFrameworkVersion );
- getLog().debug( NPANDAY-1100-014.2: Vendor info: + vendorInfo
);
+getLog().debug( NPANDAY-1100-014.2: Vendor info: + vendorInfo );
try
{
- getLog().debug( NPANDAY-1100-015: Processor type: +
processor );
+getLog().debug( NPANDAY-1100-015: Processor type: + processor );
processor.process( vendorInfo );
}
catch ( IllegalStateException e )
@@ -378,7 +378,7 @@ extends AbstractMojo
throw new MojoExecutionException( e.getMessage(), e );
}
//ListString commands = getCommandsFor( vendorInfo.getVendor() );
- getLog().debug( NPANDAY-1100-014.3: Vendor info: + vendorInfo
);
+getLog().debug( NPANDAY-1100-014.3: Vendor info: + vendorInfo );
ListString commands = getCommandsFor( vendorInfo );
getLog().debug( NPANDAY-1100-008: + commands.toString() );
svn commit: r1056204 - /incubator/npanday/trunk/pom.xml
Author: brett Date: Fri Jan 7 06:41:23 2011 New Revision: 1056204 URL: http://svn.apache.org/viewvc?rev=1056204view=rev Log: add contributor from patches Modified: incubator/npanday/trunk/pom.xml Modified: incubator/npanday/trunk/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/pom.xml?rev=1056204r1=1056203r2=1056204view=diff == --- incubator/npanday/trunk/pom.xml (original) +++ incubator/npanday/trunk/pom.xml Fri Jan 7 06:41:23 2011 @@ -216,6 +216,9 @@ under the License. contributor nameFranz Allan Valencia See/name /contributor +contributor + namePaul G/name +/contributor /contributors modules modulecomponents/module
svn commit: r1056205 - /incubator/npanday/trunk/pom.xml
Author: brett Date: Fri Jan 7 06:46:23 2011 New Revision: 1056205 URL: http://svn.apache.org/viewvc?rev=1056205view=rev Log: another contributor Modified: incubator/npanday/trunk/pom.xml Modified: incubator/npanday/trunk/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/pom.xml?rev=1056205r1=1056204r2=1056205view=diff == --- incubator/npanday/trunk/pom.xml (original) +++ incubator/npanday/trunk/pom.xml Fri Jan 7 06:46:23 2011 @@ -219,6 +219,9 @@ under the License. contributor namePaul G/name /contributor +contributor + nameHenrik Bie/name +/contributor /contributors modules modulecomponents/module
svn commit: r1070390 - /incubator/npanday/trunk/pom.xml
Author: brett
Date: Mon Feb 14 05:07:44 2011
New Revision: 1070390
URL: http://svn.apache.org/viewvc?rev=1070390view=rev
Log:
put back old snapshots repo for now so that CI doesn't fail
Modified:
incubator/npanday/trunk/pom.xml
Modified: incubator/npanday/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/pom.xml?rev=1070390r1=1070389r2=1070390view=diff
==
--- incubator/npanday/trunk/pom.xml (original)
+++ incubator/npanday/trunk/pom.xml Mon Feb 14 05:07:44 2011
@@ -579,13 +579,17 @@ under the License.
npanday.snapshots.urlhttp://repo.npanday.org/archiva/repository/npanday-snapshots/npanday.snapshots.url
npanday.releases.urlhttp://repo.npanday.org/archiva/repository/npanday-releases/npanday.releases.url
!--stable.npanday.version${project.version}/stable.npanday.version--
-stable.npanday.version1.3-incubating/stable.npanday.version
+stable.npanday.version1.2.1/stable.npanday.version
/properties
distributionManagement
repository
idvmbuild.staging/id
urlhttp://vmbuild.apache.org/archiva/repository/staged-npanday//url
/repository
+snapshotRepository
+ idvmbuild.snapshots/id
+ urlhttp://repo.npanday.org/archiva/repository/npanday-snapshots//url
+/snapshotRepository
/distributionManagement
pluginRepositories
pluginRepository
@@ -607,4 +611,4 @@ under the License.
/snapshots
/repository
/repositories
-/project
\ No newline at end of file
+/project
svn commit: r1081756 [2/2] - in /incubator/npanday/trunk: ./ components/dotnet-core/src/main/java/npanday/ components/dotnet-core/src/main/java/npanday/impl/ components/dotnet-dao-project/src/main/jav
Modified:
incubator/npanday/trunk/plugins/partcover-maven-plugin/src/site/apt/usage.apt
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/partcover-maven-plugin/src/site/apt/usage.apt?rev=1081756r1=1081755r2=1081756view=diff
==
---
incubator/npanday/trunk/plugins/partcover-maven-plugin/src/site/apt/usage.apt
(original)
+++
incubator/npanday/trunk/plugins/partcover-maven-plugin/src/site/apt/usage.apt
Tue Mar 15 13:01:02 2011
@@ -1,46 +1,46 @@
-~~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.
-Usage
-
- To be able to use the partcover plugin, the following line should be added to
the .net module and -Ppartcover argument should be added when compiling.
-+-+
- profile
-idpartcover/id
-build
- plugins
-plugin
- groupIdnpanday.plugin/groupId
- artifactIdpartcover-maven-plugin/artifactId
- configuration
-nUnit${unit-console.exe}/nUnit
-partCover${PartCover.exe}/partCover
-assemblyName${assemblyName.dll}/assemblyName
-msxsl${msxsl.exe}/msxsl
- /configuration
- executions
-execution
- goals
-goalgenerate/goal
-goalconvert/goal
- /goals
-/execution
- /executions
-/plugin
- /plugins
-/build
- /profile
+~~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.
+Usage
+
+ To be able to use the partcover plugin, the following line should be added to
the .net module and -Ppartcover argument should be added when compiling.
++-+
+ profile
+idpartcover/id
+build
+ plugins
+plugin
+ groupIdnpanday.plugin/groupId
+ artifactIdpartcover-maven-plugin/artifactId
+ configuration
+nUnit${unit-console.exe}/nUnit
+partCover${PartCover.exe}/partCover
+assemblyName${assemblyName.dll}/assemblyName
+msxsl${msxsl.exe}/msxsl
+ /configuration
+ executions
+execution
+ goals
+goalgenerate/goal
+goalconvert/goal
+ /goals
+/execution
+ /executions
+/plugin
+ /plugins
+/build
+ /profile
+-+
\ No newline at end of file
Propchange:
incubator/npanday/trunk/plugins/partcover-maven-plugin/src/site/apt/usage.apt
--
svn:eol-style = native
Modified:
incubator/npanday/trunk/plugins/partcover-maven-plugin/src/site/site.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/partcover-maven-plugin/src/site/site.xml?rev=1081756r1=1081755r2=1081756view=diff
==
--- incubator/npanday/trunk/plugins/partcover-maven-plugin/src/site/site.xml
(original)
+++ incubator/npanday/trunk/plugins/partcover-maven-plugin/src/site/site.xml
Tue Mar 15 13:01:02 2011
@@ -1,31 +1,31 @@
-?xml version=1.0 encoding=UTF-8?
-!--
-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
svn commit: r1086946 [2/2] - in /incubator/npanday/trunk: ./ archetypes/ archetypes/maven-archetype-dotnet-simple/ archetypes/maven-archetype-netexecutable/ archetypes/maven-archetype-vb-simple/ compo
Modified: incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/javabinding/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/javabinding/pom.xml?rev=1086946r1=1086945r2=1086946view=diff == --- incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/javabinding/pom.xml (original) +++ incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/javabinding/pom.xml Wed Mar 30 13:27:23 2011 @@ -21,7 +21,7 @@ under the License. project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xmlns:xsd=http://www.w3.org/2001/XMLSchema; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; parent groupIdnpanday.plugin/groupId -version1.3.1-Incubating-SNAPSHOT/version +version1.3.1-incubating-SNAPSHOT/version artifactIdmaven-dotnet-plugins/artifactId relativePath../../../pom.xml/relativePath /parent Modified: incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/pom.xml?rev=1086946r1=1086945r2=1086946view=diff == --- incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/pom.xml (original) +++ incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/pom.xml Wed Mar 30 13:27:23 2011 @@ -21,7 +21,7 @@ under the License. project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; parent groupIdnpanday.plugin/groupId -version1.3.1-Incubating-SNAPSHOT/version +version1.3.1-incubating-SNAPSHOT/version artifactIdnpanday.plugins/artifactId /parent modelVersion4.0.0/modelVersion @@ -32,7 +32,7 @@ under the License. dependency groupIdnpanday.plugin/groupId artifactIdNPanday.Plugin/artifactId - version1.3.1-Incubating-SNAPSHOT/version + version1.3.1-incubating-SNAPSHOT/version typelibrary/type /dependency /dependencies Modified: incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.SysRef/javabinding/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.SysRef/javabinding/pom.xml?rev=1086946r1=1086945r2=1086946view=diff == --- incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.SysRef/javabinding/pom.xml (original) +++ incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.SysRef/javabinding/pom.xml Wed Mar 30 13:27:23 2011 @@ -20,7 +20,7 @@ under the License. project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xmlns:xsd=http://www.w3.org/2001/XMLSchema; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; parent groupIdnpanday.plugin/groupId -version1.3.1-Incubating-SNAPSHOT/version +version1.3.1-incubating-SNAPSHOT/version artifactIdmaven-dotnet-plugins/artifactId relativePath../../../pom.xml/relativePath /parent Modified: incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.SysRef/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.SysRef/pom.xml?rev=1086946r1=1086945r2=1086946view=diff == --- incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.SysRef/pom.xml (original) +++ incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.SysRef/pom.xml Wed Mar 30 13:27:23 2011 @@ -21,7 +21,7 @@ under the License. project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; parent groupIdnpanday.plugin/groupId -version1.3.1-Incubating-SNAPSHOT/version +version1.3.1-incubating-SNAPSHOT/version artifactIdnpanday.plugins/artifactId /parent modelVersion4.0.0/modelVersion @@ -32,25 +32,25 @@ under the License. dependency groupIdnpanday.artifact/groupId artifactIdNPanday.Artifact/artifactId - version1.3.1-Incubating-SNAPSHOT/version + version1.3.1-incubating-SNAPSHOT/version typelibrary/type /dependency dependency groupIdnpanday.model/groupId artifactIdNPanday.Model.AutomationExtensibility/artifactId - version1.3.1-Incubating-SNAPSHOT/version + version1.3.1-incubating-SNAPSHOT/version typelibrary/type
svn commit: r1091282 - in /incubator/npanday/trunk/plugins: custom-lifecycle-maven-plugin/src/main/java/npanday/plugin/customLifecycle/ netplugins/NPanday.Plugin.Settings/src/main/csharp/NPanday/Plugi
Author: brett
Date: Tue Apr 12 03:41:01 2011
New Revision: 1091282
URL: http://svn.apache.org/viewvc?rev=1091282view=rev
Log:
add missince license headers
Modified:
incubator/npanday/trunk/plugins/custom-lifecycle-maven-plugin/src/main/java/npanday/plugin/customLifecycle/SetArtifactMojo.java
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/src/main/csharp/NPanday/Plugin/Settings/DotnetSdkLocator.cs
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/src/main/csharp/NPanday/Plugin/Settings/PathUtil.cs
Modified:
incubator/npanday/trunk/plugins/custom-lifecycle-maven-plugin/src/main/java/npanday/plugin/customLifecycle/SetArtifactMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/custom-lifecycle-maven-plugin/src/main/java/npanday/plugin/customLifecycle/SetArtifactMojo.java?rev=1091282r1=1091281r2=1091282view=diff
==
---
incubator/npanday/trunk/plugins/custom-lifecycle-maven-plugin/src/main/java/npanday/plugin/customLifecycle/SetArtifactMojo.java
(original)
+++
incubator/npanday/trunk/plugins/custom-lifecycle-maven-plugin/src/main/java/npanday/plugin/customLifecycle/SetArtifactMojo.java
Tue Apr 12 03:41:01 2011
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package npanday.plugin.customLifecycle;
import npanday.ArtifactType;
Modified:
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/src/main/csharp/NPanday/Plugin/Settings/DotnetSdkLocator.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/src/main/csharp/NPanday/Plugin/Settings/DotnetSdkLocator.cs?rev=1091282r1=1091281r2=1091282view=diff
==
---
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/src/main/csharp/NPanday/Plugin/Settings/DotnetSdkLocator.cs
(original)
+++
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/src/main/csharp/NPanday/Plugin/Settings/DotnetSdkLocator.cs
Tue Apr 12 03:41:01 2011
@@ -1,4 +1,23 @@
-using Microsoft.Win32;
+//
+// 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.
+//
+
+using Microsoft.Win32;
namespace NPanday.Plugin.Settings
{
Modified:
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/src/main/csharp/NPanday/Plugin/Settings/PathUtil.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/src/main/csharp/NPanday/Plugin/Settings/PathUtil.cs?rev=1091282r1=1091281r2=1091282view=diff
==
---
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/src/main/csharp/NPanday/Plugin/Settings/PathUtil.cs
(original)
+++
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/src/main/csharp/NPanday/Plugin/Settings/PathUtil.cs
Tue Apr 12 03:41:01 2011
@@ -1,4 +1,23 @@
-using System.IO;
+//
+// 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
svn propchange: r1091282 - svn:log
Author: brett Revision: 1091282 Modified property: svn:log Modified: svn:log at Tue Apr 12 04:54:46 2011 -- --- svn:log (original) +++ svn:log Tue Apr 12 04:54:46 2011 @@ -1 +1 @@ -add missince license headers +add missing license headers
svn commit: r1096484 - in /incubator/npanday/site: pom.xml src/site/apt/index.apt.vm src/site/filtered-resources/ src/site/filtered-resources/.htaccess src/site/resources/.htaccess src/site/site.xml
Author: brett
Date: Mon Apr 25 13:59:00 2011
New Revision: 1096484
URL: http://svn.apache.org/viewvc?rev=1096484view=rev
Log:
make sure to point to the release at Codeplex for now
Added:
incubator/npanday/site/src/site/filtered-resources/
incubator/npanday/site/src/site/filtered-resources/.htaccess
- copied, changed from r1096403,
incubator/npanday/site/src/site/resources/.htaccess
Removed:
incubator/npanday/site/src/site/resources/.htaccess
Modified:
incubator/npanday/site/pom.xml
incubator/npanday/site/src/site/apt/index.apt.vm
incubator/npanday/site/src/site/site.xml
Modified: incubator/npanday/site/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/site/pom.xml?rev=1096484r1=1096483r2=1096484view=diff
==
--- incubator/npanday/site/pom.xml (original)
+++ incubator/npanday/site/pom.xml Mon Apr 25 13:59:00 2011
@@ -25,7 +25,7 @@
version7/version
/parent
groupIdnpanday/groupId
- version2.0-SNAPSHOT/version
+ version1.3.1-incubating-SNAPSHOT/version
artifactIdnpanday-site/artifactId
packagingpom/packaging
nameNPanday/name
@@ -256,8 +256,8 @@
/distributionManagement
properties
-npandayReleaseVersion1.3-incubating/npandayReleaseVersion
-npandayReleaseDate10 March 2011/npandayReleaseDate
+npandayReleaseVersion1.2.1/npandayReleaseVersion
+npandayReleaseDate8 September 2010/npandayReleaseDate
/properties
build
@@ -276,6 +276,29 @@
/execution
/executions
/plugin
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-resources-plugin/artifactId
+executions
+ execution
+idcopy-resources/id
+!-- here the phase you need --
+phasepre-site/phase
+goals
+ goalcopy-resources/goal
+/goals
+configuration
+ outputDirectory${basedir}/target/site/outputDirectory
+ resources
+resource
+ directorysrc/site/filtered-resources/directory
+ filteringtrue/filtering
+/resource
+ /resources
+/configuration
+ /execution
+/executions
+ /plugin
/plugins
extensions
extension
Modified: incubator/npanday/site/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/incubator/npanday/site/src/site/apt/index.apt.vm?rev=1096484r1=1096483r2=1096484view=diff
==
--- incubator/npanday/site/src/site/apt/index.apt.vm (original)
+++ incubator/npanday/site/src/site/apt/index.apt.vm Mon Apr 25 13:59:00 2011
@@ -30,18 +30,24 @@ NPanday
* News
- ${npandayReleaseDate}: {{{./docs/${npandayReleaseVersion}/download.html}
Release 1.3-incubating available}}. This is our 9th release and the first one
after we've moved to the Apache Incubator. This release includes 2 major
issues: the removal of the UAC and PAB directories, thus making NPanday more
maven-like and the support of NPanday for VS 2010 and Net 4.0 Framework.
+ ~~10 March 2011: {{{./docs/1.3-incubating/download.html} Release
1.3-incubating available}}. This is our 9th release and the first one after
we've moved to the Apache Incubator. This release includes 2 major issues: the
removal of the UAC and PAB directories, thus making NPanday more maven-like and
the support of NPanday for VS 2010 and Net 4.0 Framework.
08 September 2010: {{{http://npanday.codeplex.com/releases/view/47408}
Release 1.2.1 available}}. This is our 8th release, incorporating many bug
fixes, improved documentation, greatly enhanced the performance on projects
with many (transitive) dependencies and a variety of new features, include code
coverage for Java and .Net modules. This is the last release to be produced
from Codeplex, with the infrastructure being moved to the Apache Incubator.
* Current Release and Documentation
-The current release is ${npandayReleaseVersion}:
+The current release is ${npandayReleaseVersion} (released on Codeplex):
- * {{{./docs/${npandayReleaseVersion}/download.html} NPanday
${npandayReleaseVersion} Release}}
+ * {{{http://npanday.codeplex.com/releases/view/47408} NPanday
${npandayReleaseVersion} Release}}
* {{{./docs/${npandayReleaseVersion}} NPanday ${npandayReleaseVersion}
Documentation}}
+~~The current release is ${npandayReleaseVersion}:
+~~
+~~ * {{{./docs/${npandayReleaseVersion}/download.html} NPanday
${npandayReleaseVersion} Release}}
+~~
+~~ * {{{./docs/${npandayReleaseVersion}} NPanday ${npandayReleaseVersion}
Documentation}}
+
* Current Development Version (Incubating)
* {{{./docs/${project.version}/} NPanday ${project.version} Documentation}}
Copied: incubator/npanday/site/src/site/filtered-resources/.htaccess (from
r1096403, incubator/npanday/site/src/site
svn commit: r1096485 - /incubator/npanday/site/src/site/apt/index.apt.vm
Author: brett
Date: Mon Apr 25 14:01:30 2011
New Revision: 1096485
URL: http://svn.apache.org/viewvc?rev=1096485view=rev
Log:
fix link
Modified:
incubator/npanday/site/src/site/apt/index.apt.vm
Modified: incubator/npanday/site/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/incubator/npanday/site/src/site/apt/index.apt.vm?rev=1096485r1=1096484r2=1096485view=diff
==
--- incubator/npanday/site/src/site/apt/index.apt.vm (original)
+++ incubator/npanday/site/src/site/apt/index.apt.vm Mon Apr 25 14:01:30 2011
@@ -40,17 +40,17 @@ The current release is ${npandayReleaseV
* {{{http://npanday.codeplex.com/releases/view/47408} NPanday
${npandayReleaseVersion} Release}}
- * {{{./docs/${npandayReleaseVersion}} NPanday ${npandayReleaseVersion}
Documentation}}
+ * {{{./docs/${npandayReleaseVersion}/index.html} NPanday
${npandayReleaseVersion} Documentation}}
~~The current release is ${npandayReleaseVersion}:
~~
~~ * {{{./docs/${npandayReleaseVersion}/download.html} NPanday
${npandayReleaseVersion} Release}}
~~
-~~ * {{{./docs/${npandayReleaseVersion}} NPanday ${npandayReleaseVersion}
Documentation}}
+~~ * {{{./docs/${npandayReleaseVersion}/index.html} NPanday
${npandayReleaseVersion} Documentation}}
* Current Development Version (Incubating)
- * {{{./docs/${project.version}/} NPanday ${project.version} Documentation}}
+ * {{{./docs/${project.version}/index.html} NPanday ${project.version}
Documentation}}
* Contributing to NPanday
svn commit: r1101017 - in /incubator/npanday/trunk: LICENSE.txt NOTICE.txt
Author: brett Date: Mon May 9 13:20:57 2011 New Revision: 1101017 URL: http://svn.apache.org/viewvc?rev=1101017view=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=1101017r1=1101016r2=1101017view=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=1101017r1=1101016r2=1101017view=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=licenser=2.2.10). - -This product includes software developed under BSD License.
svn commit: r1103613 [3/3] - in /incubator/npanday/trunk: dotnet/assemblies/NPanday.Artifact/src/main/csharp/ dotnet/assemblies/NPanday.Logging/src/main/csharp/ dotnet/assemblies/NPanday.Model.Setting
Propchange: incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT003/TestApplication/TestApplication.csproj -- svn:eol-style = native Propchange: incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT003/TestLibrary/TestLibrary.csproj -- svn:eol-style = native Propchange: incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT004/TestConsoleApplication/TestConsoleApplication.csproj -- svn:eol-style = native Propchange: incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT005/TestApplication/TestApplication.csproj -- svn:eol-style = native Propchange: incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT005/TestLibrary/TestLibrary.csproj -- svn:eol-style = native Propchange: incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT007/WIXLocalizationExample/WIXLocalizationExample.csproj -- svn:eol-style = native
svn commit: r1132992 - /incubator/npanday/site/src/site/apt/index.apt.vm
Author: brett
Date: Tue Jun 7 13:13:06 2011
New Revision: 1132992
URL: http://svn.apache.org/viewvc?rev=1132992view=rev
Log:
correct some typos
Modified:
incubator/npanday/site/src/site/apt/index.apt.vm
Modified: incubator/npanday/site/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/incubator/npanday/site/src/site/apt/index.apt.vm?rev=1132992r1=1132991r2=1132992view=diff
==
--- incubator/npanday/site/src/site/apt/index.apt.vm (original)
+++ incubator/npanday/site/src/site/apt/index.apt.vm Tue Jun 7 13:13:06 2011
@@ -36,18 +36,12 @@ NPanday
* Current Release and Documentation
-The current release is ${npandayReleaseVersion} (released on Codeplex):
+The current release is ${npandayReleaseVersion}:
- * {{{http://npanday.codeplex.com/releases/view/47408} NPanday
${npandayReleaseVersion} Release}}
+ * {{{./docs/${npandayReleaseVersion}/download.html} NPanday
${npandayReleaseVersion} Release}}
* {{{./docs/${npandayReleaseVersion}/index.html} NPanday
${npandayReleaseVersion} Documentation}}
-~~The current release is ${npandayReleaseVersion}:
-~~
-~~ * {{{./docs/${npandayReleaseVersion}/download.html} NPanday
${npandayReleaseVersion} Release}}
-~~
-~~ * {{{./docs/${npandayReleaseVersion}/index.html} NPanday
${npandayReleaseVersion} Documentation}}
-
* Current Development Version (Incubating)
* {{{./docs/${project.version}/index.html} NPanday ${project.version}
Documentation}}
svn commit: r1135941 - /incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Parser/SlnParser/ProjectSolutionParser.cs
Author: brett
Date: Wed Jun 15 07:08:21 2011
New Revision: 1135941
URL: http://svn.apache.org/viewvc?rev=1135941view=rev
Log:
[NPANDAY-441] add quotes to message
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Parser/SlnParser/ProjectSolutionParser.cs
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Parser/SlnParser/ProjectSolutionParser.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Parser/SlnParser/ProjectSolutionParser.cs?rev=1135941r1=1135940r2=1135941view=diff
==
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Parser/SlnParser/ProjectSolutionParser.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Parser/SlnParser/ProjectSolutionParser.cs
Wed Jun 15 07:08:21 2011
@@ -61,7 +61,7 @@ namespace NPanday.ProjectImporter.Parser
}
catch (Exception exception)
{
-throw new Exception(Unknown error occurred parsing solution
file: + solutionFile + (embedded error is: + exception.Message + ));
+throw new Exception(Unknown error occurred parsing solution
file: + solutionFile + (embedded error is: \ + exception.Message + \));
}
String UnsupportedProjectsMessage = string.Empty;
svn commit: r1135943 - /incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Digest/Algorithms/NormalProjectDigestAlgorithm.cs
Author: brett
Date: Wed Jun 15 07:24:47 2011
New Revision: 1135943
URL: http://svn.apache.org/viewvc?rev=1135943view=rev
Log:
[NPANDAY-443] remove incorrect workaround
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Digest/Algorithms/NormalProjectDigestAlgorithm.cs
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Digest/Algorithms/NormalProjectDigestAlgorithm.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Digest/Algorithms/NormalProjectDigestAlgorithm.cs?rev=1135943r1=1135942r2=1135943view=diff
==
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Digest/Algorithms/NormalProjectDigestAlgorithm.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Digest/Algorithms/NormalProjectDigestAlgorithm.cs
Wed Jun 15 07:24:47 2011
@@ -184,12 +184,6 @@ namespace NPanday.ProjectImporter.Digest
break;
case Reference:
Reference reference = new
Reference(projectBasePath, gac);
-//quick workaround for cases of importing .net
4.0 targeted projects, as their referneces has to be also for
-//.net framework 4.0 (that is their version in
GAC is 4.0.0.0). Then we will use this
-if (projectDigest.TargetFramework == 4.0)
-{
-reference.Version = 4.0.0.0; //Then we
will use this version when resolving references from GAC
-}
//set processorArchitecture property to
platform, it will be used by GacUtility in
// order to resolve artifact to right
processor architecture
if
(!string.IsNullOrEmpty(projectDigest.Platform))
svn commit: r1138772 - /incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/WebWithVbOrCsProjectFilePomConverter.cs
Author: brett
Date: Thu Jun 23 08:50:05 2011
New Revision: 1138772
URL: http://svn.apache.org/viewvc?rev=1138772view=rev
Log:
Partial rollback of r1128182, as it was already determined that it wasn't a
good idea to add this plugin so often. Users that need it may add it by hand.
Side effects of adding it here are that it builds the project twice, and can
introduce some dependence on directory structure in a multi-module build (as
project files can contain relative paths using ..)
See mailing list: http://s.apache.org/Q9I
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/WebWithVbOrCsProjectFilePomConverter.cs
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/WebWithVbOrCsProjectFilePomConverter.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/WebWithVbOrCsProjectFilePomConverter.cs?rev=1138772r1=1138771r2=1138772view=diff
==
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/WebWithVbOrCsProjectFilePomConverter.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/WebWithVbOrCsProjectFilePomConverter.cs
Thu Jun 23 08:50:05 2011
@@ -77,15 +77,6 @@ namespace NPanday.ProjectImporter.Conver
Plugin aspxPlugin = AddPlugin(org.apache.npanday.plugins,
maven-aspx-plugin);
if (!string.IsNullOrEmpty(projectDigest.TargetFramework))
AddPluginConfiguration(aspxPlugin, frameworkVersion,
projectDigest.TargetFramework);
-
-// add msbuild plugin config in pom if there's a
maven-resgen-plugin but no msbuild config
-// generates resources in target/bin folder
-if (( FindPlugin(npanday.plugin, maven-resgen-plugin) != null
FindPlugin(npanday.plugin, NPanday.Plugin.Msbuild.JavaBinding) == null)
|| ( FindPlugin(org.apache.npanday.plugins, maven-resgen-plugin) != null
FindPlugin(org.apache.npanday.plugins,
NPanday.Plugin.Msbuild.JavaBinding) == null))
-{
-Plugin msBuildPlugin = AddPlugin(org.apache.npanday.plugins,
NPanday.Plugin.Msbuild.JavaBinding);
-AddPluginExecution(msBuildPlugin, compile, validate);
-AddPluginConfiguration(msBuildPlugin, frameworkVersion,
ProjectDigest.TargetFramework);
-}
if (writePom)
{
svn commit: r1138810 - in /incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_268_TransitiveDependenciesTest: LadderBuild.zip TransDependency.zip
Author: brett Date: Thu Jun 23 10:16:37 2011 New Revision: 1138810 URL: http://svn.apache.org/viewvc?rev=1138810view=rev Log: update the plugin group ID within the ZIP file Modified: incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_268_TransitiveDependenciesTest/LadderBuild.zip incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_268_TransitiveDependenciesTest/TransDependency.zip Modified: incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_268_TransitiveDependenciesTest/LadderBuild.zip URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_268_TransitiveDependenciesTest/LadderBuild.zip?rev=1138810r1=1138809r2=1138810view=diff == Binary files - no diff available. Modified: incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_268_TransitiveDependenciesTest/TransDependency.zip URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_268_TransitiveDependenciesTest/TransDependency.zip?rev=1138810r1=1138809r2=1138810view=diff == Binary files - no diff available.
svn commit: r1139167 - /incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/NPanday/Utils/GacUtility.cs
Author: brett
Date: Fri Jun 24 06:40:07 2011
New Revision: 1139167
URL: http://svn.apache.org/viewvc?rev=1139167view=rev
Log:
Partial revert of r1069722 so that GAC dependencies are created during project
import again
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/NPanday/Utils/GacUtility.cs
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/NPanday/Utils/GacUtility.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/NPanday/Utils/GacUtility.cs?rev=1139167r1=1139166r2=1139167view=diff
==
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/NPanday/Utils/GacUtility.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/NPanday/Utils/GacUtility.cs
Fri Jun 24 06:40:07 2011
@@ -39,9 +39,9 @@ namespace NPanday.Utils
public GacUtility()
{
-/*
-TODO: Why is this done?
-
+// Used to determine which references exist in the GAC, used
during VS project import
+// TODO: we need a better way to determine this by querying the
GAC using .NET
+// rather than parsing command output
Process p = new Process();
try
@@ -66,7 +66,6 @@ namespace NPanday.Utils
{
throw new Exception( Unable to execute gacutil - check that
your PATH has been set correctly (Message: + exception.Message + ) );
}
-*/
string msBuildPath =
Path.GetDirectoryName(System.Reflection.Assembly.GetAssembly(typeof(string)).Location);
svn commit: r1139243 - in /incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/src/it/IT001: WpfApplicationExample.suo WpfApplicationExample/bin/ WpfApplicationExample/obj/
Author: brett Date: Fri Jun 24 11:11:08 2011 New Revision: 1139243 URL: http://svn.apache.org/viewvc?rev=1139243view=rev Log: remove generated files Removed: incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/src/it/IT001/WpfApplicationExample.suo incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/src/it/IT001/WpfApplicationExample/bin/ incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/src/it/IT001/WpfApplicationExample/obj/
svn commit: r1139253 - in /incubator/npanday/trunk/plugins/netplugins: NPanday.Plugin.Addin/ NPanday.Plugin.Devenv/ NPanday.Plugin.Msbuild/ NPanday.Plugin.Settings/ NPanday.Plugin.SysRef/
Author: brett Date: Fri Jun 24 11:39:25 2011 New Revision: 1139253 URL: http://svn.apache.org/viewvc?rev=1139253view=rev Log: ignore generated files Modified: incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Addin/ (props changed) incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Devenv/ (props changed) incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/ (props changed) incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/ (props changed) incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.SysRef/ (props changed) Propchange: incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Addin/ -- --- svn:ignore (original) +++ svn:ignore Fri Jun 24 11:39:25 2011 @@ -1,3 +1,3 @@ target - +pom-java.xml NPanday.Plugin.Addin.iml Propchange: incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Devenv/ -- --- svn:ignore (original) +++ svn:ignore Fri Jun 24 11:39:25 2011 @@ -1,3 +1,3 @@ target - +pom-java.xml NPanday.Plugin.Devenv.iml Propchange: incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/ -- --- svn:ignore (original) +++ svn:ignore Fri Jun 24 11:39:25 2011 @@ -1,3 +1,3 @@ target - +pom-java.xml NPanday.Plugin.Msbuild.iml Propchange: incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/ -- --- svn:ignore (original) +++ svn:ignore Fri Jun 24 11:39:25 2011 @@ -1,3 +1,3 @@ target - +pom-java.xml NPanday.Plugin.Settings.iml Propchange: incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.SysRef/ -- --- svn:ignore (original) +++ svn:ignore Fri Jun 24 11:39:25 2011 @@ -1,3 +1,3 @@ target - +pom-java.xml NPanday.Plugin.SysRef.iml
svn commit: r1139414 - in /incubator/npanday/trunk/dotnet/assemblies: NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/ NPanday.ProjectImporter/Engine/src/ma
Author: brett
Date: Fri Jun 24 19:26:22 2011
New Revision: 1139414
URL: http://svn.apache.org/viewvc?rev=1139414view=rev
Log:
[NPANDAY-445] find the reference for the correct target framework
also split RSP code from GAC code and other refactoring
Added:
incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/NPanday/Utils/RspUtility.cs
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/AbstractPomConverter.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/NormalPomConverter.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/WebPomConverter.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Digest/Algorithms/NormalProjectDigestAlgorithm.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Digest/Algorithms/WebProjectDigestAlgorithm.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Digest/Model/Reference.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/NPanday.Utils.csproj
incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/NPanday/Utils/GacUtility.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/NPanday/Utils/PomHelperUtility.cs
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/AbstractPomConverter.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/AbstractPomConverter.cs?rev=1139414r1=1139413r2=1139414view=diff
==
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/AbstractPomConverter.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/AbstractPomConverter.cs
Fri Jun 24 19:26:22 2011
@@ -40,6 +40,7 @@ namespace NPanday.ProjectImporter.Conver
public abstract class AbstractPomConverter : IPomConverter
{
protected GacUtility gacUtil;
+protected RspUtility rspUtil;
protected ArtifactContext artifactContext;
protected ListArtifact.Artifact localArtifacts;
protected string mainPomFile;
@@ -76,6 +77,7 @@ namespace NPanday.ProjectImporter.Conver
this.groupId = FilterID(groupId);
this.version = parent != null ? parent.version : null;
+this.rspUtil = new RspUtility();
this.gacUtil = new GacUtility();
this.model = new NPanday.Model.Pom.Model();
@@ -472,7 +474,7 @@ namespace NPanday.ProjectImporter.Conver
|| dotnet-library.Equals(refDependency.type,
StringComparison.OrdinalIgnoreCase)))
{
// ignore gac if already in the RSP
-if (gacUtil.IsRspIncluded(refDependency.artifactId,
projectDigest.Language))
+if (rspUtil.IsRspIncluded(refDependency.artifactId,
projectDigest.Language))
{
return;
}
@@ -747,20 +749,25 @@ namespace NPanday.ProjectImporter.Conver
return dependency;
}
-
+Liststring refs = gacUtil.GetAssemblyInfo(reference.Name, null,
projectDigest.Platform);
// resolve from GAC
-if (!string.IsNullOrEmpty(gacUtil.GetAssemblyInfo(reference.Name,
null, projectDigest.Platform)))
+if (refs.Count 0)
{
// Assembly is found at the gac
+//exclude ProcessArchitecture when loading assembly on a
non-32 bit machine
+refs = gacUtil.GetAssemblyInfo(reference.Name,
reference.Version, null);
+
+System.Reflection.Assembly a =
System.Reflection.Assembly.ReflectionOnlyLoad(new
System.Reflection.AssemblyName(refs[0]).FullName);
+
Dependency refDependency = new Dependency();
refDependency.artifactId = reference.Name;
refDependency.groupId = reference.Name;
if (MSIL.Equals(reference.ProcessorArchitecture,
StringComparison.OrdinalIgnoreCase))
{
-if (4.0.0.0.Equals(reference.Version))
+if (a.ImageRuntimeVersion.StartsWith(v4.0))
{
refDependency.type
svn commit: r1139488 - in /incubator/npanday/trunk: dist/ dist/dotnet-repository-builder/pom.xml dist/npanday-installer/pom.xml dist/npanday-repository-builder/pom.xml dist/npanday-skin/pom.xml dist/p
Author: brett
Date: Sat Jun 25 04:03:36 2011
New Revision: 1139488
URL: http://svn.apache.org/viewvc?rev=1139488view=rev
Log:
move misc to dist and add an intermediate parent
clean up POMs
Added:
incubator/npanday/trunk/dist/
- copied from r1139414, incubator/npanday/trunk/misc/
incubator/npanday/trunk/dist/pom.xml
Removed:
incubator/npanday/trunk/misc/
Modified:
incubator/npanday/trunk/dist/dotnet-repository-builder/pom.xml
incubator/npanday/trunk/dist/npanday-installer/pom.xml
incubator/npanday/trunk/dist/npanday-repository-builder/pom.xml
incubator/npanday/trunk/dist/npanday-skin/pom.xml
incubator/npanday/trunk/pom.xml
Modified: incubator/npanday/trunk/dist/dotnet-repository-builder/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dist/dotnet-repository-builder/pom.xml?rev=1139488r1=1139414r2=1139488view=diff
==
--- incubator/npanday/trunk/dist/dotnet-repository-builder/pom.xml (original)
+++ incubator/npanday/trunk/dist/dotnet-repository-builder/pom.xml Sat Jun 25
04:03:36 2011
@@ -20,19 +20,13 @@ under the License.
project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
parent
groupIdorg.apache.npanday/groupId
-artifactIdnpanday-project/artifactId
+artifactIdnpanday-dist-parent/artifactId
version1.4.1-incubating-SNAPSHOT/version
-relativePath../../pom.xml/relativePath
/parent
modelVersion4.0.0/modelVersion
artifactIddotnet-repository-builder/artifactId
nameNPanday :: .NET Repository Builder/name
packagingpom/packaging
- scm
-
connectionscm:svn:https://npanday.svn.codeplex.com/svn/trunk/misc/dotnet-repository-builder/connection
-
developerConnectionscm:svn:https://npanday.svn.codeplex.com/svn/trunk/misc/dotnet-repository-builder/developerConnection
-
urlhttps://npanday.svn.codeplex.com/svn/trunk/misc/dotnet-repository-builder/url
- /scm
dependencies
!--assemblies--
dependency
@@ -107,40 +101,40 @@ under the License.
groupIdorg.apache.npanday.visualstudio/groupId
artifactIdNPanday.VisualStudio.Addin/artifactId
version${project.version}/version
- exclusions
- exclusion
- groupIdMicrosoft.VisualStudio.CommandBars/groupId
- artifactIdMicrosoft.VisualStudio.CommandBars/artifactId
- /exclusion
- exclusion
- groupIdEnvDTE/groupId
- artifactIdEnvDTE/artifactId
- /exclusion
- exclusion
- groupIdEnvDTE80/groupId
- artifactIdEnvDTE80/artifactId
- /exclusion
- exclusion
- groupIdExtensibility/groupId
- artifactIdExtensibility/artifactId
- /exclusion
- exclusion
- groupIdVSLangProj/groupId
- artifactIdVSLangProj/artifactId
- /exclusion
- exclusion
- groupIdVSLangProj80/groupId
- artifactIdVSLangProj80/artifactId
- /exclusion
- exclusion
- groupIdVsWebSite.Interop/groupId
- artifactIdVsWebSite.Interop/artifactId
- /exclusion
- exclusion
- groupIdMicrosoft.Build.Engine/groupId
- artifactIdMicrosoft.Build.Engine/artifactId
- /exclusion
- /exclusions
+ exclusions
+exclusion
+ groupIdMicrosoft.VisualStudio.CommandBars/groupId
+ artifactIdMicrosoft.VisualStudio.CommandBars/artifactId
+/exclusion
+exclusion
+ groupIdEnvDTE/groupId
+ artifactIdEnvDTE/artifactId
+ /exclusion
+exclusion
+ groupIdEnvDTE80/groupId
+ artifactIdEnvDTE80/artifactId
+/exclusion
+exclusion
+ groupIdExtensibility/groupId
+ artifactIdExtensibility/artifactId
+/exclusion
+exclusion
+ groupIdVSLangProj/groupId
+ artifactIdVSLangProj/artifactId
+/exclusion
+exclusion
+ groupIdVSLangProj80/groupId
+ artifactIdVSLangProj80/artifactId
+/exclusion
+exclusion
+ groupIdVsWebSite.Interop/groupId
+ artifactIdVsWebSite.Interop/artifactId
+/exclusion
+exclusion
+ groupIdMicrosoft.Build.Engine/groupId
+ artifactIdMicrosoft.Build.Engine/artifactId
+/exclusion
+ /exclusions
typevisual-studio-addin/type
/dependency
Modified: incubator/npanday/trunk/dist/npanday-installer/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dist/npanday-installer
svn commit: r1139495 - /incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Digest/Algorithms/NormalProjectDigestAlgorithm.cs
Author: brett
Date: Sat Jun 25 06:49:40 2011
New Revision: 1139495
URL: http://svn.apache.org/viewvc?rev=1139495view=rev
Log:
add some error handling in case the path is an unexpected value
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Digest/Algorithms/NormalProjectDigestAlgorithm.cs
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Digest/Algorithms/NormalProjectDigestAlgorithm.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Digest/Algorithms/NormalProjectDigestAlgorithm.cs?rev=1139495r1=1139494r2=1139495view=diff
==
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Digest/Algorithms/NormalProjectDigestAlgorithm.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Digest/Algorithms/NormalProjectDigestAlgorithm.cs
Sat Jun 25 06:49:40 2011
@@ -222,12 +222,20 @@ namespace NPanday.ProjectImporter.Digest
string bestFramework = 0.0;
foreach (string s in refs)
{
-Assembly a =
Assembly.ReflectionOnlyLoad(s);
-string framework =
a.ImageRuntimeVersion.Substring(1,3);
-if
(framework.CompareTo(targetFramework) = 0
framework.CompareTo(bestFramework) 0)
+try
{
-best = s;
-bestFramework = framework;
+Assembly a =
Assembly.ReflectionOnlyLoad(s);
+string framework =
a.ImageRuntimeVersion.Substring(1, 3);
+if
(framework.CompareTo(targetFramework) = 0
framework.CompareTo(bestFramework) 0)
+{
+best = s;
+bestFramework =
framework;
+}
+}
+catch (Exception e)
+{
+// skip this assembly
+Console.WriteLine(An
error occurred loading assembly ' + s + ' - check that your PATH to gacutil
matches your runtime environment: + e.Message);
}
}
reference.SetAssemblyInfoValues(best);
svn commit: r1139680 - /incubator/npanday/trunk/pom.xml
Author: brett Date: Sun Jun 26 00:44:13 2011 New Revision: 1139680 URL: http://svn.apache.org/viewvc?rev=1139680view=rev Log: move dist to its own profile so that it is easier to activate Modified: incubator/npanday/trunk/pom.xml Modified: incubator/npanday/trunk/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/pom.xml?rev=1139680r1=1139679r2=1139680view=diff == --- incubator/npanday/trunk/pom.xml (original) +++ incubator/npanday/trunk/pom.xml Sun Jun 26 00:44:13 2011 @@ -240,7 +240,7 @@ under the License. tagBasehttps://svn.apache.org/repos/asf/incubator/npanday/tags/tagBase useReleaseProfilefalse/useReleaseProfile goalsdeploy/goals - arguments-Pnpanday-release/arguments + arguments-Pnpanday-release,dist/arguments preparationGoalsclean install/preparationGoals autoVersionSubmodulestrue/autoVersionSubmodules mavenExecutorIdforked-path/mavenExecutorId @@ -507,10 +507,13 @@ under the License. /build /profile profile - idnpanday-release/id + iddist/id modules moduledist/module /modules +/profile +profile + idnpanday-release/id build plugins !-- Fail fast: the release build must run on Windows for the Add-in --
svn commit: r1140436 - in /incubator/npanday/trunk/dotnet/assemblies: NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/ NPanday.ProjectImporter/Engine/src/ma
Author: brett
Date: Tue Jun 28 04:57:53 2011
New Revision: 1140436
URL: http://svn.apache.org/viewvc?rev=1140436view=rev
Log:
[NPDANY-445] refactor GAC utility to be more independent and reuse from
reference addition logic as well to avoid parsing paths that may not be correct
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/AbstractPomConverter.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Digest/Algorithms/NormalProjectDigestAlgorithm.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/NPanday/Utils/GacUtility.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/Connect.cs
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/AbstractPomConverter.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/AbstractPomConverter.cs?rev=1140436r1=1140435r2=1140436view=diff
==
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/AbstractPomConverter.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/AbstractPomConverter.cs
Tue Jun 28 04:57:53 2011
@@ -39,7 +39,6 @@ namespace NPanday.ProjectImporter.Conver
{
public abstract class AbstractPomConverter : IPomConverter
{
-protected GacUtility gacUtil;
protected RspUtility rspUtil;
protected ArtifactContext artifactContext;
protected ListArtifact.Artifact localArtifacts;
@@ -78,7 +77,6 @@ namespace NPanday.ProjectImporter.Conver
this.version = parent != null ? parent.version : null;
this.rspUtil = new RspUtility();
-this.gacUtil = new GacUtility();
this.model = new NPanday.Model.Pom.Model();
// Add build Tag
@@ -749,7 +747,7 @@ namespace NPanday.ProjectImporter.Conver
return dependency;
}
-Liststring refs = gacUtil.GetAssemblyInfo(reference.Name, null,
projectDigest.Platform);
+Liststring refs =
GacUtility.GetInstance().GetAssemblyInfo(reference.Name, null,
projectDigest.Platform);
// resolve from GAC
if (refs.Count 0)
@@ -757,65 +755,15 @@ namespace NPanday.ProjectImporter.Conver
// Assembly is found at the gac
//exclude ProcessArchitecture when loading assembly on a
non-32 bit machine
-refs = gacUtil.GetAssemblyInfo(reference.Name,
reference.Version, null);
+refs =
GacUtility.GetInstance().GetAssemblyInfo(reference.Name, reference.Version,
null);
System.Reflection.Assembly a =
System.Reflection.Assembly.ReflectionOnlyLoad(new
System.Reflection.AssemblyName(refs[0]).FullName);
Dependency refDependency = new Dependency();
refDependency.artifactId = reference.Name;
refDependency.groupId = reference.Name;
-
-if (MSIL.Equals(reference.ProcessorArchitecture,
StringComparison.OrdinalIgnoreCase))
-{
-if (a.ImageRuntimeVersion.StartsWith(v4.0))
-{
-refDependency.type = gac_msil4;
-}
-else
-{
-refDependency.type = gac_msil;
-}
-}
-else if (x86.Equals(reference.ProcessorArchitecture,
StringComparison.OrdinalIgnoreCase))
-{
-if (a.ImageRuntimeVersion.StartsWith(v4.0))
-{
-refDependency.type = gac_32_4;
-}
-else
-{
-refDependency.type = gac_32;
-}
-}
-else if (IA64.Equals(reference.ProcessorArchitecture,
StringComparison.OrdinalIgnoreCase) ||
- AMD64.Equals(reference.ProcessorArchitecture,
StringComparison.OrdinalIgnoreCase))
-{
-if (a.ImageRuntimeVersion.StartsWith(v4.0))
-{
-refDependency.type = gac_64_4;
-}
-else
-{
-refDependency.type = gac_64;
-}
-}
-//Assemblies that with null
svn propchange: r1140436 - svn:log
Author: brett Revision: 1140436 Modified property: svn:log Modified: svn:log at Wed Jun 29 12:31:42 2011 -- --- svn:log (original) +++ svn:log Wed Jun 29 12:31:42 2011 @@ -1 +1 @@ -[NPDANY-445] refactor GAC utility to be more independent and reuse from reference addition logic as well to avoid parsing paths that may not be correct +[NPANDAY-445] refactor GAC utility to be more independent and reuse from reference addition logic as well to avoid parsing paths that may not be correct
svn commit: r1156097 - in /incubator/npanday/trunk: dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebSiteWithCSProj/WebApplication1/ dotnet/assemblies/NPanday.ProjectImporter/Engi
Author: brett
Date: Wed Aug 10 10:40:25 2011
New Revision: 1156097
URL: http://svn.apache.org/viewvc?rev=1156097view=rev
Log:
fix line endings
Removed:
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/VBWebApplication_Wix/VBWebApplication_Wix.vbproj.user
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/WIXVBWebApp08.suo
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebSiteWithCSProj/WebApplication1/Web.config
(props changed)
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-multi-module-web-application-vb/web.config
(props changed)
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT001/Sample.wxs
(props changed)
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT002/Sample.wixobj
(contents, props changed)
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT003/TestAppInstaller/IT003.wxs
(props changed)
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT005/TestAppInstaller/src/main/wix/IT005.wxs
(props changed)
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/VBWebApplication_Wix/Web.config
(contents, props changed)
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/WixMSI/Product.wxs
(contents, props changed)
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/WixMSI/SampleWebDir.wixobj
(contents, props changed)
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/WixMSI/WixMSI.wixproj
(contents, props changed)
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT007/LocalizationInstaller/LocalizationInstaller.wixproj
(props changed)
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT007/LocalizationInstaller/Product.wxs
(props changed)
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT008/Sample.wxs
(props changed)
Propchange:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebSiteWithCSProj/WebApplication1/Web.config
--
svn:eol-style = native
Propchange:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-multi-module-web-application-vb/web.config
--
svn:eol-style = native
Propchange:
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT001/Sample.wxs
--
svn:eol-style = native
Modified:
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT002/Sample.wixobj
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT002/Sample.wixobj?rev=1156097r1=1156096r2=1156097view=diff
==
--- incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT002/Sample.wixobj
(original)
+++ incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT002/Sample.wixobj
Wed Aug 10 10:40:25 2011
@@ -1,19 +1,19 @@
-!--
-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.
---
+!--
+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.
+--
?xml version=1.0 encoding=utf-8?wixObject version=3.0.2002.0
xmlns=http://schemas.microsoft.com/wix/2006/objects;section
id={6E390708-A2AD-4269-8CE0-561D72DFCFF3} type=product
codepage=1252table name
svn commit: r1156099 [2/2] - in /incubator/npanday/trunk: dotnet/assemblies/NPanday.Artifact/ dotnet/assemblies/NPanday.Model.Settings/src/test/csharp/ dotnet/assemblies/NPanday.ProjectImporter/Engine
Propchange:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-multi-module-web-application-vb/NMaven.WebApplication_WithVBProject.sln
--
svn:eol-style = native
Propchange:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-multi-module/consoleApp2/consoleApp2.vbproj
--
svn:eol-style = native
Propchange:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-multi-module/flatVB_proj.sln
--
svn:eol-style = native
Propchange:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-multi-module/flatVB_proj.vbproj
--
svn:eol-style = native
Propchange:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-single-module-cs/FlatSingleModule.sln
--
svn:eol-style = native
Propchange:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-single-module-vb/FlatSingleModuleVB.sln
--
svn:eol-style = native
Propchange:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-single-module-vb/FlatSingleModuleVB.vbproj
--
svn:eol-style = native
Propchange:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/sample_web_project/SampleWebProjects.sln
--
svn:eol-style = native
Propchange:
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/NPanday.VisualStudio.Addin.sln
--
svn:eol-style = native
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.Utils-Test.sln
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.Utils-Test.sln?rev=1156099r1=1156098r2=1156099view=diff
==
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.Utils-Test.sln
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.Utils-Test.sln
Wed Aug 10 10:43:00 2011
@@ -1,20 +1,20 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project({FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}) = ConnectTest,
NPanday.Utils-Test\ConnectTest.csproj,
{CD2E70EA-44C3-4AA0-9701-F99181332E8F}
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {CD2E70EA-44C3-4AA0-9701-F99181332E8F}.Debug|Any CPU.ActiveCfg
= Debug|Any CPU
- {CD2E70EA-44C3-4AA0-9701-F99181332E8F}.Debug|Any CPU.Build.0 =
Debug|Any CPU
- {CD2E70EA-44C3-4AA0-9701-F99181332E8F}.Release|Any
CPU.ActiveCfg = Release|Any CPU
- {CD2E70EA-44C3-4AA0-9701-F99181332E8F}.Release|Any CPU.Build.0
= Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project({FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}) = ConnectTest,
NPanday.Utils-Test\ConnectTest.csproj,
{CD2E70EA-44C3-4AA0-9701-F99181332E8F}
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {CD2E70EA-44C3-4AA0-9701-F99181332E8F}.Debug|Any CPU.ActiveCfg
= Debug|Any CPU
+ {CD2E70EA-44C3-4AA0-9701-F99181332E8F}.Debug|Any CPU.Build.0 =
Debug|Any CPU
+ {CD2E70EA-44C3-4AA0-9701-F99181332E8F}.Release|Any
CPU.ActiveCfg = Release|Any CPU
+ {CD2E70EA-44C3-4AA0-9701-F99181332E8F}.Release|Any CPU.Build.0
= Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+
svn commit: r1156517 - /incubator/npanday/npanday-its/trunk/.gitignore
Author: brett Date: Thu Aug 11 07:28:02 2011 New Revision: 1156517 URL: http://svn.apache.org/viewvc?rev=1156517view=rev Log: ignore VS generated files Modified: incubator/npanday/npanday-its/trunk/.gitignore Modified: incubator/npanday/npanday-its/trunk/.gitignore URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/.gitignore?rev=1156517r1=1156516r2=1156517view=diff == --- incubator/npanday/npanday-its/trunk/.gitignore (original) +++ incubator/npanday/npanday-its/trunk/.gitignore Thu Aug 11 07:28:02 2011 @@ -1 +1,2 @@ target +*.suo
svn commit: r1156622 - in /incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild: javabinding/src/main/java/NPanday/Plugin/Msbuild/MsbuildMojo.java src/main/csharp/NPanday/Plugin/Msbuild/M
Author: brett
Date: Thu Aug 11 14:09:28 2011
New Revision: 1156622
URL: http://svn.apache.org/viewvc?rev=1156622view=rev
Log:
[NPANDAY-459] Don't traverse project references when building with MSBuild, and
ensure that the project's artifacts are in place where MSBuild would expect to
find them
Modified:
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/javabinding/src/main/java/NPanday/Plugin/Msbuild/MsbuildMojo.java
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/src/main/csharp/NPanday/Plugin/Msbuild/MsbuildMojo.cs
Modified:
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/javabinding/src/main/java/NPanday/Plugin/Msbuild/MsbuildMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/javabinding/src/main/java/NPanday/Plugin/Msbuild/MsbuildMojo.java?rev=1156622r1=1156621r2=1156622view=diff
==
---
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/javabinding/src/main/java/NPanday/Plugin/Msbuild/MsbuildMojo.java
(original)
+++
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/javabinding/src/main/java/NPanday/Plugin/Msbuild/MsbuildMojo.java
Thu Aug 11 14:09:28 2011
@@ -21,12 +21,17 @@ package NPanday.Plugin.Msbuild;
import java.io.File;
import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import npanday.plugin.FieldAnnotation;
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.model.Resource;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.FileUtils;
/**
@@ -55,6 +60,11 @@ public class MsbuildMojo
private org.apache.maven.project.MavenProject project;
/**
+ * @parameter expression = ${reactorProjects}
+ */
+private Listorg.apache.maven.project.MavenProject reactorProjects;
+
+/**
* @parameter expression = ${settings.localRepository}
*/
private String localRepository;
@@ -150,15 +160,36 @@ public class MsbuildMojo
{
if ( copyReferences )
{
+MapString,MavenProject projects = new
HashMapString,MavenProject();
+for ( MavenProject p : reactorProjects )
+{
+projects.put( ArtifactUtils.versionlessKey( p.getGroupId(),
p.getArtifactId() ), p );
+}
+getLog().info( projects = + projects.keySet() );
+
for ( Object artifact : project.getDependencyArtifacts() )
{
Artifact a = (Artifact) artifact;
-String path =
-a.getGroupId() + / + a.getArtifactId() + - +
a.getBaseVersion() + / + a.getArtifactId() + . +
-a.getArtifactHandler().getExtension();
-File targetFile = new File( referencesDirectory, path );
-
+File targetDir;
+String vKey = ArtifactUtils.versionlessKey( a );
+if ( !projects.containsKey( vKey ) )
+{
+String path =
+a.getGroupId() + / + a.getArtifactId() + - +
a.getBaseVersion();
+targetDir = new File( referencesDirectory, path );
+}
+else
+{
+// Likely a project reference in MSBuild.
+// If the other project was not built with MSBuild, make
sure the artifact is present where it will look for it
+// Note: deliberately limited for now - will only work
with reactor projects and doesn't test what are references and what are not
+// TODO: support other configurations, or more aligned
MSBuild-based builds
+targetDir = new File( projects.get( vKey ).getBasedir(),
bin/Debug );
+}
+File targetFile = new File( targetDir, a.getArtifactId() + .
+ a.getArtifactHandler().getExtension() );
+
+getLog().info( Copying reference + vKey + to +
targetFile );
if ( !targetFile.exists() )
{
targetFile.getParentFile().mkdirs();
Modified:
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/src/main/csharp/NPanday/Plugin/Msbuild/MsbuildMojo.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/src/main/csharp/NPanday/Plugin/Msbuild/MsbuildMojo.cs?rev=1156622r1=1156621r2=1156622view=diff
==
---
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/src/main/csharp/NPanday/Plugin/Msbuild/MsbuildMojo.cs
(original)
+++
incubator/npanday/trunk
svn commit: r1156991 - in /incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile: SourceProcessorMojo.java TestSourceProcessorMojo.java
Author: brett
Date: Fri Aug 12 07:30:10 2011
New Revision: 1156991
URL: http://svn.apache.org/viewvc?rev=1156991view=rev
Log:
use Files instead of Strings so that they can be correctly basedir aligned
Modified:
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/SourceProcessorMojo.java
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/TestSourceProcessorMojo.java
Modified:
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/SourceProcessorMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/SourceProcessorMojo.java?rev=1156991r1=1156990r2=1156991view=diff
==
---
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/SourceProcessorMojo.java
(original)
+++
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/SourceProcessorMojo.java
Fri Aug 12 07:30:10 2011
@@ -49,7 +49,7 @@ public class SourceProcessorMojo
* @parameter expression = ${sourceDirectory}
default-value=${project.build.sourceDirectory}
* @required
*/
-private String sourceDirectory;
+private File sourceDirectory;
/**
* Output directory
@@ -57,7 +57,7 @@ public class SourceProcessorMojo
* @parameter expression = ${outputDirectory}
default-value=${project.build.directory}/build-sources
* @required
*/
-private String outputDirectory;
+private File outputDirectory;
/**
* @parameter expression = ${includes}
@@ -87,13 +87,13 @@ public class SourceProcessorMojo
{
long startTime = System.currentTimeMillis();
-if ( !new File( sourceDirectory ).exists() )
+if ( !sourceDirectory.exists() )
{
getLog().info( NPANDAY-904-001: No source files to copy );
return;
}
DirectoryScanner directoryScanner = new DirectoryScanner();
-directoryScanner.setBasedir( sourceDirectory );
+directoryScanner.setBasedir( sourceDirectory.getAbsolutePath() );
ListString excludeList = new ArrayListString();
//target files
@@ -135,8 +135,8 @@ public class SourceProcessorMojo
{
try
{
-File sourceFile = new File( sourceDirectory + File.separator +
file );
-File targetFile = new File( outputDirectory + File.separator +
file );
+File sourceFile = new File( sourceDirectory, file );
+File targetFile = new File( outputDirectory, file );
if ( sourceFile.lastModified() targetFile.lastModified() )
{
super.getPluginContext().put( SOURCE_FILES_UP_TO_DATE,
Boolean.FALSE );
Modified:
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/TestSourceProcessorMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/TestSourceProcessorMojo.java?rev=1156991r1=1156990r2=1156991view=diff
==
---
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/TestSourceProcessorMojo.java
(original)
+++
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/TestSourceProcessorMojo.java
Fri Aug 12 07:30:10 2011
@@ -48,7 +48,7 @@ public class TestSourceProcessorMojo
* @parameter expression = ${sourceDirectory}
default-value=${project.build.testSourceDirectory}
* @required
*/
-private String sourceDirectory;
+private File sourceDirectory;
/**
* Output directory for the test sources.
@@ -56,7 +56,7 @@ public class TestSourceProcessorMojo
* @parameter expression = ${outputDirectory}
default-value=${project.build.directory}/build-test-sources
* @required
*/
-private String outputDirectory;
+private File outputDirectory;
/**
* @parameter expression = ${testExcludes}
@@ -86,13 +86,13 @@ public class TestSourceProcessorMojo
{
long startTime = System.currentTimeMillis();
-if ( !new File( sourceDirectory ).exists() )
+if ( !sourceDirectory.exists() )
{
getLog().info( NPANDAY-905-001: No test source files to copy );
return;
}
DirectoryScanner directoryScanner = new DirectoryScanner();
-directoryScanner.setBasedir( sourceDirectory );
+directoryScanner.setBasedir( sourceDirectory.getAbsolutePath() );
ListString excludeList = new ArrayListString();
excludeList.add( *.suo );
@@ -133,8 +133,8 @@ public class TestSourceProcessorMojo
{
try
svn commit: r1160108 [9/9] - in /incubator/npanday/npanday-its/trunk: ./ src/test/java/npanday/its/ src/test/resources/BootstrapTest/ src/test/resources/NPANDAY_121_ResGenWithErrorInFileNameTest/ src/
Modified: incubator/npanday/npanday-its/trunk/src/test/resources/NPandayIT0039ConsoleApplicationTest/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/resources/NPandayIT0039ConsoleApplicationTest/pom.xml?rev=1160108r1=1160107r2=1160108view=diff == --- incubator/npanday/npanday-its/trunk/src/test/resources/NPandayIT0039ConsoleApplicationTest/pom.xml (original) +++ incubator/npanday/npanday-its/trunk/src/test/resources/NPandayIT0039ConsoleApplicationTest/pom.xml Mon Aug 22 05:15:04 2011 @@ -1,36 +1,36 @@ -?xml version=1.0 encoding=utf-8? -!-- -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. --- -project xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xmlns:xsd=http://www.w3.org/2001/XMLSchema; - xmlns=http://maven.apache.org/POM/4.0.0; - modelVersion4.0.0/modelVersion - parent -groupIdNPanday.ITs/groupId -artifactIdNPanday.ITs.Parent/artifactId -version1-SNAPSHOT/version - /parent - groupIdNPanday.IT/groupId - artifactIdConsoleApplicationEx-parent/artifactId - packagingpom/packaging - nameNPanday.IT : ConsoleApplicationEx-parent/name - version1.0-SNAPSHOT/version - modules -moduleConsoleApplicationEx/module - /modules +?xml version=1.0 encoding=utf-8? +!-- +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. +-- +project xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xmlns:xsd=http://www.w3.org/2001/XMLSchema; + xmlns=http://maven.apache.org/POM/4.0.0; + modelVersion4.0.0/modelVersion + parent +groupIdNPanday.ITs/groupId +artifactIdNPanday.ITs.Parent/artifactId +version1-SNAPSHOT/version + /parent + groupIdNPanday.IT/groupId + artifactIdConsoleApplicationEx-parent/artifactId + packagingpom/packaging + nameNPanday.IT : ConsoleApplicationEx-parent/name + version1.0-SNAPSHOT/version + modules +moduleConsoleApplicationEx/module + /modules /project \ No newline at end of file Propchange: incubator/npanday/npanday-its/trunk/src/test/resources/NPandayIT0039ConsoleApplicationTest/pom.xml -- svn:eol-style = native Modified: incubator/npanday/npanday-its/trunk/src/test/resources/NPandayIT0040IntraProjectDependencyTest/ClassLibrary1/Properties/Settings.settings URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/resources/NPandayIT0040IntraProjectDependencyTest/ClassLibrary1/Properties/Settings.settings?rev=1160108r1=1160107r2=1160108view=diff == --- incubator/npanday/npanday-its/trunk/src/test/resources/NPandayIT0040IntraProjectDependencyTest/ClassLibrary1/Properties/Settings.settings (original) +++ incubator/npanday/npanday-its/trunk/src/test/resources/NPandayIT0040IntraProjectDependencyTest/ClassLibrary1/Properties/Settings.settings Mon Aug 22 05:15:04 2011 @@ -1,23 +1,23 @@ -?xml version='1.0' encoding='utf-8'? -!-- -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
svn commit: r1160110 [6/31] - in /incubator/npanday/npanday-its/trunk/src/test/resources: NPANDAY_121_ResGenWithErrorInFileNameTest/npanday-9903/ NPANDAY_196_MvcSupportTest/NPanday11480/ NPANDAY_196_M
Propchange: incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_196_MvcSupportTest/NPanday11480/Scripts/jquery-1.4.1-vsdoc.js -- svn:eol-style = native
svn commit: r1160110 [3/31] - in /incubator/npanday/npanday-its/trunk/src/test/resources: NPANDAY_121_ResGenWithErrorInFileNameTest/npanday-9903/ NPANDAY_196_MvcSupportTest/NPanday11480/ NPANDAY_196_M
Propchange:
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_196_MvcSupportTest/NPanday11480/Scripts/MicrosoftAjax.debug.js
--
svn:eol-style = native
Modified:
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_196_MvcSupportTest/NPanday11480/Scripts/MicrosoftAjax.js
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_196_MvcSupportTest/NPanday11480/Scripts/MicrosoftAjax.js?rev=1160110r1=1160109r2=1160110view=diff
==
---
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_196_MvcSupportTest/NPanday11480/Scripts/MicrosoftAjax.js
(original)
+++
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_196_MvcSupportTest/NPanday11480/Scripts/MicrosoftAjax.js
Mon Aug 22 05:24:49 2011
@@ -1,22 +1,22 @@
-//
-// 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.
-//
-
-// MicrosoftAjax.js
[... 25 lines stripped ...]
Propchange:
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_196_MvcSupportTest/NPanday11480/Scripts/MicrosoftAjax.js
--
svn:eol-style = native
Modified:
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_196_MvcSupportTest/NPanday11480/Scripts/MicrosoftMvcAjax.debug.js
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_196_MvcSupportTest/NPanday11480/Scripts/MicrosoftMvcAjax.debug.js?rev=1160110r1=1160109r2=1160110view=diff
==
---
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_196_MvcSupportTest/NPanday11480/Scripts/MicrosoftMvcAjax.debug.js
(original)
+++
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_196_MvcSupportTest/NPanday11480/Scripts/MicrosoftMvcAjax.debug.js
Mon Aug 22 05:24:49 2011
@@ -1,427 +1,427 @@
-//
-// 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.
-//
-
-//!--
-//! Copyright (C) Microsoft Corporation. All rights reserved.
-//!--
-//! MicrosoftMvcAjax.js
-
-Type.registerNamespace('Sys.Mvc');
-
-
-// Sys.Mvc.AjaxOptions
-
-Sys.Mvc.$create_AjaxOptions = function Sys_Mvc_AjaxOptions() { return {}; }
-
-
-
-// Sys.Mvc.InsertionMode
-
-Sys.Mvc.InsertionMode = function() {
-/// field name=replace type=Number integer=true static=true
-/// /field
-/// field name=insertBefore type=Number integer=true static=true
-/// /field
-/// field name=insertAfter type=Number integer=true static=true
-/// /field
-};
-Sys.Mvc.InsertionMode.prototype = {
-replace: 0,
-insertBefore: 1,
-insertAfter: 2
-}
-Sys.Mvc.InsertionMode.registerEnum('Sys.Mvc.InsertionMode', false);
-
-
-
-// Sys.Mvc.AjaxContext
-
-Sys.Mvc.AjaxContext = function Sys_Mvc_AjaxContext(request, updateTarget,
loadingElement, insertionMode) {
-/// param name=request type=Sys.Net.WebRequest
-/// /param
-/// param name=updateTarget type=Object
svn commit: r1160110 [8/31] - in /incubator/npanday/npanday-its/trunk/src/test/resources: NPANDAY_121_ResGenWithErrorInFileNameTest/npanday-9903/ NPANDAY_196_MvcSupportTest/NPanday11480/ NPANDAY_196_M
Propchange: incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_196_MvcSupportTest/NPanday11480/Scripts/jquery-1.4.1.js -- svn:eol-style = native
svn commit: r1160110 [12/31] - in /incubator/npanday/npanday-its/trunk/src/test/resources: NPANDAY_121_ResGenWithErrorInFileNameTest/npanday-9903/ NPANDAY_196_MvcSupportTest/NPanday11480/ NPANDAY_196_
Propchange: incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_196_MvcSupportTest/NPanday11480/Scripts/jquery-1.4.1.min.js -- svn:eol-style = native
svn commit: r1160110 [20/31] - in /incubator/npanday/npanday-its/trunk/src/test/resources: NPANDAY_121_ResGenWithErrorInFileNameTest/npanday-9903/ NPANDAY_196_MvcSupportTest/NPanday11480/ NPANDAY_196_
Propchange:
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_330_VS2010MvcProjectSupportTest/NPanday330MVC2010ProjectTest/Scripts/MicrosoftAjax.debug.js
--
svn:eol-style = native
Modified:
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_330_VS2010MvcProjectSupportTest/NPanday330MVC2010ProjectTest/Scripts/MicrosoftAjax.js
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_330_VS2010MvcProjectSupportTest/NPanday330MVC2010ProjectTest/Scripts/MicrosoftAjax.js?rev=1160110r1=1160109r2=1160110view=diff
==
---
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_330_VS2010MvcProjectSupportTest/NPanday330MVC2010ProjectTest/Scripts/MicrosoftAjax.js
(original)
+++
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_330_VS2010MvcProjectSupportTest/NPanday330MVC2010ProjectTest/Scripts/MicrosoftAjax.js
Mon Aug 22 05:24:49 2011
@@ -1,25 +1,25 @@
-//
-// 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.
-//
-
-//--
-// Copyright (C) Microsoft Corporation. All rights reserved.
-//--
-// MicrosoftAjax.js
[... 28 lines stripped ...]
Propchange:
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_330_VS2010MvcProjectSupportTest/NPanday330MVC2010ProjectTest/Scripts/MicrosoftAjax.js
--
svn:eol-style = native
Modified:
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_330_VS2010MvcProjectSupportTest/NPanday330MVC2010ProjectTest/Scripts/MicrosoftMvcAjax.debug.js
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_330_VS2010MvcProjectSupportTest/NPanday330MVC2010ProjectTest/Scripts/MicrosoftMvcAjax.debug.js?rev=1160110r1=1160109r2=1160110view=diff
==
---
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_330_VS2010MvcProjectSupportTest/NPanday330MVC2010ProjectTest/Scripts/MicrosoftMvcAjax.debug.js
(original)
+++
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_330_VS2010MvcProjectSupportTest/NPanday330MVC2010ProjectTest/Scripts/MicrosoftMvcAjax.debug.js
Mon Aug 22 05:24:49 2011
@@ -1,427 +1,427 @@
-//
-// 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.
-//
-
-//!--
-//! Copyright (C) Microsoft Corporation. All rights reserved.
-//!--
-//! MicrosoftMvcAjax.js
-
-Type.registerNamespace('Sys.Mvc');
-
-
-// Sys.Mvc.AjaxOptions
-
-Sys.Mvc.$create_AjaxOptions = function Sys_Mvc_AjaxOptions() { return {}; }
-
-
-
-// Sys.Mvc.InsertionMode
-
-Sys.Mvc.InsertionMode = function() {
-/// field name=replace type=Number integer=true static=true
-/// /field
-/// field name=insertBefore type=Number integer=true static=true
-/// /field
-/// field name=insertAfter type=Number integer=true static=true
-/// /field
-};
svn commit: r1160110 [18/31] - in /incubator/npanday/npanday-its/trunk/src/test/resources: NPANDAY_121_ResGenWithErrorInFileNameTest/npanday-9903/ NPANDAY_196_MvcSupportTest/NPanday11480/ NPANDAY_196_
Modified:
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_328_VS2010WpfProjectSupportTest/MainWindow.xaml
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_328_VS2010WpfProjectSupportTest/MainWindow.xaml?rev=1160110r1=1160109r2=1160110view=diff
==
---
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_328_VS2010WpfProjectSupportTest/MainWindow.xaml
(original)
+++
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_328_VS2010WpfProjectSupportTest/MainWindow.xaml
Mon Aug 22 05:24:49 2011
@@ -1,26 +1,26 @@
-!--
-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.
---
-Window x:Class=WpfApplication8.MainWindow
-xmlns=http://schemas.microsoft.com/winfx/2006/xaml/presentation;
-xmlns:x=http://schemas.microsoft.com/winfx/2006/xaml;
-Title=MainWindow Height=350 Width=525
-Grid
-
-/Grid
-/Window
+!--
+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.
+--
+Window x:Class=WpfApplication8.MainWindow
+xmlns=http://schemas.microsoft.com/winfx/2006/xaml/presentation;
+xmlns:x=http://schemas.microsoft.com/winfx/2006/xaml;
+Title=MainWindow Height=350 Width=525
+Grid
+
+/Grid
+/Window
Propchange:
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_328_VS2010WpfProjectSupportTest/MainWindow.xaml
--
svn:eol-style = native
Modified:
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_328_VS2010WpfProjectSupportTest/WpfApplication8.csproj
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_328_VS2010WpfProjectSupportTest/WpfApplication8.csproj?rev=1160110r1=1160109r2=1160110view=diff
==
---
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_328_VS2010WpfProjectSupportTest/WpfApplication8.csproj
(original)
+++
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_328_VS2010WpfProjectSupportTest/WpfApplication8.csproj
Mon Aug 22 05:24:49 2011
@@ -1,125 +1,125 @@
-?xml version=1.0 encoding=utf-8?
-!--
-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.
---
-Project ToolsVersion=4.0 DefaultTargets=Build
xmlns=http://schemas.microsoft.com/developer/msbuild/2003;
- PropertyGroup
-Configuration Condition= '$(Configuration)' == '' Debug/Configuration
-Platform Condition= '$(Platform)' == '' x86/Platform
-ProductVersion8.0.30703/ProductVersion
-SchemaVersion2.0/SchemaVersion
-ProjectGuid{CE43E596-6AC3-48BC-86A5-3A3358283768}/ProjectGuid
-OutputTypeWinExe/OutputType
-
svn commit: r1160110 [23/31] - in /incubator/npanday/npanday-its/trunk/src/test/resources: NPANDAY_121_ResGenWithErrorInFileNameTest/npanday-9903/ NPANDAY_196_MvcSupportTest/NPanday11480/ NPANDAY_196_
Propchange: incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_330_VS2010MvcProjectSupportTest/NPanday330MVC2010ProjectTest/Scripts/jquery-1.4.1-vsdoc.js -- svn:eol-style = native
svn commit: r1160112 [1/3] - in /incubator/npanday/npanday-its/trunk/src/test/resources: NPANDAY_121_ResGenWithErrorInFileNameTest/npanday-9903/My Project/ NPANDAY_140_ConflictingExtensionsTest/flex-p
Author: brett Date: Mon Aug 22 05:30:24 2011 New Revision: 1160112 URL: http://svn.apache.org/viewvc?rev=1160112view=rev Log: more line endings Modified: incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_121_ResGenWithErrorInFileNameTest/npanday-9903/My Project/Settings.settings (contents, props changed) incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_140_ConflictingExtensionsTest/flex-project/src/main/flex/com/aworldforus/ArrayUtils.as (contents, props changed) incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_196_MvcSupportTest/NPanday11480/Content/Site.css (contents, props changed) incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_330_VS2010MvcProjectSupportTest/NPanday330MVC2010ProjectTest/Content/Site.css (contents, props changed) incubator/npanday/npanday-its/trunk/src/test/resources/NPandayIT0012VBWebAppTest/My Project/Settings.settings (contents, props changed) incubator/npanday/npanday-its/trunk/src/test/resources/NPandayIT0037ClassLibWithWebRefInstallTest/ClassLibraryWithWebReference/WebReferences/com.amazon.soap/AmazonSearch.wsdl (contents, props changed) incubator/npanday/npanday-its/trunk/src/test/resources/NPandayIT0037ClassLibWithWebRefInstallTest/ClassLibraryWithWebReference/WebReferences/net.webservicex.www/Reference.map (contents, props changed) incubator/npanday/npanday-its/trunk/src/test/resources/NPandayIT0037ClassLibWithWebRefInstallTest/ClassLibraryWithWebReference/WebReferences/net.webservicex.www/sendsmsworld.wsdl (contents, props changed) Modified: incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_121_ResGenWithErrorInFileNameTest/npanday-9903/My Project/Settings.settings URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_121_ResGenWithErrorInFileNameTest/npanday-9903/My%20Project/Settings.settings?rev=1160112r1=1160111r2=1160112view=diff == --- incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_121_ResGenWithErrorInFileNameTest/npanday-9903/My Project/Settings.settings (original) +++ incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_121_ResGenWithErrorInFileNameTest/npanday-9903/My Project/Settings.settings Mon Aug 22 05:30:24 2011 @@ -1,25 +1,25 @@ -?xml version='1.0' encoding='utf-8'? -!-- -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. --- -SettingsFile xmlns=http://schemas.microsoft.com/VisualStudio/2004/01/settings; CurrentProfile=(Default) UseMySettingsClassName=true - Profiles -Profile Name=(Default) / - /Profiles - Settings / -/SettingsFile +?xml version='1.0' encoding='utf-8'? +!-- +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. +-- +SettingsFile xmlns=http://schemas.microsoft.com/VisualStudio/2004/01/settings; CurrentProfile=(Default) UseMySettingsClassName=true + Profiles +Profile Name=(Default) / + /Profiles + Settings / +/SettingsFile Propchange: incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_121_ResGenWithErrorInFileNameTest/npanday-9903/My Project/Settings.settings -- svn:eol-style = native Modified: incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_140_ConflictingExtensionsTest/flex-project/src/main/flex/com/aworldforus/ArrayUtils.as URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/resources
svn commit: r1160112 [3/3] - in /incubator/npanday/npanday-its/trunk/src/test/resources: NPANDAY_121_ResGenWithErrorInFileNameTest/npanday-9903/My Project/ NPANDAY_140_ConflictingExtensionsTest/flex-p
Propchange: incubator/npanday/npanday-its/trunk/src/test/resources/NPandayIT0037ClassLibWithWebRefInstallTest/ClassLibraryWithWebReference/WebReferences/com.amazon.soap/AmazonSearch.wsdl -- svn:eol-style = native Modified: incubator/npanday/npanday-its/trunk/src/test/resources/NPandayIT0037ClassLibWithWebRefInstallTest/ClassLibraryWithWebReference/WebReferences/net.webservicex.www/Reference.map URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/resources/NPandayIT0037ClassLibWithWebRefInstallTest/ClassLibraryWithWebReference/WebReferences/net.webservicex.www/Reference.map?rev=1160112r1=1160111r2=1160112view=diff == --- incubator/npanday/npanday-its/trunk/src/test/resources/NPandayIT0037ClassLibWithWebRefInstallTest/ClassLibraryWithWebReference/WebReferences/net.webservicex.www/Reference.map (original) +++ incubator/npanday/npanday-its/trunk/src/test/resources/NPandayIT0037ClassLibWithWebRefInstallTest/ClassLibraryWithWebReference/WebReferences/net.webservicex.www/Reference.map Mon Aug 22 05:30:24 2011 @@ -1,24 +1,24 @@ -?xml version=1.0 encoding=utf-8? -!-- -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. --- -DiscoveryClientResultsFile xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xmlns:xsd=http://www.w3.org/2001/XMLSchema; - Results -DiscoveryClientResult referenceType=System.Web.Services.Discovery.ContractReference url=http://www.webservicex.net/sendsmsworld.asmx?WSDL; filename=sendsmsworld.wsdl / - /Results +?xml version=1.0 encoding=utf-8? +!-- +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. +-- +DiscoveryClientResultsFile xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xmlns:xsd=http://www.w3.org/2001/XMLSchema; + Results +DiscoveryClientResult referenceType=System.Web.Services.Discovery.ContractReference url=http://www.webservicex.net/sendsmsworld.asmx?WSDL; filename=sendsmsworld.wsdl / + /Results /DiscoveryClientResultsFile \ No newline at end of file Propchange: incubator/npanday/npanday-its/trunk/src/test/resources/NPandayIT0037ClassLibWithWebRefInstallTest/ClassLibraryWithWebReference/WebReferences/net.webservicex.www/Reference.map -- svn:eol-style = native Modified: incubator/npanday/npanday-its/trunk/src/test/resources/NPandayIT0037ClassLibWithWebRefInstallTest/ClassLibraryWithWebReference/WebReferences/net.webservicex.www/sendsmsworld.wsdl URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/resources/NPandayIT0037ClassLibWithWebRefInstallTest/ClassLibraryWithWebReference/WebReferences/net.webservicex.www/sendsmsworld.wsdl?rev=1160112r1=1160111r2=1160112view=diff == --- incubator/npanday/npanday-its/trunk/src/test/resources/NPandayIT0037ClassLibWithWebRefInstallTest/ClassLibraryWithWebReference/WebReferences/net.webservicex.www/sendsmsworld.wsdl (original) +++ incubator/npanday/npanday-its/trunk/src/test/resources/NPandayIT0037ClassLibWithWebRefInstallTest/ClassLibraryWithWebReference/WebReferences/net.webservicex.www/sendsmsworld.wsdl Mon Aug 22 05:30:24 2011 @@ -1,150 +1,150 @@ -?xml version=1.0 encoding=utf-8? -!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for
svn commit: r1160144 - /incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/Connect.cs
Author: brett
Date: Mon Aug 22 08:39:17 2011
New Revision: 1160144
URL: http://svn.apache.org/viewvc?rev=1160144view=rev
Log:
[NPANDAY-445] avoid loading from path so that reference assemblies don't cause
a conflict in the main appdomain
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/Connect.cs
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/Connect.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/Connect.cs?rev=1160144r1=1160143r2=1160144view=diff
==
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/Connect.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/Connect.cs
Mon Aug 22 08:39:17 2011
@@ -852,17 +852,20 @@ namespace NPanday.VisualStudio.Addin
}
else
{
-Assembly a =
Assembly.ReflectionOnlyLoadFrom(pReference.Path);
+// Because this might be a reference assembly, which
is a copy in a new location,
+// we can't just load it from the path - so try to
find it in the GAC
+Liststring refs =
GacUtility.GetInstance().GetAssemblyInfo(pReference.Name, pReference.Version,
null);
-// original is probably a reference assembly, so now
check if it's in the GAC
-// for that, we must load (runtime) instead of just
reflection, or from the reference path
-AppDomain appDomain =
AppDomain.CreateDomain(NPandayTempDomain);
-Assembly asm = appDomain.Load(a.FullName);
-if (asm.GlobalAssemblyCache)
+Assembly a = null;
+
+if (refs.Count 0)
+{
+a = Assembly.ReflectionOnlyLoad(new
System.Reflection.AssemblyName(refs[0]).FullName);
+}
+
+if (a != null)
{
-// use the original assembly to get the GAC type
so we don't get the wrong image version
-// but use processor architecture from the GAC
version as it is None otherwise
-refType =
GacUtility.GetNPandayGacType(a.ImageRuntimeVersion,
asm.GetName().ProcessorArchitecture, refToken);
+refType =
GacUtility.GetNPandayGacType(a.ImageRuntimeVersion,
a.GetName().ProcessorArchitecture, refToken);
}
else
{
@@ -878,7 +881,6 @@ namespace NPanday.VisualStudio.Addin
), Add Reference, MessageBoxButtons.OK,
MessageBoxIcon.Warning);
}
}
-AppDomain.Unload(appDomain);
}
}
else
svn commit: r1160145 - /incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Digest/Model/Reference.cs
Author: brett
Date: Mon Aug 22 08:43:47 2011
New Revision: 1160145
URL: http://svn.apache.org/viewvc?rev=1160145view=rev
Log:
[NPANDAY-463] download artifact fails if settings.xml doesn't have
activeProfiles element
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Digest/Model/Reference.cs
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Digest/Model/Reference.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Digest/Model/Reference.cs?rev=1160145r1=1160144r2=1160145view=diff
==
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Digest/Model/Reference.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Digest/Model/Reference.cs
Mon Aug 22 08:43:47 2011
@@ -267,7 +267,10 @@ namespace NPanday.ProjectImporter.Digest
return false;
}
Liststring activeProfiles = new Liststring();
-activeProfiles.AddRange(settings.activeProfiles);
+if (settings.activeProfiles != null)
+{
+activeProfiles.AddRange(settings.activeProfiles);
+}
Dictionarystring, string mirrors = new Dictionarystring,
string();
svn commit: r1160149 - in /incubator/npanday/npanday-its/trunk/src/test/resources: NPANDAY_196_MvcSupportTest/NPanday11480/Views/Shared/Site.Master NPANDAY_330_VS2010MvcProjectSupportTest/NPanday330MV
Author: brett Date: Mon Aug 22 08:52:31 2011 New Revision: 1160149 URL: http://svn.apache.org/viewvc?rev=1160149view=rev Log: final line endings changes Modified: incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_196_MvcSupportTest/NPanday11480/Views/Shared/Site.Master (contents, props changed) incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_330_VS2010MvcProjectSupportTest/NPanday330MVC2010ProjectTest/Views/Shared/Site.Master (contents, props changed) Modified: incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_196_MvcSupportTest/NPanday11480/Views/Shared/Site.Master URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_196_MvcSupportTest/NPanday11480/Views/Shared/Site.Master?rev=1160149r1=1160148r2=1160149view=diff == --- incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_196_MvcSupportTest/NPanday11480/Views/Shared/Site.Master (original) +++ incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_196_MvcSupportTest/NPanday11480/Views/Shared/Site.Master Mon Aug 22 08:52:31 2011 @@ -1,59 +1,59 @@ -!-- -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. --- - -%@ Master Language=C# Inherits=System.Web.Mvc.ViewMasterPage % - -!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Strict//EN http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd; -html xmlns=http://www.w3.org/1999/xhtml; -head runat=server -titleasp:ContentPlaceHolder ID=TitleContent runat=server //title -link href=../../Content/Site.css rel=stylesheet type=text/css / -/head - -body -div class=page - -div id=header -div id=title -h1My MVC Application/h1 -/div - -div id=logindisplay -% Html.RenderPartial(LogOnUserControl); % -/div - -div id=menucontainer - -ul id=menu -li%= Html.ActionLink(Home, Index, Home)%/li -li%= Html.ActionLink(About, About, Home)%/li -/ul - -/div -/div - -div id=main -asp:ContentPlaceHolder ID=MainContent runat=server / - -div id=footer -/div -/div -/div -/body -/html +!-- +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. +-- + +%@ Master Language=C# Inherits=System.Web.Mvc.ViewMasterPage % + +!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Strict//EN http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd; +html xmlns=http://www.w3.org/1999/xhtml; +head runat=server +titleasp:ContentPlaceHolder ID=TitleContent runat=server //title +link href=../../Content/Site.css rel=stylesheet type=text/css / +/head + +body +div class=page + +div id=header +div id=title +h1My MVC Application/h1 +/div + +div id=logindisplay +% Html.RenderPartial(LogOnUserControl); % +/div + +div id=menucontainer + +ul id=menu +li%= Html.ActionLink(Home, Index, Home)%/li +li%= Html.ActionLink(About, About, Home)%/li +/ul + +/div +/div + +div id=main +asp:ContentPlaceHolder ID=MainContent runat=server / + +div id=footer +/div +/div
svn commit: r1160228 - /incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/
Author: brett
Date: Mon Aug 22 12:07:12 2011
New Revision: 1160228
URL: http://svn.apache.org/viewvc?rev=1160228view=rev
Log:
fix up base versions
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_288_Net40SupportTest.java
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_328_VS2010WpfProjectSupportTest.java
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_329_VS2010WcfProjectSupportTest.java
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_330_VS2010MvcProjectSupportTest.java
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_377_WithCustomNPandaySettingsDirectoryTest.java
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_377_WithCustomNPandaySettingsFileTest.java
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_288_Net40SupportTest.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_288_Net40SupportTest.java?rev=1160228r1=1160227r2=1160228view=diff
==
---
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_288_Net40SupportTest.java
(original)
+++
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_288_Net40SupportTest.java
Mon Aug 22 12:07:12 2011
@@ -30,7 +30,7 @@ public class NPANDAY_288_Net40SupportTes
{
public NPANDAY_288_Net40SupportTest()
{
-super( [1.2.2-incubating,), [v4.0.30319,) );
+super( [1.4.0-incubating,), [v4.0.30319,) );
}
public void testNet40Project()
@@ -44,4 +44,4 @@ public class NPANDAY_288_Net40SupportTes
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}
-}
\ No newline at end of file
+}
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_328_VS2010WpfProjectSupportTest.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_328_VS2010WpfProjectSupportTest.java?rev=1160228r1=1160227r2=1160228view=diff
==
---
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_328_VS2010WpfProjectSupportTest.java
(original)
+++
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_328_VS2010WpfProjectSupportTest.java
Mon Aug 22 12:07:12 2011
@@ -26,7 +26,7 @@ public class NPANDAY_328_VS2010WpfProjec
{
public NPANDAY_328_VS2010WpfProjectSupportTest()
{
-super( [1.2.2-incubating,), [v4.0.30319,) );
+super( [1.4.0-incubating,), [v4.0.30319,) );
}
public void testWPF2010Project()
@@ -48,4 +48,4 @@ public class NPANDAY_328_VS2010WpfProjec
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}
-}
\ No newline at end of file
+}
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_329_VS2010WcfProjectSupportTest.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_329_VS2010WcfProjectSupportTest.java?rev=1160228r1=1160227r2=1160228view=diff
==
---
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_329_VS2010WcfProjectSupportTest.java
(original)
+++
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_329_VS2010WcfProjectSupportTest.java
Mon Aug 22 12:07:12 2011
@@ -26,7 +26,7 @@ public class NPANDAY_329_VS2010WcfProjec
{
public NPANDAY_329_VS2010WcfProjectSupportTest()
{
-super( [1.2.2-incubating,), [v4.0.30319,) );
+super( [1.4.0-incubating,), [v4.0.30319,) );
}
public void testWCF2010Project()
@@ -41,4 +41,4 @@ public class NPANDAY_329_VS2010WcfProjec
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}
-}
\ No newline at end of file
+}
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_330_VS2010MvcProjectSupportTest.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_330_VS2010MvcProjectSupportTest.java?rev=1160228r1=1160227r2=1160228view=diff
==
---
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_330_VS2010MvcProjectSupportTest.java
(original)
+++
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_330_VS2010MvcProjectSupportTest.java
Mon Aug 22 12:07:12 2011
@@ -30,7 +30,7 @@ public class NPANDAY_330_VS2010MvcProjec
{
public NPANDAY_330_VS2010MvcProjectSupportTest()
{
-super( [1.2.2-incubating,), [v4.0.30319,) );
+super( [1.4.0-incubating,), [v4.0.30319,) );
File f = new File( System.getenv( SYSTEMROOT
svn commit: r1176130 - in /incubator/npanday/trunk: components/dotnet-dao-project/src/main/java/npanday/dao/impl/ProjectDaoImpl.java plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/C
Author: brett
Date: Mon Sep 26 23:32:38 2011
New Revision: 1176130
URL: http://svn.apache.org/viewvc?rev=1176130view=rev
Log:
add some additional exception logging
Modified:
incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/impl/ProjectDaoImpl.java
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/ComponentInitializerMojo.java
Modified:
incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/impl/ProjectDaoImpl.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/impl/ProjectDaoImpl.java?rev=1176130r1=1176129r2=1176130view=diff
==
---
incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/impl/ProjectDaoImpl.java
(original)
+++
incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/impl/ProjectDaoImpl.java
Mon Sep 26 23:32:38 2011
@@ -1053,7 +1053,7 @@ public final class ProjectDaoImpl
}
catch ( Exception e )
{
-throw new IOException( e.getMessage() );
+throw new IOException( e.getMessage(), e );
}
String interopAbsolutePath = tmpDir.getAbsolutePath() + File.separator
+ Interop. + name + .dll;
@@ -1065,7 +1065,7 @@ public final class ProjectDaoImpl
}
catch ( Exception e )
{
-throw new IOException( e.getMessage() );
+throw new IOException( e.getMessage(), e );
}
return interopAbsolutePath;
Modified:
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/ComponentInitializerMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/ComponentInitializerMojo.java?rev=1176130r1=1176129r2=1176130view=diff
==
---
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/ComponentInitializerMojo.java
(original)
+++
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/ComponentInitializerMojo.java
Mon Sep 26 23:32:38 2011
@@ -89,11 +89,11 @@ public class ComponentInitializerMojo
}
catch ( java.io.IOException e )
{
-throw new MojoExecutionException( e.getMessage() );
+throw new MojoExecutionException( e.getMessage(), e );
}
catch( NPandayArtifactResolutionException e )
{
-throw new MojoExecutionException( e.getMessage() );
+throw new MojoExecutionException( e.getMessage(), e );
}
try
@@ -102,7 +102,7 @@ public class ComponentInitializerMojo
}
catch ( InitializationException e )
{
-throw new MojoExecutionException( NPANDAY-901-002: Failed to
initialize the assembler context );
+throw new MojoExecutionException( NPANDAY-901-002: Failed to
initialize the assembler context, e );
}
long endTime = System.currentTimeMillis();
svn commit: r1177894 - /incubator/npanday/trunk/site/src/site/apt/guide/advanced/project-types.apt.vm
Author: brett Date: Sat Oct 1 03:42:38 2011 New Revision: 1177894 URL: http://svn.apache.org/viewvc?rev=1177894view=rev Log: formatting and typo Modified: incubator/npanday/trunk/site/src/site/apt/guide/advanced/project-types.apt.vm Modified: incubator/npanday/trunk/site/src/site/apt/guide/advanced/project-types.apt.vm URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/site/src/site/apt/guide/advanced/project-types.apt.vm?rev=1177894r1=1177893r2=1177894view=diff == --- incubator/npanday/trunk/site/src/site/apt/guide/advanced/project-types.apt.vm (original) +++ incubator/npanday/trunk/site/src/site/apt/guide/advanced/project-types.apt.vm Sat Oct 1 03:42:38 2011 @@ -23,19 +23,19 @@ Available Project Types - Currently NPanday has two plugins that register types for dotnet. The maven-compile-plugin - and the custom-lifecycle-maven-plugin. + Currently NPanday has two plugins that register types for .NET. The + maven-compile-plugin and the custom-lifecycle-maven-plugin. - While the compile-plugin introduces the NPanday default lifecycle, the other - one just does a default maven install and deploy, while leaving it to you - to fill up the maven lifecycle with meaningful executions. + While the Compile plugin introduces the NPanday default lifecycle, the other + one just does a default Maven install and deploy, while leaving it to you + to fill up the Maven lifecycle with meaningful executions. Both plugins can resolve dependencies with the types of the other. * Maven Compile Plugin - The following packaging types are supported by the Maven plugins. To make them available, add the Compile plugin - with the following definition: + The following packaging types are supported by the Maven plugins. To make them + available, add the Compile plugin with the following definition: plugin @@ -52,7 +52,7 @@ Available Project Types * dotnet-executable - build and package a console application (Deprecated: exe, winexe) -* dotnet-module - builds and packages the assembly then uses the Link plugin in the package phase (Deprecated: module) +* dotnet-module - builds and packages the assembly then uses the Link plugin in the package phase (Deprecated: netmodule) * dotnet-maven-plugin - build an assembly from the .NET code and generate a Java binding for Maven (Deprecated: netplugin) @@ -78,7 +78,7 @@ Available Project Types * dotnet-vsdocs - XML-file containing intellisense information for libraries or executables -* dotnet-gac, gac_32 - dependencies in the respective GAC types variants (Deprecated: gac, gac_generic, gac_msil) +* dotnet-gac, gac_32 - dependencies in the respective GAC types variants (Deprecated: gac, gac_generic, gac_msil) [] @@ -95,23 +95,23 @@ Available Project Types /plugin -* dotnet-module - a .NET module with extension netmodule +* dotnet-module - a .NET module with extension netmodule -* dotnet-library - A dll-file compiled by any of the .NET compilers +* dotnet-library - A DLL-file compiled by any of the .NET compilers * dotnet-library-config - Configuration file attachable to a library artifact -* dotnet-executable - A exe-file compiled by any of the .NET compilers +* dotnet-executable - A EXE-file compiled by any of the .NET compilers * dotnet-executable-config - Configuration file attachable to a executable artifact -* dotnet-symbols - A pdb-file containing debug symbols for either a dll or executable +* dotnet-symbols - A PDB-file containing debug symbols for either a DLL or executable -* ole-type-library - A tlb-file that contains information about types of a library that are accessible through COM +* ole-type-library - A TLB-file that contains information about types of a library that are accessible through COM -* dotnet-vsdocs - A xml-file containing the inline code documentation for a library or executable +* dotnet-vsdocs - A XML-file containing the inline code documentation for a library or executable -* dotnet-archive - A zip of libraries and their complementary files as debug symbols, +* dotnet-archive - A ZIP of libraries and their complementary files as debug symbols, docs or local satellite assemblies. []
svn commit: r1204810 - in /incubator/npanday/trunk: bootstrap.bat mvn2_bootstrap_new_version.bat mvn3_bootstrap_new_version_interactive.bat pom.xml
Author: brett Date: Tue Nov 22 05:07:52 2011 New Revision: 1204810 URL: http://svn.apache.org/viewvc?rev=1204810view=rev Log: unify bootstrap mechanism Added: incubator/npanday/trunk/bootstrap.bat - copied, changed from r1197475, incubator/npanday/trunk/mvn2_bootstrap_new_version.bat Removed: incubator/npanday/trunk/mvn2_bootstrap_new_version.bat incubator/npanday/trunk/mvn3_bootstrap_new_version_interactive.bat Modified: incubator/npanday/trunk/pom.xml Copied: incubator/npanday/trunk/bootstrap.bat (from r1197475, incubator/npanday/trunk/mvn2_bootstrap_new_version.bat) URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/bootstrap.bat?p2=incubator/npanday/trunk/bootstrap.batp1=incubator/npanday/trunk/mvn2_bootstrap_new_version.batr1=1197475r2=1204810rev=1204810view=diff == --- incubator/npanday/trunk/mvn2_bootstrap_new_version.bat (original) +++ incubator/npanday/trunk/bootstrap.bat Tue Nov 22 05:07:52 2011 @@ -27,7 +27,7 @@ echo Bootstrapping the NPanday Compile echo ### @echo on -call mvn install --projects org.apache.npanday.plugins:maven-compile-plugin --also-make +call mvn install -Dbootstrap --projects org.apache.npanday.plugins:maven-compile-plugin --also-make IF %ERRORLEVEL% NEQ 0 GOTO Error @echo off @@ -47,4 +47,4 @@ echo ### pause @echo on -:End \ No newline at end of file +:End Modified: incubator/npanday/trunk/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/pom.xml?rev=1204810r1=1204809r2=1204810view=diff == --- incubator/npanday/trunk/pom.xml (original) +++ incubator/npanday/trunk/pom.xml Tue Nov 22 05:07:52 2011 @@ -267,7 +267,6 @@ under the License. modulecomponents/module modulearchetypes/module moduleplugins/module -moduledotnet/module /modules build plugins @@ -498,6 +497,17 @@ under the License. /dependencyManagement profiles profile + iddotnet-modules/id + activation +property + name!bootstrap/name +/property + /activation + modules +moduledotnet/module + /modules +/profile +profile idintegrationTests/id modules modulenpanday-it-runner/module
svn commit: r1204812 - /incubator/npanday/trunk/pom.xml
Author: brett Date: Tue Nov 22 05:19:35 2011 New Revision: 1204812 URL: http://svn.apache.org/viewvc?rev=1204812view=rev Log: add the required openrdf repository for now Modified: incubator/npanday/trunk/pom.xml Modified: incubator/npanday/trunk/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/pom.xml?rev=1204812r1=1204811r2=1204812view=diff == --- incubator/npanday/trunk/pom.xml (original) +++ incubator/npanday/trunk/pom.xml Tue Nov 22 05:19:35 2011 @@ -44,29 +44,16 @@ under the License. !--bootstrap.npanday.version1.2.1/bootstrap.npanday.version-- /properties - !-- - Theese repos are slow. Enable them once, when needed. - pluginRepositories -pluginRepository - idnpanday.group/id - nameNPanday Group Repository/name - urlhttp://repo.npanday.org/archiva/repository/npanday-group/url - snapshots -enabledfalse/enabled - /snapshots -/pluginRepository - /pluginRepositories repositories repository - idnpanday.group/id - nameNPanday Group Repository/name - urlhttp://repo.npanday.org/archiva/repository/npanday-group/url + idopenrdf/id + nameOpenRDF Repository/name + urlhttp://repository.aduna-software.org/maven2/url snapshots enabledfalse/enabled /snapshots /repository /repositories - -- mailingLists mailingList
svn commit: r1204813 - /incubator/npanday/trunk/pom.xml
Author: brett Date: Tue Nov 22 05:31:34 2011 New Revision: 1204813 URL: http://svn.apache.org/viewvc?rev=1204813view=rev Log: updated repositories Modified: incubator/npanday/trunk/pom.xml Modified: incubator/npanday/trunk/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/pom.xml?rev=1204813r1=1204812r2=1204813view=diff == --- incubator/npanday/trunk/pom.xml (original) +++ incubator/npanday/trunk/pom.xml Tue Nov 22 05:31:34 2011 @@ -53,8 +53,27 @@ under the License. enabledfalse/enabled /snapshots /repository +repository + releases +enabledfalse/enabled + /releases + idnpanday.snapshots/id + nameNPanday Snapshot Repository/name + urlhttp://vmbuild.apache.org/archiva/repository/npanday-snapshots/url +/repository /repositories + pluginRepositories +pluginRepository + releases +enabledfalse/enabled + /releases + idnpanday.snapshots/id + nameNPanday Snapshot Repository/name + urlhttp://vmbuild.apache.org/archiva/repository/npanday-snapshots/url +/pluginRepository + /pluginRepositories + mailingLists mailingList nameNPanday Developers List/name @@ -634,12 +653,12 @@ under the License. /profiles distributionManagement repository - idvmbuild.staging/id - urlhttp://vmbuild.apache.org/archiva/repository/staged-npanday//url + idvmbuild.releases/id + urlhttp://vmbuild.apache.org/archiva/repository/npanday-releases//url /repository snapshotRepository idvmbuild.snapshots/id - urlhttp://repo.npanday.org/archiva/repository/npanday-snapshots//url + urlhttp://vmbuild.apache.org/archiva/repository/npanday-snapshots//url /snapshotRepository /distributionManagement /project
svn commit: r1207117 - /incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_480_AzureSupportOneWebRole/License.rtf
Author: brett Date: Mon Nov 28 12:53:05 2011 New Revision: 1207117 URL: http://svn.apache.org/viewvc?rev=1207117view=rev Log: set mime-type Modified: incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_480_AzureSupportOneWebRole/License.rtf (props changed) Propchange: incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_480_AzureSupportOneWebRole/License.rtf -- svn:mime-type = text/rtf
svn commit: r1209443 - /incubator/npanday/trunk/pom.xml
Author: brett Date: Fri Dec 2 12:29:50 2011 New Revision: 1209443 URL: http://svn.apache.org/viewvc?rev=1209443view=rev Log: fix typo Modified: incubator/npanday/trunk/pom.xml Modified: incubator/npanday/trunk/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/pom.xml?rev=1209443r1=1209442r2=1209443view=diff == --- incubator/npanday/trunk/pom.xml (original) +++ incubator/npanday/trunk/pom.xml Fri Dec 2 12:29:50 2011 @@ -52,7 +52,6 @@ under the License. /snapshots /repository repository -repository idopenrdf/id nameOpenRDF Repository/name urlhttp://repository.aduna-software.org/maven2/url
svn commit: r1210330 - /incubator/npanday/npanday-its/trunk/pom.xml
Author: brett
Date: Mon Dec 5 04:39:50 2011
New Revision: 1210330
URL: http://svn.apache.org/viewvc?rev=1210330view=rev
Log:
update inline with NPanday POM
Modified:
incubator/npanday/npanday-its/trunk/pom.xml
Modified: incubator/npanday/npanday-its/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/pom.xml?rev=1210330r1=1210329r2=1210330view=diff
==
--- incubator/npanday/npanday-its/trunk/pom.xml (original)
+++ incubator/npanday/npanday-its/trunk/pom.xml Mon Dec 5 04:39:50 2011
@@ -18,6 +18,11 @@ specific language governing permissions
under the License.
--
modelVersion4.0.0/modelVersion
+ parent
+groupIdorg.apache/groupId
+artifactIdapache/artifactId
+version8/version
+ /parent
groupIdorg.apache.npanday.its/groupId
artifactIdnpanday-its/artifactId
version1.4.1-incubating-SNAPSHOT/version
@@ -188,34 +193,54 @@ under the License.
/profile
/profiles
+ !-- TODO: set up a common parent with NPanday again to store these --
distributionManagement
repository
- idvmbuild.staging/id
- urlhttp://vmbuild.apache.org/archiva/repository/staged-npanday//url
+ idvmbuild.releases/id
+ urlhttp://vmbuild.apache.org/archiva/repository/npanday-releases//url
/repository
+snapshotRepository
+ idvmbuild.snapshots/id
+
urlhttp://vmbuild.apache.org/archiva/repository/npanday-snapshots//url
+/snapshotRepository
/distributionManagement
- !-- TODO: need to get these into central after 1.1 --
pluginRepositories
pluginRepository
- idnpanday.releases/id
- nameNPanday Releases Repository/name
- url${npanday.releases.url}/url
- snapshots
+ releases
enabledfalse/enabled
- /snapshots
+ /releases
+ idnpanday.snapshots/id
+ nameNPanday Snapshot Repository/name
+ urlhttp://vmbuild.apache.org/archiva/repository/npanday-snapshots/url
/pluginRepository
/pluginRepositories
repositories
+!-- Temporary solution until we figure out where to house these properly
--
repository
- idnpanday.releases/id
- nameNPanday Releases Repository/name
- url${npanday.releases.url}/url
+ id3rdparty/id
+ name3rd Party .NET Repository/name
+ urlhttp://repo.npanday.org/3rdparty/url
snapshots
enabledfalse/enabled
/snapshots
/repository
- /repositories
-
+repository
+ idopenrdf/id
+ nameOpenRDF Repository/name
+ urlhttp://repository.aduna-software.org/maven2/url
+ snapshots
+enabledfalse/enabled
+ /snapshots
+/repository
+repository
+ releases
+enabledfalse/enabled
+ /releases
+ idnpanday.snapshots/id
+ nameNPanday Snapshot Repository/name
+ urlhttp://vmbuild.apache.org/archiva/repository/npanday-snapshots/url
+/repository
+ /repositories
/project
svn commit: r1210333 - in /incubator/npanday/trunk: components/dotnet-registry/src/main/java/npanday/registry/ConnectionsRepository.java site/src/site/apt/guide/installation/uninstall.apt
Author: brett
Date: Mon Dec 5 05:20:59 2011
New Revision: 1210333
URL: http://svn.apache.org/viewvc?rev=1210333view=rev
Log:
store the RDF repository in a separate directory that can be more easily be
removed, until the repository is no longer needed
Modified:
incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/ConnectionsRepository.java
incubator/npanday/trunk/site/src/site/apt/guide/installation/uninstall.apt
Modified:
incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/ConnectionsRepository.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/ConnectionsRepository.java?rev=1210333r1=1210332r2=1210333view=diff
==
---
incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/ConnectionsRepository.java
(original)
+++
incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/ConnectionsRepository.java
Mon Dec 5 05:20:59 2011
@@ -64,7 +64,7 @@ public class ConnectionsRepository
{
long start = System.currentTimeMillis();
-File dataDir = new File( System.getProperty( user.home ),
.m2/repository );
+File dataDir = new File( System.getProperty( user.home ), .npanday
);
MemoryStore store = new MemoryStore( dataDir );
store.setPersist( true );
store.setSyncDelay( 0 );
Modified:
incubator/npanday/trunk/site/src/site/apt/guide/installation/uninstall.apt
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/site/src/site/apt/guide/installation/uninstall.apt?rev=1210333r1=1210332r2=1210333view=diff
==
--- incubator/npanday/trunk/site/src/site/apt/guide/installation/uninstall.apt
(original)
+++ incubator/npanday/trunk/site/src/site/apt/guide/installation/uninstall.apt
Mon Dec 5 05:20:59 2011
@@ -51,6 +51,8 @@ Uninstalling NPanday
[[5]] Remove the following file C:\\Documents and
Settings\\[user_home]\\.m2\\repository\\npanday.artifacts.resolved
+ [[6]] Remove the following directory C:\\Documents and
Settings\\[user_home]\\.npanday
+
[]
An alternative to step 3 is to run the following commands from the command
prompt as an administrator:
svn commit: r1210339 - /incubator/npanday/trunk/README.txt
Author: brett Date: Mon Dec 5 06:24:11 2011 New Revision: 1210339 URL: http://svn.apache.org/viewvc?rev=1210339view=rev Log: add a note about Mono versions Modified: incubator/npanday/trunk/README.txt Modified: incubator/npanday/trunk/README.txt URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/README.txt?rev=1210339r1=1210338r2=1210339view=diff == --- incubator/npanday/trunk/README.txt (original) +++ incubator/npanday/trunk/README.txt Mon Dec 5 06:24:11 2011 @@ -7,6 +7,12 @@ Prerequisites This is due to needing the .NET 2.0 AppDomainManagers for executing Maven .NET plugins. You may still target your own projects with .NET 1.1 build. +Mono + +The build has been tested with Mono 2.10.6. Some older versions have problems +generating the correct XSD if you are compiling NPanday yourself - if the build +fails due to a missing PluginConfiguration class, consider upgrading. + Deploying NPanday Artifacts * Due to a bug with not being able to use snapshots with an executables exe.config file, you will need to do this next step manually: Copy the
svn commit: r1210481 - /incubator/npanday/trunk/plugins/maven-repository-plugin/src/main/java/npanday/plugin/repository/RepositoryConverterForArtifactMojo.java
Author: brett
Date: Mon Dec 5 14:49:41 2011
New Revision: 1210481
URL: http://svn.apache.org/viewvc?rev=1210481view=rev
Log:
improve error reporting
Modified:
incubator/npanday/trunk/plugins/maven-repository-plugin/src/main/java/npanday/plugin/repository/RepositoryConverterForArtifactMojo.java
Modified:
incubator/npanday/trunk/plugins/maven-repository-plugin/src/main/java/npanday/plugin/repository/RepositoryConverterForArtifactMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-repository-plugin/src/main/java/npanday/plugin/repository/RepositoryConverterForArtifactMojo.java?rev=1210481r1=1210480r2=1210481view=diff
==
---
incubator/npanday/trunk/plugins/maven-repository-plugin/src/main/java/npanday/plugin/repository/RepositoryConverterForArtifactMojo.java
(original)
+++
incubator/npanday/trunk/plugins/maven-repository-plugin/src/main/java/npanday/plugin/repository/RepositoryConverterForArtifactMojo.java
Mon Dec 5 14:49:41 2011
@@ -93,11 +93,11 @@ public class RepositoryConverterForArtif
}
catch ( IOException e )
{
-throw new MojoExecutionException( e.getMessage() );
+throw new MojoExecutionException( e.getMessage(), e );
}
catch( NPandayRepositoryException e )
{
-throw new MojoExecutionException( e.getMessage() );
+throw new MojoExecutionException( e.getMessage(), e );
}
}
}
svn commit: r1210745 - in /incubator/npanday/branches/NPANDAY-410/dotnet/assemblies: NPanday.Model.Pom/ NPanday.Plugin.Loader/src/main/csharp/ NPanday.Plugin.MojoGenerator/src/main/csharp/ NPanday.Plu
Author: brett
Date: Tue Dec 6 01:49:36 2011
New Revision: 1210745
URL: http://svn.apache.org/viewvc?rev=1210745view=rev
Log:
[NPANDAY-410] do not install artifacts to the GAC, and change plugin loader not
to use an appdomainmanager which requires the GAC and doesn't work on Mono
either way
Removed:
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin/src/main/csharp/PluginDomainManager.cs
Modified:
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Model.Pom/pom.xml
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin.Loader/src/main/csharp/PluginLoader.cs
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin.MojoGenerator/src/main/csharp/Generator.cs
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin.Runner/src/main/csharp/PluginLauncher.cs
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin/pom.xml
Modified:
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Model.Pom/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Model.Pom/pom.xml?rev=1210745r1=1210744r2=1210745view=diff
==
---
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Model.Pom/pom.xml
(original)
+++
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Model.Pom/pom.xml
Tue Dec 6 01:49:36 2011
@@ -69,7 +69,6 @@ under the License.
/executions
/plugin
/plugins
-!-- TODO: ideally, avoid GAC installation of this artifact --
pluginManagement
plugins
plugin
@@ -84,9 +83,6 @@ under the License.
groupIdorg.apache.npanday.plugins/groupId
artifactIdmaven-install-plugin/artifactId
version${bootstrap.npanday.version}/version
- configuration
-isGacInstalltrue/isGacInstall
- /configuration
/plugin
/plugins
/pluginManagement
Modified:
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin.Loader/src/main/csharp/PluginLoader.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin.Loader/src/main/csharp/PluginLoader.cs?rev=1210745r1=1210744r2=1210745view=diff
==
---
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin.Loader/src/main/csharp/PluginLoader.cs
(original)
+++
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin.Loader/src/main/csharp/PluginLoader.cs
Tue Dec 6 01:49:36 2011
@@ -48,8 +48,8 @@ namespace NPanday.Plugin.Loader
setup.ApplicationBase =
pluginAssemblyFile.DirectoryName;
AppDomain applicationDomain =
AppDomain.CreateDomain(Loader, null, setup);
- PluginDomainManager pluginDomainManager =
(PluginDomainManager) applicationDomain.DomainManager;
- pluginDomainManager.LoadPlugin(pluginAssemblyFile);
+ string assemblyName =
pluginAssemblyFile.Name.Replace(pluginAssemblyFile.Extension,);
+ applicationDomain.Load(assemblyName);
return applicationDomain;
}
Modified:
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin.MojoGenerator/src/main/csharp/Generator.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin.MojoGenerator/src/main/csharp/Generator.cs?rev=1210745r1=1210744r2=1210745view=diff
==
---
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin.MojoGenerator/src/main/csharp/Generator.cs
(original)
+++
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin.MojoGenerator/src/main/csharp/Generator.cs
Tue Dec 6 01:49:36 2011
@@ -71,8 +71,8 @@ namespace NPanday.Plugin.MojoGenerator
AppDomain applicationDomain = AppDomain.CreateDomain(Loader,
null, setup);
-PluginDomainManager pluginDomainManager =
(PluginDomainManager)applicationDomain.DomainManager;
-pluginDomainManager.LoadPlugin(pluginAssemblyFile);
+string assemblyName =
pluginAssemblyFile.Name.Replace(pluginAssemblyFile.Extension,);
+applicationDomain.Load(assemblyName);
return applicationDomain;
}
Modified:
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin.Runner/src/main/csharp/PluginLauncher.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin.Runner/src/main/csharp/PluginLauncher.cs?rev=1210745r1=1210744r2=1210745view=diff
==
---
incubator/npanday
svn commit: r1210758 - /incubator/npanday/branches/NPANDAY-410/components/dotnet-executable/src/main/java/npanday/executable/impl/NetExecutableFactoryImpl.java
Author: brett Date: Tue Dec 6 03:03:23 2011 New Revision: 1210758 URL: http://svn.apache.org/viewvc?rev=1210758view=rev Log: [NPANDAY-410] make sure NPanday.Plugin is now present at execution time Modified: incubator/npanday/branches/NPANDAY-410/components/dotnet-executable/src/main/java/npanday/executable/impl/NetExecutableFactoryImpl.java Modified: incubator/npanday/branches/NPANDAY-410/components/dotnet-executable/src/main/java/npanday/executable/impl/NetExecutableFactoryImpl.java URL: http://svn.apache.org/viewvc/incubator/npanday/branches/NPANDAY-410/components/dotnet-executable/src/main/java/npanday/executable/impl/NetExecutableFactoryImpl.java?rev=1210758r1=1210757r2=1210758view=diff == --- incubator/npanday/branches/NPANDAY-410/components/dotnet-executable/src/main/java/npanday/executable/impl/NetExecutableFactoryImpl.java (original) +++ incubator/npanday/branches/NPANDAY-410/components/dotnet-executable/src/main/java/npanday/executable/impl/NetExecutableFactoryImpl.java Tue Dec 6 03:03:23 2011 @@ -184,6 +184,11 @@ public class NetExecutableFactoryImpl commands.add( assemblyFile= + artifactPath.getAbsolutePath() ); commands.add( mojoName= + mojoName );//ArtifactId = namespace +// make sure plugin artifact is present to run with in the application base +Artifact pluginArtifact = artifactContext.getArtifactsFor( org.apache.npanday.plugins, NPanday.Plugin, null, + null ).get( 0 ); +PathUtil.getPrivateApplicationBaseFileFor( pluginArtifact, new File( localRepository ), targetDir ); + Artifact pluginLoaderArtifact = artifactContext.getArtifactsFor( org.apache.npanday.plugins, NPanday.Plugin.Loader, null, null ).get( 0 ); artifactPath = PathUtil.getPrivateApplicationBaseFileFor( pluginLoaderArtifact, new File( localRepository ), targetDir );
svn commit: r1210760 - /incubator/npanday/branches/NPANDAY-410/components/dotnet-executable/src/main/java/npanday/executable/impl/NetExecutableFactoryImpl.java
Author: brett Date: Tue Dec 6 03:06:49 2011 New Revision: 1210760 URL: http://svn.apache.org/viewvc?rev=1210760view=rev Log: [NPANDAY-410] make sure NPanday.Model.Pom is now present at execution time Modified: incubator/npanday/branches/NPANDAY-410/components/dotnet-executable/src/main/java/npanday/executable/impl/NetExecutableFactoryImpl.java Modified: incubator/npanday/branches/NPANDAY-410/components/dotnet-executable/src/main/java/npanday/executable/impl/NetExecutableFactoryImpl.java URL: http://svn.apache.org/viewvc/incubator/npanday/branches/NPANDAY-410/components/dotnet-executable/src/main/java/npanday/executable/impl/NetExecutableFactoryImpl.java?rev=1210760r1=1210759r2=1210760view=diff == --- incubator/npanday/branches/NPANDAY-410/components/dotnet-executable/src/main/java/npanday/executable/impl/NetExecutableFactoryImpl.java (original) +++ incubator/npanday/branches/NPANDAY-410/components/dotnet-executable/src/main/java/npanday/executable/impl/NetExecutableFactoryImpl.java Tue Dec 6 03:06:49 2011 @@ -185,6 +185,10 @@ public class NetExecutableFactoryImpl commands.add( mojoName= + mojoName );//ArtifactId = namespace // make sure plugin artifact is present to run with in the application base +// TODO: can we do this transitively from the loader or the plugin artifact? Hardcoding the transitive deps here +Artifact modelArtifact = artifactContext.getArtifactsFor( org.apache.npanday, NPanday.Model.Pom, null, + null ).get( 0 ); +PathUtil.getPrivateApplicationBaseFileFor( modelArtifact, new File( localRepository ), targetDir ); Artifact pluginArtifact = artifactContext.getArtifactsFor( org.apache.npanday.plugins, NPanday.Plugin, null, null ).get( 0 ); PathUtil.getPrivateApplicationBaseFileFor( pluginArtifact, new File( localRepository ), targetDir );
svn commit: r1210767 [2/2] - in /incubator/npanday/trunk: ./ components/ components/dotnet-artifact/src/main/java/npanday/artifact/ components/dotnet-artifact/src/main/java/npanday/artifact/impl/ comp
Modified:
incubator/npanday/trunk/plugins/maven-install-plugin/src/main/java/npanday/plugin/install/InstallerMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-install-plugin/src/main/java/npanday/plugin/install/InstallerMojo.java?rev=1210767r1=1210766r2=1210767view=diff
==
---
incubator/npanday/trunk/plugins/maven-install-plugin/src/main/java/npanday/plugin/install/InstallerMojo.java
(original)
+++
incubator/npanday/trunk/plugins/maven-install-plugin/src/main/java/npanday/plugin/install/InstallerMojo.java
Tue Dec 6 03:24:44 2011
@@ -18,19 +18,16 @@
*/
package npanday.plugin.install;
-import npanday.ArtifactTypeHelper;
+import npanday.PathUtil;
import npanday.dao.ProjectDaoException;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.artifact.installer.ArtifactInstallationException;
-import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolver;
import npanday.artifact.ArtifactContext;
-import npanday.ArtifactType;
-import npanday.artifact.ApplicationConfig;
import npanday.executable.NetExecutable;
import npanday.executable.ExecutionException;
import npanday.PlatformUnsupportedException;
@@ -183,43 +180,6 @@ public class InstallerMojo
}
}
-// To allow executables to be runnable from the repo
-Artifact artifact = project.getArtifact();
-
-if (ArtifactTypeHelper.isDotnetExecutable( artifact.getType() ) ||
-ArtifactTypeHelper.isDotnetMavenPlugin( artifact.getType() ) ||
-artifact.getType().equals(
ArtifactType.VISUAL_STUDIO_ADDIN.getPackagingType() ) ||
-artifact.getType().equals(
ArtifactType.SHARP_DEVELOP_ADDIN.getPackagingType() ) )
-{
-ListDependency dependencies = project.getDependencies();
-if ( ArtifactTypeHelper.isDotnetExecutable( artifact.getType() ) )
-{
-ApplicationConfig applicationConfig =
artifactContext.getApplicationConfigFor( artifact );
- // File configExeFile = new File(
applicationConfig.getConfigDestinationPath() );
-/*
-if ( configExeFile.exists() )
-{
-Dependency dependency = new Dependency();
-dependency.setGroupId( artifact.getGroupId() );
-dependency.setArtifactId( artifact.getArtifactId() );
-dependency.setVersion( artifact.getVersion() );
-dependency.setType(
ArtifactType.EXECONFIG.getPackagingType() );
-dependencies.add( dependency );
-}
-*/
-}
-try
-{
-artifactContext.getArtifactInstaller()
-.installArtifactAndDependenciesIntoPrivateApplicationBase(
localRepository, artifact,
-
dependencies );
-}
-catch ( java.io.IOException e )
-{
-throw new MojoExecutionException( e.getMessage() );
-}
-}
-
long endTime = System.currentTimeMillis();
getLog().info( Mojo Execution Time = + ( endTime - startTime ) );
}
@@ -258,7 +218,9 @@ public class InstallerMojo
try
{
-dao.storeProjectAndResolveDependencies( proj, localRepository, new
ArrayListArtifactRepository() );
+File targetDir = PathUtil.getPrivateApplicationBaseDirectory(
project );
+dao.storeProjectAndResolveDependencies( proj, localRepository, new
ArrayListArtifactRepository(),
+targetDir );
}
catch ( java.io.IOException e )
{
Modified:
incubator/npanday/trunk/plugins/maven-mojo-generator-plugin/src/main/java/npanday/plugin/generator/MojoGeneratorMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-mojo-generator-plugin/src/main/java/npanday/plugin/generator/MojoGeneratorMojo.java?rev=1210767r1=1210766r2=1210767view=diff
==
---
incubator/npanday/trunk/plugins/maven-mojo-generator-plugin/src/main/java/npanday/plugin/generator/MojoGeneratorMojo.java
(original)
+++
incubator/npanday/trunk/plugins/maven-mojo-generator-plugin/src/main/java/npanday/plugin/generator/MojoGeneratorMojo.java
Tue Dec 6 03:24:44 2011
@@ -18,6 +18,8 @@
*/
package npanday.plugin.generator;
+import npanday.PathUtil;
+import npanday.artifact.ArtifactContext;
import org.apache.maven.plugin.AbstractMojo;
import
svn commit: r1210772 - in /incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource: MultipleFolderLevelTest/SubLevelWebApplication/SubLevelWebApplication/ WebSiteWit
Author: brett Date: Tue Dec 6 04:13:01 2011 New Revision: 1210772 URL: http://svn.apache.org/viewvc?rev=1210772view=rev Log: avoid requirement of MVC 2 for project importer tests Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MultipleFolderLevelTest/SubLevelWebApplication/SubLevelWebApplication/SubLevelWebApplication.vbproj incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebSiteWithCSProj/WebApplication1/WebApplication1.csproj Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MultipleFolderLevelTest/SubLevelWebApplication/SubLevelWebApplication/SubLevelWebApplication.vbproj URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MultipleFolderLevelTest/SubLevelWebApplication/SubLevelWebApplication/SubLevelWebApplication.vbproj?rev=1210772r1=1210771r2=1210772view=diff == --- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MultipleFolderLevelTest/SubLevelWebApplication/SubLevelWebApplication/SubLevelWebApplication.vbproj (original) +++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MultipleFolderLevelTest/SubLevelWebApplication/SubLevelWebApplication/SubLevelWebApplication.vbproj Tue Dec 6 04:13:01 2011 @@ -130,7 +130,9 @@ under the License. WebReferences Include=Web References\ / /ItemGroup Import Project=$(MSBuildBinPath)\Microsoft.VisualBasic.targets / - Import Project=$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets / +!-- Comment out so MVC 2 need not be installed to test + Import Project=$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets/ +-- !-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. Target Name=BeforeBuild Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebSiteWithCSProj/WebApplication1/WebApplication1.csproj URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebSiteWithCSProj/WebApplication1/WebApplication1.csproj?rev=1210772r1=1210771r2=1210772view=diff == --- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebSiteWithCSProj/WebApplication1/WebApplication1.csproj (original) +++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebSiteWithCSProj/WebApplication1/WebApplication1.csproj Tue Dec 6 04:13:01 2011 @@ -72,7 +72,10 @@ under the License. Compile Include=Properties\AssemblyInfo.cs / /ItemGroup Import Project=$(MSBuildBinPath)\Microsoft.CSharp.targets / +!-- Comment out so MVC 2 need not be installed to test Import Project=$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets/ +-- +-- !-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. Target Name=BeforeBuild @@ -95,4 +98,4 @@ under the License. /FlavorProperties /VisualStudio /ProjectExtensions -/Project \ No newline at end of file +/Project
svn commit: r1210776 - in /incubator/npanday/trunk/site/src/site/apt/guide: advanced/generate-project.apt vs/executeGoals.apt vs/references.apt
Author: brett Date: Tue Dec 6 04:42:07 2011 New Revision: 1210776 URL: http://svn.apache.org/viewvc?rev=1210776view=rev Log: update documentation for changes in UAC Modified: incubator/npanday/trunk/site/src/site/apt/guide/advanced/generate-project.apt incubator/npanday/trunk/site/src/site/apt/guide/vs/executeGoals.apt incubator/npanday/trunk/site/src/site/apt/guide/vs/references.apt Modified: incubator/npanday/trunk/site/src/site/apt/guide/advanced/generate-project.apt URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/site/src/site/apt/guide/advanced/generate-project.apt?rev=1210776r1=1210775r2=1210776view=diff == --- incubator/npanday/trunk/site/src/site/apt/guide/advanced/generate-project.apt (original) +++ incubator/npanday/trunk/site/src/site/apt/guide/advanced/generate-project.apt Tue Dec 6 04:42:07 2011 @@ -71,17 +71,6 @@ mvn archetype:generate -DarchetypeArtifa The mvn install command typically puts artifacts (installs them) into the repository here, C:\\Documents and Settings\\[user_home]\\.m2\\repository. - NPanday installs the artifacts in a .NET local repository, located in - C:\\Documents and Settings\\[user_home]\\.m2\\uac. - - For the Example.Project solution the artifact is placed here, - C:\\Documents and Settings\\[user_home]\\.m2\\uac\\gac_msil\\Example.Project\\1.0-SNAPSHOT__com.example\Example.Project.dll - - The contents in C:\\Documents and Settings\\[user_home]\\.m2\\uac\\gac_msil SHOULD NOT be manually modified or - the project build will fail due to artifacts that are not properly indexed and are not synchronized with the - repository. In case the contents have been modified, delete the - C:\\Documents and Settings\\[user_home]\\.m2\\uac directory then re-install the project. - The sample project contains NUnit tests. If the build fails on nunit-console, make sure you have NUnit 2.2+ installed and located in the PATH. Modified: incubator/npanday/trunk/site/src/site/apt/guide/vs/executeGoals.apt URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/site/src/site/apt/guide/vs/executeGoals.apt?rev=1210776r1=1210775r2=1210776view=diff == --- incubator/npanday/trunk/site/src/site/apt/guide/vs/executeGoals.apt (original) +++ incubator/npanday/trunk/site/src/site/apt/guide/vs/executeGoals.apt Tue Dec 6 04:42:07 2011 @@ -89,40 +89,12 @@ Executing Maven Goals Corresponding information is sent to the Output window (including a message saying the build was successful). You can scroll up and down in the output window to display all the text. - Next, verify the artifacts were placed into the .NET local repository under the following path: - C:\\Documents and Settings\\[user_home]\\.m2\\uac\\[gac_architecture]\\artifactId\Version__GroupId + Next, verify the artifacts were placed into the local repository under the following path: + C:\\Documents and Settings\\[user_home]\\.m2\\repository\\groupId\\artifactId - For example: - C:\\Documents and Settings\\[user_home]\\.m2\\uac\\gac_msil\\NPanday.Test\\1.0__NPanday + Finally, verify that C:\\Documents and Settings\\[user_home]\\.m2\\npanday-settings.xml is also created. - The following explains what each element in the path means: - - * [user_home] The user's home directory. - - * gac_architecture The architecture type such as gac_msil, gac_32, etc. - - * artifactId This is similar to the Maven artifactId. It is equivalent to the project's module name. - In the example above, the artifactId is NPanday.Test. - - * Version__GroupId The version of the artifact and the group it is in. - In the example above the version is 1.0 and the GroupId is NPanday. - - [] - - The contents in C:\\Documents and Settings\\[user_home]\\.m2\\uac\\gac_msil SHOULD NOT be manually modified or the - project build will fail due to artifacts that are not properly indexed and are not synchronized with the repository. - In case the contents have been modified, delete the C:\\Documents and Settings\\[user_home]\\.m2\\uac directory then - re-install the project. - - Finally, Verify that the following are also created under the following paths: - - * C:\\Documents and Settings\\[user_home]\\.m2\\pab - - * C:\\Documents and Settings\\[user_home]\\.m2\\npanday-settings.xml - - [] - - Contents of npanday-settings.xml looks similar to the following: + The contents of npanday-settings.xml looks similar to the following: +--+ ?xml version=1.0 encoding=utf-8? Modified: incubator/npanday/trunk/site/src/site/apt/guide/vs/references.apt URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/site/src/site/apt/guide/vs/references.apt?rev=1210776r1=1210775r2=1210776view=diff
svn commit: r1210784 - /incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java
Author: brett
Date: Tue Dec 6 05:18:56 2011
New Revision: 1210784
URL: http://svn.apache.org/viewvc?rev=1210784view=rev
Log:
[NPANDAY-410] make sure the local repository is passed in
Modified:
incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java
Modified:
incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java?rev=1210784r1=1210783r2=1210784view=diff
==
---
incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java
(original)
+++
incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java
Tue Dec 6 05:18:56 2011
@@ -79,6 +79,9 @@ public abstract class AbstractMojo
*/
private String outputDirectory;
+/** @component */
+private ArtifactContext artifactContext;
+
public void contextualize(Context context) throws ContextException {
container = (PlexusContainer) context.get(PlexusConstants.PLEXUS_KEY);
}
@@ -149,8 +152,9 @@ public abstract class AbstractMojo
}
}
+MavenProject project = getMavenProject();
// TODO: should be configurable, but relies on it being passed into
everywhere
-File targetDir = PathUtil.getPrivateApplicationBaseDirectory(
getMavenProject() );
+File targetDir = PathUtil.getPrivateApplicationBaseDirectory( project
);
try
{
@@ -162,10 +166,11 @@ public abstract class AbstractMojo
vendorInfo.setFrameworkVersion( getFrameworkVersion() );
vendorInfo.setVendorVersion( getVendorVersion() );
+String localRepository = getLocalRepository();
+artifactContext.init( project,
project.getRemoteArtifactRepositories(), new File( localRepository ) );
Artifact artifact =
getNetExecutableFactory().getArtifactFor(getMojoGroupId(), getMojoArtifactId());
resolveArtifact(artifact, targetDir );
-getNetExecutableFactory().getPluginLoaderFor( artifact, vendorInfo,
-
getLocalRepository(), paramFile,
+getNetExecutableFactory().getPluginLoaderFor( artifact,
vendorInfo, localRepository, paramFile,
getClassName(),
targetDir ).execute();
}
catch ( PlatformUnsupportedException e )
svn commit: r1210787 - /incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java
Author: brett
Date: Tue Dec 6 05:32:22 2011
New Revision: 1210787
URL: http://svn.apache.org/viewvc?rev=1210787view=rev
Log:
[NPANDAY-410] artifact context needs to be loaded manually from the container
Modified:
incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java
Modified:
incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java?rev=1210787r1=1210786r2=1210787view=diff
==
---
incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java
(original)
+++
incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java
Tue Dec 6 05:32:22 2011
@@ -18,18 +18,16 @@
*/
package npanday.plugin;
-import npanday.artifact.NPandayArtifactResolutionException;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import npanday.PlatformUnsupportedException;
import npanday.PathUtil;
+import npanday.PlatformUnsupportedException;
import npanday.artifact.ArtifactContext;
import npanday.artifact.AssemblyResolver;
+import npanday.artifact.NPandayArtifactResolutionException;
import npanday.executable.ExecutionException;
import npanday.executable.NetExecutableFactory;
-import npanday.registry.DataAccessObjectRegistry;
import npanday.vendor.VendorFactory;
import npanday.vendor.VendorInfo;
+import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Dependency;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
@@ -44,6 +42,13 @@ import org.codehaus.plexus.personality.p
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
@@ -53,11 +58,6 @@ import javax.xml.transform.TransformerEx
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.*;
/**
* The base class for plugins that execute a .NET plugin. Classes that extend
this class are only expected to provide
@@ -70,17 +70,6 @@ public abstract class AbstractMojo
implements DotNetMojo, Contextualizable
{
protected PlexusContainer container;
-
- /**
- * Output directory
- *
- * @parameter expression = ${outputDirectory}
default-value=${project.build.directory}/build-sources
- * @required
- */
-private String outputDirectory;
-
-/** @component */
-private ArtifactContext artifactContext;
public void contextualize(Context context) throws ContextException {
container = (PlexusContainer) context.get(PlexusConstants.PLEXUS_KEY);
@@ -156,6 +145,7 @@ public abstract class AbstractMojo
// TODO: should be configurable, but relies on it being passed into
everywhere
File targetDir = PathUtil.getPrivateApplicationBaseDirectory( project
);
+ArtifactContext artifactContext = null;
try
{
VendorInfo vendorInfo =
VendorInfo.Factory.createDefaultVendorInfo();
@@ -167,7 +157,10 @@ public abstract class AbstractMojo
vendorInfo.setVendorVersion( getVendorVersion() );
String localRepository = getLocalRepository();
+
+artifactContext = (ArtifactContext)
container.lookup(ArtifactContext.ROLE);
artifactContext.init( project,
project.getRemoteArtifactRepositories(), new File( localRepository ) );
+
Artifact artifact =
getNetExecutableFactory().getArtifactFor(getMojoGroupId(), getMojoArtifactId());
resolveArtifact(artifact, targetDir );
getNetExecutableFactory().getPluginLoaderFor( artifact,
vendorInfo, localRepository, paramFile,
@@ -183,6 +176,10 @@ public abstract class AbstractMojo
} catch (ComponentLookupException e) {
throw new MojoExecutionException( NPANDAY-xxx-000, e );
}
+finally
+{
+release(artifactContext);
+}
postExecute();
}
@@ -195,15 +192,9 @@ public abstract class AbstractMojo
return;
}
-ArtifactContext artifactContext = null;
AssemblyResolver assemblyResolver = null;
-ArtifactFactory artifactFactory = null;
-DataAccessObjectRegistry daoRegistry = null;
try
svn commit: r1210791 - /incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.ProjectWizard/pom.xml
Author: brett
Date: Tue Dec 6 06:17:35 2011
New Revision: 1210791
URL: http://svn.apache.org/viewvc?rev=1210791view=rev
Log:
[NPANDAY-410] don't need to install to GAC
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.ProjectWizard/pom.xml
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.ProjectWizard/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.ProjectWizard/pom.xml?rev=1210791r1=1210790r2=1210791view=diff
==
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.ProjectWizard/pom.xml
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.ProjectWizard/pom.xml
Tue Dec 6 06:17:35 2011
@@ -71,15 +71,7 @@ under the License.
keyfilesample.snk/keyfile
/configuration
/plugin
-plugin
- groupIdorg.apache.npanday.plugins/groupId
- artifactIdmaven-install-plugin/artifactId
- version${bootstrap.npanday.version}/version
- configuration
-isGacInstalltrue/isGacInstall
- /configuration
-/plugin
- /plugins
+ /plugins
/pluginManagement
/build
/project
svn commit: r1210798 - /incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs
Author: brett Date: Tue Dec 6 06:50:12 2011 New Revision: 1210798 URL: http://svn.apache.org/viewvc?rev=1210798view=rev Log: add missing import Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs?rev=1210798r1=1210797r2=1210798view=diff == --- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs (original) +++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs Tue Dec 6 06:50:12 2011 @@ -18,6 +18,7 @@ // using System; using System.Collections.Generic; +using System.Reflection; using System.Text; using System.IO;
svn commit: r1210800 - /incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs
Author: brett
Date: Tue Dec 6 07:02:06 2011
New Revision: 1210800
URL: http://svn.apache.org/viewvc?rev=1210800view=rev
Log:
fix exception handling
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs?rev=1210800r1=1210799r2=1210800view=diff
==
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs
Tue Dec 6 07:02:06 2011
@@ -142,8 +142,11 @@ namespace NPanday.ProjectImporter.Import
{
// check MVC 2 installed
string name = System.Web.MVC, Version=2.0.0.0, Culture=neutral,
PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL;
-Assembly a = Assembly.ReflectionOnlyLoad(new
System.Reflection.AssemblyName(name).FullName);
-if (a == null)
+try
+{
+Assembly.ReflectionOnlyLoad(new
System.Reflection.AssemblyName(name).FullName);
+}
+catch
{
Assert.Ignore(Test only runs with MVC 2 installed);
}
svn commit: r1210815 - /incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/Net40GacImportTest.cs
Author: brett
Date: Tue Dec 6 08:10:09 2011
New Revision: 1210815
URL: http://svn.apache.org/viewvc?rev=1210815view=rev
Log:
additional check for test
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/Net40GacImportTest.cs
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/Net40GacImportTest.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/Net40GacImportTest.cs?rev=1210815r1=1210814r2=1210815view=diff
==
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/Net40GacImportTest.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/Net40GacImportTest.cs
Tue Dec 6 08:10:09 2011
@@ -32,6 +32,9 @@ namespace NPanday.ProjectImporter.Import
{
Assert.Ignore(Test only runs on .NET 4.0, but is: +
this.GetType().Assembly.ImageRuntimeVersion);
}
+
+// Test uses System.Web.MVC
+CheckWebMVC();
}
public override string SolutionFileRelativePath
svn commit: r1210865 - in /incubator/npanday/trunk/dist/npanday-repository-builder: pom.xml src/main/assembly/repo.xml
Author: brett
Date: Tue Dec 6 11:24:46 2011
New Revision: 1210865
URL: http://svn.apache.org/viewvc?rev=1210865view=rev
Log:
ensure ordering of build is correct in dist
Modified:
incubator/npanday/trunk/dist/npanday-repository-builder/pom.xml
incubator/npanday/trunk/dist/npanday-repository-builder/src/main/assembly/repo.xml
Modified: incubator/npanday/trunk/dist/npanday-repository-builder/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dist/npanday-repository-builder/pom.xml?rev=1210865r1=1210864r2=1210865view=diff
==
--- incubator/npanday/trunk/dist/npanday-repository-builder/pom.xml (original)
+++ incubator/npanday/trunk/dist/npanday-repository-builder/pom.xml Tue Dec 6
11:24:46 2011
@@ -164,6 +164,13 @@ under the License.
artifactIdmaven-archetype-vb-simple/artifactId
version1.4.1-incubating-SNAPSHOT/version
/dependency
+dependency
+ groupIdorg.apache.npanday/groupId
+ artifactIddotnet-repository-builder/artifactId
+ version1.4.1-incubating-SNAPSHOT/version
+ typetar.gz/type
+ classifierbin/classifier
+/dependency
/dependencies
build
plugins
@@ -178,18 +185,11 @@ under the License.
phaseprocess-resources/phase
configuration
outputDirectory${project.build.directory}/dotnet/outputDirectory
- artifactItems
-artifactItem
- groupIdorg.apache.npanday/groupId
- artifactIddotnet-repository-builder/artifactId
- version${project.version}/version
- typetar.gz/type
- classifierbin/classifier
-/artifactItem
- /artifactItems
+ excludeTransitivetrue/excludeTransitive
+ includeTypestar.gz/includeTypes
/configuration
goals
- goalunpack/goal
+ goalunpack-dependencies/goal
/goals
/execution
/executions
Modified:
incubator/npanday/trunk/dist/npanday-repository-builder/src/main/assembly/repo.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dist/npanday-repository-builder/src/main/assembly/repo.xml?rev=1210865r1=1210864r2=1210865view=diff
==
---
incubator/npanday/trunk/dist/npanday-repository-builder/src/main/assembly/repo.xml
(original)
+++
incubator/npanday/trunk/dist/npanday-repository-builder/src/main/assembly/repo.xml
Tue Dec 6 11:24:46 2011
@@ -25,6 +25,9 @@ under the License.
repository
outputDirectoryreleases/outputDirectory
includeMetadatatrue/includeMetadata
+ excludes
+excludeorg.apache.npanday:dotnet-repository-builder/exclude
+ /excludes
/repository
/repositories
fileSets
svn commit: r1210877 - in /incubator/npanday/trunk: ./ plugins/maven-fxcop-plugin/src/site/apt/ plugins/maven-install-plugin/src/site/apt/ plugins/maven-mojo-generator-plugin/src/site/apt/ plugins/wix
Author: brett Date: Tue Dec 6 11:58:22 2011 New Revision: 1210877 URL: http://svn.apache.org/viewvc?rev=1210877view=rev Log: update more historic mappings for npanday.plugin Modified: incubator/npanday/trunk/README.txt incubator/npanday/trunk/plugins/maven-fxcop-plugin/src/site/apt/usage.apt incubator/npanday/trunk/plugins/maven-install-plugin/src/site/apt/usage.apt incubator/npanday/trunk/plugins/maven-mojo-generator-plugin/src/site/apt/usage.apt incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT001/goals.txt incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT002/goals.txt incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT008/goals.txt incubator/npanday/trunk/site/src/site/apt/faqs.apt incubator/npanday/trunk/site/src/site/apt/guide/advanced/dependencies.apt incubator/npanday/trunk/site/src/site/apt/guide/advanced/releasing.apt incubator/npanday/trunk/site/src/site/apt/guide/devinfra/continuum.apt Modified: incubator/npanday/trunk/README.txt URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/README.txt?rev=1210877r1=1210876r2=1210877view=diff == --- incubator/npanday/trunk/README.txt (original) +++ incubator/npanday/trunk/README.txt Tue Dec 6 11:58:22 2011 @@ -20,16 +20,12 @@ Deploying NPanday Artifacts in NPanday\Plugins\NPanday.Plugin.Resx\1.1-SNAPSHOT from the local repository to the remote repository. -Generating CS Project Files and Solutions: - * Go to the directory containing a pom file. - * type: mvn npanday.plugin:maven-solution-plugin:solution - If the project was multi-module, the plugin will pick those up as well. Setting up the Visual Studio 2005 Addin: After building the project: * To generate the Addin for VisualStudio type: - mvn npanday.plugin:maven-vsinstaller-plugin:install + mvn org.apache.npanday.plugins:maven-vsinstaller-plugin:install * Start the IDE * Click on an NPanday project * Click on Tools/NPanday Addin Modified: incubator/npanday/trunk/plugins/maven-fxcop-plugin/src/site/apt/usage.apt URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-fxcop-plugin/src/site/apt/usage.apt?rev=1210877r1=1210876r2=1210877view=diff == --- incubator/npanday/trunk/plugins/maven-fxcop-plugin/src/site/apt/usage.apt (original) +++ incubator/npanday/trunk/plugins/maven-fxcop-plugin/src/site/apt/usage.apt Tue Dec 6 11:58:22 2011 @@ -38,11 +38,11 @@ Usage For a single module install or a multi-module, non-aggregated reports, type: ++ -mvn npanday.plugin:maven-fxcop-plugin:fxcop +mvn org.apache.npanday.plugins:maven-fxcop-plugin:fxcop ++ For a multi-module, aggregated report, type: ++ -mvn npanday.plugin:maven-fxcop-plugin:aggregate +mvn org.apache.npanday.plugins:maven-fxcop-plugin:aggregate ++ Modified: incubator/npanday/trunk/plugins/maven-install-plugin/src/site/apt/usage.apt URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-install-plugin/src/site/apt/usage.apt?rev=1210877r1=1210876r2=1210877view=diff == --- incubator/npanday/trunk/plugins/maven-install-plugin/src/site/apt/usage.apt (original) +++ incubator/npanday/trunk/plugins/maven-install-plugin/src/site/apt/usage.apt Tue Dec 6 11:58:22 2011 @@ -28,7 +28,7 @@ Usage The example below shows how to install NUnit 2.2.8.0 into your local repository. ++ - mvn npanday.plugin:maven-install-plugin:install-file + mvn org.apache.npanday.plugins:maven-install-plugin:install-file -Dfile=../imports/nunit-2.0/nunit.framework.dll -DpomFile=../imports/nunit-2.0/pom.xml -DgroupId=NUnit Modified: incubator/npanday/trunk/plugins/maven-mojo-generator-plugin/src/site/apt/usage.apt URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-mojo-generator-plugin/src/site/apt/usage.apt?rev=1210877r1=1210876r2=1210877view=diff == --- incubator/npanday/trunk/plugins/maven-mojo-generator-plugin/src/site/apt/usage.apt (original) +++ incubator/npanday/trunk/plugins/maven-mojo-generator-plugin/src/site/apt/usage.apt Tue Dec 6 11:58:22 2011 @@ -46,7 +46,7 @@ Usage Next generate the JavaBinding classes for the .NET Plugin. ++ - mvn npanday.plugin:maven-mojo-generator-plugin:generate-bindings + mvn org.apache.npanday.plugins:maven-mojo-generator-plugin:generate-bindings ++ Your project structure will now look like this: Modified: incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT001/goals.txt URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT001/goals.txt?rev=1210877r1=1210876r2=1210877view=diff
svn commit: r1210882 - /incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_140_ConflictingExtensionsTest/pom.xml
Author: brett Date: Tue Dec 6 12:14:28 2011 New Revision: 1210882 URL: http://svn.apache.org/viewvc?rev=1210882view=rev Log: add repository until a better example can be constructed Modified: incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_140_ConflictingExtensionsTest/pom.xml Modified: incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_140_ConflictingExtensionsTest/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_140_ConflictingExtensionsTest/pom.xml?rev=1210882r1=1210881r2=1210882view=diff == --- incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_140_ConflictingExtensionsTest/pom.xml (original) +++ incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_140_ConflictingExtensionsTest/pom.xml Tue Dec 6 12:14:28 2011 @@ -61,4 +61,22 @@ under the License. /dependency /dependencies /dependencyManagement + pluginRepositories +pluginRepository + idservebox/id + urlhttp://maven.servebox.org/repository/url + snapshots +enabledfalse/enabled + /snapshots +/pluginRepository + /pluginRepositories + repositories +repository + idservebox/id + urlhttp://maven.servebox.org/repository/url + snapshots +enabledfalse/enabled + /snapshots +/repository + /repositories /project
svn commit: r1210911 - in /incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test: csharp/ImporterTests/ resource/MultipleFolderLevelTest/SubLevelWebApplication/SubLevelWebA
Author: brett
Date: Tue Dec 6 13:42:48 2011
New Revision: 1210911
URL: http://svn.apache.org/viewvc?rev=1210911view=rev
Log:
try again to use conditional instead of installation of MVC as a guide - as it
actually requires more of Visual Studio installed to access the file
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MultipleFolderLevelTest/SubLevelWebApplication/SubLevelWebApplication/SubLevelWebApplication.vbproj
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebSiteWithCSProj/WebApplication1/WebApplication1.csproj
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs?rev=1210911r1=1210910r2=1210911view=diff
==
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs
Tue Dec 6 13:42:48 2011
@@ -141,15 +141,15 @@ namespace NPanday.ProjectImporter.Import
public void CheckWebMVC()
{
// check MVC 2 installed
-string name = System.Web.MVC, Version=2.0.0.0, Culture=neutral,
PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL;
-try
-{
-Assembly.ReflectionOnlyLoad(new
System.Reflection.AssemblyName(name).FullName);
-}
-catch
-{
-Assert.Ignore(Test only runs with MVC 2 installed);
-}
+//string name = System.Web.MVC, Version=2.0.0.0, Culture=neutral,
PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL;
+//try
+//{
+//Assembly.ReflectionOnlyLoad(new
System.Reflection.AssemblyName(name).FullName);
+//}
+//catch
+//{
+//Assert.Ignore(Test only runs with MVC 2 installed);
+//}
}
[Test]
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MultipleFolderLevelTest/SubLevelWebApplication/SubLevelWebApplication/SubLevelWebApplication.vbproj
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MultipleFolderLevelTest/SubLevelWebApplication/SubLevelWebApplication/SubLevelWebApplication.vbproj?rev=1210911r1=1210910r2=1210911view=diff
==
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MultipleFolderLevelTest/SubLevelWebApplication/SubLevelWebApplication/SubLevelWebApplication.vbproj
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MultipleFolderLevelTest/SubLevelWebApplication/SubLevelWebApplication/SubLevelWebApplication.vbproj
Tue Dec 6 13:42:48 2011
@@ -130,7 +130,7 @@ under the License.
WebReferences Include=Web References\ /
/ItemGroup
Import Project=$(MSBuildBinPath)\Microsoft.VisualBasic.targets /
- Import
Project=$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets
/
+ Import
Project=$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets
Condition=exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets')/
!-- To modify your build process, add your task inside one of the targets
below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Target Name=BeforeBuild
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebSiteWithCSProj/WebApplication1/WebApplication1.csproj
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebSiteWithCSProj/WebApplication1/WebApplication1.csproj?rev=1210911r1=1210910r2=1210911view=diff
==
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebSiteWithCSProj/WebApplication1/WebApplication1.csproj
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebSiteWithCSProj
svn commit: r1210919 - /incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT002/Sample.wixobj
Author: brett
Date: Tue Dec 6 14:01:03 2011
New Revision: 1210919
URL: http://svn.apache.org/viewvc?rev=1210919view=rev
Log:
remove license from generated file
Modified:
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT002/Sample.wixobj
Modified:
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT002/Sample.wixobj
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT002/Sample.wixobj?rev=1210919r1=1210918r2=1210919view=diff
==
--- incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT002/Sample.wixobj
(original)
+++ incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT002/Sample.wixobj
Tue Dec 6 14:01:03 2011
@@ -1,19 +1 @@
-!--
-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.
---
-?xml version=1.0 encoding=utf-8?wixObject version=3.0.2002.0
xmlns=http://schemas.microsoft.com/wix/2006/objects;section
id={6E390708-A2AD-4269-8CE0-561D72DFCFF3} type=product
codepage=1252table name=_SummaryInformationrow
sourceLineNumber=F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*6field1/fieldfield1252/field/rowrow
sourceLineNumber=F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*6field2/fieldfieldInstallation
Database/field/rowrow
sourceLineNumber=F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*6field3/fieldfieldSample
Inc's Thing 1.0 Installer/field/rowrow
sourceLineNumber=F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*6field4/fieldfieldSample
Inc./field/rowrow
sourceLineNumber=F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*6field5/fieldfieldInstaller/field/rowrow
sourceLineNumber=F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*6field6/f
ieldfieldThing is a registered trademark of Sample Inc./field/rowrow
sourceLineNumber=F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*6field7/fieldfieldIntel;1033/field/rowrow
sourceLineNumber=F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*6field9/fieldfield{5902BCD6-12B9-4F38-BF6B-2C30F825FFED}/field/rowrow
sourceLineNumber=F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*6field14/fieldfield100/field/rowrow
sourceLineNumber=F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*6field15/fieldfield2/field/rowrow
sourceLineNumber=F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*6field19/fieldfield2/field/row/tabletable
name=Componentrow
sourceLineNumber=F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*18fieldMainExecutable/fieldfield{059035F2-A47C-4407-8459-0597276DF276}/fieldfieldINSTALLDIR/fieldfield4/fieldfield
/fieldregAE2619ED6104800F210A1CB6511
A5F82/field/rowrow
sourceLineNumber=F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*29fieldHelperLibrary/fieldfield{DFEB88F1-A60F-45E9-80F1-1AB62E66D73C}/fieldfieldINSTALLDIR/fieldfield0/fieldfield
/fieldHelperDLL/field/rowrow
sourceLineNumber=F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*33fieldManual/fieldfield{B6277FF6-CA9E-481E-9619-758FD725A752}/fieldfieldINSTALLDIR/fieldfield4/fieldfield
/fieldregB6A8F75963CF49F3026E3E7D48AD2E48/field/row/tabletable
name=Directoryrow
sourceLineNumber=F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*16fieldINSTALLDIR/fieldfieldSample/fieldfielddkshdkwd|Thing
1.0/field/rowrow
sourceLineNumber=F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*15fieldSample/fieldfieldProgramFilesFolder/fieldfieldSample/field/rowrow
sourceLineNumber=F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*14fieldProgramFilesFolder/fiel
dfieldTARGETDIR/fieldfieldPFiles/field/rowrow
sourceLineNumber=F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*47fieldProgramMenuDir/fieldfieldProgramMenuFolder/fieldfieldiljk7ior|Thing
1.0/field/rowrow
sourceLineNumber=F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*46fieldProgramMenuFolder/fieldfieldTARGETDIR/fieldfieldPrograms/field/rowrow
sourceLineNumber=F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*50fieldDesktopFolder/fieldfieldTARGETDIR/fieldfieldDesktop/field/rowrow
sourceLineNumber=F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*13fieldTARGETDIR/fieldfield
/fieldSourceDir/field/row/tabletable name=Featurerow
sourceLineNumber=F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs
svn commit: r1210921 - in /incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT007/WIXLocalizationExample: Form1.cs Program.cs
Author: brett Date: Tue Dec 6 14:03:37 2011 New Revision: 1210921 URL: http://svn.apache.org/viewvc?rev=1210921view=rev Log: remove .NET 3 import Linq - projects are for SDK 2.0 Modified: incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT007/WIXLocalizationExample/Form1.cs incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT007/WIXLocalizationExample/Program.cs Modified: incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT007/WIXLocalizationExample/Form1.cs URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT007/WIXLocalizationExample/Form1.cs?rev=1210921r1=1210920r2=1210921view=diff == --- incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT007/WIXLocalizationExample/Form1.cs (original) +++ incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT007/WIXLocalizationExample/Form1.cs Tue Dec 6 14:03:37 2011 @@ -19,7 +19,6 @@ using System.Collections.Generic; using System.ComponentModel; using System.Data; using System.Drawing; -using System.Linq; using System.Text; using System.Windows.Forms; Modified: incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT007/WIXLocalizationExample/Program.cs URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT007/WIXLocalizationExample/Program.cs?rev=1210921r1=1210920r2=1210921view=diff == --- incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT007/WIXLocalizationExample/Program.cs (original) +++ incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT007/WIXLocalizationExample/Program.cs Tue Dec 6 14:03:37 2011 @@ -16,7 +16,6 @@ // under the License. using System; using System.Collections.Generic; -using System.Linq; using System.Windows.Forms; namespace WIXLocalizationExample
svn commit: r1210928 - in /incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT004/TestConsoleApplication: TestConsoleApplication.csproj pom.xml
Author: brett
Date: Tue Dec 6 14:23:54 2011
New Revision: 1210928
URL: http://svn.apache.org/viewvc?rev=1210928view=rev
Log:
remove unnecessary dependency that has a problem due to NPANDAY-501
Modified:
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT004/TestConsoleApplication/TestConsoleApplication.csproj
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT004/TestConsoleApplication/pom.xml
Modified:
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT004/TestConsoleApplication/TestConsoleApplication.csproj
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT004/TestConsoleApplication/TestConsoleApplication.csproj?rev=1210928r1=1210927r2=1210928view=diff
==
---
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT004/TestConsoleApplication/TestConsoleApplication.csproj
(original)
+++
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT004/TestConsoleApplication/TestConsoleApplication.csproj
Tue Dec 6 14:23:54 2011
@@ -57,16 +57,6 @@ under the License.
ItemGroup
WebReferences Include=Web References\ /
/ItemGroup
- ItemGroup
-COMReference Include=Shell32
- Guid{50A7E9B0-70EF-11D1-B75A-00A0C90564FE}/Guid
- VersionMajor1/VersionMajor
- VersionMinor0/VersionMinor
- Lcid0/Lcid
- WrapperTooltlbimp/WrapperTool
- IsolatedFalse/Isolated
-/COMReference
- /ItemGroup
Import Project=$(MSBuildBinPath)\Microsoft.CSharp.targets /
!-- To modify your build process, add your task inside one of the targets
below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
@@ -75,4 +65,4 @@ under the License.
Target Name=AfterBuild
/Target
--
-/Project
\ No newline at end of file
+/Project
Modified:
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT004/TestConsoleApplication/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT004/TestConsoleApplication/pom.xml?rev=1210928r1=1210927r2=1210928view=diff
==
---
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT004/TestConsoleApplication/pom.xml
(original)
+++
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT004/TestConsoleApplication/pom.xml
Tue Dec 6 14:23:54 2011
@@ -44,13 +44,4 @@ under the License.
/plugin
/plugins
/build
- dependencies
-dependency
- groupIdShell32/groupId
- artifactIdShell32/artifactId
- version1.0.0.0/version
- typecom_reference/type
- classifier{50A7E9B0-70EF-11D1-B75A-00A0C90564FE}-1.0-0/classifier
-/dependency
- /dependencies
-/project
\ No newline at end of file
+/project
svn commit: r1211291 - /incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/ArtifactUtils.cs
Author: brett Date: Wed Dec 7 04:19:38 2011 New Revision: 1211291 URL: http://svn.apache.org/viewvc?rev=1211291view=rev Log: add missing license header Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/ArtifactUtils.cs Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/ArtifactUtils.cs URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/ArtifactUtils.cs?rev=1211291r1=1211290r2=1211291view=diff == --- incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/ArtifactUtils.cs (original) +++ incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/ArtifactUtils.cs Wed Dec 7 04:19:38 2011 @@ -1,3 +1,24 @@ +#region Apache License, Version 2.0 +// +// 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 System; using System.Collections.Generic; using System.Globalization;
svn commit: r1211389 - /incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0012VBWebAppTest.java
Author: brett Date: Wed Dec 7 11:25:01 2011 New Revision: 1211389 URL: http://svn.apache.org/viewvc?rev=1211389view=rev Log: fix incorrect path Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0012VBWebAppTest.java Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0012VBWebAppTest.java URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0012VBWebAppTest.java?rev=1211389r1=1211388r2=1211389view=diff == --- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0012VBWebAppTest.java (original) +++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0012VBWebAppTest.java Wed Dec 7 11:25:01 2011 @@ -54,7 +54,7 @@ public class NPandayIT0012VBWebAppTest assertZipEntries( zipFile, expectedEntries ); -String assembly = new File( testDir, target/bin/VBWebAppTest.dll ).getAbsolutePath(); +String assembly = new File( testDir, target/VBWebAppTest/bin/VBWebAppTest.dll ).getAbsolutePath(); assertResourcePresent( assembly, VBWebAppTest.Resources.resources ); assertClassPresent( assembly, VBWebAppTest._Default ); }
svn commit: r1211395 - /incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0012VBWebAppTest.java
Author: brett Date: Wed Dec 7 11:42:47 2011 New Revision: 1211395 URL: http://svn.apache.org/viewvc?rev=1211395view=rev Log: correct IT Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0012VBWebAppTest.java Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0012VBWebAppTest.java URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0012VBWebAppTest.java?rev=1211395r1=1211394r2=1211395view=diff == --- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0012VBWebAppTest.java (original) +++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0012VBWebAppTest.java Wed Dec 7 11:42:47 2011 @@ -54,8 +54,8 @@ public class NPandayIT0012VBWebAppTest assertZipEntries( zipFile, expectedEntries ); -String assembly = new File( testDir, target/VBWebAppTest/bin/VBWebAppTest.dll ).getAbsolutePath(); -assertResourcePresent( assembly, VBWebAppTest.Resources.resources ); -assertClassPresent( assembly, VBWebAppTest._Default ); +String assembly = new File( testDir, target/VBWebAppTest/bin/VBWebAppTest.dll ).getCanonicalPath(); +assertResourcePresent( assembly, Resources.resources ); +assertClassPresent( assembly, _Default ); } }
svn commit: r1211396 - /incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0013WebAppInstallTest.java
Author: brett Date: Wed Dec 7 11:48:14 2011 New Revision: 1211396 URL: http://svn.apache.org/viewvc?rev=1211396view=rev Log: updated IT for contents of ZIP Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0013WebAppInstallTest.java Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0013WebAppInstallTest.java URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0013WebAppInstallTest.java?rev=1211396r1=1211395r2=1211396view=diff == --- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0013WebAppInstallTest.java (original) +++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0013WebAppInstallTest.java Wed Dec 7 11:48:14 2011 @@ -24,6 +24,8 @@ import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; import java.io.File; +import java.util.Arrays; +import java.util.List; public class NPandayIT0013WebAppInstallTest extends AbstractNPandayIntegrationTestCase @@ -39,8 +41,16 @@ public class NPandayIT0013WebAppInstallT File testDir = ResourceExtractor.simpleExtractResources( getClass(), /NPandayIT0013WebAppInstallTest ); Verifier verifier = getVerifier( testDir ); verifier.executeGoal( install ); -verifier.assertFilePresent( new File( testDir, getAssemblyFile( WebAppExample, 1.0.0, zip ) ).getAbsolutePath() ); +File zipFile = new File( testDir, getAssemblyFile( WebAppExample, 1.0.0, zip ) ); +verifier.assertFilePresent( zipFile.getAbsolutePath() ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); + +ListString expectedEntries = Arrays.asList( bin/WebAppExample.dll, Default.aspx, Web.config ); + +assertZipEntries( zipFile, expectedEntries ); + +String assembly = new File( testDir, target/WebAppExample/bin/WebAppExample.dll ).getCanonicalPath(); +assertClassPresent( assembly, _Default ); } }
svn commit: r1211399 - /incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_121_ResGenWithErrorInFileNameTest.java
Author: brett
Date: Wed Dec 7 11:59:56 2011
New Revision: 1211399
URL: http://svn.apache.org/viewvc?rev=1211399view=rev
Log:
updated IT for contents of ZIP
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_121_ResGenWithErrorInFileNameTest.java
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_121_ResGenWithErrorInFileNameTest.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_121_ResGenWithErrorInFileNameTest.java?rev=1211399r1=1211398r2=1211399view=diff
==
---
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_121_ResGenWithErrorInFileNameTest.java
(original)
+++
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_121_ResGenWithErrorInFileNameTest.java
Wed Dec 7 11:59:56 2011
@@ -24,6 +24,8 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
+import java.util.Arrays;
+import java.util.List;
public class NPANDAY_121_ResGenWithErrorInFileNameTest
extends AbstractNPandayIntegrationTestCase
@@ -36,12 +38,28 @@ public class NPANDAY_121_ResGenWithError
public void testResGenWithErrorInFileName()
throws Exception
{
-File testDir = ResourceExtractor.simpleExtractResources( getClass(),
/NPANDAY_121_ResGenWithErrorInFileNameTest );
+File testDir = ResourceExtractor.simpleExtractResources( getClass(),
+
/NPANDAY_121_ResGenWithErrorInFileNameTest );
Verifier verifier = getVerifier( testDir );
verifier.executeGoal( install );
-verifier.assertFilePresent( new File( testDir, npanday-9903/ +
-getAssemblyFile( npanday-9903, 1.0.0, zip )
).getAbsolutePath() );
+File zipFile = new File( testDir, npanday-9903/ + getAssemblyFile(
npanday-9903, 1.0.0, zip ) );
+verifier.assertFilePresent( zipFile.getAbsolutePath() );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
+
+ListString expectedEntries = Arrays.asList( bin/npanday-9903.dll,
Default.aspx, error.aspx,
+ error.asp.resx, My
Project/Application.myapp,
+ My
Project/Resources.resx, My Project/Settings.settings,
+ Web.config );
+
+assertZipEntries( zipFile, expectedEntries );
+
+String assembly = new File( testDir,
target/npanday-9903/bin/npanday-9903.dll ).getCanonicalPath();
+assertResourcePresent( assembly, Resources.resources );
+assertResourcePresent( assembly, error.asp.resources );
+assertClassPresent( assembly, _Default );
+assertClassPresent( assembly, _error );
+assertClassPresent( assembly, My.MyApplication );
+assertClassPresent( assembly, My.MySettings );
}
}
svn commit: r1211400 - /incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0012VBWebAppTest.java
Author: brett Date: Wed Dec 7 12:00:21 2011 New Revision: 1211400 URL: http://svn.apache.org/viewvc?rev=1211400view=rev Log: updated IT for contents of ZIP Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0012VBWebAppTest.java Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0012VBWebAppTest.java URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0012VBWebAppTest.java?rev=1211400r1=1211399r2=1211400view=diff == --- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0012VBWebAppTest.java (original) +++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0012VBWebAppTest.java Wed Dec 7 12:00:21 2011 @@ -57,5 +57,7 @@ public class NPandayIT0012VBWebAppTest String assembly = new File( testDir, target/VBWebAppTest/bin/VBWebAppTest.dll ).getCanonicalPath(); assertResourcePresent( assembly, Resources.resources ); assertClassPresent( assembly, _Default ); +assertClassPresent( assembly, My.MyApplication ); +assertClassPresent( assembly, My.MySettings ); } }
svn commit: r1211403 - /incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_121_ResGenWithErrorInFileNameTest.java
Author: brett Date: Wed Dec 7 12:06:56 2011 New Revision: 1211403 URL: http://svn.apache.org/viewvc?rev=1211403view=rev Log: correct resource check Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_121_ResGenWithErrorInFileNameTest.java Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_121_ResGenWithErrorInFileNameTest.java URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_121_ResGenWithErrorInFileNameTest.java?rev=1211403r1=1211402r2=1211403view=diff == --- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_121_ResGenWithErrorInFileNameTest.java (original) +++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_121_ResGenWithErrorInFileNameTest.java Wed Dec 7 12:06:56 2011 @@ -55,8 +55,8 @@ public class NPANDAY_121_ResGenWithError assertZipEntries( zipFile, expectedEntries ); String assembly = new File( testDir, npanday-9903/target/npanday-9903/bin/npanday-9903.dll ).getCanonicalPath(); -assertResourcePresent( assembly, Resources.resources ); -assertResourcePresent( assembly, error.asp.resources ); +assertResourcePresent( assembly, npanday_9903, Resources.resources ); +assertResourcePresent( assembly, npanday_9903,error.asp.resources ); assertClassPresent( assembly, _Default ); assertClassPresent( assembly, _error ); assertClassPresent( assembly, My.MyApplication );
svn commit: r1211404 - /incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0012VBWebAppTest.java
Author: brett Date: Wed Dec 7 12:12:36 2011 New Revision: 1211404 URL: http://svn.apache.org/viewvc?rev=1211404view=rev Log: fix class name Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0012VBWebAppTest.java Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0012VBWebAppTest.java URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0012VBWebAppTest.java?rev=1211404r1=1211403r2=1211404view=diff == --- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0012VBWebAppTest.java (original) +++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0012VBWebAppTest.java Wed Dec 7 12:12:36 2011 @@ -57,7 +57,7 @@ public class NPandayIT0012VBWebAppTest String assembly = new File( testDir, target/VBWebAppTest/bin/VBWebAppTest.dll ).getCanonicalPath(); assertResourcePresent( assembly, Resources.resources ); assertClassPresent( assembly, _Default ); -assertClassPresent( assembly, My.MyApplication ); +assertClassPresent( assembly, My.MyWebExtension ); assertClassPresent( assembly, My.MySettings ); } }
svn commit: r1211406 - /incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_329_VS2010WcfProjectSupportTest.java
Author: brett
Date: Wed Dec 7 12:16:53 2011
New Revision: 1211406
URL: http://svn.apache.org/viewvc?rev=1211406view=rev
Log:
update IT for zip contents
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_329_VS2010WcfProjectSupportTest.java
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_329_VS2010WcfProjectSupportTest.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_329_VS2010WcfProjectSupportTest.java?rev=1211406r1=1211405r2=1211406view=diff
==
---
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_329_VS2010WcfProjectSupportTest.java
(original)
+++
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_329_VS2010WcfProjectSupportTest.java
Wed Dec 7 12:16:53 2011
@@ -20,6 +20,8 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
+import java.util.Arrays;
+import java.util.List;
public class NPANDAY_329_VS2010WcfProjectSupportTest
extends AbstractNPandayIntegrationTestCase
@@ -32,13 +34,23 @@ public class NPANDAY_329_VS2010WcfProjec
public void testWCF2010Project()
throws Exception
{
-File testDir = ResourceExtractor.simpleExtractResources( getClass(),
/NPANDAY_329_VS2010WcfProjectSupportTest );
+File testDir = ResourceExtractor.simpleExtractResources( getClass(),
+
/NPANDAY_329_VS2010WcfProjectSupportTest );
Verifier verifier = getVerifier( testDir );
verifier.executeGoal( install );
-String assembly = new File( testDir,
-getAssemblyFile( WcfService1, 1.0.0, zip )
).getAbsolutePath();
-verifier.assertFilePresent( assembly );
+File zipFile = new File( testDir, getAssemblyFile( WcfService1,
1.0.0, zip ) );
+verifier.assertFilePresent( zipFile.getAbsolutePath() );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
+
+ListString expectedEntries = Arrays.asList( bin/WcfService1.dll,
bin/System.Web.DynamicData.dll,
+
bin/System.Web.Entity.dll,
+
bin/System.Web.ApplicationServices.dll, Service1.svc,
+ Web.config,
Web.Debug.config, Web.Release.config );
+
+assertZipEntries( zipFile, expectedEntries );
+
+String assembly = new File( testDir,
target/WcfService1/bin/WcfService1.dll ).getCanonicalPath();
+assertClassPresent( assembly, Service1 );
}
}
svn commit: r1211762 - in /incubator/npanday/npanday-its/trunk: ./ src/test/java/npanday/its/ src/test/resources/NPANDAY_329_VS2010WcfProjectSupportTest/ src/test/resources/NPANDAY_96_GlobalAsaxPrecom
Author: brett
Date: Thu Dec 8 06:00:47 2011
New Revision: 1211762
URL: http://svn.apache.org/viewvc?rev=1211762view=rev
Log:
add a test case for NPANDAY-96 which introduced some special filtering into the
precompilation plugin, so changes there are safer
Added:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_96_GlobalAsaxPrecompiledTest.java
- copied, changed from r1211406,
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_329_VS2010WcfProjectSupportTest.java
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_96_GlobalAsaxPrecompiledTest/
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_96_GlobalAsaxPrecompiledTest/Default.aspx
(with props)
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_96_GlobalAsaxPrecompiledTest/Default.aspx.cs
(with props)
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_96_GlobalAsaxPrecompiledTest/Default.aspx.designer.cs
(with props)
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_96_GlobalAsaxPrecompiledTest/Global.asax
(with props)
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_96_GlobalAsaxPrecompiledTest/Global.asax.cs
(with props)
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_96_GlobalAsaxPrecompiledTest/GlobalASAXExample.csproj
(with props)
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_96_GlobalAsaxPrecompiledTest/Properties/
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_96_GlobalAsaxPrecompiledTest/Properties/AssemblyInfo.cs
(with props)
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_96_GlobalAsaxPrecompiledTest/Web.config
(with props)
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_96_GlobalAsaxPrecompiledTest/pom.xml
(with props)
Modified:
incubator/npanday/npanday-its/trunk/ (props changed)
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_329_VS2010WcfProjectSupportTest/pom.xml
Propchange: incubator/npanday/npanday-its/trunk/
--
--- svn:ignore (original)
+++ svn:ignore Thu Dec 8 06:00:47 2011
@@ -2,3 +2,4 @@
*.iml
*.iws
target
+.idea
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java?rev=1211762r1=1211761r2=1211762view=diff
==
---
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java
(original)
+++
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java
Thu Dec 8 06:00:47 2011
@@ -205,12 +205,31 @@ public abstract class AbstractNPandayInt
protected static void assertZipEntries( File zipFile, ListString
expectedEntries )
throws IOException
{
+assertZipEntries( zipFile, expectedEntries, true );
+}
+
+protected static void assertNoZipEntries( File zipFile, ListString
unexpectedEntries )
+throws IOException
+{
+assertZipEntries( zipFile, unexpectedEntries, false );
+}
+
+protected static void assertZipEntries( File zipFile, ListString
expectedEntries, boolean expected )
+throws IOException
+{
ZipFile zip = new ZipFile( zipFile );
try
{
for ( String name : expectedEntries )
{
-assertNotNull( zip.getEntry( name ) );
+if ( expected )
+{
+assertNotNull( zip.getEntry( name ) );
+}
+else
+{
+assertNull( zip.getEntry( name ) );
+}
}
}
finally
Copied:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_96_GlobalAsaxPrecompiledTest.java
(from r1211406,
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_329_VS2010WcfProjectSupportTest.java)
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_96_GlobalAsaxPrecompiledTest.java?p2=incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_96_GlobalAsaxPrecompiledTest.javap1=incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_329_VS2010WcfProjectSupportTest.javar1=1211406r2=1211762rev=1211762view=diff
==
---
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_329_VS2010WcfProjectSupportTest.java
(original)
+++
incubator/npanday/npanday
svn commit: r1211766 - /incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_96_GlobalAsaxPrecompiledTest.java
Author: brett Date: Thu Dec 8 06:28:48 2011 New Revision: 1211766 URL: http://svn.apache.org/viewvc?rev=1211766view=rev Log: additional check for NPANDAY-96 Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_96_GlobalAsaxPrecompiledTest.java Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_96_GlobalAsaxPrecompiledTest.java URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_96_GlobalAsaxPrecompiledTest.java?rev=1211766r1=1211765r2=1211766view=diff == --- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_96_GlobalAsaxPrecompiledTest.java (original) +++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_96_GlobalAsaxPrecompiledTest.java Thu Dec 8 06:28:48 2011 @@ -54,5 +54,6 @@ public class NPANDAY_96_GlobalAsaxPrecom String assembly = new File( testDir, target/GlobalASAXExample/bin/GlobalASAXExample.dll ).getCanonicalPath(); assertClassPresent( assembly, _Default ); +assertClassPresent( assembly, Global ); } }
svn commit: r1211797 - /incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java
Author: brett
Date: Thu Dec 8 10:06:15 2011
New Revision: 1211797
URL: http://svn.apache.org/viewvc?rev=1211797view=rev
Log:
ability to turn on -X for Maven
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java?rev=1211797r1=1211796r2=1211797view=diff
==
---
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java
(original)
+++
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java
Thu Dec 8 10:06:15 2011
@@ -68,6 +68,8 @@ public abstract class AbstractNPandayInt
private static boolean debugMaven = Boolean.valueOf( System.getProperty(
debug.maven, false ) );
+private static boolean debugOutput = Boolean.valueOf( System.getProperty(
npanday.log.debug, false ) );
+
private static boolean forceVersion = Boolean.valueOf( System.getProperty(
npanday.version.force, false ) );
private static final Pattern PATTERN = Pattern.compile(
(.*?)-(RC[0-9]+|SNAPSHOT) );
@@ -224,11 +226,11 @@ public abstract class AbstractNPandayInt
{
if ( expected )
{
-assertNotNull( zip.getEntry( name ) );
+assertNotNull( expected + name + to be present in
zip, zip.getEntry( name ) );
}
else
{
-assertNull( zip.getEntry( name ) );
+assertNull( expected + name + to be absent in zip,
zip.getEntry( name ) );
}
}
}
@@ -286,6 +288,10 @@ public abstract class AbstractNPandayInt
}
ListString cliOptions = new ArrayListString( 2 );
cliOptions.add( -Dnpanday.version= + version );
+if ( debugOutput )
+{
+cliOptions.add( -X );
+}
verifier.setCliOptions( cliOptions );
return verifier;
}
svn commit: r1211819 - in /incubator/npanday/npanday-its/trunk/src/test: java/npanday/its/NPANDAY_465_AspxDisablePrecompilationTest.java resources/NPANDAY_465_AspxDisablePrecompilationTest/ resources/
Author: brett
Date: Thu Dec 8 10:51:38 2011
New Revision: 1211819
URL: http://svn.apache.org/viewvc?rev=1211819view=rev
Log:
[NPANDAY-465] integration test for disable precompile flag
Added:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_465_AspxDisablePrecompilationTest.java
- copied, changed from r1211762,
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_96_GlobalAsaxPrecompiledTest.java
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_465_AspxDisablePrecompilationTest/
- copied from r1211762,
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_96_GlobalAsaxPrecompiledTest/
Modified:
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_465_AspxDisablePrecompilationTest/pom.xml
Copied:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_465_AspxDisablePrecompilationTest.java
(from r1211762,
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_96_GlobalAsaxPrecompiledTest.java)
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_465_AspxDisablePrecompilationTest.java?p2=incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_465_AspxDisablePrecompilationTest.javap1=incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_96_GlobalAsaxPrecompiledTest.javar1=1211762r2=1211819rev=1211819view=diff
==
---
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_96_GlobalAsaxPrecompiledTest.java
(original)
+++
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_465_AspxDisablePrecompilationTest.java
Thu Dec 8 10:51:38 2011
@@ -23,18 +23,18 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-public class NPANDAY_96_GlobalAsaxPrecompiledTest
+public class NPANDAY_465_AspxDisablePrecompilationTest
extends AbstractNPandayIntegrationTestCase
{
-public NPANDAY_96_GlobalAsaxPrecompiledTest()
+public NPANDAY_465_AspxDisablePrecompilationTest()
{
-super( [1.4.0-incubating,), [v3.5,) );
+super( [1.4.1-incubating,), [v3.5,) );
}
-public void testGlobalAsaxPrecompiled()
+public void testDisablePrecompilation()
throws Exception
{
-File testDir = ResourceExtractor.simpleExtractResources( getClass(),
/NPANDAY_96_GlobalAsaxPrecompiledTest );
+File testDir = ResourceExtractor.simpleExtractResources( getClass(),
/NPANDAY_465_AspxDisablePrecompilationTest );
Verifier verifier = getVerifier( testDir );
verifier.executeGoal( install );
File zipFile = new File( testDir, getAssemblyFile(
GlobalASAXExample, 1.0.0, zip ) );
@@ -54,5 +54,6 @@ public class NPANDAY_96_GlobalAsaxPrecom
String assembly = new File( testDir,
target/GlobalASAXExample/bin/GlobalASAXExample.dll ).getCanonicalPath();
assertClassPresent( assembly, _Default );
+assertClassPresent( assembly, Global );
}
}
Modified:
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_465_AspxDisablePrecompilationTest/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_465_AspxDisablePrecompilationTest/pom.xml?rev=1211819r1=1211762r2=1211819view=diff
==
---
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_465_AspxDisablePrecompilationTest/pom.xml
(original)
+++
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_465_AspxDisablePrecompilationTest/pom.xml
Thu Dec 8 10:51:38 2011
@@ -6,11 +6,11 @@
version1-SNAPSHOT/version
/parent
modelVersion4.0.0/modelVersion
- groupIdNPanday.ITs.GlobalASAXExample/groupId
+ groupIdNPanday.ITs.NPANDAY465/groupId
artifactIdGlobalASAXExample/artifactId
version1.0-SNAPSHOT/version
packagingasp/packaging
- nameNPanday.ITs.GlobalASAXExample : GlobalASAXExample/name
+ nameNPanday.ITs.NPANDAY465 : GlobalASAXExample/name
build
sourceDirectory./sourceDirectory
plugins
@@ -29,6 +29,13 @@
outputDirectorybin/outputDirectory
/configuration
/plugin
+ plugin
+groupIdorg.apache.npanday.plugins/groupId
+artifactIdmaven-aspx-plugin/artifactId
+configuration
+ precompilefalse/precompile
+/configuration
+ /plugin
/plugins
/build
/project
svn commit: r1211820 - /incubator/npanday/trunk/plugins/maven-aspx-plugin/src/main/java/npanday/plugin/aspx/AspxCompilerMojo.java
Author: brett
Date: Thu Dec 8 10:53:53 2011
New Revision: 1211820
URL: http://svn.apache.org/viewvc?rev=1211820view=rev
Log:
[NPANDAY-465] flag to disable aspnet_compiler, as it can occasionally be
problematic. Simulate by copying everything except *.cs and *.vb files into the
location for packaging - further excludes can be done with the excludes
parameter. Likely to be superceded in NPanday 1.5.0 by alternate packaging
Modified:
incubator/npanday/trunk/plugins/maven-aspx-plugin/src/main/java/npanday/plugin/aspx/AspxCompilerMojo.java
Modified:
incubator/npanday/trunk/plugins/maven-aspx-plugin/src/main/java/npanday/plugin/aspx/AspxCompilerMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-aspx-plugin/src/main/java/npanday/plugin/aspx/AspxCompilerMojo.java?rev=1211820r1=1211819r2=1211820view=diff
==
---
incubator/npanday/trunk/plugins/maven-aspx-plugin/src/main/java/npanday/plugin/aspx/AspxCompilerMojo.java
(original)
+++
incubator/npanday/trunk/plugins/maven-aspx-plugin/src/main/java/npanday/plugin/aspx/AspxCompilerMojo.java
Thu Dec 8 10:53:53 2011
@@ -51,7 +51,7 @@ public class AspxCompilerMojo
{
private static final String DEFAULT_INCLUDES = **; //any extension can
be made for request handler in ASPX
-private static final String DEFAULT_EXCLUDES =
.svn/**,.references/**,obj/**, target/**, **/*.pdb, **/*.csproj, **/*.vbproj,
**/*.suo, **/*.user,pom.xml,
**/*.sln,build.log,PrecompiledApp.config,csproj.user,Properties/**,**.releaseBackup,^-?(?:\\d+|\\d{1,3}(?:,\\d{3})+)(?:\\.\\d+)?$/**;
+private static final String DEFAULT_EXCLUDES =
.svn/**,.references/**,obj/**, target/**, **/*.pdb, **/*.csproj, **/*.vbproj,
**/*.suo, **/*.user,pom.xml,
**/*.sln,build.log,PrecompiledApp.config,csproj.user,Properties/**,**.releaseBackup,^-?(?:\\d+|\\d{1,3}(?:,\\d{3})+)(?:\\.\\d+)?$/**,**/*.cs,**/*.vb;
/**
* @parameter expression=${npanday.settings}
default-value=${user.home}/.m2
@@ -154,6 +154,11 @@ public class AspxCompilerMojo
*/
private String[] excludes;
+/**
+ * @parameter default-value=true expression=${npanday.aspx.precompile}
+ */
+private boolean precompile;
+
/**
* @component
*/
@@ -205,38 +210,46 @@ public class AspxCompilerMojo
{
throw new MojoExecutionException( Unable to copy directory +
webSourceDirectory.getAbsolutePath() + to +
tmpSourceDir.getAbsolutePath(), e );
-}
+}
-File tmpDestDir = new File( tmpDir, dest );
-tmpDestDir.mkdirs();
+File tmpDestDir;
+if ( precompile )
+{
+tmpDestDir = new File( tmpDir, dest );
+tmpDestDir.mkdirs();
-CompilerRequirement compilerRequirement = createCompilerRequirement();
+CompilerRequirement compilerRequirement =
createCompilerRequirement();
-CompilerConfig compilerConfig = createCompilerConfig(
tmpSourceDir.getAbsolutePath(), tmpDestDir.getAbsolutePath() );
+CompilerConfig compilerConfig = createCompilerConfig(
tmpSourceDir.getAbsolutePath(), tmpDestDir.getAbsolutePath() );
-try
-{
-CompilerExecutable compilerExecutable =
-netExecutableFactory.getCompilerExecutableFor(
compilerRequirement, compilerConfig, project,
-
profileAssemblyPath );
-
-long startTimeCompile = System.currentTimeMillis();
-compilerExecutable.execute();
-long endTimeCompile = System.currentTimeMillis();
+try
+{
+CompilerExecutable compilerExecutable =
+netExecutableFactory.getCompilerExecutableFor(
compilerRequirement, compilerConfig, project,
+
profileAssemblyPath );
+
+long startTimeCompile = System.currentTimeMillis();
+compilerExecutable.execute();
+long endTimeCompile = System.currentTimeMillis();
-getLog().info( NPANDAY-000-000: Compile Time = + (
endTimeCompile - startTimeCompile ) + ms );
-project.getArtifact().setFile(
compilerExecutable.getCompiledArtifact() );
-}
-catch ( PlatformUnsupportedException e )
-{
-throw new MojoExecutionException( NPANDAY-900-005: Unsupported
Platform: Language = + language +
-, Vendor = + vendor + , ArtifactType = +
project.getArtifact().getType(), e );
+getLog().info( NPANDAY-000-000: Compile Time = + (
endTimeCompile - startTimeCompile ) + ms );
+project.getArtifact().setFile(
compilerExecutable.getCompiledArtifact() );
+}
+catch ( PlatformUnsupportedException e )
+{
+throw new
svn commit: r1213212 - in /incubator/npanday/trunk: plugins/maven-ilmerge-plugin/pom.xml pom.xml
Author: brett
Date: Mon Dec 12 12:31:28 2011
New Revision: 1213212
URL: http://svn.apache.org/viewvc?rev=1213212view=rev
Log:
[maven-release-plugin] prepare branch npanday-1.4.x
Modified:
incubator/npanday/trunk/plugins/maven-ilmerge-plugin/pom.xml
incubator/npanday/trunk/pom.xml
Modified: incubator/npanday/trunk/plugins/maven-ilmerge-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-ilmerge-plugin/pom.xml?rev=1213212r1=1213211r2=1213212view=diff
==
--- incubator/npanday/trunk/plugins/maven-ilmerge-plugin/pom.xml (original)
+++ incubator/npanday/trunk/plugins/maven-ilmerge-plugin/pom.xml Mon Dec 12
12:31:28 2011
@@ -1,39 +1,39 @@
-?xml version=1.0 encoding=UTF-8?
-
-!--
-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.
---
-project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
- parent
-groupIdorg.apache.npanday.plugins/groupId
-version1.4.1-incubating-SNAPSHOT/version
-artifactIdmaven-dotnet-plugins/artifactId
- /parent
- modelVersion4.0.0/modelVersion
- artifactIdmaven-ilmerge-plugin/artifactId
- packagingmaven-plugin/packaging
- nameNPanday :: ILMerge Maven Plugin/name
- descriptionMaven Plugin for .NET: Merges assemblies/description
- dependencies
-dependency
- groupIdorg.codehaus.plexus/groupId
- artifactIdplexus-utils/artifactId
- version${plexus.utils.version}/version
-/dependency
- /dependencies
-/project
+?xml version=1.0 encoding=UTF-8?
+
+!--
+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.
+--
+project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
+ parent
+groupIdorg.apache.npanday.plugins/groupId
+version1.4.1-incubating-SNAPSHOT/version
+artifactIdmaven-dotnet-plugins/artifactId
+ /parent
+ modelVersion4.0.0/modelVersion
+ artifactIdmaven-ilmerge-plugin/artifactId
+ packagingmaven-plugin/packaging
+ nameNPanday :: ILMerge Maven Plugin/name
+ descriptionMaven Plugin for .NET: Merges assemblies/description
+ dependencies
+dependency
+ groupIdorg.codehaus.plexus/groupId
+ artifactIdplexus-utils/artifactId
+ version${plexus.utils.version}/version
+/dependency
+ /dependencies
+/project
Modified: incubator/npanday/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/pom.xml?rev=1213212r1=1213211r2=1213212view=diff
==
--- incubator/npanday/trunk/pom.xml (original)
+++ incubator/npanday/trunk/pom.xml Mon Dec 12 12:31:28 2011
@@ -113,9 +113,9 @@ under the License.
/mailingList
/mailingLists
scm
-
connectionscm:svn:http://svn.apache.org/repos/asf/incubator/npanday/trunk//connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/incubator/npanday/trunk//developerConnection
-urlhttp://svn.apache.org/viewvc/incubator/npanday/trunk/url
+
connectionscm:svn:https://svn.apache.org/repos/asf/incubator/npanday/branches/npanday-1.4.x/connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/incubator/npanday/branches/npanday-1.4.x/developerConnection
+
urlhttps://svn.apache.org/repos/asf/incubator/npanday/branches
svn commit: r1213213 - /incubator/npanday/branches/npanday-1.4.x/
Author: brett Date: Mon Dec 12 12:31:38 2011 New Revision: 1213213 URL: http://svn.apache.org/viewvc?rev=1213213view=rev Log: [maven-release-plugin] copy for branch npanday-1.4.x Added: incubator/npanday/branches/npanday-1.4.x/ (props changed) - copied from r1213212, incubator/npanday/trunk/ Propchange: incubator/npanday/branches/npanday-1.4.x/ -- --- svn:ignore (added) +++ svn:ignore Mon Dec 12 12:31:38 2011 @@ -0,0 +1,4 @@ +target +*.ipr +*.iml +*.iws Propchange: incubator/npanday/branches/npanday-1.4.x/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Dec 12 12:31:38 2011 @@ -0,0 +1,3 @@ +/incubator/npanday/branches/NPANDAY-410:1210743-1210765 +/incubator/npanday/branches/npanday-uac-removed:1002005-1024539 +/incubator/npanday/branches/npanday-vs2010-support:1002029-1025477
svn commit: r1213226 - in /incubator/npanday/trunk: dist/ dist/npanday-repository-builder/ dotnet/assemblies/NPanday.ProjectImporter/ dotnet/assemblies/NPanday.ProjectImporter/Engine/ dotnet/assemblie
Author: brett Date: Mon Dec 12 13:18:05 2011 New Revision: 1213226 URL: http://svn.apache.org/viewvc?rev=1213226view=rev Log: fix remaining versions Modified: incubator/npanday/trunk/dist/npanday-repository-builder/pom.xml incubator/npanday/trunk/dist/pom.xml incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/pom.xml incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/pom.xml incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/pom.xml incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.ProjectWizard/pom.xml incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio/pom.xml incubator/npanday/trunk/site/pom.xml Modified: incubator/npanday/trunk/dist/npanday-repository-builder/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dist/npanday-repository-builder/pom.xml?rev=1213226r1=1213225r2=1213226view=diff == --- incubator/npanday/trunk/dist/npanday-repository-builder/pom.xml (original) +++ incubator/npanday/trunk/dist/npanday-repository-builder/pom.xml Mon Dec 12 13:18:05 2011 @@ -34,87 +34,87 @@ under the License. dependency groupIdorg.apache.npanday.plugins/groupId artifactIdmaven-compile-plugin/artifactId - version1.4.1-incubating-SNAPSHOT/version + version1.5.0-incubating-SNAPSHOT/version /dependency dependency groupIdorg.apache.npanday.plugins/groupId artifactIdmaven-aspx-plugin/artifactId - version1.4.1-incubating-SNAPSHOT/version + version1.5.0-incubating-SNAPSHOT/version /dependency dependency groupIdorg.apache.npanday.plugins/groupId artifactIdmaven-fxcop-plugin/artifactId - version1.4.1-incubating-SNAPSHOT/version + version1.5.0-incubating-SNAPSHOT/version /dependency dependency groupIdorg.apache.npanday.plugins/groupId artifactIdmaven-install-plugin/artifactId - version1.4.1-incubating-SNAPSHOT/version + version1.5.0-incubating-SNAPSHOT/version /dependency dependency groupIdorg.apache.npanday.plugins/groupId artifactIdmaven-link-plugin/artifactId - version1.4.1-incubating-SNAPSHOT/version + version1.5.0-incubating-SNAPSHOT/version /dependency dependency groupIdorg.apache.npanday.plugins/groupId artifactIdmaven-mojo-generator-plugin/artifactId - version1.4.1-incubating-SNAPSHOT/version + version1.5.0-incubating-SNAPSHOT/version /dependency dependency groupIdorg.apache.npanday.plugins/groupId artifactIdmaven-repository-plugin/artifactId - version1.4.1-incubating-SNAPSHOT/version + version1.5.0-incubating-SNAPSHOT/version /dependency dependency groupIdorg.apache.npanday.plugins/groupId artifactIdmaven-resgen-plugin/artifactId - version1.4.1-incubating-SNAPSHOT/version + version1.5.0-incubating-SNAPSHOT/version /dependency dependency groupIdorg.apache.npanday.plugins/groupId artifactIdmaven-resolver-plugin/artifactId - version1.4.1-incubating-SNAPSHOT/version + version1.5.0-incubating-SNAPSHOT/version /dependency dependency groupIdorg.apache.npanday.plugins/groupId artifactIdmaven-test-plugin/artifactId - version1.4.1-incubating-SNAPSHOT/version + version1.5.0-incubating-SNAPSHOT/version /dependency dependency groupIdorg.apache.npanday.plugins/groupId artifactIdmaven-vsinstaller-plugin/artifactId - version1.4.1-incubating-SNAPSHOT/version + version1.5.0-incubating-SNAPSHOT/version /dependency dependency groupIdorg.apache.npanday.plugins/groupId artifactIdmaven-webapp-plugin/artifactId - version1.4.1-incubating-SNAPSHOT/version + version1.5.0-incubating-SNAPSHOT/version /dependency dependency groupIdorg.apache.npanday.plugins/groupId artifactIdmaven-wsdl-plugin/artifactId - version1.4.1-incubating-SNAPSHOT/version + version1.5.0-incubating-SNAPSHOT/version /dependency dependency groupIdorg.apache.npanday.plugins/groupId artifactIdmaven-xsd-plugin/artifactId - version1.4.1-incubating-SNAPSHOT/version + version1.5.0-incubating-SNAPSHOT/version /dependency dependency groupIdorg.apache.npanday.plugins/groupId artifactIdmaven-xsp-plugin/artifactId - version1.4.1-incubating-SNAPSHOT/version + version1.5.0-incubating-SNAPSHOT/version /dependency dependency groupIdorg.apache.npanday.plugins/groupId artifactIdwix-maven-plugin/artifactId - version1.4.1-incubating-SNAPSHOT/version + version1.5.0-incubating-SNAPSHOT/version /dependency dependency groupIdorg.apache.npanday.plugins/groupId artifactIdcustom-lifecycle-maven-plugin/artifactId - version1.4.1
svn commit: r1213521 - /incubator/npanday/trunk/npanday-it-runner/pom.xml
Author: brett
Date: Tue Dec 13 00:33:31 2011
New Revision: 1213521
URL: http://svn.apache.org/viewvc?rev=1213521view=rev
Log:
no need to branch the ITs, so use these ones until released
Modified:
incubator/npanday/trunk/npanday-it-runner/pom.xml
Modified: incubator/npanday/trunk/npanday-it-runner/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/npanday-it-runner/pom.xml?rev=1213521r1=1213520r2=1213521view=diff
==
--- incubator/npanday/trunk/npanday-it-runner/pom.xml (original)
+++ incubator/npanday/trunk/npanday-it-runner/pom.xml Tue Dec 13 00:33:31 2011
@@ -36,8 +36,8 @@ under the License.
dependency
groupIdorg.apache.npanday.its/groupId
artifactIdnpanday-its/artifactId
- version${project.version}/version
- classifiertests/classifier
+ version1.4.1-incubating-SNAPSHOT/version
+ classifiertests/classifier
/dependency
/dependencies
svn commit: r1213553 - /incubator/npanday/trunk/npanday-it-runner/pom.xml
Author: brett
Date: Tue Dec 13 03:35:58 2011
New Revision: 1213553
URL: http://svn.apache.org/viewvc?rev=1213553view=rev
Log:
fix typo
Modified:
incubator/npanday/trunk/npanday-it-runner/pom.xml
Modified: incubator/npanday/trunk/npanday-it-runner/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/npanday-it-runner/pom.xml?rev=1213553r1=1213552r2=1213553view=diff
==
--- incubator/npanday/trunk/npanday-it-runner/pom.xml (original)
+++ incubator/npanday/trunk/npanday-it-runner/pom.xml Tue Dec 13 03:35:58 2011
@@ -71,7 +71,7 @@ under the License.
overWriteSnapshotstrue/overWriteSnapshots
overWriteReleasestrue/overWriteReleases
outputDirectory${project.basedir}/target/test-classes/outputDirectory
- excludeTransitivetrueexcludeTransitive
+ excludeTransitivetrue/excludeTransitive
/configuration
/execution
/executions
