Author: alex.guizar(a)jboss.com Date: 2009-10-24 17:50:36 -0400 (Sat, 24 Oct 2009) New Revision: 5788 Added: jbpm3/branches/bpel-1.2/jboss/configuration/4.2.3.GA/ Modified: jbpm3/branches/bpel-1.2/bamconsole/build.xml jbpm3/branches/bpel-1.2/bpel/container/jboss420/.classpath jbpm3/branches/bpel-1.2/build/build.properties jbpm3/branches/bpel-1.2/build/profiles/jboss403.profile.properties jbpm3/branches/bpel-1.2/jboss/configuration/4.2.2.GA/build.xml jbpm3/branches/bpel-1.2/jboss/configuration/4.2.3.GA/build.xml Log: [BPEL-313] bring back bpel build Modified: jbpm3/branches/bpel-1.2/bamconsole/build.xml =================================================================== --- jbpm3/branches/bpel-1.2/bamconsole/build.xml 2009-10-24 11:43:47 UTC (rev 5787) +++ jbpm3/branches/bpel-1.2/bamconsole/build.xml 2009-10-24 21:50:36 UTC (rev 5788) @@ -17,8 +17,8 @@ <!-- Give user a chance to override without editing this file or typing -D --> <property file="${basedir}/build.properties" /> - <property name="profile" value="dev" /> - <property file="build-${profile}.properties" /> + <property name="bam.profile" value="dev" /> + <property file="build-${bam.profile}.properties" /> <!-- set global properties for this build --> <property name="project.name" value="bamconsole" /> @@ -137,8 +137,8 @@ <include name="ejb-jar.xml" /> </fileset> </copy> - <copy tofile="${jar.dir}/META-INF/persistence.xml" file="${basedir}/resources/META-INF/persistence-${profile}.xml" overwrite="true" /> - <copy tofile="${jar.dir}/import.sql" file="${basedir}/resources/import-${profile}.sql" overwrite="true" /> + <copy tofile="${jar.dir}/META-INF/persistence.xml" file="${basedir}/resources/META-INF/persistence-${bam.profile}.xml" overwrite="true" /> + <copy tofile="${jar.dir}/import.sql" file="${basedir}/resources/import-${bam.profile}.sql" overwrite="true" /> </target> <target name="war" depends="compile" description="Build the distribution .war file"> @@ -235,7 +235,7 @@ <fail unless="jboss.home">jboss.home not set</fail> <copy todir="${deploy.dir}"> <fileset dir="${basedir}/resources"> - <include name="${project.name}-${profile}-ds.xml" /> + <include name="${project.name}-${bam.profile}-ds.xml" /> </fileset> </copy> </target> @@ -263,7 +263,7 @@ <exclude name="**/*.jar" /> </fileset> </delete> - <delete file="${deploy.dir}/${project.name}-${profile}-ds.xml" failonerror="no" /> + <delete file="${deploy.dir}/${project.name}-${bam.profile}-ds.xml" failonerror="no" /> <delete dir="${ear.deploy.dir}" failonerror="no" /> </target> @@ -503,7 +503,7 @@ </target> <target name="install" depends="package" description="Copy the ear and the datasource to the local repository"> - <copy tofile="${dist.dir}/${project.name}-ds.xml" file="${basedir}/resources/${project.name}-${profile}-ds.xml" /> + <copy tofile="${dist.dir}/${project.name}-ds.xml" file="${basedir}/resources/${project.name}-${bam.profile}-ds.xml" /> <copy tofile="${lib.jbpm.bamconsole.local}" file="${dist.dir}/${project.name}.ear" /> <copy tofile="${lib.jbpm.bamconsole.datasource.local}" file="${dist.dir}/${project.name}-ds.xml" /> </target> Modified: jbpm3/branches/bpel-1.2/bpel/container/jboss420/.classpath =================================================================== --- jbpm3/branches/bpel-1.2/bpel/container/jboss420/.classpath 2009-10-24 11:43:47 UTC (rev 5787) +++ jbpm3/branches/bpel-1.2/bpel/container/jboss420/.classpath 2009-10-24 21:50:36 UTC (rev 5788) @@ -3,6 +3,6 @@ <classpathentry kind="src" path="src/main/java"/> <classpathentry combineaccessrules="false" kind="src" path="/bpel"/> <classpathentry kind="var" path="JBPM_REPO/jbossws/2.0.1.SP2/lib/jbossws-client.jar"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="output" path="target/classes"/> </classpath> Modified: jbpm3/branches/bpel-1.2/build/build.properties =================================================================== --- jbpm3/branches/bpel-1.2/build/build.properties 2009-10-24 11:43:47 UTC (rev 5787) +++ jbpm3/branches/bpel-1.2/build/build.properties 2009-10-24 21:50:36 UTC (rev 5788) @@ -28,18 +28,18 @@ # jwsdp.home is used for generating web service artifacts # wscompile is an alternative to the wstools included in jboss as 4.0.4+ -jwsdp.home=${software.installation.dir}/jwsdp-1.6 +jwsdp.version=1.6 +jwsdp.home=${software.installation.dir}/jwsdp-${jwsdp.version} # REPOSITORY LOCATION PROPERTIES local.repository=${user.home}/jbpm/repository remote.repository=http://repository.jboss.org -remote.jboss.repository=http://superb-east.dl.sourceforge.net/sourceforge/jboss docbook.support.dir=${local.repository} # BROWSER PROPERTIES windows.browser=C:/Program Files/Internet Explorer/IEXPLORE.EXE macos.browser=/usr/bin/open -linux.browser=mozilla +linux.browser=gnome-open # The remainder section of this configuration file should # typically not be customized. @@ -730,7 +730,7 @@ lib.jboss.as.name=jboss.zip lib.jboss.as.dir=jbossas/${lib.jboss.version}/lib lib.jboss.as.local=${local.repository}/${lib.jboss.as.dir}/${lib.jboss.as.name} -lib.jboss.as.remote=${remote.jboss.repository}/jboss-${jboss.version}.zip +lib.jboss.as.remote=http://downloads.sourceforge.net/project/jboss/JBoss/JBoss-${jboss.version}/jboss-${jboss.version}.zip lib.jboss.backport-concurrent.version=2.1.0.GA lib.jboss.backport-concurrent.license=public-domain @@ -862,7 +862,7 @@ lib.oscache.local=${local.repository}/${lib.oscache.path} lib.oscache.remote=${remote.repository}/${lib.oscache.path} -lib.servlet.version=2.5 +lib.servlet.version=2.4 lib.servlet.license=apache-2.0 lib.servlet.name=servlet-api.jar lib.servlet.dir=sun-servlet/${lib.servlet.version}/lib @@ -870,7 +870,7 @@ lib.servlet.local=${local.repository}/${lib.servlet.path} lib.servlet.remote=${remote.repository}/${lib.servlet.path} -lib.servlet-jsp.version=2.5 +lib.servlet-jsp.version=${lib.servlet.version} lib.servlet-jsp.license=apache-2.0 lib.servlet-jsp.name=jsp-api.jar lib.servlet-jsp.dir=sun-servlet/${lib.servlet-jsp.version}/lib Modified: jbpm3/branches/bpel-1.2/build/profiles/jboss403.profile.properties =================================================================== --- jbpm3/branches/bpel-1.2/build/profiles/jboss403.profile.properties 2009-10-24 11:43:47 UTC (rev 5787) +++ jbpm3/branches/bpel-1.2/build/profiles/jboss403.profile.properties 2009-10-24 21:50:36 UTC (rev 5788) @@ -1,6 +1,7 @@ jboss.version=4.0.3.SP1 +lib.jboss.as.remote=http://downloads.sourceforge.net/project/jboss/JBoss/JBoss-4.0.3SP1/jboss-4.0.3SP1.zip lib.jboss.saaj.version=${jboss.version} lib.jboss.saaj.dir=jboss-ws4ee/${lib.jboss.saaj.version}/lib -lib.jbpm.bpel.container.jar.file=jbpm-bpel-jboss403.jar \ No newline at end of file +lib.jbpm.bpel.container.jar.file=jbpm-bpel-jboss403.jar Modified: jbpm3/branches/bpel-1.2/jboss/configuration/4.2.2.GA/build.xml =================================================================== --- jbpm3/branches/bpel-1.2/jboss/configuration/4.2.2.GA/build.xml 2009-10-24 11:43:47 UTC (rev 5787) +++ jbpm3/branches/bpel-1.2/jboss/configuration/4.2.2.GA/build.xml 2009-10-24 21:50:36 UTC (rev 5788) @@ -1,4 +1,4 @@ -<project name="jbpm.jboss.configuration.4.0.4.GA" basedir="." default="package"> +<project name="jbpm.jboss.configuration.4.2.2.GA" basedir="." default="package"> <!-- project specific properties --> <property name="jbpm.root" value="../../.." /> Copied: jbpm3/branches/bpel-1.2/jboss/configuration/4.2.3.GA (from rev 5787, jbpm3/branches/bpel-1.2/jboss/configuration/4.2.2.GA) Property changes on: jbpm3/branches/bpel-1.2/jboss/configuration/4.2.3.GA ___________________________________________________________________ Name: svn:mergeinfo + Modified: jbpm3/branches/bpel-1.2/jboss/configuration/4.2.3.GA/build.xml =================================================================== --- jbpm3/branches/bpel-1.2/jboss/configuration/4.2.2.GA/build.xml 2009-10-24 11:43:47 UTC (rev 5787) +++ jbpm3/branches/bpel-1.2/jboss/configuration/4.2.3.GA/build.xml 2009-10-24 21:50:36 UTC (rev 5788) @@ -1,4 +1,4 @@ -<project name="jbpm.jboss.configuration.4.0.4.GA" basedir="." default="package"> +<project name="jbpm.jboss.configuration.4.2.3.GA" basedir="." default="package"> <!-- project specific properties --> <property name="jbpm.root" value="../../.." />