JBoss JBPM SVN: r6540 - in jbpm3/branches/jbpm-3.2-soa: modules/core/src/main/resources and 5 other directories.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2010-07-30 23:23:32 -0400 (Fri, 30 Jul 2010)
New Revision: 6540
Added:
jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/cache/
jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/cache/jbpm-jbc1-service.xml
Modified:
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.common.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/install-definition.xml
jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/service/jboss-service.xml
Log:
JBPM-2916 employ jbc 1.4 cache provider in jbas 4 and jbc 2 cache region factory in jbas 5
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh 2010-07-29 06:21:07 UTC (rev 6539)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh 2010-07-31 03:23:32 UTC (rev 6540)
@@ -6,7 +6,6 @@
# Exported shell variables required:
# WORKSPACE work directory
# JAVA_HOME location of java development kit
-# JAVA_14_HOME
# JAVA_15_HOME required if testing against java 1.4 only
# DATABASE db2, hsqldb, mssql, mysql, oracle, postgresql
# CONTAINER jboss405, jboss423, jboss501, jboss510
@@ -49,34 +48,26 @@
JAVA_VERSION=`$JAVA -version 2>&1 | grep version | awk '{ print substr($3, 2, 3); }'`
if [ $JAVA_VERSION = 1.4 ]; then
- JAVA_BT_HOME=$JAVA_15_HOME
- JAVA_RT_HOME=$JAVA_HOME
- JAVA=$JAVA_BT_HOME/bin/java
+ ORIG_JAVA_HOME=$JAVA_HOME
+ JAVA=$JAVA_15_HOME/bin/java
+ export JAVA_HOME=$JAVA_15_HOME
else
- JAVA_BT_HOME=$JAVA_HOME
- JAVA_RT_HOME=$JAVA_HOME
+ ORIG_JAVA_HOME=$JAVA_HOME
fi
#
# Set up Maven
#
-export MAVEN_OPTS=-Ddatabase=$DATABASE
+export MAVEN_OPTS="-Ddatabase=$DATABASE -Xms16m -Xmx256m"
cp -u hudson/profiles.redhat.qa.xml profiles.xml
-#
-# Give builds a max memory amount of at least 256 MB
-#
-TOTAL_MEM=`free -mo | grep Mem | awk '{ print $2 }'`
-if [ `expr $TOTAL_MEM / 4` -lt 256 ]; then
- export MAVEN_OPTS="$MAVEN_OPTS -Xms64m -Xmx256m"
-fi
+# Determine jBPM version
+mvn -Dexpression=project.version help:evaluate > $WORKSPACE/project-version.txt
+JBPM_VERSION=`grep '^3\.' $WORKSPACE/project-version.txt`
#
# Build distro
#
-export JAVA_HOME=$JAVA_BT_HOME
-mvn -Dexpression=project.version help:evaluate > $WORKSPACE/project-version.txt
-JBPM_VERSION=`grep '^3\.' $WORKSPACE/project-version.txt`
mvn -Pdistro,soa -Djbpm.home=$WORKSPACE/jbpm-$JBPM_VERSION -Dcontainer=$CONTAINER \
-Djboss.home=$JBOSS_HOME -Djboss.server=$JBOSS_SERVER clean install
if [ $? -ne 0 ]; then
@@ -148,7 +139,6 @@
#
# Start JBoss AS
#
-export JAVA_HOME=$JAVA_RT_HOME
$JBOSS_HOME/bin/run.sh -b $JBOSS_BINDADDR -c $JBOSS_SERVER &> /dev/null &
# Was it successfully started?
@@ -160,16 +150,11 @@
fi
#
-# Give tests a max memory amount of at least 256 MB
-#
-if [ $JAVA_VERSION = 1.4 -o `expr $TOTAL_MEM / 4` -lt 256 ]; then
- export MAVEN_OPTS="$MAVEN_OPTS -Dsurefire.jvm.args=-Xmx256m"
-fi
-
-#
# Execute tests
#
-mvn --fail-at-end -Djboss.bind.address=$JBOSS_BINDADDR test | tee $WORKSPACE/tests.log
+export JAVA_HOME=$ORIG_JAVA_HOME
+mvn --fail-at-end -Djboss.bind.address=$JBOSS_BINDADDR -Dsurefire.jvm.args="-Xms64m -Xmx256m" \
+ test | tee $WORKSPACE/tests.log
grep -E 'FIXME\|FAILED' $WORKSPACE/tests.log | sort -u | tee $WORKSPACE/fixme.txt
grep -E '\[\S*]' $WORKSPACE/fixme.txt > $WORKSPACE/errata-$CONTAINER.txt
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.common.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.common.xml 2010-07-29 06:21:07 UTC (rev 6539)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.common.xml 2010-07-31 03:23:32 UTC (rev 6540)
@@ -14,26 +14,46 @@
<property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
==== CMT transaction properties (end) -->
+ <!-- SQL rendering properties (begin) ===
+ <property name="hibernate.format_sql">true</property>
+ <property name="hibernate.use_sql_comments">true</property>
+ ==== SQL rendering properties (end) -->
+
<!-- ################################### -->
- <!-- # common settings # -->
+ <!-- # cache settings # -->
<!-- ################################### -->
<property name="hibernate.cache.use_second_level_cache">true</property>
<!-- Memory cache (begin) -->
- <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
+ <property name="hibernate.cache.provider_class">
+ org.hibernate.cache.HashtableCacheProvider
+ </property>
<!-- Memory cache (end) -->
+ <!--
+ The cache provider is for use with Hibernate 3.2 and JBoss Cache 1.4,
+ both included in JBoss AS 4. In this environment, the cache region factory
+ property is not known and simply ignored.
+ http://community.jboss.org/wiki/NewJBossCache14xBasedHibernate32CacheProv...
+
+ The cache region factory is for use with Hibernate 3.3 and JBoss Cache 2,
+ both components of JBoss AS 5. In this environment, the cache region factory
+ takes precedence over the cache provider.
+ http://community.jboss.org/wiki/ReferenceManualJBossCache2asaHibernate33S...
+ -->
+
<!-- Clustered cache (begin) ===
- <property name="hibernate.cache.provider_class">org.jboss.hibernate.jbc.cacheprovider.JmxBoundTreeCacheProvider</property>
- <property name="hibernate.treecache.mbean.object_name">org.jboss.jbpm:service=TreeCache,type=Hibernate</property>
+ <property name="hibernate.cache.provider_class">
+ org.jboss.hibernate.jbc.cacheprovider.JmxBoundTreeCacheProvider
+ </property>
+ <property name="hibernate.treecache.mbean.object_name">jboss.jbpm:service=TreeCache</property>
+
+ <property name="hibernate.cache.region.factory_class">
+ org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory
+ </property>
==== Clustered cache (end) -->
- <!-- SQL rendering properties (begin) ===
- <property name="hibernate.format_sql">true</property>
- <property name="hibernate.use_sql_comments">true</property>
- ==== SQL rendering properties (end) -->
-
<!-- ############################################ -->
<!-- # mapping files with external dependencies # -->
<!-- ############################################ -->
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-07-29 06:21:07 UTC (rev 6539)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml 2010-07-31 03:23:32 UTC (rev 6540)
@@ -66,7 +66,17 @@
</copy>
</target>
- <target name="configure">
+ <target name="reorganize-examples">
+ <subant genericantfile="${ant.file}" target="reorganize-example" inheritall="yes">
+ <dirset dir="${project.build.assembly.resources}/jbpm-examples-dev/src/test/resources"
+ includes="*" />
+ </subant>
+ <copy todir="${project.build.assembly.resources}/jbpm-examples-dist">
+ <fileset dir="${resources.dir}/examples" excludes="module/**" />
+ </copy>
+ </target>
+
+ <target name="configure-hibernate">
<property name="db2.cfg.xml"
value="${project.build.assembly.resources}/jbpm-jpdl-config/hibernate.cfg.db2.xml" />
<macro-disable file="${db2.cfg.xml}" section="JDBC connection properties" />
@@ -139,21 +149,13 @@
<replace file="${sybase.cfg.xml}"
token="usage="nonstrict-read-write""
value="usage="transactional"" />
-
- <subant genericantfile="${ant.file}" target="reorganize-example" inheritall="yes">
- <dirset dir="${project.build.assembly.resources}/jbpm-examples-dev/src/test/resources"
- includes="*" />
- </subant>
- <copy todir="${project.build.assembly.resources}/jbpm-examples-dist">
- <fileset dir="${resources.dir}/examples" excludes="module/**" />
- </copy>
</target>
<!-- ================================================================== -->
<!-- Distribution -->
<!-- ================================================================== -->
<target name="process-resources"
- depends="configure"
+ depends="configure-hibernate, reorganize-examples"
description="prepares installer resources">
<copy todir="${resources.output.dir}" overwrite="true">
<fileset dir="${resources.dir}/installer" />
Added: 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 (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/cache/jbpm-jbc1-service.xml 2010-07-31 03:23:32 UTC (rev 6540)
@@ -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-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
Property changes on: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/cache/jbpm-jbc1-service.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
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-07-29 06:21:07 UTC (rev 6539)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml 2010-07-31 03:23:32 UTC (rev 6540)
@@ -173,7 +173,7 @@
<include name="log4j.jar" />
</fileset>
- <!-- jbpm3/src - Must be called 'src' because the GPD has a dependency on it -->
+ <!-- jbpm3/src - Must be called 'src' because the GPD depends on it -->
<fileset dir="@{project.build.assemblyDirectory}/src" targetdir="$INSTALL_PATH/src">
<include name="jsf-console-sources.jar" />
<include name="jbpm-jpdl-sources.jar" />
@@ -200,10 +200,15 @@
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar">
<include name="jbpm-jpdl.jar" />
<include name="jbpm-identity.jar" />
- <include name="hibernate-jbc-cacheprovider.jar" />
</fileset>
<file src="@{resources.directory}/service/jboss-service.xml"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/META-INF" />
+ <file condition="isJBoss405"
+ src="@{project.build.assemblyDirectory}/lib/hibernate-jbc-cacheprovider.jar"
+ targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" />
+ <file condition="isJBoss423"
+ src="@{project.build.assemblyDirectory}/lib/hibernate-jbc-cacheprovider.jar"
+ targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" />
<!-- jbpm/jbpm-enterprise.jar -->
<file src="@{project.build.assemblyDirectory}/lib/jbpm-enterprise.jar"
@@ -215,18 +220,30 @@
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-userguide.war"
unpack="true" />
- <!-- jbpm-mq-service -->
- <file src="@{resources.directory}/destination/jbpm-mq-service.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm"
+ <!-- jbpm-mq-service.xml -->
+ <file src="@{resources.directory}/destination/jbpm-mq-service.xml"
+ targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm"
condition="isJBoss405" />
- <file src="@{resources.directory}/destination/jbpm-mq-service.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm"
+ <file src="@{resources.directory}/destination/jbpm-mq-service.xml"
+ targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm"
condition="isJBoss423" />
- <!-- jbpm-jbm-service -->
- <file src="@{resources.directory}/destination/jbpm-jbm-service.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm"
+ <!-- jbpm-jbm-service.xml -->
+ <file src="@{resources.directory}/destination/jbpm-jbm-service.xml"
+ targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm"
condition="isJBoss501" />
- <file src="@{resources.directory}/destination/jbpm-jbm-service.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm"
+ <file src="@{resources.directory}/destination/jbpm-jbm-service.xml"
+ targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm"
condition="isJBoss510" />
+ <!-- jbpm-jbc1-service.xml -->
+ <file src="@{resources.directory}/cache/jbpm-jbc1-service.xml"
+ targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm"
+ condition="isJBoss405" />
+ <file src="@{resources.directory}/cache/jbpm-jbc1-service.xml"
+ targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm"
+ condition="isJBoss423" />
+
<!-- Database configs to docs/examples/jbpm -->
<fileset dir="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config"
targetdir="${jbossInstallPath}/docs/examples/jbpm">
Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/service/jboss-service.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/service/jboss-service.xml 2010-07-29 06:21:07 UTC (rev 6539)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/service/jboss-service.xml 2010-07-31 03:23:32 UTC (rev 6540)
@@ -1,19 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Dynamic login service that specifies a JAAS login configuration as part of a deployment.
+ http://community.jboss.org/wiki/DynamicLoginConfig
+-->
<server>
- <!-- JAAS login configuration that dynamically updates the application server policy -->
- <mbean code="org.jboss.security.auth.login.DynamicLoginConfig" name="org.jboss.jbpm:service=LoginConfig">
+ <mbean code="org.jboss.security.auth.login.DynamicLoginConfig"
+ name="jboss.jbpm:service=LoginConfig">
+ <!-- Service that supports dynamic processing of login configurations -->
<depends optional-attribute-name="LoginConfigService">
jboss.security:service=XMLLoginConfig
</depends>
+ <!--
+ Security manager to use when this service is stopped
+ to flush the auth caches of the domains registered by this service
+ -->
<depends optional-attribute-name="SecurityManagerService">
jboss.security:service=JaasSecurityManager
</depends>
<attribute name="PolicyConfig" serialDataType="jbxb">
- <jaas:policy xsi:schemaLocation="urn:jboss:security-config:4.1 resource:security-config_4_1.xsd"
- xmlns:jaas="urn:jboss:security-config:4.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <jaas:policy xmlns:jaas="urn:jboss:security-config:4.1"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:security-config:4.1 resource:security-config_4_1.xsd">
<jaas:application-policy name="jbpm-console">
<jaas:authentication>
<jaas:login-module code="org.jboss.security.auth.spi.DatabaseServerLoginModule"
@@ -27,7 +37,7 @@
</jaas:module-option>
<jaas:module-option name="rolesQuery">
- SELECT g.NAME_ ,'Roles'
+ SELECT g.NAME_ , 'Roles'
FROM JBPM_ID_GROUP g
JOIN JBPM_ID_MEMBERSHIP m ON g.ID_ = m.GROUP_
JOIN JBPM_ID_USER u ON m.USER_ = u.ID_
@@ -39,115 +49,4 @@
</jaas:policy>
</attribute>
</mbean>
-
- <!-- JBoss Cache service configuration for use with Hibernate -->
- <mbean code="org.jboss.cache.TreeCache" name="org.jboss.jbpm:service=TreeCache,type=Hibernate">
- <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-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>
13 years, 10 months
JBoss JBPM SVN: r6539 - jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2010-07-29 02:21:07 -0400 (Thu, 29 Jul 2010)
New Revision: 6539
Modified:
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh
Log:
JBPM-2916 diagnose jbpm version determination problem
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh 2010-07-29 01:51:57 UTC (rev 6538)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh 2010-07-29 06:21:07 UTC (rev 6539)
@@ -75,7 +75,8 @@
# Build distro
#
export JAVA_HOME=$JAVA_BT_HOME
-JBPM_VERSION=`mvn -Dexpression=project.version help:evaluate | grep '^3\.'`
+mvn -Dexpression=project.version help:evaluate > $WORKSPACE/project-version.txt
+JBPM_VERSION=`grep '^3\.' $WORKSPACE/project-version.txt`
mvn -Pdistro,soa -Djbpm.home=$WORKSPACE/jbpm-$JBPM_VERSION -Dcontainer=$CONTAINER \
-Djboss.home=$JBOSS_HOME -Djboss.server=$JBOSS_SERVER clean install
if [ $? -ne 0 ]; then
@@ -92,11 +93,11 @@
#
# Install proprietary JDBC drivers
#
-mvn -N -DoutputFile=$WORKSPACE/resolve.tmp dependency:resolve
+mvn -N -DoutputFile=$WORKSPACE/dependencies.txt dependency:resolve
# Install DB2 driver
if [ "$DATABASE" = "db2" ]; then
- DB2JCC_VERSION=`grep com.ibm:db2jcc:jar $WORKSPACE/resolve.tmp | awk -F : '{ print $4 }'`
+ DB2JCC_VERSION=`grep com.ibm:db2jcc:jar $WORKSPACE/dependencies.txt | awk -F : '{ print $4 }'`
DB2JCC_JAR=~/.m2/repository/com/ibm/db2jcc/$DB2JCC_VERSION/db2jcc-$DB2JCC_VERSION.jar
if [ -f $DB2JCC_JAR ]; then
ln -s $DB2JCC_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib
@@ -113,7 +114,7 @@
# Install MSSQL driver
if [ "$DATABASE" = "mssql" ]; then
- MSJDBC_VERSION=`grep com.microsoft.sqlserver:msjdbc $WORKSPACE/resolve.tmp | awk -F : '{ print $4 }'`
+ MSJDBC_VERSION=`grep com.microsoft.sqlserver:msjdbc $WORKSPACE/dependencies.txt | awk -F : '{ print $4 }'`
MSJDBC_JAR=~/.m2/repository/com/microsoft/sqlserver/msjdbc/$MSJDBC_VERSION/msjdbc-$MSJDBC_VERSION.jar
if [ -f $MSJDBC_JAR ]; then
ln -s $MSJDBC_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib
@@ -124,7 +125,7 @@
# Install Oracle driver
if [ "$DATABASE" = "oracle" ]; then
- OJDBC_VERSION=`grep com.oracle:ojdbc14 $WORKSPACE/resolve.tmp | awk -F : '{ print $4 }'`
+ OJDBC_VERSION=`grep com.oracle:ojdbc14 $WORKSPACE/dependencies.txt | awk -F : '{ print $4 }'`
OJDBC_JAR=~/.m2/repository/com/oracle/ojdbc14/$OJDBC_VERSION/ojdbc14-$OJDBC_VERSION.jar
if [ -f $OJDBC_JAR ]; then
ln -s $OJDBC_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib
@@ -135,7 +136,7 @@
# Install Sybase driver
if [ "$DATABASE" = "sybase" ]; then
- JCONNECT_VERSION=`grep com.sybase:jconnect $WORKSPACE/resolve.tmp | awk -F : '{ print $4 }'`
+ JCONNECT_VERSION=`grep com.sybase:jconnect $WORKSPACE/dependencies.txt | awk -F : '{ print $4 }'`
JCONNECT_JAR=~/.m2/repository/com/sybase/jconnect/$JCONNECT_VERSION/jconnect-$JCONNECT_VERSION.jar
if [ -f $JCONNECT_JAR ]; then
ln -s $JCONNECT_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib
@@ -144,9 +145,6 @@
fi
fi
-# Remove resolution output file
-rm $WORKSPACE/resolve.tmp
-
#
# Start JBoss AS
#
13 years, 11 months
JBoss JBPM SVN: r6538 - in jbpm4/trunk/modules: test-db/src/test/java/org/jbpm/test/activity/subprocess and 2 other directories.
by do-not-reply＠jboss.org
Author: rebody
Date: 2010-07-28 21:51:57 -0400 (Wed, 28 Jul 2010)
New Revision: 6538
Added:
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/subprocess/SubProcessEndTest.java
jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/activity/subprocess/
jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/activity/subprocess/mp.jpdl.xml
jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/activity/subprocess/mp.png
jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/activity/subprocess/sp1.jpdl.xml
jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/activity/subprocess/sp1.png
jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/activity/subprocess/sp2.jpdl.xml
jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/activity/subprocess/sp2.png
Modified:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java
Log:
JBPM-2795 move end child execution to the end of the ExecutionImpl.end() as Vic mentioned.
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2010-07-28 22:31:57 UTC (rev 6537)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2010-07-29 01:51:57 UTC (rev 6538)
@@ -351,21 +351,12 @@
}
}
- // end all child executions
- // making a copy of the executions to prevent ConcurrentMoidificationException
- List<ExecutionImpl> executionsToEnd = new ArrayList<ExecutionImpl>(executions);
- for (ExecutionImpl child: executionsToEnd) {
- child.end(state);
- }
-
setState(state);
this.propagation = Propagation.EXPLICIT;
DbSession dbSession = EnvironmentImpl.getFromCurrent(DbSession.class, false);
-
-
if (parent!=null) {
if (dbSession!=null) {
@@ -396,6 +387,13 @@
dbSession.deleteProcessInstance(id, false);
}
}
+
+ // end all child executions
+ // making a copy of the executions to prevent ConcurrentMoidificationException
+ List<ExecutionImpl> executionsToEnd = new ArrayList<ExecutionImpl>(executions);
+ for (ExecutionImpl child: executionsToEnd) {
+ child.end(state);
+ }
}
public void end(OpenExecution executionToEnd) {
Added: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/subprocess/SubProcessEndTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/subprocess/SubProcessEndTest.java (rev 0)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/subprocess/SubProcessEndTest.java 2010-07-29 01:51:57 UTC (rev 6538)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+/**
+ *
+ */
+package org.jbpm.test.activity.subprocess;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.jbpm.api.ProcessInstance;
+import org.jbpm.api.task.Task;
+import org.jbpm.test.JbpmTestCase;
+
+public class SubProcessEndTest extends JbpmTestCase {
+ private String mpId;
+ private String sp1Id;
+ private String sp2Id;
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ this.sp1Id = repositoryService.createDeployment()
+ .addResourceFromClasspath("org/jbpm/test/activity/subprocess/sp1.jpdl.xml").deploy();
+ this.sp2Id = repositoryService.createDeployment()
+ .addResourceFromClasspath("org/jbpm/test/activity/subprocess/sp2.jpdl.xml").deploy();
+ this.mpId = repositoryService.createDeployment()
+ .addResourceFromClasspath("org/jbpm/test/activity/subprocess/mp.jpdl.xml").deploy();
+ }
+
+ protected void tearDown() throws Exception {
+ repositoryService.deleteDeploymentCascade(this.sp1Id);
+ repositoryService.deleteDeploymentCascade(this.sp2Id);
+ repositoryService.deleteDeploymentCascade(this.mpId);
+ super.tearDown();
+ }
+
+ public void testSubProcessJoinEnd() {
+ ProcessInstance processInstance = executionService.startProcessInstanceByKey("mp");
+
+ List<Task> taskList = taskService.findPersonalTasks("v");
+ Map<String, Object> variables = new HashMap<String, Object>();
+ variables.put("result", "reject");
+ taskService.setVariables(taskList.get(0).getId(), variables);
+ taskService.completeTask(taskList.get(0).getId());
+ this.assertTrue(true);
+ }
+}
Added: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/activity/subprocess/mp.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/activity/subprocess/mp.jpdl.xml (rev 0)
+++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/activity/subprocess/mp.jpdl.xml 2010-07-29 01:51:57 UTC (rev 6538)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process name="mp" xmlns="http://jbpm.org/4.3/jpdl">
+ <start g="100,16,48,48" name="start1">
+ <transition g="-43,-17" name="to fork1" to="fork1"/>
+ </start>
+ <fork g="100,96,48,48" name="fork1">
+ <transition g="-75,-17" name="to Subprocess1" to="Subprocess1"/>
+ <transition g="-75,-17" name="to Subprocess2" to="Subprocess2"/>
+ </fork>
+ <sub-process g="16,176,92,52" name="Subprocess1" outcome="#{result}" sub-process-key="sp1">
+ <transition g="-41,-17" name="accept" to="join1"/>
+ <transition g="-40,-17" name="reject" to="main process end"/>
+ </sub-process>
+ <sub-process g="140,176,92,52" name="Subprocess2" outcome="#{result}" sub-process-key="sp2">
+ <transition g="-41,-17" name="accept" to="join1"/>
+ <transition g="12,-18" name="reject" to="main process end"/>
+ </sub-process>
+ <end g="101,340,48,48" name="main process end"/>
+ <join g="101,260,48,48" name="join1">
+ <transition g="-42,-12" name="to main process end" to="main process end"/>
+ </join>
+</process>
\ No newline at end of file
Added: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/activity/subprocess/mp.png
===================================================================
(Binary files differ)
Property changes on: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/activity/subprocess/mp.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/activity/subprocess/sp1.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/activity/subprocess/sp1.jpdl.xml (rev 0)
+++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/activity/subprocess/sp1.jpdl.xml 2010-07-29 01:51:57 UTC (rev 6538)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process name="sp1" xmlns="http://jbpm.org/4.3/jpdl">
+ <start name="start1" g="38,16,48,48">
+ <transition name="to task1" to="sp1 task" g="-41,-17" />
+ </start>
+ <end name="sp1 end" g="38,180,48,48" />
+ <task name="sp1 task" g="16,96,92,52" assignee="v">
+ <transition name="to sp1 end" to="sp1 end" g="-40,-17" />
+ </task>
+</process>
\ No newline at end of file
Added: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/activity/subprocess/sp1.png
===================================================================
(Binary files differ)
Property changes on: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/activity/subprocess/sp1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/activity/subprocess/sp2.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/activity/subprocess/sp2.jpdl.xml (rev 0)
+++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/activity/subprocess/sp2.jpdl.xml 2010-07-29 01:51:57 UTC (rev 6538)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process name="sp2" xmlns="http://jbpm.org/4.3/jpdl">
+ <start name="start1" g="38,16,48,48">
+ <transition name="to sp2 task" to="sp2 task" g="-41,-17" />
+ </start>
+ <task name="sp2 task" g="16,96,92,52" assignee="jic">
+ <transition name="to sp2 end" to="sp2 end" g="-40,-17" />
+ </task>
+ <end name="sp2 end" g="38,180,48,48" />
+</process>
\ No newline at end of file
Added: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/activity/subprocess/sp2.png
===================================================================
(Binary files differ)
Property changes on: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/activity/subprocess/sp2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
13 years, 11 months
JBoss JBPM SVN: r6537 - jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2010-07-28 18:31:57 -0400 (Wed, 28 Jul 2010)
New Revision: 6537
Modified:
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh
Log:
JBPM-2916 give builds a max memory amount of at least 256m
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh 2010-07-28 03:48:01 UTC (rev 6536)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh 2010-07-28 22:31:57 UTC (rev 6537)
@@ -32,7 +32,7 @@
JBOSS_VERSION=jboss-5.1.0.GA
;;
*)
- echo "invalid container: $CONTAINER"
+ echo "ERROR: invalid container: $CONTAINER"
exit 1
;;
esac
@@ -45,7 +45,8 @@
#
# Determine Java platform version
#
-JAVA_VERSION=`java -version 2>&1 | grep version | awk '{ print substr($3, 2, 3); }'`
+JAVA=$JAVA_HOME/bin/java
+JAVA_VERSION=`$JAVA -version 2>&1 | grep version | awk '{ print substr($3, 2, 3); }'`
if [ $JAVA_VERSION = 1.4 ]; then
JAVA_BT_HOME=$JAVA_15_HOME
@@ -54,21 +55,33 @@
else
JAVA_BT_HOME=$JAVA_HOME
JAVA_RT_HOME=$JAVA_HOME
- JAVA=java
fi
#
# Set up Maven
#
-export MAVEN_OPTS="-Ddatabase=$DATABASE"
+export MAVEN_OPTS=-Ddatabase=$DATABASE
cp -u hudson/profiles.redhat.qa.xml profiles.xml
#
+# Give builds a max memory amount of at least 256 MB
+#
+TOTAL_MEM=`free -mo | grep Mem | awk '{ print $2 }'`
+if [ `expr $TOTAL_MEM / 4` -lt 256 ]; then
+ export MAVEN_OPTS="$MAVEN_OPTS -Xms64m -Xmx256m"
+fi
+
+#
# Build distro
#
export JAVA_HOME=$JAVA_BT_HOME
JBPM_VERSION=`mvn -Dexpression=project.version help:evaluate | grep '^3\.'`
-mvn -Pdistro,soa -Djbpm.home=$WORKSPACE/jbpm-$JBPM_VERSION -Dcontainer=$CONTAINER -Djboss.home=$JBOSS_HOME -Djboss.server=$JBOSS_SERVER clean install
+mvn -Pdistro,soa -Djbpm.home=$WORKSPACE/jbpm-$JBPM_VERSION -Dcontainer=$CONTAINER \
+ -Djboss.home=$JBOSS_HOME -Djboss.server=$JBOSS_SERVER clean install
+if [ $? -ne 0 ]; then
+ echo "ERROR: failed to build distro"
+ exit 1
+fi
#
# Install distro
@@ -77,7 +90,7 @@
modules/distribution/target/resources/auto-install-template.xml
#
-# Install non-redistributable JDBC drivers
+# Install proprietary JDBC drivers
#
mvn -N -DoutputFile=$WORKSPACE/resolve.tmp dependency:resolve
@@ -105,7 +118,7 @@
if [ -f $MSJDBC_JAR ]; then
ln -s $MSJDBC_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib
else
- echo "WARNING: MSSQL driver not found: $MSSQL_JAR"
+ echo "WARNING: SQL Server driver not found: $MSJDBC_JAR"
fi
fi
@@ -149,14 +162,8 @@
fi
#
-# Log dependency tree
-#
-mvn dependency:tree | tee $WORKSPACE/dependency-tree.txt
-
-#
# Give tests a max memory amount of at least 256 MB
#
-TOTAL_MEM=`free -mo | grep Mem | awk '{ print $2 }'`
if [ $JAVA_VERSION = 1.4 -o `expr $TOTAL_MEM / 4` -lt 256 ]; then
export MAVEN_OPTS="$MAVEN_OPTS -Dsurefire.jvm.args=-Xmx256m"
fi
@@ -165,8 +172,8 @@
# Execute tests
#
mvn --fail-at-end -Djboss.bind.address=$JBOSS_BINDADDR test | tee $WORKSPACE/tests.log
-grep -E FIXME\|FAILED $WORKSPACE/tests.log | sort -u | tee $WORKSPACE/fixme.txt
-grep -E "\[\S*]" $WORKSPACE/fixme.txt > $WORKSPACE/errata-$CONTAINER.txt
+grep -E 'FIXME\|FAILED' $WORKSPACE/tests.log | sort -u | tee $WORKSPACE/fixme.txt
+grep -E '\[\S*]' $WORKSPACE/fixme.txt > $WORKSPACE/errata-$CONTAINER.txt
#
# Stop JBoss AS
@@ -174,4 +181,3 @@
$JBOSS_HOME/bin/shutdown.sh -s jnp://$JBOSS_BINDADDR:1099 -S
ln -sf $JBOSS_HOME/server/$JBOSS_SERVER/log/boot.log $WORKSPACE
ln -sf $JBOSS_HOME/server/$JBOSS_SERVER/log/server.log $WORKSPACE
-
13 years, 11 months
JBoss JBPM SVN: r6536 - in jbpm3/branches/jbpm-3.2-soa: hudson and 4 other directories.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2010-07-27 23:48:01 -0400 (Tue, 27 Jul 2010)
New Revision: 6536
Removed:
jbpm3/branches/jbpm-3.2-soa/hudson/jboss/
Modified:
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh
jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.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/profiles.example.xml
Log:
JBPM-2916 make jboss server profile configurable in hudson script; \
switch to >all< profile; retire semi-redundant jboss scripts
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh 2010-07-27 00:40:29 UTC (rev 6535)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh 2010-07-28 03:48:01 UTC (rev 6536)
@@ -1,104 +1,98 @@
#!/bin/sh
#
-# A script that uses Maven to build the project and
-# execute its test suite against a given target container
+# Script that builds the project via Maven and
+# executes the test suite against a given target container
#
+# Exported shell variables required:
+# WORKSPACE work directory
+# JAVA_HOME location of java development kit
+# JAVA_14_HOME
+# JAVA_15_HOME required if testing against java 1.4 only
+# DATABASE db2, hsqldb, mssql, mysql, oracle, postgresql
+# CONTAINER jboss405, jboss423, jboss501, jboss510
+# JBOSS_BINDADDR jboss bind address
+# SOURCE_REPO location of jboss distributions
+#
# $Id$
-WORKSPACE=$PWD
-JBPMDIR=$WORKSPACE/jbpm
-
#
# Extract JBoss distro
#
-case "$CONTAINER" in
- jboss405*)
- JBOSS_BUILD=jboss-4.0.5.GA
+case $CONTAINER in
+ jboss405)
+ JBOSS_VERSION=jboss-4.0.5.GA
;;
- jboss423*)
- JBOSS_BUILD=jboss-4.2.3.GA
+ jboss423)
+ JBOSS_VERSION=jboss-4.2.3.GA
;;
- jboss501*)
- JBOSS_BUILD=jboss-5.0.1.GA
+ jboss501)
+ JBOSS_VERSION=jboss-5.0.1.GA
;;
- jboss510*)
- JBOSS_BUILD=jboss-5.1.0.GA
+ jboss510)
+ JBOSS_VERSION=jboss-5.1.0.GA
;;
+ *)
+ echo "invalid container: $CONTAINER"
+ exit 1
+ ;;
esac
-JBOSS_HOME=$WORKSPACE/$JBOSS_BUILD
+JBOSS_HOME=$WORKSPACE/$JBOSS_VERSION
+JBOSS_SERVER=all
-rm -rf $JBOSS_BUILD
-unzip -q $HUDSON_BASE/jboss/$JBOSS_BUILD.zip
+rm -rf $JBOSS_HOME
+unzip -q -d $WORKSPACE $SOURCE_REPO/jboss/$JBOSS_VERSION.zip
#
# Determine Java platform version
#
-java -version 2> version.tmp
-JAVA_VERSION=`grep "java version" version.tmp | awk '{ print substr($3, 2, length($3)-2); }'`
-rm version.tmp
-echo java version $JAVA_VERSION
+JAVA_VERSION=`java -version 2>&1 | grep version | awk '{ print substr($3, 2, 3); }'`
-case $JAVA_VERSION in
- 1.4*)
+if [ $JAVA_VERSION = 1.4 ]; then
JAVA_BT_HOME=$JAVA_15_HOME
- JAVA_RT_HOME=$JAVA_14_HOME
+ JAVA_RT_HOME=$JAVA_HOME
JAVA=$JAVA_BT_HOME/bin/java
- ;;
- *)
+else
JAVA_BT_HOME=$JAVA_HOME
JAVA_RT_HOME=$JAVA_HOME
JAVA=java
- ;;
-esac
+fi
#
# Set up Maven
#
-MVN_OPTS="-Ddatabase=$DATABASE -Dcontainer=$CONTAINER -Djboss.home=$JBOSS_HOME -Djboss.bind.address=$JBOSS_BINDADDR"
-cp "$JBPMDIR/hudson/profiles.redhat.qa.xml" "$JBPMDIR/profiles.xml"
+export MAVEN_OPTS="-Ddatabase=$DATABASE"
+cp -u hudson/profiles.redhat.qa.xml profiles.xml
#
# Build distro
#
-cd $JBPMDIR
export JAVA_HOME=$JAVA_BT_HOME
-MVN_CMD="mvn -U $MVN_OPTS -Pdistro,soa clean install"
-echo $MVN_CMD; $MVN_CMD; MVN_STATUS=$?
-if [ $MVN_STATUS -ne 0 ]; then
- echo maven exit status $MVN_STATUS
- exit 1
-fi
+JBPM_VERSION=`mvn -Dexpression=project.version help:evaluate | grep '^3\.'`
+mvn -Pdistro,soa -Djbpm.home=$WORKSPACE/jbpm-$JBPM_VERSION -Dcontainer=$CONTAINER -Djboss.home=$JBOSS_HOME -Djboss.server=$JBOSS_SERVER clean install
#
# Install distro
#
-JBPM_VERSION=`echo project version \$\{project.version\} | mvn help:evaluate | grep 'project version' | awk '{ print $3 }'`
-echo jbpm version $JBPM_VERSION
-AUTO_INSTALL=modules/distribution/target/resources/auto-install-template.xml; cat $AUTO_INSTALL;
-JAVA_CMD="$JAVA -jar modules/distribution/target/jbpm-installer-$JBPM_VERSION.jar $AUTO_INSTALL"
-echo $JAVA_CMD; $JAVA_CMD
+$JAVA -jar modules/distribution/target/jbpm-installer-$JBPM_VERSION.jar \
+ modules/distribution/target/resources/auto-install-template.xml
#
# Install non-redistributable JDBC drivers
#
-MVN_CMD="mvn -o -N $MVN_OPTS -DoutputFile=resolve.tmp dependency:resolve"
-echo $MVN_CMD; $MVN_CMD
-cat resolve.tmp
+mvn -N -DoutputFile=$WORKSPACE/resolve.tmp dependency:resolve
# Install DB2 driver
if [ "$DATABASE" = "db2" ]; then
- DB2JCC_VERSION=`grep com.ibm:db2jcc:jar resolve.tmp | awk --field-separator : '{ print $4 }'`
+ DB2JCC_VERSION=`grep com.ibm:db2jcc:jar $WORKSPACE/resolve.tmp | awk -F : '{ print $4 }'`
DB2JCC_JAR=~/.m2/repository/com/ibm/db2jcc/$DB2JCC_VERSION/db2jcc-$DB2JCC_VERSION.jar
if [ -f $DB2JCC_JAR ]; then
- CP_CMD="cp $DB2JCC_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib"
- echo $CP_CMD; $CP_CMD
+ ln -s $DB2JCC_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib
else
echo "WARNING: DB2 driver not found: $DB2JCC_JAR"
fi
DB2JCC_LICENSE=~/.m2/repository/com/ibm/db2jcc_license_cu/$DB2JCC_VERSION/db2jcc_license_cu-$DB2JCC_VERSION.jar
if [ -f $DB2JCC_LICENSE ]; then
- CP_CMD="cp $DB2JCC_LICENSE $JBOSS_HOME/server/$JBOSS_SERVER/lib"
- echo $CP_CMD; $CP_CMD
+ ln -s $DB2JCC_LICENSE $JBOSS_HOME/server/$JBOSS_SERVER/lib
else
echo "WARNING: DB2 license not found: $DB2JCC_LICENSE"
fi
@@ -106,11 +100,10 @@
# Install MSSQL driver
if [ "$DATABASE" = "mssql" ]; then
- MSJDBC_VERSION=`grep com.microsoft.sqlserver:msjdbc resolve.tmp | awk --field-separator : '{ print $4 }'`
+ MSJDBC_VERSION=`grep com.microsoft.sqlserver:msjdbc $WORKSPACE/resolve.tmp | awk -F : '{ print $4 }'`
MSJDBC_JAR=~/.m2/repository/com/microsoft/sqlserver/msjdbc/$MSJDBC_VERSION/msjdbc-$MSJDBC_VERSION.jar
if [ -f $MSJDBC_JAR ]; then
- CP_CMD="cp $MSJDBC_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib"
- echo $CP_CMD; $CP_CMD
+ ln -s $MSJDBC_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib
else
echo "WARNING: MSSQL driver not found: $MSSQL_JAR"
fi
@@ -118,11 +111,10 @@
# Install Oracle driver
if [ "$DATABASE" = "oracle" ]; then
- OJDBC_VERSION=`grep com.oracle:ojdbc14 resolve.tmp | awk --field-separator : '{ print $4 }'`
+ OJDBC_VERSION=`grep com.oracle:ojdbc14 $WORKSPACE/resolve.tmp | awk -F : '{ print $4 }'`
OJDBC_JAR=~/.m2/repository/com/oracle/ojdbc14/$OJDBC_VERSION/ojdbc14-$OJDBC_VERSION.jar
if [ -f $OJDBC_JAR ]; then
- CP_CMD="cp $OJDBC_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib"
- echo $CP_CMD; $CP_CMD
+ ln -s $OJDBC_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib
else
echo "WARNING: Oracle driver not found: $OJDBC_JAR"
fi
@@ -130,59 +122,56 @@
# Install Sybase driver
if [ "$DATABASE" = "sybase" ]; then
- JCONNECT_VERSION=`grep com.sybase:jconnect resolve.tmp | awk --field-separator : '{ print $4 }'`
+ JCONNECT_VERSION=`grep com.sybase:jconnect $WORKSPACE/resolve.tmp | awk -F : '{ print $4 }'`
JCONNECT_JAR=~/.m2/repository/com/sybase/jconnect/$JCONNECT_VERSION/jconnect-$JCONNECT_VERSION.jar
if [ -f $JCONNECT_JAR ]; then
- CP_CMD="cp $JCONNECT_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib"
- echo $CP_CMD; $CP_CMD
+ ln -s $JCONNECT_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib
else
echo "WARNING: Sybase driver not found: $JCONNECT_JAR"
fi
fi
# Remove resolution output file
-rm resolve.tmp
+rm $WORKSPACE/resolve.tmp
#
# Start JBoss AS
#
export JAVA_HOME=$JAVA_RT_HOME
-$JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BINDADDR
+$JBOSS_HOME/bin/run.sh -b $JBOSS_BINDADDR -c $JBOSS_SERVER &> /dev/null &
# Was it successfully started?
-$JBPMDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $WORKSPACE/spider.failed ]; then
+wget --spider --retry-connrefused --waitretry=24 --no-verbose $JBOSS_BINDADDR:8080
+if [ $? -ne 0 ]; then
tail -n 100 $JBOSS_HOME/server/$JBOSS_SERVER/log/server.log
- $JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BINDADDR
+ $JBOSS_HOME/bin/shutdown.sh -s jnp://$JBOSS_BINDADDR:1099 -S
exit 1
fi
#
# Log dependency tree
#
-MVN_CMD="mvn -o $MVN_OPTS dependency:tree"
-echo $MVN_CMD; $MVN_CMD | tee $WORKSPACE/dependency-tree.txt
+mvn dependency:tree | tee $WORKSPACE/dependency-tree.txt
#
# Give tests a max memory amount of at least 256 MB
#
TOTAL_MEM=`free -mo | grep Mem | awk '{ print $2 }'`
-echo "Total memory: $TOTAL_MEM"
-MAX_MEM=`expr $TOTAL_MEM / 4`
-[ $MAX_MEM -lt 256 ] && MAX_MEM=256
-MVN_OPTS="$MVN_OPTS -Dsurefire.jvm.args=-Xmx$MAX_MEM"m
+if [ $JAVA_VERSION = 1.4 -o `expr $TOTAL_MEM / 4` -lt 256 ]; then
+ export MAVEN_OPTS="$MAVEN_OPTS -Dsurefire.jvm.args=-Xmx256m"
+fi
#
# Execute tests
#
-MVN_CMD="mvn -o -fae $MVN_OPTS test"
-echo $MVN_CMD; $MVN_CMD 2>&1 | tee $WORKSPACE/tests.log
-cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
-cat $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$CONTAINER.txt
+mvn --fail-at-end -Djboss.bind.address=$JBOSS_BINDADDR test | tee $WORKSPACE/tests.log
+grep -E FIXME\|FAILED $WORKSPACE/tests.log | sort -u | tee $WORKSPACE/fixme.txt
+grep -E "\[\S*]" $WORKSPACE/fixme.txt > $WORKSPACE/errata-$CONTAINER.txt
#
# Stop JBoss AS
#
-$JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop
-cp $JBOSS_HOME/server/$JBOSS_SERVER/log/boot.log $WORKSPACE/jboss-boot.log
-cp $JBOSS_HOME/server/$JBOSS_SERVER/log/server.log $WORKSPACE/jboss-server.log
+$JBOSS_HOME/bin/shutdown.sh -s jnp://$JBOSS_BINDADDR:1099 -S
+ln -sf $JBOSS_HOME/server/$JBOSS_SERVER/log/boot.log $WORKSPACE
+ln -sf $JBOSS_HOME/server/$JBOSS_SERVER/log/server.log $WORKSPACE
+
Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml 2010-07-27 00:40:29 UTC (rev 6535)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml 2010-07-28 03:48:01 UTC (rev 6536)
@@ -31,7 +31,6 @@
<project.build.assemblyDirectory>${project.build.directory}/${assembly.id}</project.build.assemblyDirectory>
<resources.outputDirectory>${project.build.directory}/resources</resources.outputDirectory>
<resources.directory>${basedir}/src/main/resources</resources.directory>
- <product.name>${project.parent.name}</product.name>
</properties>
<!-- Dependencies -->
@@ -210,8 +209,10 @@
value="${project.build.assemblyDirectory}/resources" />
<property name="resources.dir" value="${resources.directory}" />
<property name="resources.output.dir" value="${resources.outputDirectory}" />
+ <property name="jbpm.home" value="${jbpm.home}" />
<property name="container" value="${container}" />
<property name="jboss.home" value="${jboss.home}" />
+ <property name="jboss.server" value="${jboss.server}" />
<property name="database" value="${database}" />
<ant antfile="scripts/antrun-installer.xml" target="process-resources" />
</tasks>
@@ -251,7 +252,6 @@
<type>war</type>
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
@@ -280,5 +280,4 @@
</build>
</profile>
</profiles>
-
-</project>
\ No newline at end of file
+</project>
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-07-27 00:40:29 UTC (rev 6535)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml 2010-07-28 03:48:01 UTC (rev 6536)
@@ -158,12 +158,13 @@
<copy todir="${resources.output.dir}" overwrite="true">
<fileset dir="${resources.dir}/installer" />
<filterset>
- <filter token="user.home" value="${user.home}" />
<filter token="project.version" value="${project.version}" />
+ <filter token="jbpm.home" value="${jbpm.home}" />
<filter token="container" value="${container}" />
<filter token="jboss.home" value="${jboss.home}" />
+ <filter token="jboss.server" value="${jboss.server}"/>
<filter token="database" value="${database}" />
</filterset>
</copy>
</target>
-</project>
\ No newline at end of file
+</project>
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-07-27 00:40:29 UTC (rev 6535)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/auto-install-template.xml 2010-07-28 03:48:01 UTC (rev 6536)
@@ -2,7 +2,7 @@
<AutomatedInstallation langpack="eng">
<com.izforge.izpack.panels.HelloPanel />
<com.izforge.izpack.panels.TargetPanel>
- <installpath>@user.home@/jbpm-(a)project.version@</installpath>
+ <installpath>@jbpm.home@</installpath>
</com.izforge.izpack.panels.TargetPanel>
<com.izforge.izpack.panels.TreePacksPanel>
<pack name="jBPM3 Standalone" index="0" selected="true"/>
@@ -14,7 +14,7 @@
</com.izforge.izpack.panels.TreePacksPanel>
<com.izforge.izpack.panels.UserInputPanel>
<userInput>
- <entry key="jbossTargetServer" value="all" />
+ <entry key="jbossTargetServer" value="@jboss.server@" />
<entry key="jbossSelection" value="@container@" />
</userInput>
</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-07-27 00:40:29 UTC (rev 6535)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml 2010-07-28 03:48:01 UTC (rev 6536)
@@ -5,8 +5,9 @@
otherwise use variables below in installer files with ${}
-->
<info>
- <appname>@{product.name}</appname>
+ <appname>@{project.name}</appname>
<appversion>@{project.version}</appversion>
+ <url>http://jboss.org/jbpm</url>
<uninstaller path="$INSTALL_PATH/uninstall" />
</info>
<guiprefs width="600" height="440" resizable="yes" />
@@ -352,4 +353,4 @@
</pack>
</packs>
-</installation>
\ No newline at end of file
+</installation>
Modified: jbpm3/branches/jbpm-3.2-soa/profiles.example.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/profiles.example.xml 2010-07-27 00:40:29 UTC (rev 6535)
+++ jbpm3/branches/jbpm-3.2-soa/profiles.example.xml 2010-07-28 03:48:01 UTC (rev 6536)
@@ -61,6 +61,9 @@
<jboss423.home>$USER_HOME/jboss-4.2.3.GA</jboss423.home>
<jboss501.home>$USER_HOME/jboss-5.0.1.GA</jboss501.home>
<jboss510.home>$USER_HOME/jboss-5.1.0.GA</jboss510.home>
+ <jboss.server>all</jboss.server>
+
+ <jbpm.home>$USER_HOME/jbpm-${project.version}</jbpm.home>
</properties>
</profile>
</profiles>
13 years, 11 months
JBoss JBPM SVN: r6535 - in jbpm3: tags and 1 other directory.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2010-07-26 20:40:29 -0400 (Mon, 26 Jul 2010)
New Revision: 6535
Added:
jbpm3/tags/jbpm-3.2.8.GA_JBPM-2617/
Removed:
jbpm3/branches/jbpm-3.2.8.GA_JBPM-2617/
Log:
move inactive JBPM-2617 branch to tags directory
Copied: jbpm3/tags/jbpm-3.2.8.GA_JBPM-2617 (from rev 6534, jbpm3/branches/jbpm-3.2.8.GA_JBPM-2617)
13 years, 11 months
JBoss JBPM SVN: r6533 - in projects/jsf-console/branches/jsf-console-3.2-soa: console and 3 other directories.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2010-07-26 19:17:56 -0400 (Mon, 26 Jul 2010)
New Revision: 6533
Modified:
projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml
projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/pom.xml
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/pom.xml
projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml
projects/jsf-console/branches/jsf-console-3.2-soa/soa/pom.xml
Log:
bump jsf-console development version to 3.2.10-SNAPSHOT
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml 2010-07-26 15:11:01 UTC (rev 6532)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml 2010-07-26 23:17:56 UTC (rev 6533)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jsf-console-parent</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/pom.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/pom.xml 2010-07-26 15:11:01 UTC (rev 6532)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/pom.xml 2010-07-26 23:17:56 UTC (rev 6533)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jsf-console-parent</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/pom.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/pom.xml 2010-07-26 15:11:01 UTC (rev 6532)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/pom.xml 2010-07-26 23:17:56 UTC (rev 6533)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jsf-console-parent</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml 2010-07-26 15:11:01 UTC (rev 6532)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml 2010-07-26 23:17:56 UTC (rev 6533)
@@ -16,13 +16,20 @@
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jsf-console-parent</artifactId>
<packaging>pom</packaging>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
+ <!-- Source Control Management -->
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbpm/projects/jsf-console/branches...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbpm/projects/jsf-console/branches/js...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/JbpmSvn/projects/jsf-console/branches/jsf...</url>
+ </scm>
+
<!-- Parent -->
<parent>
<groupId>org.jbpm</groupId>
<artifactId>jbpm-parent</artifactId>
- <version>1.0.3</version>
+ <version>1.0.4</version>
</parent>
<!-- Modules -->
@@ -138,13 +145,14 @@
<repository>
<id>jboss-public-repository-group</id>
<name>JBoss Public Maven Repository Group</name>
- <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <url>https://repository.jboss.org/nexus/content/groups/public</url>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
</snapshots>
</repository>
</repositories>
@@ -153,10 +161,9 @@
<pluginRepository>
<id>jboss-public-repository-group</id>
<name>JBoss Public Maven Repository Group</name>
- <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <url>https://repository.jboss.org/nexus/content/groups/public</url>
<releases>
<enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>true</enabled>
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/soa/pom.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/soa/pom.xml 2010-07-26 15:11:01 UTC (rev 6532)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/soa/pom.xml 2010-07-26 23:17:56 UTC (rev 6533)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jsf-console-parent</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
</project>
13 years, 11 months
JBoss JBPM SVN: r6532 - projects/jsf-console/tags.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2010-07-26 11:11:01 -0400 (Mon, 26 Jul 2010)
New Revision: 6532
Added:
projects/jsf-console/tags/jsf-console-3.2.9/
Log:
tag jsf-console 3.2.9
Copied: projects/jsf-console/tags/jsf-console-3.2.9 (from rev 6356, projects/jsf-console/branches/jsf-console-3.2-soa)
13 years, 11 months
JBoss JBPM SVN: r6531 - jbpm4/trunk/modules/distro/src/main/files/install.
by do-not-reply＠jboss.org
Author: rebody
Date: 2010-07-24 05:59:32 -0400 (Sat, 24 Jul 2010)
New Revision: 6531
Modified:
jbpm4/trunk/modules/distro/src/main/files/install/build.xml
Log:
JBPM-2848 resovled start.tomcat and stop.tomcat issues in windows platform
Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2010-07-24 07:27:56 UTC (rev 6530)
+++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2010-07-24 09:59:32 UTC (rev 6531)
@@ -598,7 +598,7 @@
</target>
<!-- ### INSTALL HSQLDB SERVER ################################################ -->
- <target name="install.hsqldb.server" if="is.hsqldb">
+ <target name="install.hsqldb.server" if="is.hsqldb" description="Install Hsqldb server">
<delete dir="${hsqldb.server.install.dir}" />
<!-- Also deletes old data -->
<mkdir dir="${hsqldb.server.install.dir}" />
@@ -614,7 +614,7 @@
</target>
<!-- ### START HSQLDB SERVER ################################################ -->
- <target name="start.hsqldb.server" if="is.hsqldb">
+ <target name="start.hsqldb.server" if="is.hsqldb" description="Start Hsqldb server">
<java classname="org.hsqldb.Server" fork="yes" spawn="yes">
<classpath location="${hsqldb.server.install.dir}/hsqldb.jar" />
<arg value="-address" />
@@ -635,7 +635,7 @@
</target>
<!-- ### SHUTDOWN HSQLDB SERVER ################################################ -->
- <target name="stop.hsqldb.server" if="is.hsqldb">
+ <target name="stop.hsqldb.server" if="is.hsqldb" description="Stop Hsqldb server">
<sql driver="${jdbc.driver}"
password="${jdbc.password}"
url="${jdbc.url}"
@@ -652,7 +652,7 @@
<!-- ### START TOMCAT ################################################### -->
<target name="start.tomcat" description="Start Tomcat and wait for it to become available">
- <exec executable="${tomcat.home}/bin/startup.bat" osfamily="windows" />
+ <exec executable="${tomcat.home}/bin/startup.bat" osfamily="windows" dir="${tomcat.home}/bin" spawn="true" />
<exec executable="${tomcat.home}/bin/startup.sh" osfamily="unix" />
<waitfor maxwait="2"
maxwaitunit="minute"
@@ -666,7 +666,7 @@
<!-- ### STOP TOMCAT ################################################### -->
<target name="stop.tomcat" description="Signal Tomcat to stop">
- <exec executable="${tomcat.home}/bin/shutdown.bat" osfamily="windows" />
+ <exec executable="${tomcat.home}/bin/shutdown.bat" osfamily="windows" dir="${tomcat.home}/bin" spawn="true" />
<exec executable="${tomcat.home}/bin/shutdown.sh" osfamily="unix" />
</target>
13 years, 11 months