Author: objectiser Date: 2010-03-13 14:12:26 -0500 (Sat, 13 Mar 2010) New Revision: 195 Modified: tools/eclipse/trunk/plugins/eclipse-build/allElements.xml tools/eclipse/trunk/plugins/eclipse-build/build.properties tools/eclipse/trunk/plugins/eclipse-build/customTargets.xml tools/eclipse/trunk/plugins/eclipse-build/extras/eclipse-stp-bpmn.zip tools/eclipse/trunk/plugins/eclipse-build/pom.xml tools/eclipse/trunk/plugins/eclipse-build/setupEclipse.xml tools/eclipse/trunk/plugins/org.pi4soa.bpmn.feature/feature.xml Log: Added BPMN support. Included pre-built version of BPMN modeller trunk shipped with M1, and also the pi4soa bpmn plugins. Modified: tools/eclipse/trunk/plugins/eclipse-build/allElements.xml =================================================================== --- tools/eclipse/trunk/plugins/eclipse-build/allElements.xml 2010-03-13 00:49:12 UTC (rev 194) +++ tools/eclipse/trunk/plugins/eclipse-build/allElements.xml 2010-03-13 19:12:26 UTC (rev 195) @@ -25,13 +25,10 @@ <property name="type" value="feature" /> <property name="id" value="org.jboss.savara.tools.jbossesb.feature" /> </ant> - - <!-- - <ant antfile="${genericTargets}" target="${target}"> + <ant antfile="${genericTargets}" target="${target}"> <property name="type" value="feature" /> <property name="id" value="org.pi4soa.bpmn.feature" /> </ant> - --> <ant antfile="${genericTargets}" target="${target}"> <property name="type" value="feature" /> <property name="id" value="org.pi4soa.monitor.feature" /> @@ -60,12 +57,10 @@ <property name="archiveName" value="${org.jboss.savara.tools.jbossesb.zipFile}"/> <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> </target> - <!-- <target name="assemble.org.pi4soa.bpmn.feature"> <property name="archiveName" value="${org.pi4soa.bpmn.zipFile}"/> <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> </target> - --> <target name="assemble.org.pi4soa.monitor.feature"> <property name="archiveName" value="${org.pi4soa.monitor.zipFile}"/> <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> Modified: tools/eclipse/trunk/plugins/eclipse-build/build.properties =================================================================== --- tools/eclipse/trunk/plugins/eclipse-build/build.properties 2010-03-13 00:49:12 UTC (rev 194) +++ tools/eclipse/trunk/plugins/eclipse-build/build.properties 2010-03-13 19:12:26 UTC (rev 195) @@ -10,7 +10,7 @@ ##sets the zip name org.jboss.savara.tools.bpel.zipFile=org.jboss.savara.tools.bpel-eclipse-${scribbleVersion}.zip org.jboss.savara.tools.jbossesb.zipFile=org.jboss.savara.tools.jbossesb-eclipse-${scribbleVersion}.zip -#org.pi4soa.bpmn.zipFile=org.pi4soa.bpmn-eclipse-${scribbleVersion}.zip +org.pi4soa.bpmn.zipFile=org.pi4soa.bpmn-eclipse-${scribbleVersion}.zip org.pi4soa.monitor.zipFile=org.pi4soa.monitor-eclipse-${scribbleVersion}.zip org.scribble.zipFile=org.scribble-eclipse-${scribbleVersion}.zip @@ -40,36 +40,47 @@ #basews=win32 #basearch=x86 -http://www.eclipse.org/modeling/download.php?file=/modeling/emf/transaction/downloads/drops/1.3.1/R200909151245/emf-transaction-runtime-1.3.1.zip - eclipseGefURL=http://download.eclipse.org/tools/gef/downloads/drops eclipseEMFURL=http://download.eclipse.org/modeling/emf/emf/downloads/drops eclipseEMFTURL=http://download.eclipse.org/modeling/emf/transaction/downl... +eclipseEMFVURL=http://download.eclipse.org/modeling/emf/validation/downloads/drops eclipseGMFURL=http://download.eclipse.org/modeling/gmf/gmf/downloads/drops +eclipseOCLURL=http://download.eclipse.org/modeling/mdt/ocl/downloads/drops +eclipseUML2URL=http://download.eclipse.org/modeling/mdt/uml2/downloads/drops eclipseURL=http://download.eclipse.org/eclipse/downloads/drops pi4soaURL=http://download.jboss.org/jbosstools/builds/nightly/trunk orbitURL=http://repository.jboss.com/eclipse/galileo/repos #eclipseBuildRevision=R-3.4-200806172000 -eclipseBuildRevision=R-3.5.1-200909170800 +#eclipseBuildRevision=R-3.5.1-200909170800 +eclipseBuildRevision=R-3.5.2-201002111343 #eclipseGefBuildRevision=R200806091334 eclipseGefBuildRevision=R200909151220 eclipseEMFBuildRevision=R200906151043 eclipseEMFTBuildRevision=R200909151245 -eclipseGMFBuildRevision=R201002241200 +eclipseEMFVBuildRevision=R200909151245 +#eclipseGMFBuildRevision=R201002241200 +eclipseGMFBuildRevision=R200909151752 +eclipseOCLBuildRevision=R200906151742 +eclipseUML2BuildRevision=R200908281428 eclipsePi4soaBuildRevision=201003050650 orbitBuildRevision=R20100114021427 #eclipseBuildId=3.4 -eclipseBuildId=3.5.1 +#eclipseBuildId=3.5.1 +eclipseBuildId=3.5.2 #eclipseGefBuildId=3.4.0 eclipseGefBuildId=3.5.1 eclipseEMFBuildId=2.5.0 eclipseEMFTBuildId=1.3.1 -eclipseGMFBuildId=2.2.2 +eclipseEMFVBuildId=1.3.1 +#eclipseGMFBuildId=2.2.2 +eclipseGMFBuildId=2.2.1 +eclipseOCLBuildId=1.3.0 +eclipseUML2BuildId=3.0.1 eclipsePi4soaBuildId=3.2.0.v201003050650N-H45-beta1 Modified: tools/eclipse/trunk/plugins/eclipse-build/customTargets.xml =================================================================== --- tools/eclipse/trunk/plugins/eclipse-build/customTargets.xml 2010-03-13 00:49:12 UTC (rev 194) +++ tools/eclipse/trunk/plugins/eclipse-build/customTargets.xml 2010-03-13 19:12:26 UTC (rev 195) @@ -80,11 +80,9 @@ <fileset dir="${builder}/../org.jboss.savara.tools.jbossesb.feature"/> </copy> - <!-- <copy todir="${buildDirectory}/features/org.pi4soa.bpmn.feature"> <fileset dir="${builder}/../org.pi4soa.bpmn.feature"/> </copy> - --> <copy todir="${buildDirectory}/features/org.pi4soa.monitor.feature"> <fileset dir="${builder}/../org.pi4soa.monitor.feature"/> @@ -111,11 +109,9 @@ <fileset dir="${builder}/../org.jboss.savara.tools.wsdl"/> </copy> - <!-- <copy todir="${buildDirectory}/plugins/org.pi4soa.bpmn"> <fileset dir="${builder}/../org.pi4soa.bpmn"/> </copy> - --> <copy todir="${buildDirectory}/plugins/org.pi4soa.monitor"> <fileset dir="${builder}/../org.pi4soa.monitor"/> Modified: tools/eclipse/trunk/plugins/eclipse-build/extras/eclipse-stp-bpmn.zip =================================================================== (Binary files differ) Modified: tools/eclipse/trunk/plugins/eclipse-build/pom.xml =================================================================== --- tools/eclipse/trunk/plugins/eclipse-build/pom.xml 2010-03-13 00:49:12 UTC (rev 194) +++ tools/eclipse/trunk/plugins/eclipse-build/pom.xml 2010-03-13 19:12:26 UTC (rev 195) @@ -155,9 +155,7 @@ <tasks> <unzip src="target/org.jboss.savara.tools.bpel-eclipse-${project.version}.zip" dest="../../target/eclipse"/> <unzip src="target/org.jboss.savara.tools.jbossesb-eclipse-${project.version}.zip" dest="../../target/eclipse"/> - <!-- <unzip src="target/org.pi4soa.bpmn-eclipse-${project.version}.zip" dest="../../target/eclipse"/> - --> <unzip src="target/org.pi4soa.monitor-eclipse-${project.version}.zip" dest="../../target/eclipse"/> <unzip src="target/org.scribble-eclipse-${project.version}.zip" dest="../../target/eclipse"/> Modified: tools/eclipse/trunk/plugins/eclipse-build/setupEclipse.xml =================================================================== --- tools/eclipse/trunk/plugins/eclipse-build/setupEclipse.xml 2010-03-13 00:49:12 UTC (rev 194) +++ tools/eclipse/trunk/plugins/eclipse-build/setupEclipse.xml 2010-03-13 19:12:26 UTC (rev 195) @@ -84,12 +84,30 @@ dest="${localEclipseDrop}/tools/emft/${eclipseEMFTBuildRevision}/emf-transaction-runtime-${eclipseEMFTBuildId}.zip" /> </target> + <target name="getEMFVJar" depends="checkEMFVJar" unless="skipGetEMFVJar"> + <mkdir dir="${localEclipseDrop}/tools/emfv/${eclipseEMFVBuildRevision}" /> + <get usetimestamp="true" src="${eclipseEMFVURL}/${eclipseEMFVBuildId}/${eclipseEMFVBuildRevision}/emf-validation-runtime-${eclipseEMFVBuildId}.zip" + dest="${localEclipseDrop}/tools/emfv/${eclipseEMFVBuildRevision}/emf-validation-runtime-${eclipseEMFVBuildId}.zip" /> + </target> + <target name="getGMFJar" depends="checkGMFJar" unless="skipGetGMFJar"> <mkdir dir="${localEclipseDrop}/tools/gmf/${eclipseGMFBuildRevision}" /> <get usetimestamp="true" src="${eclipseGMFURL}/${eclipseGMFBuildId}/${eclipseGMFBuildRevision}/gmf-runtime-${eclipseGMFBuildId}.zip" dest="${localEclipseDrop}/tools/gmf/${eclipseGMFBuildRevision}/gmf-runtime-${eclipseGMFBuildId}.zip" /> </target> + <target name="getOCLJar" depends="checkOCLJar" unless="skipGetOCLJar"> + <mkdir dir="${localEclipseDrop}/tools/ocl/${eclipseOCLBuildRevision}" /> + <get usetimestamp="true" src="${eclipseOCLURL}/${eclipseOCLBuildId}/${eclipseOCLBuildRevision}/mdt-ocl-runtime-${eclipseOCLBuildId}.zip" + dest="${localEclipseDrop}/tools/ocl/${eclipseOCLBuildRevision}/mdt-ocl-runtime-${eclipseOCLBuildId}.zip" /> + </target> + + <target name="getUML2Jar" depends="checkUML2Jar" unless="skipGetUML2Jar"> + <mkdir dir="${localEclipseDrop}/tools/uml2/${eclipseUML2BuildRevision}" /> + <get usetimestamp="true" src="${eclipseUML2URL}/${eclipseUML2BuildId}/${eclipseUML2BuildRevision}/mdt-uml2-runtime-${eclipseUML2BuildId}.zip" + dest="${localEclipseDrop}/tools/uml2/${eclipseUML2BuildRevision}/mdt-uml2-runtime-${eclipseUML2BuildId}.zip" /> + </target> + <target name="getOrbitJar" depends="checkOrbitJar" unless="skipGetOrbitJar"> <mkdir dir="${localEclipseDrop}/tools/orbit" /> <get usetimestamp="true" src="${orbitURL}/orbit-${orbitBuildRevision}-updateSite.zip" @@ -122,6 +140,18 @@ <available file="${localEclipseDrop}/tools/emft/${eclipseEMFTBuildRevision}/emf-transaction-runtime-${eclipseEMFTBuildId}.zip" property="skipGetEMFTJar" /> </target> + <target name="checkEMFVJar"> + <available file="${localEclipseDrop}/tools/emfv/${eclipseEMFVBuildRevision}/emf-validation-runtime-${eclipseEMFVBuildId}.zip" property="skipGetEMFVJar" /> + </target> + + <target name="checkOCLJar"> + <available file="${localEclipseDrop}/tools/ocl/${eclipseOCLBuildRevision}/mdt-ocl-runtime-${eclipseOCLBuildId}.zip" property="skipGetOCLJar" /> + </target> + + <target name="checkUML2Jar"> + <available file="${localEclipseDrop}/tools/uml2/${eclipseUML2BuildRevision}/mdt-uml2-runtime-${eclipseUML2BuildId}.zip" property="skipGetUML2Jar" /> + </target> + <target name="checkGMFJar"> <available file="${localEclipseDrop}/tools/gmf/${eclipseGMFBuildRevision}/gmf-runtime-${eclipseGMFBuildId}.zip" property="skipGetGMFJar" /> </target> @@ -141,8 +171,11 @@ <antcall target="getGefJar" /> <antcall target="getEMFJar" /> <antcall target="getEMFTJar" /> + <antcall target="getEMFVJar" /> <antcall target="getGMFJar" /> - <antcall target="getOrbitJar" /> + <antcall target="getOCLJar" /> + <antcall target="getUML2Jar" /> + <antcall target="getOrbitJar" /> <antcall target="getPi4soaJar" /> </target> @@ -163,8 +196,17 @@ src="${localEclipseDrop}/tools/emft/${eclipseEMFTBuildRevision}/emf-transaction-runtime-${eclipseEMFTBuildId}.zip" /> <unzip dest="${base}" overwrite="true" + src="${localEclipseDrop}/tools/emfv/${eclipseEMFVBuildRevision}/emf-validation-runtime-${eclipseEMFVBuildId}.zip" /> + + <unzip dest="${base}" overwrite="true" src="${localEclipseDrop}/tools/gmf/${eclipseGMFBuildRevision}/gmf-runtime-${eclipseGMFBuildId}.zip" /> + <unzip dest="${base}" overwrite="true" + src="${localEclipseDrop}/tools/ocl/${eclipseOCLBuildRevision}/mdt-ocl-runtime-${eclipseOCLBuildId}.zip" /> + + <unzip dest="${base}" overwrite="true" + src="${localEclipseDrop}/tools/uml2/${eclipseUML2BuildRevision}/mdt-uml2-runtime-${eclipseUML2BuildId}.zip" /> + <!-- <unzip dest="${base}/eclipse" overwrite="true" src="${localEclipseDrop}/tools/orbit/orbit-${orbitBuildRevision}-updateSite.zip" /> Modified: tools/eclipse/trunk/plugins/org.pi4soa.bpmn.feature/feature.xml =================================================================== --- tools/eclipse/trunk/plugins/org.pi4soa.bpmn.feature/feature.xml 2010-03-13 00:49:12 UTC (rev 194) +++ tools/eclipse/trunk/plugins/org.pi4soa.bpmn.feature/feature.xml 2010-03-13 19:12:26 UTC (rev 195) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <feature - id="org.pi4soa.feature.bpmn" + id="org.pi4soa.bpmn.feature" label="pi4soa BPMN Feature" version="3.0.0.qualifier" provider-name="www.pi4soa.org">