[servicemix-scm] Fixed the handling of jbi.bundle

[pdodds]

Commit in servicemix/tooling/maven-jbi-plugin on MAIN
plugin.jelly	+2	-2	1.1 -> 1.2
src/plugin-resources/jbi.jsl	+5	-5	1.1 -> 1.2
	+7	-7

2 modified files

Fixed the handling of jbi.bundle

---

servicemix/tooling/maven-jbi-plugin

plugin.jelly 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- plugin.jelly	8 Aug 2005 00:46:34 -0000	1.1
+++ plugin.jelly	10 Aug 2005 15:43:53 -0000	1.2
@@ -30,8 +30,8 @@

 	</j:file>
 	<ant:copy file="${plugin.resources}/jbi.xsd" todir="${jbi.build.dir}"/>
 	<ant:copy file="${plugin.resources}/service.xsd" todir="${jbi.build.dir}"/>	

-	<ant:jar destfile="${maven.build.dir}/${maven.final.name}-jbi-installer.jar" basedir="${jbi.build.dir}">

+	<ant:zip destfile="${maven.build.dir}/${maven.final.name}-jbi-installer.zip" basedir="${jbi.build.dir}">

     	<include name="**/*"/>            	

-  	</ant:jar>

+  	</ant:zip>

   </goal>
 </project>

---

servicemix/tooling/maven-jbi-plugin/src/plugin-resources

jbi.jsl 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- jbi.jsl	8 Aug 2005 00:46:34 -0000	1.1
+++ jbi.jsl	10 Aug 2005 15:43:53 -0000	1.2
@@ -30,10 +30,11 @@

 						file="${maven.build.dir}/${maven.final.name}.jar"
 						todir="${jbi.build.dir}/lib" />
 			<path-element>${componentJar}</path-element>        

-	        <j:forEach var="lib" items="${pom.artifacts}">			
-	        	<j:if test="${lib.getProperty('jbi.bundle')=='true' and lib.type=='jar'}">   

+	        <j:forEach var="lib" items="${pom.artifacts}">
+       			<j:set var="dep" value="${lib.dependency}"/> 
+	        	<j:if test="${dep.getProperty('jbi.bundle')=='true'}">   

 					<ant:copy

-						file="${pom.getDependencyPath(lib.dependency.getId())}"

+						file="${pom.getDependencyPath(dep.getId())}"

 						todir="${jbi.build.dir}/lib" />
 					<j:set var="libname" value="lib/${lib.file.name}"/>
 	            	<path-element>${libname}</path-element>

@@ -50,8 +51,7 @@

 					todir="${jbi.build.dir}/lib" />
 			<path-element>${componentJar}</path-element>   
         </bootstrap-class-path>

-        </j:if>
-        <!--<shared-library>SunWSDLSharedLibrary</shared-library>-->

+        </j:if>        

     </component>
 </x:element> 	
 </j:whitespace>

CVSspam 0.2.8