[jbpm-commits] JBoss JBPM SVN: r5566 - in jbpm4/trunk: modules/distro and 6 other directories.

Author: jbarrez Date: 2009-08-27 10:09:31 -0400 (Thu, 27 Aug 2009) New Revision: 5566 Added: jbpm4/trunk/modules/distro/src/main/files/install/src/tomcat/server.xml Modified: jbpm4/trunk/modules/distro/pom.xml jbpm4/trunk/modules/distro/src/main/files/examples/build.xml jbpm4/trunk/modules/distro/src/main/files/install/build.xml jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml jbpm4/trunk/modules/integration/pom.xml jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartTomcatTask.java jbpm4/trunk/pom.xml Log: Added Tomcat version of the demo.setup Modified: jbpm4/trunk/modules/distro/pom.xml =================================================================== --- jbpm4/trunk/modules/distro/pom.xml 2009-08-27 13:37:56 UTC (rev 5565) +++ jbpm4/trunk/modules/distro/pom.xml 2009-08-27 14:09:31 UTC (rev 5566) @@ -69,6 +69,10 @@ </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-tomcat6</artifactId> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-jpdl</artifactId> </dependency> <dependency> Modified: jbpm4/trunk/modules/distro/src/main/files/examples/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2009-08-27 13:37:56 UTC (rev 5565) +++ jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2009-08-27 14:09:31 UTC (rev 5566) @@ -1,106 +1,119 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="jbpm.examples"> - - <!-- DEVELOPER SPECIFIC CONFIGURATIONS --> - <property file="${user.home}/.jbpm4/build.properties" /> - <!-- DEFAULT PROPERTY VALUES --> - <property name="database" value="hsqldb" /> - <property name="jbpm.parent.dir" value="../.." /> - <property name="jbpm.version" value="4.1-SNAPSHOT" /> - <property name="jboss.version" value="5.0.0.GA" /> - <property name="jbpm.home" value="${jbpm.parent.dir}/jbpm-${jbpm.version}" /> + <!-- DEVELOPER SPECIFIC CONFIGURATIONS --> + <property file="${user.home}/.jbpm4/build.properties" /> - <property name="jboss.parent.dir" value="${jbpm.home}" /> - <property name="jboss.home" value="${jboss.parent.dir}/jboss-${jboss.version}" /> - <property name="jboss.server.configuration" value="default" /> - <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" /> + <!-- DEFAULT PROPERTY VALUES --> + <property name="database" value="hsqldb" /> + <property name="jbpm.parent.dir" value="../.." /> + <property name="jbpm.version" value="4.1-SNAPSHOT" /> + <property name="jboss.version" value="5.0.0.GA" /> + <property name="jbpm.home" value="${jbpm.parent.dir}/jbpm-${jbpm.version}" /> - <!-- JDBC PROPERTIES --> - <property file="${user.home}/.jbpm4/jdbc/${database}.properties" /> - <property file="${jbpm.home}/db/jdbc/${database}.properties" /> + <property name="jboss.parent.dir" value="${jbpm.home}" /> + <property name="jboss.home" value="${jboss.parent.dir}/jboss-${jboss.version}" /> + <property name="jboss.server.configuration" value="default" /> + <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" /> + + <property name="tomcat.version" value="6.0.20" /> + <property name="tomcat.parent.dir" value="${jbpm.home}" /> + <property name="tomcat.home" value="${tomcat.parent.dir}/apache-tomcat-${tomcat.version}" /> + <!-- JDBC PROPERTIES --> + <property file="${user.home}/.jbpm4/jdbc/${database}.properties" /> + <property file="${jbpm.home}/db/jdbc/${database}.properties" /> + <!-- ### LOG PROPERTIES ################################################# --> - <target name="log.properties"> - <echo message="database: ${database}" /> - <echo message="jdbc.driver........ ${jdbc.driver}" /> - <echo message="jdbc.url........... ${jdbc.url}" /> - <echo message="jdbc.username...... ${jdbc.username}" /> - <echo message="jbpm.version....... ${jbpm.version}" /> - <echo message="jbpm.home.......... ${jbpm.home}" /> - </target> - + <target name="log.properties"> + <echo message="database: ${database}" /> + <echo message="jdbc.driver........ ${jdbc.driver}" /> + <echo message="jdbc.url........... ${jdbc.url}" /> + <echo message="jdbc.username...... ${jdbc.username}" /> + <echo message="jbpm.version....... ${jbpm.version}" /> + <echo message="jbpm.home.......... ${jbpm.home}" /> + </target> + <target name="jbpm.libs.path"> - <path id="jbpm.libs.incl.dependencies"> - <pathelement location="${jbpm.home}/examples/target/classes" /> - <fileset dir="${jbpm.home}"> - <include name="jbpm.jar" /> - </fileset> - <fileset dir="${jbpm.home}/lib" /> - </path> + <path id="jbpm.libs.incl.dependencies"> + <pathelement location="${jbpm.home}/examples/target/classes" /> + <fileset dir="${jbpm.home}"> + <include name="jbpm.jar" /> + </fileset> + <fileset dir="${jbpm.home}/lib" /> + </path> </target> - - <!-- ### DEPLOY EXAMPLE BUSINESS ARCHIVES ############################### --> - <target name="deploy.examples" + + <!-- ### DEPLOY EXAMPLE BUSINESS ARCHIVES ############################### --> + <target name="deploy.examples.into.jboss" description="deploys all the example processes" - depends="jbpm.libs.path, examples.jar"> - <mkdir dir="${jbpm.home}/examples/target" /> - <copy file="${jbpm.home}/db/hibernate.cfg/${database}.hibernate.cfg.xml" - tofile="${jbpm.home}/examples/target/classes/jbpm.hibernate.cfg.xml" - overwrite="true"> - <filterset filtersfile="${jbpm.home}/db/jdbc/${database}.properties" /> - </copy> - <jar destfile="${jbpm.home}/examples/target/examples.bar"> - <fileset dir="${jbpm.home}/examples/src"> - <exclude name="jbpm.cfg.xml" /> - <exclude name="jbpm.hibernate.cfg.xml" /> - <exclude name="jbpm.mail.properties" /> - <exclude name="jbpm.mail.templates.examples.xml" /> - <exclude name="logging.properties" /> - <exclude name="org/jbpm/examples/task/swimlane/process.jpdl.xml" /> - <exclude name="org/jbpm/examples/task/candidates/process.jpdl.xml" /> - <exclude name="org/jbpm/examples/concurrency/graphbased/process.jpdl.xml" /> - <exclude name="org/jbpm/examples/timer/repeat/process.jpdl.xml" /> - <exclude name="org/jbpm/examples/script/text/process.jpdl.xml" /> - <exclude name="org/jbpm/examples/decision/handler/process.jpdl.xml" /> - <exclude name="org/jbpm/examples/mail/template/process.jpdl.xml" /> - <exclude name="org/jbpm/examples/script/expression/process.jpdl.xml" /> - <exclude name="org/jbpm/examples/task/assignee/process.jpdl.xml" /> - <exclude name="org/jbpm/examples/mail/inline/process.jpdl.xml" /> - <exclude name="org/jbpm/examples/mail/template/process.jpdl.xml" /> - <exclude name="org/jbpm/examples/eventlistener/process.jpdl.xml" /> - <exclude name="org/jbpm/examples/timer/event/process.jpdl.xml" /> - <exclude name="org/jbpm/examples/task/assignmenthandler/process.jpdl.xml" /> - <exclude name="org/jbpm/examples/java/JavaInstantiateTest.java" /> - </fileset> - </jar> - <taskdef name="jbpm-deploy" - classname="org.jbpm.pvm.internal.ant.JbpmDeployTask" - classpathref="jbpm.libs.incl.dependencies" /> - <jbpm-deploy file="${jbpm.home}/examples/target/examples.bar" /> - - <mkdir dir="${jboss.server.config.dir}/deploy/jbpm/userlibs" /> - <copy file="${jbpm.home}/examples/target/examples.jar" + depends="jbpm.libs.path, examples.jar, create.and.deploy.examples"> + <mkdir dir="${jboss.server.config.dir}/deploy/jbpm/userlibs" /> + <copy file="${jbpm.home}/examples/target/examples.jar" todir="${jboss.server.config.dir}/deploy/jbpm/userlibs" overwrite="true" /> - </target> - + </target> + + <target name="create.and.deploy.examples"> + <mkdir dir="${jbpm.home}/examples/target" /> + <copy file="${jbpm.home}/db/hibernate.cfg/${database}.hibernate.cfg.xml" + tofile="${jbpm.home}/examples/target/classes/jbpm.hibernate.cfg.xml" + overwrite="true"> + <filterset filtersfile="${jbpm.home}/db/jdbc/${database}.properties" /> + </copy> + <jar destfile="${jbpm.home}/examples/target/examples.bar"> + <fileset dir="${jbpm.home}/examples/src"> + <exclude name="jbpm.cfg.xml" /> + <exclude name="jbpm.hibernate.cfg.xml" /> + <exclude name="jbpm.mail.properties" /> + <exclude name="jbpm.mail.templates.examples.xml" /> + <exclude name="logging.properties" /> + <exclude name="org/jbpm/examples/task/swimlane/process.jpdl.xml" /> + <exclude name="org/jbpm/examples/task/candidates/process.jpdl.xml" /> + <exclude name="org/jbpm/examples/concurrency/graphbased/process.jpdl.xml" /> + <exclude name="org/jbpm/examples/timer/repeat/process.jpdl.xml" /> + <exclude name="org/jbpm/examples/script/text/process.jpdl.xml" /> + <exclude name="org/jbpm/examples/decision/handler/process.jpdl.xml" /> + <exclude name="org/jbpm/examples/mail/template/process.jpdl.xml" /> + <exclude name="org/jbpm/examples/script/expression/process.jpdl.xml" /> + <exclude name="org/jbpm/examples/task/assignee/process.jpdl.xml" /> + <exclude name="org/jbpm/examples/mail/inline/process.jpdl.xml" /> + <exclude name="org/jbpm/examples/mail/template/process.jpdl.xml" /> + <exclude name="org/jbpm/examples/eventlistener/process.jpdl.xml" /> + <exclude name="org/jbpm/examples/timer/event/process.jpdl.xml" /> + <exclude name="org/jbpm/examples/task/assignmenthandler/process.jpdl.xml" /> + <exclude name="org/jbpm/examples/java/JavaInstantiateTest.java" /> + </fileset> + </jar> + <taskdef name="jbpm-deploy" classname="org.jbpm.pvm.internal.ant.JbpmDeployTask" classpathref="jbpm.libs.incl.dependencies" /> + <jbpm-deploy file="${jbpm.home}/examples/target/examples.bar" /> + </target> + + <target name="deploy.examples.into.tomcat" + description="deploys all the example processes" + depends="jbpm.libs.path, examples.jar, create.and.deploy.examples"> + + <copy file="${jbpm.home}/examples/target/examples.jar" + todir="${tomcat.home}/lib" + overwrite="true" /> + </target> + <target name="examples.jar" depends="jbpm.libs.path"> - <mkdir dir="${jbpm.home}/examples/target/classes" /> - <javac srcdir="${jbpm.home}/examples/src" + <mkdir dir="${jbpm.home}/examples/target/classes" /> + <javac srcdir="${jbpm.home}/examples/src" destdir="${jbpm.home}/examples/target/classes" classpathref="jbpm.libs.incl.dependencies" /> - <copy todir="${jbpm.home}/examples/target/classes"> - <fileset dir="${jbpm.home}/examples/src"> - <exclude name="**/*.java" /> - </fileset> - </copy> - <jar destfile="${jbpm.home}/examples/target/examples.jar" > - <fileset dir="${jbpm.home}/examples/target/classes"> - <include name="**/*.class" /> - </fileset> - </jar> + <copy todir="${jbpm.home}/examples/target/classes"> + <fileset dir="${jbpm.home}/examples/src"> + <exclude name="**/*.java" /> + </fileset> + </copy> + <jar destfile="${jbpm.home}/examples/target/examples.jar" > + <fileset dir="${jbpm.home}/examples/target/classes"> + <include name="**/*.class" /> + </fileset> + </jar> </target> </project> Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-27 13:37:56 UTC (rev 5565) +++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-27 14:09:31 UTC (rev 5566) @@ -23,6 +23,7 @@ <property name="install.src.dir" value="${jbpm.home}/install/src" /> <property name="jdbc.properties.dir" value="${install.src.dir}/jdbc" /> <property name="mail.cfg" value="default" /> + <property file="${jbpm.home}/install/src/jdbc/${database}.properties" /> <property name="tomcat.version" value="6.0.20" /> <property name="tomcat.parent.dir" value="${jbpm.home}" /> @@ -349,6 +350,7 @@ <include name="hibernate-cglib-repack.jar" /> <include name="javassist.jar" /> <include name="jbpm-spi.jar" /> + <include name="jbpm-tomcat6.jar" /> <include name="jta.jar" /> <include name="juel*.jar" /> <include name="livetribe-jsr223.jar" /> @@ -389,6 +391,24 @@ </target> + <!-- ### TOMCAT DEMO SETUP ################################################ --> + <target name="demo.setup.tomcat" + depends="install.tomcat, install.jbpm.into.tomcat" + description="installs tomcat, installs jbpm into tomcat, starts tomcat, creates the jBPM DB schema, deploys examples, loads example identities, installs and starts eclipse"> + + <condition property="hsqldb.needed"> + <equals arg1="${database}" arg2="hsqldb" /> + </condition> + <antcall target="internal.install.and.start.hqsldb.if.needed" /> + + <antcall target="create.jbpm.schema" /> + <ant antfile="${jbpm.home}/examples/build.xml" target="deploy.examples.into.tomcat" /> + <antcall target="install.example.identities.into.tomcat" /> + <antcall target="start.tomcat" /> + <ant antfile="${jbpm.home}/gpd/build.xml" target="install.eclipse" /> + <ant antfile="${jbpm.home}/gpd/build.xml" target="start.eclipse" /> + </target> + <!-- ### INSTALL HSQLDB SERVER ################################################ --> <target name="install.hsqldb.server"> <delete dir="${hsqldb.server.install.dir}" /> <!-- Also deletes old data --> @@ -418,7 +438,6 @@ <!-- ### SHUTDOWN HSQLDB SERVER ################################################ --> <target name="shutdown.hsqldb.server"> - <property file="${jbpm.home}/install/src/jdbc/${database}.properties" /> <sql driver="${jdbc.driver}" password="${jdbc.password}" url="${jdbc.url}" @@ -432,6 +451,11 @@ </classpath> </sql> </target> + + <target name="internal.install.and.start.hqsldb.if.needed" if="hsqldb.needed"> + <antcall target="install.hsqldb.server" /> + <antcall target="start.hsqldb.server" /> + </target> <!-- ### START TOMCAT ################################################### --> @@ -544,8 +568,16 @@ </classpath> </sql> </target> + + <!-- ### INSTALL EXAMPLE IDENTITIES INTO TOMCAT ######################################## --> + <target name="install.example.identities.into.tomcat" depends="load.example.identities"> + <copy file="${install.src.dir}/tomcat/server.xml" + tofile="${tomcat.home}/conf/server.xml" + overwrite="true"> + <filterset filtersfile="${jdbc.properties.dir}/${database}.properties" /> + </copy> + </target> - <!-- ### START HSQLDB DATABASE MGR ##################################### --> <target name="hsqldb.databasemanager" description="start the hsqldb database manager"> Added: jbpm4/trunk/modules/distro/src/main/files/install/src/tomcat/server.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/tomcat/server.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/tomcat/server.xml 2009-08-27 14:09:31 UTC (rev 5566) @@ -0,0 +1,50 @@ +<?xml version='1.0' encoding='utf-8'?> + <!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version + 2.0 (the "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 Unless required by + applicable law or agreed to in writing, software distributed under + the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES + OR CONDITIONS OF ANY KIND, either express or implied. See the + License for the specific language governing permissions and + limitations under the License. + --> +<Server port="8005" shutdown="SHUTDOWN"> + + <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" /> + <Listener className="org.apache.catalina.core.JasperListener" /> + <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" /> + <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" /> + + <Service name="Catalina"> + + <Connector port="8080" protocol="HTTP/1.1" connectionTimeout="20000" redirectPort="8443" /> + + <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" /> + + <Engine name="Catalina" defaultHost="localhost"> + + <Host name="localhost" appBase="webapps" unpackWARs="true" + autoDeploy="true" xmlValidation="false" xmlNamespaceAware="false"> + + <!-- + Current workaround for using the JBPM identity tables on Tomcat. + Setting the Realm on the context with path /jbpm-console did not seem + to work. Note that this workaround means that the cmplete localhost + domain will use this realm ! + --> + <Realm className="org.jbpm.integration.tomcat6.JbpmConsoleRealm" + driverName=&quot;@jdbc.driver(a)&quot; + connectionUrl=&quot;@jdbc.url(a)&quot; + connectionName=&quot;@jdbc.username(a)&quot; + connectionPassword=&quot;@jdbc.password(a)&quot; /> + + </Host> + </Engine> + </Service> +</Server> \ No newline at end of file Modified: jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-08-27 13:37:56 UTC (rev 5565) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-08-27 14:09:31 UTC (rev 5566) @@ -65,7 +65,7 @@ depends="install.jboss, install.jbpm.into.jboss, start.jboss" description="installs jboss, installs jbpm into jboss, starts jboss, creates the jBPM DB schema, deploys examples, loads example identities, installs and starts eclipse"> <ant antfile="${jbpm.home}/db/build.xml" target="create.jbpm.schema" /> - <ant antfile="${jbpm.home}/examples/build.xml" target="deploy.examples" /> + <ant antfile="${jbpm.home}/examples/build.xml" target="deploy.examples.into.jboss" /> <ant antfile="${jbpm.home}/db/build.xml" target="load.example.identities" /> <ant antfile="${jbpm.home}/gpd/build.xml" target="install.eclipse" /> <ant antfile="${jbpm.home}/gpd/build.xml" target="start.eclipse" /> Modified: jbpm4/trunk/modules/integration/pom.xml =================================================================== --- jbpm4/trunk/modules/integration/pom.xml 2009-08-27 13:37:56 UTC (rev 5565) +++ jbpm4/trunk/modules/integration/pom.xml 2009-08-27 14:09:31 UTC (rev 5566) @@ -124,6 +124,7 @@ <module>form-plugin</module> <module>graphView-plugin</module> <module>report</module> + <module>tomcat</module> </modules> </project> Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartTomcatTask.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartTomcatTask.java 2009-08-27 13:37:56 UTC (rev 5565) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartTomcatTask.java 2009-08-27 14:09:31 UTC (rev 5566) @@ -55,7 +55,7 @@ System.setProperty("CATALINA_HOME", getTomcatHome()); // launch the command and wait till the END_MESSAGE appears - Thread launcher = new Launcher(this, command, END_MESSAGE, getTomcatHome()+fileSeparator+"bin"); + Thread launcher = new Launcher(this, command, END_MESSAGE, null); launcher.start(); launcher.join(); Modified: jbpm4/trunk/pom.xml =================================================================== --- jbpm4/trunk/pom.xml 2009-08-27 13:37:56 UTC (rev 5565) +++ jbpm4/trunk/pom.xml 2009-08-27 14:09:31 UTC (rev 5566) @@ -139,6 +139,11 @@ <artifactId>jbpm-jboss5</artifactId> <version>${version}</version> </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-tomcat6</artifactId> + <version>${version}</version> + </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-console-integration</artifactId>