svn commit: r1173913 - /karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/instances/CreateArchiveMojo.java

[djencks]

Author: djencks
Date: Wed Sep 21 23:58:43 2011
New Revision: 1173913

URL: http://svn.apache.org/viewvc?rev=1173913&view=rev
Log:
don't use -bin classifier per jbo's request

Modified:
    
karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/instances/CreateArchiveMojo.java

Modified: 
karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/instances/CreateArchiveMojo.java
URL: 
http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/instances/CreateArchiveMojo.java?rev=1173913&r1=1173912&r2=1173913&view=diff
==============================================================================
--- 
karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/instances/CreateArchiveMojo.java
 (original)
+++ 
karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/instances/CreateArchiveMojo.java
 Wed Sep 21 23:58:43 2011
@@ -90,13 +90,13 @@ public class CreateArchiveMojo extends M
     private void archive(String type) throws IOException {
         Artifact artifact1 = 
factory.createArtifactWithClassifier(project.getArtifact().getGroupId(), 
project.getArtifact().getArtifactId(), project.getArtifact().getVersion(), 
type, "bin");
         File target1 = archive(targetServerDirectory, destDir, artifact1);
-        projectHelper.attachArtifact( project, artifact1.getType(), "bin", 
target1 );
+        projectHelper.attachArtifact( project, artifact1.getType(), null, 
target1 );
     }
 
     public File archive(File source, File dest, Artifact artifact) throws 
//ArchiverException,
             IOException {
         String serverName = artifact.getArtifactId() + "-" + 
artifact.getVersion();
-        dest = new File(dest, serverName + "-bin." + artifact.getType());
+        dest = new File(dest, serverName + "." + artifact.getType());
         Project project = new Project();
         MatchingTask archiver;
         if ("tar.gz".equals(artifact.getType())) {
@@ -132,13 +132,16 @@ public class CreateArchiveMojo extends M
             tar.add(rc);
 
             for (Resource resource: this.project.getResources()) {
-                rc = new TarFileSet();
-                rc.setPrefix(serverName);
-                rc.setProject(project);
-                rc.setDir(new File(resource.getDirectory()));
-                rc.appendIncludes(resource.getIncludes().toArray(new 
String[0]));
-                rc.appendExcludes(resource.getExcludes().toArray(new 
String[0]));
-                tar.add(rc);
+                File resourceFile = new File(resource.getDirectory());
+                if (resourceFile.exists()) {
+                    rc = new TarFileSet();
+                    rc.setPrefix(serverName);
+                    rc.setProject(project);
+                    rc.setDir(resourceFile);
+                    rc.appendIncludes(resource.getIncludes().toArray(new 
String[0]));
+                    rc.appendExcludes(resource.getExcludes().toArray(new 
String[0]));
+                    tar.add(rc);
+                }
             }
 
             archiver = tar;
@@ -152,13 +155,16 @@ public class CreateArchiveMojo extends M
             zip.addFileset(fs);
 
             for (Resource resource: this.project.getResources()) {
-                fs = new ZipFileSet();
-                fs.setPrefix(serverName);
-                fs.setProject(project);
-                fs.setDir(new File(resource.getDirectory()));
-                fs.appendIncludes(resource.getIncludes().toArray(new 
String[0]));
-                fs.appendExcludes(resource.getExcludes().toArray(new 
String[0]));
-                zip.add(fs);
+                File resourceFile = new File(resource.getDirectory());
+                if (resourceFile.exists()) {
+                    fs = new ZipFileSet();
+                    fs.setPrefix(serverName);
+                    fs.setProject(project);
+                    fs.setDir(resourceFile);
+                    fs.appendIncludes(resource.getIncludes().toArray(new 
String[0]));
+                    fs.appendExcludes(resource.getExcludes().toArray(new 
String[0]));
+                    zip.add(fs);
+                }
             }
 
             archiver = zip;