incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r536025 [3/3] - in /incubator/nmaven/branches/SI_XPT: ./ assemblies/ assemblies/NMaven.Core/ assemblies/NMaven.Core/src/main/csharp/Core/Impl/ assemblies/NMaven.IDE/ assemblies/NMaven.IDE/src/main/csharp/ assemblies/NMaven.IDE/src/main/csha...
Date Mon, 07 May 2007 23:55:06 GMT
Modified: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Resx/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Resx/pom.xml?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Resx/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Resx/pom.xml Mon May  7 16:55:03
2007
@@ -18,36 +18,15 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0">
   <parent>
-    <groupId>NMaven</groupId>
+    <groupId>NMaven.Plugins</groupId>
     <version>0.14</version>
-    <artifactId>NMaven.Assemblies</artifactId>
-  </parent>
+    <artifactId>NMaven.Plugins</artifactId>
+    <relativePath>..\pom-netplugins.xml</relativePath>
+  </parent>  
   <modelVersion>4.0.0</modelVersion>
   <groupId>NMaven.Plugin</groupId>
   <artifactId>NMaven.Plugin.Resx</artifactId>
   <packaging>exe</packaging>
   <version>0.14</version>
   <name>NMaven.Plugin.ResX</name>
-  <profiles>
-    <profile>
-      <activation>
-        <property>
-          <name>version</name>
-          <value>1.1</value>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.dotnet.plugins</groupId>
-            <artifactId>maven-compile-plugin</artifactId>
-            <extensions>true</extensions>
-            <configuration>
-              <frameworkVersion>1.1.4322</frameworkVersion>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>

Modified: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Settings/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Settings/pom.xml?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Settings/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Settings/pom.xml Mon May  7 16:55:03
2007
@@ -18,10 +18,11 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0">
   <parent>
-    <groupId>NMaven</groupId>
+    <groupId>NMaven.Plugins</groupId>
     <version>0.14</version>
-    <artifactId>NMaven.Assemblies</artifactId>
-  </parent>
+    <artifactId>NMaven.Plugins</artifactId>
+    <relativePath>..\pom-netplugins.xml</relativePath>
+  </parent>  
   <modelVersion>4.0.0</modelVersion>
   <groupId>NMaven.Plugin</groupId>
   <artifactId>NMaven.Plugin.Settings</artifactId>

Added: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/pom-java.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/pom-java.xml?view=auto&rev=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/pom-java.xml (added)
+++ incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/pom-java.xml Mon May 
7 16:55:03 2007
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>NMaven.Plugin</groupId>
+  <artifactId>NMaven.Plugin.Solution.JavaBinding</artifactId>
+  <packaging>maven-plugin</packaging>
+  <name>NMaven.Plugin.Solution.JavaBinding</name>
+  <version>0.14</version>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.dotnet</groupId>
+      <artifactId>dotnet-assembler</artifactId>
+      <version>0.14-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.dotnet</groupId>
+      <artifactId>dotnet-executable</artifactId>
+      <version>0.14-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.dotnet</groupId>
+      <artifactId>dotnet-artifact</artifactId>
+      <version>0.14-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.dotnet</groupId>
+      <artifactId>dotnet-plugin</artifactId>
+      <version>0.14-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file

Propchange: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/pom-java.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/pom.xml?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/pom.xml Mon May  7 16:55:03
2007
@@ -18,10 +18,11 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0">
   <parent>
-    <groupId>NMaven</groupId>
+    <groupId>NMaven.Plugins</groupId>
     <version>0.14</version>
-    <artifactId>NMaven.Assemblies</artifactId>
-  </parent>
+    <artifactId>NMaven.Plugins</artifactId>
+    <relativePath>..\pom-netplugins.xml</relativePath>
+  </parent>  
   <modelVersion>4.0.0</modelVersion>
   <groupId>NMaven.Plugin</groupId>
   <artifactId>NMaven.Plugin.Solution</artifactId>

Added: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/src/main/java/NMaven/Plugin/Solution/SolutionMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/src/main/java/NMaven/Plugin/Solution/SolutionMojo.java?view=auto&rev=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/src/main/java/NMaven/Plugin/Solution/SolutionMojo.java
(added)
+++ incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/src/main/java/NMaven/Plugin/Solution/SolutionMojo.java
Mon May  7 16:55:03 2007
@@ -0,0 +1,104 @@
+package NMaven.Plugin.Solution;
+
+import org.apache.maven.dotnet.plugin.FieldAnnotation;
+
+/**
+ * @phase Package
+ * @goal Solution
+ */
+public class SolutionMojo
+    extends org.apache.maven.dotnet.plugin.AbstractMojo
+{
+       /**
+        * @parameter expression = "${basedir}"
+        */
+        @FieldAnnotation()
+        public java.lang.String basedir;
+
+       /**
+        * @parameter expression = "${project}"
+        */
+        @FieldAnnotation()
+        public org.apache.maven.project.MavenProject mavenProject;
+
+       /**
+        * @parameter expression = "${settings.localRepository}"
+        */
+        private String localRepository;
+
+       /**
+        * @parameter expression = "${vendor}"
+        */
+        private String vendor;
+
+       /**
+        * @parameter expression = "${vendorVersion}"
+        */
+        private String vendorVersion;
+
+       /**
+        * @parameter expression = "${frameworkVersion}"
+        */
+        private String frameworkVersion;
+
+       /**
+        * @component
+        */
+        private org.apache.maven.dotnet.executable.NetExecutableFactory netExecutableFactory;
+
+       /**
+        * @component
+        */
+        private org.apache.maven.dotnet.plugin.PluginContext pluginContext;
+
+        public String getMojoArtifactId()
+        {
+            return "NMaven.Plugin.Solution";
+        }
+
+        public String getMojoGroupId()
+        {
+            return "NMaven.Plugin";
+        }
+
+        public String getClassName()
+        {
+            return "NMaven.Plugin.Solution.SolutionMojo";
+        }
+
+        public org.apache.maven.dotnet.plugin.PluginContext getNetPluginContext()
+        {
+            return pluginContext;
+        }
+
+        public org.apache.maven.dotnet.executable.NetExecutableFactory getNetExecutableFactory()
+        {
+            return netExecutableFactory;
+        }
+
+        public org.apache.maven.project.MavenProject getMavenProject()
+        {
+            return mavenProject;
+        }
+
+        public String getLocalRepository()
+        {
+            return localRepository;
+        }
+
+        public String getVendorVersion()
+        {
+            return vendorVersion;
+        }
+
+        public String getVendor()
+        {
+            return vendor;
+        }
+
+        public String getFrameworkVersion()
+        {
+            return frameworkVersion;
+        }
+
+}

Propchange: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/src/main/java/NMaven/Plugin/Solution/SolutionMojo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml
(original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml
Mon May  7 16:55:03 2007
@@ -363,6 +363,15 @@
       </configuration>
     </component>
     <component>
+      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+      <role-hint>visual-studio-addin</role-hint>
+      <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+      <configuration>
+        <extension>dll</extension>
+        <type>visual-studio-addin</type>
+      </configuration>
+    </component>
+    <component>
       <role>org.apache.maven.dotnet.executable.CapabilityMatcher</role>
       <implementation>org.apache.maven.dotnet.executable.impl.CapabilityMatcherImpl</implementation>
       <requirements>

Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/FileInstallerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/FileInstallerMojo.java?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/FileInstallerMojo.java
(original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/FileInstallerMojo.java
Mon May  7 16:55:03 2007
@@ -23,7 +23,6 @@
 import org.apache.maven.project.MavenProject;
 
 import java.io.File;
-import java.io.IOException;
 
 import org.apache.maven.dotnet.artifact.ArtifactContext;
 
@@ -104,8 +103,8 @@
         {
             try
             {
-                artifactContext.getArtifactInstaller().installFile( groupId, artifactId,
version, packaging,
-                                                                    artifactFile );
+                artifactContext.getArtifactInstaller().installFileWithGeneratedPom( groupId,
artifactId, version, packaging,
+                                                                                    artifactFile
);
             }
             catch ( org.apache.maven.artifact.installer.ArtifactInstallationException e )
             {

Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-mojo-generator-plugin/src/main/java/org/apache/maven/dotnet/plugin/generator/MojoGeneratorMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-mojo-generator-plugin/src/main/java/org/apache/maven/dotnet/plugin/generator/MojoGeneratorMojo.java?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-mojo-generator-plugin/src/main/java/org/apache/maven/dotnet/plugin/generator/MojoGeneratorMojo.java
(original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-mojo-generator-plugin/src/main/java/org/apache/maven/dotnet/plugin/generator/MojoGeneratorMojo.java
Mon May  7 16:55:03 2007
@@ -89,7 +89,7 @@
         }
 
         try
-        {
+        {    
             List<String> commands = new ArrayList<String>();
             VendorInfo vendorInfo = VendorInfo.Factory.createDefaultVendorInfo();
             if ( vendor != null )

Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java
(original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java
Mon May  7 16:55:03 2007
@@ -23,7 +23,6 @@
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.versioning.VersionRange;
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
 import org.apache.maven.artifact.factory.ArtifactFactory;
@@ -33,7 +32,6 @@
 import java.io.IOException;
 import java.util.List;
 import java.util.ArrayList;
-import java.util.Arrays;
 
 import org.apache.maven.dotnet.artifact.AssemblyResolver;
 import org.apache.maven.dotnet.artifact.NetDependenciesRepository;
@@ -159,7 +157,7 @@
         matchPolicies.add( new ProfileMatchPolicy( profile ) );
         dependencies.addAll( repository.getDependenciesFor( matchPolicies ) );
         getLog().info( "NMAVEN-1600-001: Found net dependencies: Number = " + dependencies.size()
);
-
+                                                                                        
                                                                 
         if ( localRepository == null )
         {
             localRepository = new File( System.getProperty( "user.home" ), ".m2/repository"
).getAbsolutePath();

Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-webapp-plugin/src/main/java/org/apache/maven/dotnet/plugin/webapp/NetAchiverMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-webapp-plugin/src/main/java/org/apache/maven/dotnet/plugin/webapp/NetAchiverMojo.java?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-webapp-plugin/src/main/java/org/apache/maven/dotnet/plugin/webapp/NetAchiverMojo.java
(original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-webapp-plugin/src/main/java/org/apache/maven/dotnet/plugin/webapp/NetAchiverMojo.java
Mon May  7 16:55:03 2007
@@ -80,8 +80,6 @@
      */
     protected ArtifactMetadataSource src;
 
-    private List excludes;
-
     public void execute()
         throws MojoExecutionException
     {

Added: incubator/nmaven/branches/SI_XPT/plugins/pom-netplugins.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/pom-netplugins.xml?view=auto&rev=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/pom-netplugins.xml (added)
+++ incubator/nmaven/branches/SI_XPT/plugins/pom-netplugins.xml Mon May  7 16:55:03 2007
@@ -0,0 +1,46 @@
+<?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">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>NMaven.Plugins</groupId>
+  <artifactId>NMaven.Plugins</artifactId>
+  <packaging>pom</packaging>
+  <version>0.14</version>
+  <name>NMaven.Plugins</name>
+  <modules>
+    <module>NMaven.Plugin.Addin</module>
+    <module>NMaven.Plugin.Devenv</module>
+    <module>NMaven.Plugin.Resx</module>
+    <module>NMaven.Plugin.Settings</module>
+    <module>NMaven.Plugin.Solution</module>
+  </modules>
+  <build>
+    <sourceDirectory>src/main/csharp</sourceDirectory>
+    <testSourceDirectory>src/test/csharp</testSourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.dotnet.plugins</groupId>
+        <artifactId>maven-compile-plugin</artifactId>
+        <extensions>true</extensions>
+      </plugin>
+    </plugins>
+  </build>  
+</project>
\ No newline at end of file

Propchange: incubator/nmaven/branches/SI_XPT/plugins/pom-netplugins.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/nmaven/branches/SI_XPT/plugins/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/pom.xml?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/pom.xml Mon May  7 16:55:03 2007
@@ -17,6 +17,11 @@
 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>
+    <groupId>org.apache.maven.dotnet</groupId>
+    <version>0.14-SNAPSHOT</version>
+    <artifactId>dotnet-project</artifactId>
+  </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.dotnet.plugins</groupId>
   <artifactId>maven-dotnet-plugins</artifactId>
@@ -34,7 +39,7 @@
     <module>maven-webapp-plugin</module>
     <module>maven-xsd-plugin</module>
     <module>maven-xsp-plugin</module>
-    <module>maven-wsdl-plugin</module>
+    <module>maven-wsdl-plugin</module> 
   </modules>
   <dependencies>
     <dependency>

Modified: incubator/nmaven/branches/SI_XPT/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/pom.xml?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/pom.xml Mon May  7 16:55:03 2007
@@ -19,7 +19,7 @@
 <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">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.maven.dotnet</groupId>
-    <artifactId>dotnet</artifactId>
+    <artifactId>dotnet-project</artifactId>
     <packaging>pom</packaging>
     <version>0.14-SNAPSHOT</version>
     <name>dotnet</name>
@@ -27,4 +27,17 @@
         <module>components</module>
         <module>plugins</module>
     </modules>
+      <repositories>
+        <repository>
+          <id>apache.org</id>
+          <name>Maven Snapshots</name>
+          <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+          <releases>
+            <enabled>false</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
 </project>



Mime
View raw message