[jbosstools-commits] JBoss Tools SVN: r39507 - in trunk/build: tycho-plugins/generate-repository-facade/src/main/java/org/jboss/tools/tycho/sitegenerator and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: mickael_istria
Date: 2012-03-14 11:51:08 -0400 (Wed, 14 Mar 2012)
New Revision: 39507

Modified:
   trunk/build/publish.sh
   trunk/build/tycho-plugins/generate-repository-facade/src/main/java/org/jboss/tools/tycho/sitegenerator/GenerateRepositoryFacadeMojo.java
Log:
JBIDE-10923
Fix publish script and generate-repository-facade Maven plugin to support <artifactId>.zip

Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh	2012-03-14 15:39:10 UTC (rev 39506)
+++ trunk/build/publish.sh	2012-03-14 15:51:08 UTC (rev 39507)
@@ -62,6 +62,11 @@
 	 siteZip=${WORKSPACE}/sources/site/target/site_assembly.zip
 	else
 	 siteZip=${WORKSPACE}/sources/site/target/repository.zip
+	 # JBIDE-10923
+	 currentDir=$(pwd)
+	 cd ${WORKSPACE}/sources/site/target/repository
+	 zip -r $siteZip .
+	 cd $currentDir
 	fi
 	z=$siteZip
 fi

Modified: trunk/build/tycho-plugins/generate-repository-facade/src/main/java/org/jboss/tools/tycho/sitegenerator/GenerateRepositoryFacadeMojo.java
===================================================================
--- trunk/build/tycho-plugins/generate-repository-facade/src/main/java/org/jboss/tools/tycho/sitegenerator/GenerateRepositoryFacadeMojo.java	2012-03-14 15:39:10 UTC (rev 39506)
+++ trunk/build/tycho-plugins/generate-repository-facade/src/main/java/org/jboss/tools/tycho/sitegenerator/GenerateRepositoryFacadeMojo.java	2012-03-14 15:51:08 UTC (rev 39507)
@@ -137,7 +137,7 @@
         }
         
         
-        File repoZipFile = new File(project.getBuild().getDirectory(), "repository.zip");
+        File repoZipFile = new File(project.getBuild().getDirectory(), project.getArtifactId() + ".zip");
 		repoZipFile.delete();
 		try {
 	        ZipArchiver archiver = new ZipArchiver();