[jboss-svn-commits] JBL Code SVN: r26740 - in labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts: bpm_orchestration2 and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue May 26 15:20:19 EDT 2009
Author: kevin.conner at jboss.com
Date: 2009-05-26 15:20:18 -0400 (Tue, 26 May 2009)
New Revision: 26740
Modified:
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/bpm_orchestration1/build.xml
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/bpm_orchestration2/build.xml
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/bpm_orchestration3/build.xml
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/bpm_orchestration4/build.xml
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/conf/base-build.xml
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/security_jbpm/build.xml
Log:
Fix upload authentication for jBPM: JBESB-1847
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/bpm_orchestration1/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/bpm_orchestration1/build.xml 2009-05-26 16:28:18 UTC (rev 26739)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/bpm_orchestration1/build.xml 2009-05-26 19:20:18 UTC (rev 26740)
@@ -24,6 +24,8 @@
</copy>
</target>
+ <target name="quickstart-specific-checks" depends="assert-jbpm-secured"/>
+
<target name="quickstart-specific-assemblies">
<copy overwrite="true" file="${project.process.dir}/processdefinition.xml" todir="${classes}" />
<copy todir="${classes}">
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/bpm_orchestration2/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/bpm_orchestration2/build.xml 2009-05-26 16:28:18 UTC (rev 26739)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/bpm_orchestration2/build.xml 2009-05-26 19:20:18 UTC (rev 26740)
@@ -12,6 +12,8 @@
<property name="project.process.dir" value="processDefinition"/>
+ <target name="quickstart-specific-checks" depends="assert-jbpm-secured"/>
+
<target name="quickstart-specific-assemblies">
<copy overwrite="true" file="${project.process.dir}/processdefinition.xml" todir="${classes}/${project.process.dir}" />
<copy todir="${classes}">
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/bpm_orchestration3/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/bpm_orchestration3/build.xml 2009-05-26 16:28:18 UTC (rev 26739)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/bpm_orchestration3/build.xml 2009-05-26 19:20:18 UTC (rev 26740)
@@ -15,6 +15,8 @@
<property name="project.process.dir" value="processDefinition"/>
+ <target name="quickstart-specific-checks" depends="assert-jbpm-secured"/>
+
<target name="quickstart-specific-assemblies">
<copy overwrite="true" file="${project.process.dir}/processdefinition.xml" todir="${classes}/${project.process.dir}" />
<copy todir="${classes}">
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/bpm_orchestration4/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/bpm_orchestration4/build.xml 2009-05-26 16:28:18 UTC (rev 26739)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/bpm_orchestration4/build.xml 2009-05-26 19:20:18 UTC (rev 26740)
@@ -14,6 +14,8 @@
<property name="project.process.dir" value="processDefinition"/>
+ <target name="quickstart-specific-checks" depends="assert-jbpm-secured"/>
+
<target name="quickstart-specific-assemblies">
<copy overwrite="true" file="${project.process.dir}/processdefinition.xml" todir="${classes}/${project.process.dir}" />
<copy todir="${classes}">
@@ -34,7 +36,7 @@
<taskdef name="deployToServer" classname="org.jbpm.ant.DeployProcessToServerTask">
<classpath refid="exec-classpath"/>
</taskdef>
- <deployToServer>
+ <deployToServer username="${jbpm.console.username}" password="${jbpm.console.password}" serverDeployer="${org.jboss.esb.jbpm.console.upload.url}">
<fileset dir="${basedir}/processDefinition" includes="*"/>
</deployToServer>
</target>
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/conf/base-build.xml 2009-05-26 16:28:18 UTC (rev 26739)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/conf/base-build.xml 2009-05-26 19:20:18 UTC (rev 26740)
@@ -267,40 +267,8 @@
<!-- compile-classpath, exec-classpath -->
<!-- ==================================================================== -->
- <target name="dependencies" depends="classpath-dependencies, quickstart-specific-checks">
-
- <!-- jBPM Console properties -->
- <condition property="jbpm.production.properties.set" value="true" else="false">
- <and>
- <equals arg1="${org.jboss.esb.server.config}" arg2="production"/>
- <isset property="quickstart.jbpm.console.username"/>
- <isset property="quickstart.jbpm.console.password"/>
- </and>
- </condition>
- <fail message="Quickstart configuration error: ${line.separator}${line.separator} jBPM username and password must be set in ${pwd}/quickstarts.properties. ${line.separator} The jBPM web console is secured when running in production mode i.e when org.jboss.esb.server.config=production.">
- <condition>
- <and>
- <equals arg1="${org.jboss.esb.server.config}" arg2="production"/>
- <equals arg1="${jbpm.production.properties.set}" arg2="false"/>
- </and>
- </condition>
- </fail>
+ <target name="dependencies" depends="classpath-dependencies, quickstart-specific-checks"/>
- <condition property="org.jboss.esb.jbpm.console.upload.url" value="/jbpm-console/app/upload/" else="/jbpm-console/upload/">
- <equals arg1="${org.jboss.esb.server.config}" arg2="production"/>
- </condition>
-
- <condition property="jbpm.console.username" value="${quickstart.jbpm.console.username}" else="">
- <equals arg1="${org.jboss.esb.server.config}" arg2="production"/>
- </condition>
-
- <condition property="jbpm.console.password" value="${quickstart.jbpm.console.password}" else="">
- <equals arg1="${org.jboss.esb.server.config}" arg2="production"/>
- </condition>
-
- <!-- End jBPM Console properties -->
- </target>
-
<target name="classpath-dependencies" depends="messaging-dependencies, jbossmq-dependencies, quickstart-specific-dependencies">
<path id="compile-classpath">
@@ -569,10 +537,37 @@
<fail unless="jgroups-available" message="Unfortunately this aspect requires jgroups in order to function correctly. Please target a server instance which contains jgroups.jar"/>
</target>
+ <target name="assert-jbpm-secured" depends="jbossesb-dependencies">
+ <condition property="jbpm.production.properties.set">
+ <or>
+ <not>
+ <equals arg1="${org.jboss.esb.server.config}" arg2="production"/>
+ </not>
+ <and>
+ <isset property="quickstart.jbpm.console.username"/>
+ <isset property="quickstart.jbpm.console.password"/>
+ </and>
+ </or>
+ </condition>
+ <fail unless="jbpm.production.properties.set" message="Quickstart configuration error: ${line.separator}${line.separator} jBPM username and password must be set in ${pwd}/quickstarts.properties. ${line.separator} The jBPM web console is secured when running in production mode i.e when org.jboss.esb.server.config=production."/>
+
+ <condition property="org.jboss.esb.jbpm.console.upload.url" value="/jbpm-console/app/upload/" else="/jbpm-console/upload/">
+ <equals arg1="${org.jboss.esb.server.config}" arg2="production"/>
+ </condition>
+
+ <condition property="jbpm.console.username" value="${quickstart.jbpm.console.username}" else="">
+ <equals arg1="${org.jboss.esb.server.config}" arg2="production"/>
+ </condition>
+
+ <condition property="jbpm.console.password" value="${quickstart.jbpm.console.password}" else="">
+ <equals arg1="${org.jboss.esb.server.config}" arg2="production"/>
+ </condition>
+ </target>
+
<!-- ==================================================================== -->
-<!-- This section defines properties/targets to be overridden by the -->
-<!-- quickstart specific build.xml file. -->
-<!-- ==================================================================== -->
+ <!-- This section defines properties/targets to be overridden by the -->
+ <!-- quickstart specific build.xml file. -->
+ <!-- ==================================================================== -->
<property name="additional.deploys" value="" />
<property name="deploy.exploded" value="false" />
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/security_jbpm/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/security_jbpm/build.xml 2009-05-26 16:28:18 UTC (rev 26739)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/security_jbpm/build.xml 2009-05-26 19:20:18 UTC (rev 26740)
@@ -16,6 +16,8 @@
<!-- Import the base Ant build script... -->
<import file="../conf/base-build.xml"/>
+ <target name="quickstart-specific-checks" depends="assert-jbpm-secured"/>
+
<target name="runtest" depends="compile" description="send esb Message to esb service">
<echo>Send esb message to esb service and get response</echo>
<java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.securityjbpm.test.SendEsbMessage" failonerror="true">
More information about the jboss-svn-commits
mailing list