incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r537383 - in /incubator/nmaven/branches/SI_XPT: ./ assemblies/ components/ components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ components/dotnet-plugin/src/main/java/org/apache/maven/dotnet/plugin/impl/ plugins/ ...
Date Sat, 12 May 2007 10:47:39 GMT
Author: sisbell
Date: Sat May 12 03:47:38 2007
New Revision: 537383

URL: http://svn.apache.org/viewvc?view=rev&rev=537383
Log:
Streamlined the process for doing deployments.

Modified:
    incubator/nmaven/branches/SI_XPT/README.txt
    incubator/nmaven/branches/SI_XPT/assemblies/pom.xml
    incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-plugin/src/main/java/org/apache/maven/dotnet/plugin/impl/PluginContextImpl.java
    incubator/nmaven/branches/SI_XPT/components/pom.xml
    incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Settings/pom-java.xml
    incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/pom-java.xml
    incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
    incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml
    incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java
    incubator/nmaven/branches/SI_XPT/plugins/pom-netplugins.xml
    incubator/nmaven/branches/SI_XPT/pom.xml

Modified: incubator/nmaven/branches/SI_XPT/README.txt
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/README.txt?view=diff&rev=537383&r1=537382&r2=537383
==============================================================================
--- incubator/nmaven/branches/SI_XPT/README.txt (original)
+++ incubator/nmaven/branches/SI_XPT/README.txt Sat May 12 03:47:38 2007
@@ -4,20 +4,28 @@
 
 Initial Build
 * On the first build, for Windows execute
-    bootstrap-build.bat or
-    bootstrap-build.bat -DM_2_2 or
-    bootstrap-build.bat -DG_x_x
+    bootstrap-build.bat [ -DMicrosoft | -DVisualStudio2005 | -DMono ]
  Or on *nix,
     bootstrap-build.sh
 
-Note that the -DM_2_2 option requires Microsoft 2.0 or higher. If this is a clean build (meaning
that you do not have a ~./m2/nmaven-settings.xml file)
-then you will also need to make sure that you have csc within your path. On subsequent builds,
you can just type mvn -f pom-M_2_2.xml install from
+If this is a clean build (meaning that you do not have a ~./m2/nmaven-settings.xml file)
+then you will also need to make sure that you have csc within your path. On subsequent builds,
you can just type mvn -f pom.xml install from
 the command prompt.
 
-The -DG_x_x option requires DotGNU 0.7.2 or higher.
-
 IntelliJ IDEA Setup
 * Do the initial build. This will create the dotnet modello model source code and will download
all of the maven
 binary dependencies. Next, click the maven-dotnet.ipr file. Go to settings/Path variables
and set localRepository
  to your ~/.m2/repository directory (specify the absolute path). Exit IntelliJ and click
the maven-dotnet.ipr file.
- Now all of the binary dependencies will be mapped to the local maven repo.
\ No newline at end of file
+ Now all of the binary dependencies will be mapped to the local maven repo.
+
+Deploying NMaven Artifacts (File System Only)
+* On the command line
+    set phase=deploy
+    set deploy.directory=${remoteRepository}
+    bootstrap-build.bat
+* Due to a bug with not being able to use snapshots with an executables exe.config file,
you will need to do this
+  manually. Copy ${localRepository}\NMaven\Plugins\NMaven.Plugin.Resx\0.14\NMaven.Plugin.Resx.exe.config
to
+  ${remoteRepository}\NMaven\Plugins\NMaven.Plugin.Resx\0.14\NMaven.Plugin.Resx.exe.config
+
+ To set up a remote repository accessible to others, you can transfer the contents of ${remoteRepository}
+ from your file system to a web server.
\ No newline at end of file

Modified: incubator/nmaven/branches/SI_XPT/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/pom.xml?view=diff&rev=537383&r1=537382&r2=537383
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/pom.xml Sat May 12 03:47:38 2007
@@ -169,4 +169,13 @@
       </modules>
     </profile>
   </profiles>
+  <distributionManagement>
+    <snapshotRepository>
+      <uniqueVersion>true</uniqueVersion>
+      <id>snapshot repo</id>
+      <name>snapshot repo</name>
+      <url>file://${deploy.directory}</url>
+      <layout>default</layout>
+    </snapshotRepository>
+  </distributionManagement>
 </project>

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java?view=diff&rev=537383&r1=537382&r2=537383
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
(original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
Sat May 12 03:47:38 2007
@@ -184,7 +184,6 @@
         installNetModules( artifact );
         ApplicationConfig applicationConfig = artifactContext.getApplicationConfigFor( artifact
);
         File configExeFile = new File( applicationConfig.getConfigDestinationPath() );
-
         //TODO: Remove GAC dependencies before installing. This should be removed and replaced
with solution in the core.
         artifact.getMetadataList().clear();
         try
@@ -207,13 +206,13 @@
         }
         //End GAC HACK
 
-        if ( configExeFile.exists() )
+        if ( configExeFile.exists() && !artifact.getType().equals( ArtifactType.EXECONFIG.getPackagingType()
) )
         {
             logger.info( "NMAVEN-002-000: Found config executable: File = " + configExeFile.getAbsolutePath()
);
             Dependency dependency = new Dependency();
             dependency.setArtifactId( project.getArtifactId() );
             dependency.setGroupId( project.getGroupId() );
-            dependency.setVersion( project.getVersion() );
+            dependency.setVersion( project.getVersion().replace( "-SNAPSHOT", "" ) );
             dependency.setType( "exe.config" );
             dependency.setScope( Artifact.SCOPE_RUNTIME );
             List<Dependency> dep = new ArrayList<Dependency>();
@@ -254,7 +253,8 @@
         catch ( ArtifactInstallationException e )
         {
             throw new ArtifactInstallationException( "NMAVEN-002-003: Failed to install artifact:
ID = " +
-                artifact.getId() + ", File = " + artifact.getFile().getAbsolutePath(), e
);
+                artifact.getId() + ", File = " +
+                ( ( artifact.getFile() != null ) ? artifact.getFile().getAbsolutePath() :
"" ), e );
         }
     }
 

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-plugin/src/main/java/org/apache/maven/dotnet/plugin/impl/PluginContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-plugin/src/main/java/org/apache/maven/dotnet/plugin/impl/PluginContextImpl.java?view=diff&rev=537383&r1=537382&r2=537383
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-plugin/src/main/java/org/apache/maven/dotnet/plugin/impl/PluginContextImpl.java
(original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-plugin/src/main/java/org/apache/maven/dotnet/plugin/impl/PluginContextImpl.java
Sat May 12 03:47:38 2007
@@ -22,7 +22,6 @@
         {
             ConfigurationAppenderAnnotation annotation =
                 (ConfigurationAppenderAnnotation) c.getAnnotation( ConfigurationAppenderAnnotation.class
);
-            //System.out.println(field.getType().getName() + ":" + annotation.targetClassName());
             if ( field.getType().getName().equals( annotation.targetClassName() ) )
             {
                 Object o;

Modified: incubator/nmaven/branches/SI_XPT/components/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/pom.xml?view=diff&rev=537383&r1=537382&r2=537383
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/components/pom.xml Sat May 12 03:47:38 2007
@@ -144,7 +144,7 @@
     <module>dotnet-assembler</module>
     <module>dotnet-embedder</module>
     <module>dotnet-executable</module>
-    <module>dotnet-plugin</module>    
+    <module>dotnet-plugin</module>
     <module>dotnet-registry</module>
     <module>dotnet-service/embedder</module>
     <module>dotnet-vendor</module>

Modified: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Settings/pom-java.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Settings/pom-java.xml?view=diff&rev=537383&r1=537382&r2=537383
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Settings/pom-java.xml (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Settings/pom-java.xml Sat May 12
03:47:38 2007
@@ -1,6 +1,6 @@
 <?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">
-    <parent>
+  <parent>
     <groupId>org.apache.maven.dotnet.plugins</groupId>
     <version>0.14-SNAPSHOT</version>
     <artifactId>maven-dotnet-plugins</artifactId>

Modified: 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=diff&rev=537383&r1=537382&r2=537383
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/pom-java.xml (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/pom-java.xml Sat May 12
03:47:38 2007
@@ -1,5 +1,11 @@
 <?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">
+  <parent>
+    <groupId>org.apache.maven.dotnet.plugins</groupId>
+    <version>0.14-SNAPSHOT</version>
+    <artifactId>maven-dotnet-plugins</artifactId>
+    <relativePath>..\pom.xml</relativePath>
+  </parent>  
   <modelVersion>4.0.0</modelVersion>
   <groupId>NMaven.Plugins</groupId>
   <artifactId>NMaven.Plugin.Solution.JavaBinding</artifactId>

Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java?view=diff&rev=537383&r1=537382&r2=537383
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
(original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
Sat May 12 03:47:38 2007
@@ -97,7 +97,6 @@
 
         ArtifactRepository localArtifactRepository =
             new DefaultArtifactRepository( "local", "file://" + localRepository, new AssemblyRepositoryLayout()
);
-        System.out.println( "LR =" + localArtifactRepository );
         try
         {
             assemblyResolver.resolveTransitivelyFor( project, project.getArtifact(), project.getDependencies(),

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=537383&r1=537382&r2=537383
==============================================================================
--- 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
Sat May 12 03:47:38 2007
@@ -294,6 +294,23 @@
         </phases>
       </configuration>
     </component>
+     <component>
+      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+      <role-hint>exe.config</role-hint>
+      <implementation>
+        org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
+      </implementation>
+      <configuration>
+        <phases>
+          <install>
+            org.apache.maven.dotnet.plugins:maven-install-plugin:install
+          </install>
+          <deploy>
+            org.apache.maven.dotnet.plugins:maven-deploy-plugin:deploy-dotnet
+          </deploy>
+        </phases>
+      </configuration>
+    </component>    
     <component>
       <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
       <role-hint>module</role-hint>

Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.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/InstallerMojo.java?view=diff&rev=537383&r1=537382&r2=537383
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java
(original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java
Sat May 12 03:47:38 2007
@@ -79,8 +79,9 @@
         {
             localRepository = new File( System.getProperty( "user.home" ), ".m2/repository"
);
         }
+        artifactContext.init( project, project.getRemoteArtifactRepositories(), localRepository
);
 
-        Artifact artifact = project.getArtifact();
+        Artifact artifact = project.getArtifact();       
         try
         {
             artifactContext.getArtifactInstaller().installArtifact( artifact, pomFile );

Modified: 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=diff&rev=537383&r1=537382&r2=537383
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/pom-netplugins.xml (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/pom-netplugins.xml Sat May 12 03:47:38 2007
@@ -42,5 +42,14 @@
         <extensions>true</extensions>
       </plugin>
     </plugins>
-  </build>  
+  </build>
+  <distributionManagement>
+    <snapshotRepository>
+      <uniqueVersion>true</uniqueVersion>
+      <id>snapshot repo</id>
+      <name>snapshot repo</name>
+      <url>file://${deploy.directory}</url>
+      <layout>default</layout>
+    </snapshotRepository>
+  </distributionManagement>
 </project>

Modified: incubator/nmaven/branches/SI_XPT/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/pom.xml?view=diff&rev=537383&r1=537382&r2=537383
==============================================================================
--- incubator/nmaven/branches/SI_XPT/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/pom.xml Sat May 12 03:47:38 2007
@@ -41,4 +41,13 @@
       </snapshots>
     </repository>
   </repositories>
+  <distributionManagement>
+    <snapshotRepository>
+      <uniqueVersion>true</uniqueVersion>
+      <id>snapshot repo</id>
+      <name>snapshot repo</name>
+      <url>file://${deploy.directory}</url>
+      <layout>default</layout>
+    </snapshotRepository>
+  </distributionManagement>
 </project>



Mime
View raw message