[jboss-svn-commits] JBL Code SVN: r30371 - in labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts: bpm_orchestration2 and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Nov 27 11:22:35 EST 2009
Author: kevin.conner at jboss.com
Date: 2009-11-27 11:22:35 -0500 (Fri, 27 Nov 2009)
New Revision: 30371
Modified:
labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/bpm_orchestration1/build.xml
labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/bpm_orchestration2/build.xml
labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/bpm_orchestration3/build.xml
labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/bpm_orchestration4/build.xml
labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/conf/base-build.xml
Log:
fix deployToServer and add secure jbpm console assertion: JBESB-3000
Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/bpm_orchestration1/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/bpm_orchestration1/build.xml 2009-11-27 15:50:37 UTC (rev 30370)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/bpm_orchestration1/build.xml 2009-11-27 16:22:35 UTC (rev 30371)
@@ -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_7_CP/product/samples/quickstarts/bpm_orchestration2/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/bpm_orchestration2/build.xml 2009-11-27 15:50:37 UTC (rev 30370)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/bpm_orchestration2/build.xml 2009-11-27 16:22:35 UTC (rev 30371)
@@ -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_7_CP/product/samples/quickstarts/bpm_orchestration3/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/bpm_orchestration3/build.xml 2009-11-27 15:50:37 UTC (rev 30370)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/bpm_orchestration3/build.xml 2009-11-27 16:22:35 UTC (rev 30371)
@@ -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_7_CP/product/samples/quickstarts/bpm_orchestration4/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/bpm_orchestration4/build.xml 2009-11-27 15:50:37 UTC (rev 30370)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/bpm_orchestration4/build.xml 2009-11-27 16:22:35 UTC (rev 30371)
@@ -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_7_CP/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/conf/base-build.xml 2009-11-27 15:50:37 UTC (rev 30370)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/conf/base-build.xml 2009-11-27 16:22:35 UTC (rev 30371)
@@ -333,42 +333,8 @@
<!-- compile-classpath, exec-classpath -->
<!-- ==================================================================== -->
- <target name="dependencies" depends="classpath-dependencies-as4, classpath-dependencies-as5, quickstart-specific-checks">
-
- <condition property="jbossesb-server-production">
- <available file="${org.jboss.esb.server.home}/server/production"/>
- </condition>
+ <target name="dependencies" depends="classpath-dependencies-as4, classpath-dependencies-as5, quickstart-specific-checks"/>
- <!-- jBPM Console properties -->
- <condition property="jbpm.production.properties.required">
- <and>
- <isset property="jbossesb-server-production"/>
- <not>
- <and>
- <isset property="quickstart.jbpm.console.username"/>
- <isset property="quickstart.jbpm.console.password"/>
- </and>
- </not>
- </and>
- </condition>
- <fail if="jbpm.production.properties.required"
- 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/">
- <isset property="jbossesb-server-production"/>
- </condition>
-
- <condition property="jbpm.console.username" value="${quickstart.jbpm.console.username}" else="">
- <isset property="jbossesb-server-production"/>
- </condition>
-
- <condition property="jbpm.console.password" value="${quickstart.jbpm.console.password}" else="">
- <isset property="jbossesb-server-production"/>
- </condition>
-
- <!-- End jBPM Console properties -->
- </target>
-
<target name="classpath-dependencies-as4" if="jbossas4" depends="messaging-dependencies, jbossmq-dependencies, quickstart-specific-dependencies">
<path id="compile-classpath">
@@ -723,10 +689,43 @@
<fail unless="invalid-jbossws-version" message="Invalid version of JBossWS installed on target server. Please install version 3.0.5.GA or higher: http://repository.jboss.org/maven2/org/jboss/ws/native/jbossws-native-core" />
</target>
+ <target name="assert-jbpm-secured" depends="jbossesb-dependencies-as4, jbossesb-dependencies-as5">
+ <condition property="jbossesb-server-production">
+ <available file="${org.jboss.esb.server.home}/server/production"/>
+ </condition>
+
+ <!-- jBPM Console properties -->
+ <condition property="jbpm.production.properties.required">
+ <and>
+ <isset property="jbossesb-server-production"/>
+ <not>
+ <and>
+ <isset property="quickstart.jbpm.console.username"/>
+ <isset property="quickstart.jbpm.console.password"/>
+ </and>
+ </not>
+ </and>
+ </condition>
+ <fail if="jbpm.production.properties.required"
+ 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."/>
+
+ <condition property="org.jboss.esb.jbpm.console.upload.url" value="/jbpm-console/app/upload/" else="/jbpm-console/upload/">
+ <isset property="jbossesb-server-production"/>
+ </condition>
+
+ <condition property="jbpm.console.username" value="${quickstart.jbpm.console.username}" else="">
+ <isset property="jbossesb-server-production"/>
+ </condition>
+
+ <condition property="jbpm.console.password" value="${quickstart.jbpm.console.password}" else="">
+ <isset property="jbossesb-server-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" />
More information about the jboss-svn-commits
mailing list