Author: brett
Date: Tue Jul 8 07:18:25 2014
New Revision: 1608678
URL: http://svn.apache.org/r1608678
Log:
[NPANDAY-505] probe for xsd instance executable also
Modified:
incubator/npanday/trunk/plugins/maven-xsd-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
Modified:
incubator/npanday/trunk/plugins/maven-xsd-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-xsd-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml?rev=1608678&r1=1608677&r2=1608678&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/maven-xsd-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
(original)
+++
incubator/npanday/trunk/plugins/maven-xsd-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
Tue Jul 8 07:18:25 2014
@@ -105,18 +105,88 @@ under the License.
<profile>XSD:XML_INSTANCE</profile>
<frameworkVersions>
<frameworkVersion>4.5.1</frameworkVersion>
+ </frameworkVersions>
+ <platforms>
+ <platform>
+ <operatingSystem>Windows</operatingSystem>
+ </platform>
+ </platforms>
+ <probingPaths>
+
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\12.0\12.0@SDK40ToolsPath}</probingPath>
+ </probingPaths>
+ <commandFilter>
+ <includes>
+ <include>o</include>
+ </includes>
+ </commandFilter>
+ </executablePlugin>
+ <executablePlugin>
+ <identifier>MS:XSD:XML_INSTANCE</identifier>
+ <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
+ <vendor>MICROSOFT</vendor>
+ <executable>xsd</executable>
+ <profile>XSD:XML_INSTANCE</profile>
+ <frameworkVersions>
<frameworkVersion>4.5</frameworkVersion>
+ </frameworkVersions>
+ <platforms>
+ <platform>
+ <operatingSystem>Windows</operatingSystem>
+ </platform>
+ </platforms>
+ <probingPaths>
+
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\12.0\11.0@SDK40ToolsPath}</probingPath>
+
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0\11.0@SDK40ToolsPath}</probingPath>
+ </probingPaths>
+ <commandFilter>
+ <includes>
+ <include>o</include>
+ </includes>
+ </commandFilter>
+ </executablePlugin>
+ <executablePlugin>
+ <identifier>MS:XSD:XML_INSTANCE</identifier>
+ <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
+ <vendor>MICROSOFT</vendor>
+ <executable>xsd</executable>
+ <profile>XSD:XML_INSTANCE</profile>
+ <frameworkVersions>
<frameworkVersion>4.0</frameworkVersion>
+ </frameworkVersions>
+ <platforms>
+ <platform>
+ <operatingSystem>Windows</operatingSystem>
+ </platform>
+ </platforms>
+ <probingPaths>
+
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0@SDK40ToolsPath}</probingPath>
+ </probingPaths>
+ <commandFilter>
+ <includes>
+ <include>o</include>
+ </includes>
+ </commandFilter>
+ </executablePlugin>
+ <executablePlugin>
+ <identifier>MS:XSD:XML_INSTANCE</identifier>
+ <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
+ <vendor>MICROSOFT</vendor>
+ <executable>xsd</executable>
+ <profile>XSD:XML_INSTANCE</profile>
+ <frameworkVersions>
<frameworkVersion>3.5</frameworkVersion>
<frameworkVersion>3.0</frameworkVersion>
<frameworkVersion>2.0.50727</frameworkVersion>
- <frameworkVersion>1.1.4322</frameworkVersion>
</frameworkVersions>
<platforms>
<platform>
<operatingSystem>Windows</operatingSystem>
</platform>
</platforms>
+ <probingPaths>
+ <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft
SDKs\Windows@CurrentInstallFolder}\bin</probingPath>
+
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0@SDK35ToolsPath}</probingPath>
+ </probingPaths>
<commandFilter>
<includes>
<include>o</include>
