[servicemix-scm] Updated to include the ablity to merge services.xml into the jbi.xml and also the ablity to specify a jbi directory so you can include other files (such as the META-INF/spring-jbi.xml)

[pdodds]

Commit in servicemix/tooling/maven-jbi-plugin on MAIN
plugin.jelly	+7		1.2 -> 1.3
plugin.properties	+2	-1	1.1 -> 1.2
src/plugin-resources/jbi.jsl	+6	-1	1.2 -> 1.3
	+15	-2

3 modified files

Updated to include the ablity to merge services.xml into the jbi.xml and also the ablity to specify a jbi directory so you can include other files (such as the META-INF/spring-jbi.xml)

---

servicemix/tooling/maven-jbi-plugin

plugin.jelly 1.2 -> 1.3

diff -u -r1.2 -r1.3
--- plugin.jelly	10 Aug 2005 15:43:53 -0000	1.2
+++ plugin.jelly	17 Aug 2005 00:08:54 -0000	1.3
@@ -28,6 +28,13 @@

 			outputMode="xml" escapeText="false">
 			<j:import file="${jbi.xml.template}" inherit="true" />
 	</j:file>

+	
+	<util:file var="jbiDirectory" name="${jbi.base.directory}"/>
+    	<j:if test="${servicesFile.exists()}">
+		<copy todir="${jbi.build.dir}">
+	    	<fileset dir="${jbi.base.directory}"/>
+		</copy>
+	</j:if>

 	<ant:copy file="${plugin.resources}/jbi.xsd" todir="${jbi.build.dir}"/>
 	<ant:copy file="${plugin.resources}/service.xsd" todir="${jbi.build.dir}"/>	
 	<ant:zip destfile="${maven.build.dir}/${maven.final.name}-jbi-installer.zip" basedir="${jbi.build.dir}">

---

servicemix/tooling/maven-jbi-plugin

plugin.properties 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- plugin.properties	8 Aug 2005 00:46:34 -0000	1.1
+++ plugin.properties	17 Aug 2005 00:08:54 -0000	1.2
@@ -23,4 +23,5 @@

 # Location of where SAR sources (non-java) are located.
 jbi.build.dir=${maven.build.dir}/jbi
 jbi.xml.template=${plugin.resources}/jbi.jsl

-

+jbi.merge.directory=${basedir}/src/main/merge
+jbi.base.directory=${basedir}/src/main/jbi

---

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

jbi.jsl 1.2 -> 1.3

diff -u -r1.2 -r1.3
--- jbi.jsl	10 Aug 2005 15:43:53 -0000	1.2
+++ jbi.jsl	17 Aug 2005 00:08:54 -0000	1.3
@@ -51,7 +51,12 @@

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

-        </j:if>        

+        </j:if>           

     </component>

+	<util:file var="servicesFile" name="${jbi.merge.directory}/services.xml"/>
+    <j:if test="${servicesFile.exists()}">
+    	<util:loadText file="${servicesFile}" var="services"/>
+    	${services}
+    </j:if>     

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

CVSspam 0.2.8