directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1214302 - in /directory/buildtools/studio-plugin/trunk/src: main/java/org/apache/directory/studio/maven/plugins/ site/apt/ test/resources/unit/basic-copy-test/
Date Wed, 14 Dec 2011 15:36:05 GMT
Author: pamarcelot
Date: Wed Dec 14 15:36:04 2011
New Revision: 1214302

URL: http://svn.apache.org/viewvc?rev=1214302&view=rev
Log:
Fix for DIRSTUDIO-660 ([Maven Studio Plugin] Unify naming for 'outputDirectory' accross goals).

Modified:
    directory/buildtools/studio-plugin/trunk/src/main/java/org/apache/directory/studio/maven/plugins/StudioCopyEclipseDependencyMojo.java
    directory/buildtools/studio-plugin/trunk/src/main/java/org/apache/directory/studio/maven/plugins/StudioReplaceFileInJarMojo.java
    directory/buildtools/studio-plugin/trunk/src/site/apt/usage.apt
    directory/buildtools/studio-plugin/trunk/src/test/resources/unit/basic-copy-test/plugin-pom.xml

Modified: directory/buildtools/studio-plugin/trunk/src/main/java/org/apache/directory/studio/maven/plugins/StudioCopyEclipseDependencyMojo.java
URL: http://svn.apache.org/viewvc/directory/buildtools/studio-plugin/trunk/src/main/java/org/apache/directory/studio/maven/plugins/StudioCopyEclipseDependencyMojo.java?rev=1214302&r1=1214301&r2=1214302&view=diff
==============================================================================
--- directory/buildtools/studio-plugin/trunk/src/main/java/org/apache/directory/studio/maven/plugins/StudioCopyEclipseDependencyMojo.java
(original)
+++ directory/buildtools/studio-plugin/trunk/src/main/java/org/apache/directory/studio/maven/plugins/StudioCopyEclipseDependencyMojo.java
Wed Dec 14 15:36:04 2011
@@ -85,16 +85,16 @@ public class StudioCopyEclipseDependency
      * @required
      * @since 1.0
      */
-    private File destinationDirectory;
+    private File outputDirectory;
 
 
     /**
-     * @param destinationDirectory
-     *            the destinationDirectory to set
+     * @param outputDirectory
+     *            the outputDirectory to set
      */
-    public void setDestinationDirectory( File destinationDirectory )
+    public void setOutputDirectory( File outputDirectory )
     {
-        this.destinationDirectory = destinationDirectory;
+        this.outputDirectory = outputDirectory;
     }
 
 
@@ -111,15 +111,15 @@ public class StudioCopyEclipseDependency
     {
         completeArtifactItems( artifactItems, false );
 
-        if ( !destinationDirectory.exists() && !destinationDirectory.mkdirs() )
+        if ( !outputDirectory.exists() && !outputDirectory.mkdirs() )
         {
-            throw new MojoExecutionException( "Can't create directory " + destinationDirectory
);
+            throw new MojoExecutionException( "Can't create directory " + outputDirectory
);
         }
 
         for ( Iterator<ArtifactItem> artifactItem = artifactItems.iterator(); artifactItem.hasNext();
)
         {
             ArtifactItem item = artifactItem.next();
-            final File destFile = new File( destinationDirectory.getAbsoluteFile() + File.separator
+            final File destFile = new File( outputDirectory.getAbsoluteFile() + File.separator
                 + maven2OsgiConverter.getBundleFileName( item.getArtifact() ) );
             getLog().info(
                 "Copying artifact " + item.getArtifactId() + " to\n               " + destFile.getAbsolutePath()
);
@@ -147,7 +147,7 @@ public class StudioCopyEclipseDependency
             if ( item.getArtifact() != null
                 && maven2OsgiConverter.getBundleSymbolicName( item.getArtifact()
).endsWith( SOURCE ) )
             {
-                final File destFile = new File( destinationDirectory.getAbsoluteFile() +
File.separator
+                final File destFile = new File( outputDirectory.getAbsoluteFile() + File.separator
                     + maven2OsgiConverter.getBundleFileName( item.getArtifact() ) );
                 getLog().info(
                     "Copying source artifact " + item.getArtifactId() + " to\n          
    "

Modified: directory/buildtools/studio-plugin/trunk/src/main/java/org/apache/directory/studio/maven/plugins/StudioReplaceFileInJarMojo.java
URL: http://svn.apache.org/viewvc/directory/buildtools/studio-plugin/trunk/src/main/java/org/apache/directory/studio/maven/plugins/StudioReplaceFileInJarMojo.java?rev=1214302&r1=1214301&r2=1214302&view=diff
==============================================================================
--- directory/buildtools/studio-plugin/trunk/src/main/java/org/apache/directory/studio/maven/plugins/StudioReplaceFileInJarMojo.java
(original)
+++ directory/buildtools/studio-plugin/trunk/src/main/java/org/apache/directory/studio/maven/plugins/StudioReplaceFileInJarMojo.java
Wed Dec 14 15:36:04 2011
@@ -71,7 +71,7 @@ public class StudioReplaceFileInJarMojo 
      * @required
      * @since 1.0
      */
-    private File destinationDirectory;
+    private File outputDirectory;
 
     /**
      * Tmp work directory for this plugin
@@ -85,12 +85,12 @@ public class StudioReplaceFileInJarMojo 
 
 
     /**
-     * @param destinationDirectory
-     *            the destinationDirectory to set
+     * @param outputDirectory
+     *            the outputDirectory to set
      */
-    public void setDestinationDirectory( File destinationDirectory )
+    public void setOutputDirectory( File outputDirectory )
     {
-        this.destinationDirectory = destinationDirectory;
+        this.outputDirectory = outputDirectory;
     }
 
 
@@ -116,7 +116,7 @@ public class StudioReplaceFileInJarMojo 
             ArtifactItem item = artifactItem.next();
             try
             {
-                final File zipFile = new File( destinationDirectory.getAbsoluteFile() + File.separator
+                final File zipFile = new File( outputDirectory.getAbsoluteFile() + File.separator
                     + maven2OsgiConverter.getBundleFileName( item.getArtifact() ) );
                 final File tmpDir = new File( pluginWorkDir + item.getArtifact().getArtifactId()
);
                 unpackToLocation( tmpDir, zipFile );

Modified: directory/buildtools/studio-plugin/trunk/src/site/apt/usage.apt
URL: http://svn.apache.org/viewvc/directory/buildtools/studio-plugin/trunk/src/site/apt/usage.apt?rev=1214302&r1=1214301&r2=1214302&view=diff
==============================================================================
--- directory/buildtools/studio-plugin/trunk/src/site/apt/usage.apt (original)
+++ directory/buildtools/studio-plugin/trunk/src/site/apt/usage.apt Wed Dec 14 15:36:04 2011
@@ -98,7 +98,7 @@ Add or replace a file to existing, distr
             </goals>
             <configuration>
               <inputFile>src/main/configuration/org.eclipse.search/plugin.xml</inputFile>
-              <destinationDirectory>${studio-dir}/plugins</destinationDirectory>
+              <outputDirectory>${studio-dir}/plugins</outputDirectory>
               <overWrite>false</overWrite>
               <outputDirectory>target/eclipse/plugins</outputDirectory>
               <artifactItems>

Modified: directory/buildtools/studio-plugin/trunk/src/test/resources/unit/basic-copy-test/plugin-pom.xml
URL: http://svn.apache.org/viewvc/directory/buildtools/studio-plugin/trunk/src/test/resources/unit/basic-copy-test/plugin-pom.xml?rev=1214302&r1=1214301&r2=1214302&view=diff
==============================================================================
--- directory/buildtools/studio-plugin/trunk/src/test/resources/unit/basic-copy-test/plugin-pom.xml
(original)
+++ directory/buildtools/studio-plugin/trunk/src/test/resources/unit/basic-copy-test/plugin-pom.xml
Wed Dec 14 15:36:04 2011
@@ -27,7 +27,7 @@
         <artifactId>studio-maven-plugin</artifactId>
         <configuration>
           <project implementation="org.apache.directory.studio.maven.plugins.stubs.StudioCopyEclipseDependencyProjectStub"
/>
-          <destinationDirectory>target/test-classes/copy-plugins</destinationDirectory>
+          <outputDirectory>target/test-classes/copy-plugins</outputDirectory>
           <artifactItems>
             <artifactItem>
               <groupId>org.eclipse.core</groupId>



Mime
View raw message