Author: alex.guizar(a)jboss.com Date: 2010-08-18 06:04:59 -0400 (Wed, 18 Aug 2010) New Revision: 6608 Added: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/cache/jbpm-jbc-service.xml Removed: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/cache/jbpm-jbc1-service.xml Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/scripts/antrun-config.xml jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/auto-install-template.xml jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-lang_eng.xml jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-lang_spa.xml jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/etc/jbpm.cfg.xml jbpm3/branches/jbpm-3.2-soa/pom.xml Log: JBPM-2916 install jbpm-mq-service to deploy directory a.o.t deploy-hasingleton; organize installer packs by functional groups Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/scripts/antrun-config.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/scripts/antrun-config.xml 2010-08-18 09:40:27 UTC (rev 6607) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/scripts/antrun-config.xml 2010-08-18 10:04:59 UTC (rev 6608) @@ -16,8 +16,8 @@ <attribute name="file" /> <attribute name="section" /> <sequential> - <replace file="@{file}" summary="true"> - <replacefilter token="&lt;!-- @{section} (begin) --&gt;" + <replace file="@{file}"> + <replacefilter token="&lt;!-- @{section} (begin) -->" value="&lt;!-- @{section} (begin) ===" /> <replacefilter token="&lt;!-- @{section} (end) -->" value="==== @{section} (end) -->" /> </replace> @@ -28,9 +28,9 @@ <attribute name="file" /> <attribute name="section" /> <sequential> - <replace file="@{file}" summary="true"> + <replace file="@{file}"> <replacefilter token="&lt;!-- @{section} (begin) ===" - value="&lt;!-- @{section} (begin) --&gt;" /> + value="&lt;!-- @{section} (begin) -->" /> <replacefilter token="==== @{section} (end) -->" value="&lt;!-- @{section} (end) -->" /> </replace> Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml 2010-08-18 09:40:27 UTC (rev 6607) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml 2010-08-18 10:04:59 UTC (rev 6608) @@ -12,14 +12,11 @@ <attribute name="file" /> <attribute name="section" /> <sequential> - <replace file="@{file}" summary="true"> - <replacetoken><![CDATA[<!-- ]]>@{section}<![CDATA[ (begin) -->]]></replacetoken> - <replacevalue><![CDATA[<!-- ]]>@{section}<![CDATA[ (begin) ===]]></replacevalue> + <replace file="@{file}"> + <replacefilter token="&lt;!-- @{section} (begin) -->" + value="&lt;!-- @{section} (begin) ===" /> + <replacefilter token="&lt;!-- @{section} (end) -->" value="==== @{section} (end) -->" /> </replace> - <replace file="@{file}" summary="true"> - <replacetoken><![CDATA[<!-- ]]>@{section}<![CDATA[ (end) -->]]></replacetoken> - <replacevalue><![CDATA[==== ]]>@{section}<![CDATA[ (end) -->]]></replacevalue> - </replace> </sequential> </macrodef> @@ -27,18 +24,16 @@ <attribute name="file" /> <attribute name="section" /> <sequential> - <replace file="@{file}" summary="true"> - <replacetoken><![CDATA[<!-- ]]>@{section}<![CDATA[ (begin) ===]]></replacetoken> - <replacevalue><![CDATA[<!-- ]]>@{section}<![CDATA[ (begin) -->]]></replacevalue> + <replace file="@{file}"> + <replacefilter token="&lt;!-- @{section} (begin) ===" + value="&lt;!-- @{section} (begin) -->" /> + <replacefilter token="==== @{section} (end) -->" + value="&lt;!-- @{section} (end) -->" /> </replace> - <replace file="@{file}" summary="true"> - <replacetoken><![CDATA[==== ]]>@{section}<![CDATA[ (end) -->]]></replacetoken> - <replacevalue><![CDATA[<!-- ]]>@{section}<![CDATA[ (end) -->]]></replacevalue> - </replace> </sequential> </macrodef> - <macrodef name="macro-hibernate-cfg"> + <macrodef name="edit-hibernate-config"> <attribute name="file" /> <sequential> <macro-disable file="@{file}" section="JDBC connection properties" /> @@ -95,7 +90,7 @@ </copy> </target> - <target name="process-hibernate-cfg"> + <target name="gen-hibernate-config" description="generate hibernate configuration"> <property name="hsqldb.cfg.xml" value="${project.build.assembly.dir}/config/hibernate.cfg.hsqldb.xml" /> <macro-disable file="${hsqldb.cfg.xml}" section="JDBC connection properties" /> @@ -103,20 +98,20 @@ <macro-enable file="${hsqldb.cfg.xml}" section="DataSource properties" /> <macro-enable file="${hsqldb.cfg.xml}" section="JTA transaction properties" /> - <macro-hibernate-cfg file="${project.build.assembly.dir}/config/hibernate.cfg.db2.xml"/> - <macro-hibernate-cfg file="${project.build.assembly.dir}/config/hibernate.cfg.mssql.xml"/> - <macro-hibernate-cfg file="${project.build.assembly.dir}/config/hibernate.cfg.mysql.xml"/> - <macro-hibernate-cfg file="${project.build.assembly.dir}/config/hibernate.cfg.oracle.xml"/> - <macro-hibernate-cfg file="${project.build.assembly.dir}/config/hibernate.cfg.postgresql.xml"/> - <macro-hibernate-cfg file="${project.build.assembly.dir}/config/hibernate.cfg.sybase.xml"/> + <edit-hibernate-config file="${project.build.assembly.dir}/config/hibernate.cfg.db2.xml"/> + <edit-hibernate-config file="${project.build.assembly.dir}/config/hibernate.cfg.mssql.xml"/> + <edit-hibernate-config file="${project.build.assembly.dir}/config/hibernate.cfg.mysql.xml"/> + <edit-hibernate-config file="${project.build.assembly.dir}/config/hibernate.cfg.oracle.xml"/> + <edit-hibernate-config file="${project.build.assembly.dir}/config/hibernate.cfg.postgresql.xml"/> + <edit-hibernate-config file="${project.build.assembly.dir}/config/hibernate.cfg.sybase.xml"/> </target> <!-- ================================================================== --> <!-- Distribution --> <!-- ================================================================== --> <target name="process-resources" - depends="process-hibernate-cfg, reorganize-examples" - description="prepares installer resources"> + depends="gen-hibernate-config, reorganize-examples" + description="prepare installer resources"> <copy todir="${resources.output.dir}" overwrite="true"> <fileset dir="${resources.dir}/installer" /> <filterset> Copied: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/cache/jbpm-jbc-service.xml (from rev 6603, jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/cache/jbpm-jbc1-service.xml) =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/cache/jbpm-jbc-service.xml (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/cache/jbpm-jbc-service.xml 2010-08-18 10:04:59 UTC (rev 6608) @@ -0,0 +1,117 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + JBoss Cache 1.4 service, for use as Hibernate 3.2 cache provider. + http://community.jboss.org/wiki/NewJBossCache14xBasedHibernate32CacheProv... +--> +<server> + <mbean code="org.jboss.cache.TreeCache" name="jboss.jbpm:service=TreeCache"> + <depends>jboss:service=Naming</depends> + <depends>jboss:service=TransactionManager</depends> + + <!-- Configure the TransactionManager --> + <attribute name="TransactionManagerLookupClass"> + org.jboss.cache.JBossTransactionManagerLookup + </attribute> + + <!-- + Node locking scheme: + OPTIMISTIC + PESSIMISTIC (default) + --> + <attribute name="NodeLockingScheme">OPTIMISTIC</attribute> + + <!-- + Note that this attribute is IGNORED if your NodeLockingScheme above is OPTIMISTIC. + + Isolation level: + SERIALIZABLE + REPEATABLE_READ (default) + READ_COMMITTED + READ_UNCOMMITTED + NONE + + Once a tx reads an item from the 2nd Level Cache, Hibernate caches it in the Session + object and does not go back to the 2LC for that same object. So READ_COMMITTED + should be enough. There is no benefit using REPEATABLE_READ. + --> + <attribute name="IsolationLevel">READ_COMMITTED</attribute> + + <!-- + Cache mode: + LOCAL + REPL_ASYNC + REPL_SYNC + INVALIDATION_ASYNC + INVALIDATION_SYNC + + INVALIDATION_ASYNC is recommended for use with clustered second-level caches. + --> + <attribute name="CacheMode">LOCAL</attribute> + + <!-- Name of cluster. Needs to be the same for all clusters, in order to find each other --> + <attribute name="ClusterName">TreeCache-${jboss.partition.name:Cluster}</attribute> + + <attribute name="ClusterConfig"> + <config> + <UDP mcast_addr="230.1.2.3" mcast_port="43333" tos="8" ucast_recv_buf_size="20000000" + ucast_send_buf_size="640000" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000" + loopback="false" discard_incompatible_packets="true" enable_bundling="true" + max_bundle_size="64000" max_bundle_timeout="30" use_incoming_packet_handler="true" + use_outgoing_packet_handler="false" ip_ttl="2" down_thread="false" up_thread="false" /> + <PING timeout="2000" down_thread="false" up_thread="false" num_initial_members="3" /> + <MERGE2 max_interval="100000" down_thread="false" up_thread="false" min_interval="20000" /> + <FD_SOCK down_thread="false" up_thread="false" /> + <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true" /> + <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false" /> + <pbcast.NAKACK max_xmit_size="60000" use_mcast_xmit="false" gc_lag="0" + retransmit_timeout="300,600,1200,2400,4800" down_thread="false" up_thread="false" + discard_delivered_msgs="true" /> + <UNICAST timeout="300,600,1200,2400,3600" down_thread="false" up_thread="false" /> + <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" + down_thread="false" up_thread="false" max_bytes="400000" /> + <pbcast.GMS print_local_addr="true" join_timeout="3000" down_thread="false" + up_thread="false" join_retry_timeout="2000" shun="true" view_bundling="true" /> + <FRAG2 frag_size="60000" down_thread="false" up_thread="false" /> + <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" + use_flush="false" /> + </config> + </attribute> + + <!-- Whether or not to fetch state on joining a cluster --> + <attribute name="FetchInMemoryState">false</attribute> + + <!-- Time to wait until all responses for a synchronous call have been received --> + <attribute name="SyncReplTimeout">20000</attribute> + + <!-- Max number of milliseconds to wait for a lock acquisition --> + <attribute name="LockAcquisitionTimeout">15000</attribute> + + <!-- + Indicate whether to use marshalling. Set this to true if you are running under a scoped + class loader, for instance, inside an application server. Default is "false". + --> + <attribute name="UseRegionBasedMarshalling">true</attribute> + <!-- Must match the value of "useRegionBasedMarshalling" --> + <attribute name="InactiveOnStartup">true</attribute> + + <!-- Specific eviction policy configurations. This is LRU --> + <attribute name="EvictionPolicyConfig"> + <config> + <attribute name="wakeUpIntervalSeconds">5</attribute> + <!-- Name of the DEFAULT eviction policy class. --> + <attribute name="policyClass">org.jboss.cache.eviction.LRUPolicy</attribute> + <!-- Cache wide default --> + <region name="/_default_"> + <attribute name="maxNodes">5000</attribute> + <attribute name="timeToLiveSeconds">1000</attribute> + </region> + <!-- Do not ever evict modification timestamps --> + <region name="/TS"> + <attribute name="maxNodes">0</attribute> + <attribute name="timeToLiveSeconds">0</attribute> + </region> + </config> + </attribute> + </mbean> +</server> \ No newline at end of file Deleted: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/cache/jbpm-jbc1-service.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/cache/jbpm-jbc1-service.xml 2010-08-18 09:40:27 UTC (rev 6607) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/cache/jbpm-jbc1-service.xml 2010-08-18 10:04:59 UTC (rev 6608) @@ -1,117 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - JBoss Cache 1.4 service, for use as Hibernate 3.2 cache provider. - http://community.jboss.org/wiki/NewJBossCache14xBasedHibernate32CacheProv... ---> -<server> - <mbean code="org.jboss.cache.TreeCache" name="jboss.jbpm:service=TreeCache"> - <depends>jboss:service=Naming</depends> - <depends>jboss:service=TransactionManager</depends> - - <!-- Configure the TransactionManager --> - <attribute name="TransactionManagerLookupClass"> - org.jboss.cache.JBossTransactionManagerLookup - </attribute> - - <!-- - Node locking scheme: - OPTIMISTIC - PESSIMISTIC (default) - --> - <attribute name="NodeLockingScheme">OPTIMISTIC</attribute> - - <!-- - Note that this attribute is IGNORED if your NodeLockingScheme above is OPTIMISTIC. - - Isolation level: - SERIALIZABLE - REPEATABLE_READ (default) - READ_COMMITTED - READ_UNCOMMITTED - NONE - - Once a tx reads an item from the 2nd Level Cache, Hibernate caches it in the Session - object and does not go back to the 2LC for that same object. So READ_COMMITTED - should be enough. There is no benefit using REPEATABLE_READ. - --> - <attribute name="IsolationLevel">READ_COMMITTED</attribute> - - <!-- - Cache mode: - LOCAL - REPL_ASYNC - REPL_SYNC - INVALIDATION_ASYNC - INVALIDATION_SYNC - - INVALIDATION_ASYNC is recommended for use with clustered second-level caches. - --> - <attribute name="CacheMode">LOCAL</attribute> - - <!-- Name of cluster. Needs to be the same for all clusters, in order to find each other --> - <attribute name="ClusterName">TreeCache-${jboss.partition.name:Cluster}</attribute> - - <attribute name="ClusterConfig"> - <config> - <UDP mcast_addr="230.1.2.3" mcast_port="43333" tos="8" ucast_recv_buf_size="20000000" - ucast_send_buf_size="640000" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000" - loopback="false" discard_incompatible_packets="true" enable_bundling="true" - max_bundle_size="64000" max_bundle_timeout="30" use_incoming_packet_handler="true" - use_outgoing_packet_handler="false" ip_ttl="2" down_thread="false" up_thread="false" /> - <PING timeout="2000" down_thread="false" up_thread="false" num_initial_members="3" /> - <MERGE2 max_interval="100000" down_thread="false" up_thread="false" min_interval="20000" /> - <FD_SOCK down_thread="false" up_thread="false" /> - <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true" /> - <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false" /> - <pbcast.NAKACK max_xmit_size="60000" use_mcast_xmit="false" gc_lag="0" - retransmit_timeout="300,600,1200,2400,4800" down_thread="false" up_thread="false" - discard_delivered_msgs="true" /> - <UNICAST timeout="300,600,1200,2400,3600" down_thread="false" up_thread="false" /> - <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" - down_thread="false" up_thread="false" max_bytes="400000" /> - <pbcast.GMS print_local_addr="true" join_timeout="3000" down_thread="false" - up_thread="false" join_retry_timeout="2000" shun="true" view_bundling="true" /> - <FRAG2 frag_size="60000" down_thread="false" up_thread="false" /> - <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" - use_flush="false" /> - </config> - </attribute> - - <!-- Whether or not to fetch state on joining a cluster --> - <attribute name="FetchInMemoryState">false</attribute> - - <!-- Time to wait until all responses for a synchronous call have been received --> - <attribute name="SyncReplTimeout">20000</attribute> - - <!-- Max number of milliseconds to wait for a lock acquisition --> - <attribute name="LockAcquisitionTimeout">15000</attribute> - - <!-- - Indicate whether to use marshalling. Set this to true if you are running under a scoped - class loader, for instance, inside an application server. Default is "false". - --> - <attribute name="UseRegionBasedMarshalling">true</attribute> - <!-- Must match the value of "useRegionBasedMarshalling" --> - <attribute name="InactiveOnStartup">true</attribute> - - <!-- Specific eviction policy configurations. This is LRU --> - <attribute name="EvictionPolicyConfig"> - <config> - <attribute name="wakeUpIntervalSeconds">5</attribute> - <!-- Name of the DEFAULT eviction policy class. --> - <attribute name="policyClass">org.jboss.cache.eviction.LRUPolicy</attribute> - <!-- Cache wide default --> - <region name="/_default_"> - <attribute name="maxNodes">5000</attribute> - <attribute name="timeToLiveSeconds">1000</attribute> - </region> - <!-- Do not ever evict modification timestamps --> - <region name="/TS"> - <attribute name="maxNodes">0</attribute> - <attribute name="timeToLiveSeconds">0</attribute> - </region> - </config> - </attribute> - </mbean> -</server> \ No newline at end of file Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/auto-install-template.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/auto-install-template.xml 2010-08-18 09:40:27 UTC (rev 6607) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/auto-install-template.xml 2010-08-18 10:04:59 UTC (rev 6608) @@ -6,14 +6,16 @@ <installpath&gt;@jbpm.home(a)&lt;/installpath&gt; </com.izforge.izpack.panels.TargetPanel> <com.izforge.izpack.panels.TreePacksPanel> - <pack name="jBPM Engine" index="0" selected="true"/> - <pack name="Documentation" index="1" selected="true"/> - <pack name="Eclipse Designer" index="2" selected="true"/> - <pack name="JBoss AS Integration" index="3" selected="true"/> - <pack name="JSF Console" index="4" selected="true"/> - <pack name="Optional Downloads" index="5" selected="false"/> - <pack name="JBoss AS" index="6" selected="false"/> - <pack name="Eclipse" index="7" selected="false"/> + <pack name="jBPM Standalone" index="0" selected="true" /> + <pack name="Process Engine" index="1" selected="true" /> + <pack name="Documentation" index="2" selected="true" /> + <pack name="Eclipse Designer" index="3" selected="true" /> + <pack name="JBoss AS Integration" index="4" selected="true" /> + <pack name="jBPM Service" index="5" selected="true" /> + <pack name="JSF Console" index="6" selected="true" /> + <pack name="Optional Downloads" index="7" selected="false" /> + <pack name="JBoss AS" index="8" selected="false" /> + <pack name="Eclipse" index="9" selected="false" /> </com.izforge.izpack.panels.TreePacksPanel> <com.izforge.izpack.panels.UserInputPanel> <userInput> @@ -23,7 +25,7 @@ </com.izforge.izpack.panels.UserInputPanel> <com.izforge.izpack.panels.UserInputPanel> <userInput> - <entry key="dbSelection" value="@database@"/> + <entry key="dbSelection" value="@database@" /> </userInput> </com.izforge.izpack.panels.UserInputPanel> <com.izforge.izpack.panels.UserInputPanel> Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml 2010-08-18 09:40:27 UTC (rev 6607) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml 2010-08-18 10:04:59 UTC (rev 6608) @@ -122,9 +122,13 @@ * jBPM Standalone * ******************************** --> - <pack name="jBPM Engine" required="yes"> - <description>Standalone process engine and configuration files</description> + <pack name="jBPM Standalone" required="no"> + <description>Standalone business process engine</description> + </pack> + <pack name="Process Engine" parent="jBPM Standalone" required="yes"> + <description>Core libraries and configuration files</description> + <!-- jbpm3/ --> <file src=&quot;(a){basedir}/src/main/etc/release.notes.html&quot; targetdir="$INSTALL_PATH" /> <file src=&quot;(a){basedir}/src/main/etc/JBossORG-EULA.txt&quot; targetdir="$INSTALL_PATH" /> @@ -132,13 +136,21 @@ <!-- jbpm3/config --> <fileset dir="@{assemblyDirectory}/config" targetdir="$INSTALL_PATH/config" /> + <!-- jbpm3/lib --> + <fileset dir="@{assemblyDirectory}/lib" targetdir="$INSTALL_PATH/lib"> + <include name="jbpm-jpdl.jar" /> + <include name="jbpm-identity.jar" /> + <include name="jsf-console.war" /> + <include name="gpd-deployer.war" /> + </fileset> + <!-- jbpm3/database --> <file src=&quot;(a){assemblyDirectory}/lib/jbpm-db.jar&quot; targetdir="$INSTALL_PATH/database" unpack="true" /> </pack> - <pack name="Documentation" required="no"> - <description>User guide and examples</description> + <pack name="Documentation" parent="jBPM Standalone" required="no"> + <description>User guide and example processes</description> <!-- jbpm3/docs --> <file src=&quot;(a){assemblyDirectory}/lib/jbpm-userguide.jdocbook&quot; @@ -151,8 +163,8 @@ targetdir="$INSTALL_PATH/examples" /> </pack> - <pack name="Eclipse Designer" required="no"> - <description>Process designer archive, plus third-party libraries and source code + <pack name="Eclipse Designer" parent="jBPM Standalone" required="no"> + <description>Process designer site archive, plus third-party libraries and source code useful to develop and test jBPM applications</description> <!-- jbpm3/designer --> @@ -173,12 +185,7 @@ <include name="dom4j.jar" /> <include name="hibernate.jar" /> <include name="hsqldb.jar" /> - <include name="jbpm-enterprise-bundle.ear" /> - <include name="jbpm-jpdl.jar" /> - <include name="jbpm-identity.jar" /> <include name="junit.jar" /> - <include name="jsf-console.war" /> - <include name="gpd-deployer.war" /> <include name="log4j.jar" /> </fileset> @@ -196,9 +203,13 @@ * JBoss Integration * ******************************** --> - <pack name="JBoss AS Integration" required="no"> - <description>Application server integration modules</description> + <pack name="JBoss AS Integration" required="no" preselected="no"> + <description>Application server integration</description> + </pack> + <pack name="jBPM Service" parent="JBoss AS Integration" required="no" preselected="no"> + <description>Business process management service</description> + <!-- jbpm/jbpm-service.sar --> <file src=&quot;(a){assemblyDirectory}/lib/jbpm-enterprise-config.jar&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" @@ -222,17 +233,12 @@ targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-enterprise.jar" unpack="true" /> - <!-- jbpm/jbpm-userguide.war --> - <file src=&quot;(a){assemblyDirectory}/lib/jbpm-userguide.jdocbook&quot; - targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-userguide.war" - unpack="true" /> - <!-- jbpm-mq-service.xml --> <file src=&quot;(a){resourcesDirectory}/destination/jbpm-mq-service.xml&quot; - targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy-hasingleton/jbpm" + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isJBoss405" /> <file src=&quot;(a){resourcesDirectory}/destination/jbpm-mq-service.xml&quot; - targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy-hasingleton/jbpm" + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isJBoss423" /> <!-- jbpm-jbm-service.xml --> @@ -243,11 +249,11 @@ targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isJBoss510" /> - <!-- jbpm-jbc1-service.xml --> - <file src=&quot;(a){resourcesDirectory}/cache/jbpm-jbc1-service.xml&quot; + <!-- jbpm-jbc-service.xml --> + <file src=&quot;(a){resourcesDirectory}/cache/jbpm-jbc-service.xml&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isJBoss405" /> - <file src=&quot;(a){resourcesDirectory}/cache/jbpm-jbc1-service.xml&quot; + <file src=&quot;(a){resourcesDirectory}/cache/jbpm-jbc-service.xml&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isJBoss423" /> @@ -340,7 +346,7 @@ * JSF Console * ******************************** --> - <pack name="JSF Console" parent="JBoss AS Integration" required="no"> + <pack name="JSF Console" parent="JBoss AS Integration" required="no" preselected="no"> <description>Web console based on the Java Server Faces technology</description> <!-- jbpm/jsf-console.war --> @@ -354,11 +360,11 @@ <!-- ******************************** - * Optional Components * + * Optional Downloads * ******************************** --> <pack name="Optional Downloads" required="no" preselected="no"> - <description>Optional components</description> + <description>Download software with which jBPM integrates</description> </pack> <!-- JBoss AS --> Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-lang_eng.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-lang_eng.xml 2010-08-18 09:40:27 UTC (rev 6607) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-lang_eng.xml 2010-08-18 10:04:59 UTC (rev 6608) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <langpack> - <str id="jboss.selection" txt="Choose your target JBoss version" /> - <str id="jboss.home" txt="JBoss home directory" /> - <str id="jboss.configuration" txt="Configuration" /> - <str id="database.selection" txt="Choose your target database" /> + <str id="jboss.selection" txt="JBoss AS version" /> + <str id="jboss.configuration" txt="Server configuration" /> + <str id="jboss.home" txt="JBoss AS home" /> + <str id="database.selection" txt="Database" /> </langpack> \ No newline at end of file Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-lang_spa.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-lang_spa.xml 2010-08-18 09:40:27 UTC (rev 6607) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-lang_spa.xml 2010-08-18 10:04:59 UTC (rev 6608) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <langpack> - <str id="jboss.selection" txt="Seleccione su versión de JBoss" /> - <str id="jboss.home" txt="Ruta de JBoss" /> - <str id="jboss.configuration" txt="Configuración" /> - <str id="database.selection" txt="Seleccione su base de datos" /> + <str id="jboss.selection" txt="Versión de JBoss AS" /> + <str id="jboss.configuration" txt="Configuración del servidor" /> + <str id="jboss.home" txt="Ruta de JBoss AS" /> + <str id="database.selection" txt="Base de datos" /> </langpack> \ No newline at end of file Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/etc/jbpm.cfg.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/etc/jbpm.cfg.xml 2010-08-18 09:40:27 UTC (rev 6607) +++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/etc/jbpm.cfg.xml 2010-08-18 10:04:59 UTC (rev 6608) @@ -12,8 +12,9 @@ <!-- employ the context class loader --> <string name="jbpm.class.loader" value="context" /> - <!-- access high-availability jndi --> + <!-- High-availability JNDI properties (begin) === <string name="resource.jndi.properties" value="jbpm.jndi.properties" /> + ==== High-availability JNDI properties (end) --> <!-- The default job executor needs to be overwritten with a null value. Modified: jbpm3/branches/jbpm-3.2-soa/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/pom.xml 2010-08-18 09:40:27 UTC (rev 6607) +++ jbpm3/branches/jbpm-3.2-soa/pom.xml 2010-08-18 10:04:59 UTC (rev 6608) @@ -41,40 +41,6 @@ <!-- Properties --> <properties> - <ant.version>1.7.0</ant.version> - <birt.version>2.2.2</birt.version> - <bsh.version>1.3.0</bsh.version> - <cactus.version>1.8.0</cactus.version> - <commons.beanutils.version>1.7.0</commons.beanutils.version> - <commons.fileupload.version>1.2.1</commons.fileupload.version> - <commons.io.version>1.4</commons.io.version> - <commons.logging.version>1.1.1</commons.logging.version> - <desmoj.version>2.1.1</desmoj.version> - <dom4j.version>1.6.1</dom4j.version> - <drools.version>4.0.7</drools.version> - <hibernate.version>3.2.4.sp1</hibernate.version> - <jackrabbit.version>1.4.5</jackrabbit.version> - <jasper.reports.version>3.5.3</jasper.reports.version> - <javax.el.version>1.2</javax.el.version> - <javax.jcr.version>1.0</javax.jcr.version> - <javax.mail.version>1.4</javax.mail.version> - <javax.servlet.version>2.4</javax.servlet.version> - <jaxen.version>1.1.1</jaxen.version> - <jboss.client.version>4.0.5.GA</jboss.client.version> - <jboss.gravel.version>1.0.0.GA</jboss.gravel.version> - <jboss.j2ee.version>4.0.2</jboss.j2ee.version> - <jbpm.designer.version>3.1.7</jbpm.designer.version> - <jbpm.jsf-console.version>3.2.10-SNAPSHOT</jbpm.jsf-console.version> - <jsf.facelets.version>1.1.15</jsf.facelets.version> - <jta.version>1.1</jta.version> - <junit.version>3.8.1</junit.version> - <log4j.version>1.2.14</log4j.version> - <mvel.version>1.3.1-java1.4</mvel.version> - <retrotranslator.version>1.2.7</retrotranslator.version> - <richfaces.ui.version>3.2.1.GA</richfaces.ui.version> - <wiser.version>1.2</wiser.version> - <xerces.version>2.6.2</xerces.version> - <!-- Database Driver Versions --> <db2jcc.version>3.1.57</db2jcc.version> <hsqldb.version>1.8.0.7</hsqldb.version> @@ -93,26 +59,26 @@ <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jsf-console</artifactId> - <version>${jbpm.jsf-console.version}</version> + <version>${project.version}</version> <type>war</type> </dependency> <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jsf-console</artifactId> - <version>${jbpm.jsf-console.version}</version> + <version>${project.version}</version> <classifier>soa</classifier> <type>war</type> </dependency> <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>gpd-deployer</artifactId> - <version>${jbpm.jsf-console.version}</version> + <version>${project.version}</version> <type>war</type> </dependency> <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-jpdl-designer-site</artifactId> - <version>${jbpm.designer.version}</version> + <version>3.1.7</version> <type>zip</type> </dependency> @@ -120,57 +86,57 @@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>${ant.version}</version> + <version>1.7.0</version> </dependency> <dependency> <groupId>bsh</groupId> <artifactId>bsh</artifactId> - <version>${bsh.version}</version> + <version>1.3.0</version> </dependency> <dependency> <groupId>org.apache.cactus</groupId> <artifactId>cactus.core.framework.wrapper.javaEE.14</artifactId> - <version>${cactus.version}</version> + <version>1.8.0</version> </dependency> <dependency> <groupId>org.apache.cactus</groupId> <artifactId>cactus.integration.shared.api</artifactId> - <version>${cactus.version}</version> + <version>1.8.0</version> </dependency> <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - <version>${commons.beanutils.version}</version> + <version>1.7.0</version> </dependency> <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> - <version>${commons.fileupload.version}</version> + <version>1.2.1</version> </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>${commons.io.version}</version> + <version>1.4</version> </dependency> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>${commons.logging.version}</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>desmoj</groupId> <artifactId>desmoj</artifactId> - <version>${desmoj.version}</version> + <version>2.1.1</version> </dependency> <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> - <version>${dom4j.version}</version> + <version>1.6.1</version> </dependency> <dependency> <groupId>org.drools</groupId> <artifactId>drools-compiler</artifactId> - <version>${drools.version}</version> + <version>4.0.7</version> <exclusions> <exclusion> <artifactId>xercesImpl</artifactId> @@ -185,22 +151,22 @@ <dependency> <groupId>org.drools</groupId> <artifactId>drools-core</artifactId> - <version>${drools.version}</version> + <version>4.0.7</version> </dependency> <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> - <version>${javax.el.version}</version> + <version>1.2</version> </dependency> <dependency> <groupId>org.jboss.gravel</groupId> <artifactId>gravel</artifactId> - <version>${jboss.gravel.version}</version> + <version>1.0.0.GA</version> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate</artifactId> - <version>${hibernate.version}</version> + <version>3.2.4.sp1</version> <exclusions> <exclusion> <groupId>javax.transaction</groupId> @@ -214,85 +180,90 @@ <version>1.0.2-SNAPSHOT</version> </dependency> <dependency> + <groupId>org.codehaus.izpack</groupId> + <artifactId>izpack-standalone-compiler</artifactId> + <version>4.3.2</version> + </dependency> + <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-core</artifactId> - <version>${jackrabbit.version}</version> + <version>1.4.5</version> </dependency> <dependency> <groupId>jasperreports</groupId> <artifactId>jasperreports</artifactId> - <version>${jasper.reports.version}</version> + <version>3.5.3</version> </dependency> <dependency> <groupId>jaxen</groupId> <artifactId>jaxen</artifactId> - <version>${jaxen.version}</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>org.jboss.client</groupId> <artifactId>jbossall-client</artifactId> - <version>${jboss.client.version}</version> + <version>4.0.5.GA</version> </dependency> <dependency> <groupId>jboss</groupId> <artifactId>jboss-j2ee</artifactId> - <version>${jboss.j2ee.version}</version> + <version>4.0.2</version> </dependency> <dependency> <groupId>javax.jcr</groupId> <artifactId>jcr</artifactId> - <version>${javax.jcr.version}</version> + <version>1.0</version> </dependency> <dependency> <groupId>javax.transaction</groupId> <artifactId>jta</artifactId> - <version>${jta.version}</version> + <version>1.1</version> </dependency> <dependency> <groupId>com.sun.facelets</groupId> <artifactId>jsf-facelets</artifactId> - <version>${jsf.facelets.version}</version> + <version>1.1.15</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>${junit.version}</version> + <version>3.8.1</version> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j.version}</version> + <version>1.2.14</version> </dependency> <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> - <version>${javax.mail.version}</version> + <version>1.4</version> </dependency> <dependency> <groupId>net.sf.retrotranslator</groupId> <artifactId>retrotranslator-runtime</artifactId> - <version>${retrotranslator.version}</version> + <version>1.2.7</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>${richfaces.ui.version}</version> + <version>3.2.1.GA</version> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>${javax.servlet.version}</version> + <version>2.4</version> </dependency> <dependency> <groupId>org.subethamail</groupId> <artifactId>subethasmtp-smtp</artifactId> - <version>${wiser.version}</version> + <version>1.2</version> <classifier>java14</classifier> </dependency> <dependency> <groupId>org.subethamail</groupId> <artifactId>subethasmtp-wiser</artifactId> - <version>${wiser.version}</version> + <version>1.2</version> <classifier>java14</classifier> <exclusions> <exclusion> @@ -348,6 +319,7 @@ <artifactId>jconnect</artifactId> <version>${jconnect.version}</version> </dependency> + </dependencies> </dependencyManagement>