directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r601506 - in /directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins: StudioCopyEclipseDependencyMojo.java StudioPrepareJarPackageMojo.java StudioReplaceFileInJarMojo.java StudioUnpackPrefixedMojo.java
Date Wed, 05 Dec 2007 20:31:22 GMT
Author: felixk
Date: Wed Dec  5 12:31:21 2007
New Revision: 601506

URL: http://svn.apache.org/viewvc?rev=601506&view=rev
Log:
No need to check for skip

Modified:
    directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioCopyEclipseDependencyMojo.java
    directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioPrepareJarPackageMojo.java
    directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioReplaceFileInJarMojo.java
    directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioUnpackPrefixedMojo.java

Modified: directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioCopyEclipseDependencyMojo.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioCopyEclipseDependencyMojo.java?rev=601506&r1=601505&r2=601506&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioCopyEclipseDependencyMojo.java
(original)
+++ directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioCopyEclipseDependencyMojo.java
Wed Dec  5 12:31:21 2007
@@ -69,26 +69,24 @@
     }
 
     public void execute() throws MojoExecutionException {
-        if (!skip) {
-            completeArtifactItems(artifactItems);
+        completeArtifactItems(artifactItems);
 
-            for (Iterator<ArtifactItem> artifactItem = artifactItems.iterator(); artifactItem.hasNext();)
{
-                ArtifactItem item = artifactItem.next();
-                try {
+        for (Iterator<ArtifactItem> artifactItem = artifactItems.iterator(); artifactItem.hasNext();)
{
+            ArtifactItem item = artifactItem.next();
+            try {
 
-                    final File destFile = new File(destinationDirectory.getAbsoluteFile()
+ File.separator
-                            + item.getArtifactId() + "_" + item.getVersion() + "." + item.getType());
+                final File destFile = new File(destinationDirectory.getAbsoluteFile() + File.separator
+                        + item.getArtifactId() + "_" + item.getVersion() + "." + item.getType());
 
-                    getLog().info("Copying " + item.getArtifactId() + " to " + destFile.getAbsolutePath());
+                getLog().info("Copying " + item.getArtifactId() + " to " + destFile.getAbsolutePath());
 
-                    if (!destinationDirectory.exists()) {
-                        destinationDirectory.mkdirs();
-                    }
-                    FileUtils.copyFile(item.getArtifact().getFile(), destFile);
-
-                } catch (Exception e) {
-                    throw new MojoExecutionException("", e);
+                if (!destinationDirectory.exists()) {
+                    destinationDirectory.mkdirs();
                 }
+                FileUtils.copyFile(item.getArtifact().getFile(), destFile);
+
+            } catch (Exception e) {
+                throw new MojoExecutionException("", e);
             }
         }
     }

Modified: directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioPrepareJarPackageMojo.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioPrepareJarPackageMojo.java?rev=601506&r1=601505&r2=601506&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioPrepareJarPackageMojo.java
(original)
+++ directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioPrepareJarPackageMojo.java
Wed Dec  5 12:31:21 2007
@@ -64,17 +64,15 @@
     private File classesDirectory;
 
     public void execute() throws MojoExecutionException {
-        if (!skip) {
-            try {
-                // Create list of used artifacts
-                final List<Artifact> artifactList = createArtifactList();
+        try {
+            // Create list of used artifacts
+            final List<Artifact> artifactList = createArtifactList();
 
-                // copy Artifacts
-                copyArtifacts(artifactList);
+            // copy Artifacts
+            copyArtifacts(artifactList);
 
-            } catch (Exception e) {
-                getLog().error(e);
-            }
+        } catch (Exception e) {
+            getLog().error(e);
         }
     }
 

Modified: directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioReplaceFileInJarMojo.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioReplaceFileInJarMojo.java?rev=601506&r1=601505&r2=601506&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioReplaceFileInJarMojo.java
(original)
+++ directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioReplaceFileInJarMojo.java
Wed Dec  5 12:31:21 2007
@@ -93,35 +93,32 @@
     }
 
     public void execute() throws MojoExecutionException {
-        if (!skip) {
+        completeArtifactItems(artifactItems);
 
-            completeArtifactItems(artifactItems);
+        // Add file to dest jar
+        for (Iterator<ArtifactItem> artifactItem = artifactItems.iterator(); artifactItem.hasNext();)
{
+            ArtifactItem item = artifactItem.next();
+            try {
+                final File zipFile = new File(destinationDirectory.getAbsolutePath() + File.separator
+                        + item.getArtifactId() + "_" + item.getVersion() + "." + item.getType());
+                final File tmpDir = new File(pluginWorkDir + item.getArtifact().getArtifactId());
+
+                getLog().info("Adding " + inputFile + " to " + zipFile);
+
+                if (getLog().isDebugEnabled())
+                    getLog().debug("Unzipping " + zipFile + " into " + tmpDir);
+                unzipToDir(tmpDir, zipFile);
+
+                if (getLog().isDebugEnabled())
+                    getLog().debug("Copying " + inputFile + " into " + tmpDir);
+                FileUtils.copyFileToDirectory(inputFile, tmpDir);
+
+                if (getLog().isDebugEnabled())
+                    getLog().debug("Zipping " + tmpDir + " into " + zipFile);
+                zipFromDir(tmpDir, zipFile);
 
-            // Add file to dest jar
-            for (Iterator<ArtifactItem> artifactItem = artifactItems.iterator(); artifactItem.hasNext();)
{
-                ArtifactItem item = artifactItem.next();
-                try {
-                    final File zipFile = new File(destinationDirectory.getAbsolutePath()
+ File.separator
-                            + item.getArtifactId() + "_" + item.getVersion() + "." + item.getType());
-                    final File tmpDir = new File(pluginWorkDir + item.getArtifact().getArtifactId());
-
-                    getLog().info("Adding " + inputFile + " to " + zipFile);
-
-                    if (getLog().isDebugEnabled())
-                        getLog().debug("Unzipping " + zipFile + " into " + tmpDir);
-                    unzipToDir(tmpDir, zipFile);
-
-                    if (getLog().isDebugEnabled())
-                        getLog().debug("Copying " + inputFile + " into " + tmpDir);
-                    FileUtils.copyFileToDirectory(inputFile, tmpDir);
-
-                    if (getLog().isDebugEnabled())
-                        getLog().debug("Zipping " + tmpDir + " into " + zipFile);
-                    zipFromDir(tmpDir, zipFile);
-
-                } catch (Exception e) {
-                    throw new MojoExecutionException("", e);
-                }
+            } catch (Exception e) {
+                throw new MojoExecutionException("", e);
             }
         }
     }

Modified: directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioUnpackPrefixedMojo.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioUnpackPrefixedMojo.java?rev=601506&r1=601505&r2=601506&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioUnpackPrefixedMojo.java
(original)
+++ directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioUnpackPrefixedMojo.java
Wed Dec  5 12:31:21 2007
@@ -68,23 +68,21 @@
     }
 
     public void execute() throws MojoExecutionException {
-        if (!skip) {
-            completeArtifactItems(artifactItems);
+        completeArtifactItems(artifactItems);
 
-            // unzip it
-            for (Iterator<ArtifactItem> artifactItem = artifactItems.iterator(); artifactItem.hasNext();)
{
-                ArtifactItem item = artifactItem.next();
-                try {
-                    final File tmpDir = new File(outputDirectory.getAbsoluteFile() + File.separator
-                            + item.getArtifactId() + "_" + item.getVersion());
+        // unzip it
+        for (Iterator<ArtifactItem> artifactItem = artifactItems.iterator(); artifactItem.hasNext();)
{
+            ArtifactItem item = artifactItem.next();
+            try {
+                final File tmpDir = new File(outputDirectory.getAbsoluteFile() + File.separator
+ item.getArtifactId()
+                        + "_" + item.getVersion());
 
-                    if (getLog().isDebugEnabled())
-                        getLog().debug("Unzipping " + item.getArtifact().getFile() + " into
" + tmpDir);
-                    unzipToDir(tmpDir, item.getArtifact().getFile());
+                if (getLog().isDebugEnabled())
+                    getLog().debug("Unzipping " + item.getArtifact().getFile() + " into "
+ tmpDir);
+                unzipToDir(tmpDir, item.getArtifact().getFile());
 
-                } catch (Exception e) {
-                    throw new MojoExecutionException("", e);
-                }
+            } catch (Exception e) {
+                throw new MojoExecutionException("", e);
             }
         }
     }



Mime
View raw message