EMBJOPR SVN: r753 - trunk/jsfunit/testdata.
by embjopr-commits@lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-09-21 15:39:46 -0400 (Mon, 21 Sep 2009)
New Revision: 753
Modified:
trunk/jsfunit/testdata/hudson_shell_script.sh
Log:
* hudson script - Added $M2_SETTINGS to be used as `mvn $M2_SETTINGS`
Modified: trunk/jsfunit/testdata/hudson_shell_script.sh
===================================================================
--- trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-18 23:41:50 UTC (rev 752)
+++ trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-21 19:39:46 UTC (rev 753)
@@ -35,7 +35,16 @@
### List JVMs
jps -l
+### M2_SETTINGS
+M2_SETTINGS_PATH=$HOME"/.m2/settings.xml"
+if [ -n USERPROFILE ] ; then # Windows
+ M2_SETTINGS_PATH="h:\\hudson\\.m2\\settings.xml"
+fi
+M2_SETTINGS_PATH="${HOME}${SEP}settings.xml"
+M2_SETTINGS="-s ${M2_SETTINGS_PATH}"
+
+
cd embjopr
# "Downdate" to older version
svn_rev_default="HEAD"
@@ -61,7 +70,7 @@
if [ -n "$DONT_SPLIT" ] ; then
echo "Running whole testsuite... (DONT_SPLIT)"
- mvn -Pjboss5x -Pfoo$ADD_PROFILES install -Dcargo.jboss.configuration=$JBOSS_CONFIG -Dhtmlunit.browser=$BROWSER --fail-never --update-snapshots -DJBOSS_HOME=$JBOSS_HOME -Dcargo.jboss.bind.address=$MYTESTIP_1
+ mvn $M2_SETTINGS -Pjboss5x -Pfoo$ADD_PROFILES install -Dcargo.jboss.configuration=$JBOSS_CONFIG -Dhtmlunit.browser=$BROWSER --fail-never --update-snapshots -DJBOSS_HOME=$JBOSS_HOME -Dcargo.jboss.bind.address=$MYTESTIP_1
else
## Include functions for Hudson.
. ~/config_repository/scripts/common/common_bash.sh
@@ -74,7 +83,7 @@
echo "Killing JBoss AS..."
kill-jboss
rm -rf target/jboss5x # Empty Cargo's configuration dir
- mvn -Pjboss5x -Pfoo$ADD_PROFILES install -Dcargo.jboss.configuration=$JBOSS_CONFIG -Dhtmlunit.browser=$BROWSER --fail-never --update-snapshots -DJBOSS_HOME=$JBOSS_HOME -Dcargo.jboss.bind.address=$MYTESTIP_1
+ mvn $M2_SETTINGS -Pjboss5x -Pfoo$ADD_PROFILES install -Dcargo.jboss.configuration=$JBOSS_CONFIG -Dhtmlunit.browser=$BROWSER --fail-never --update-snapshots -DJBOSS_HOME=$JBOSS_HOME -Dcargo.jboss.bind.address=$MYTESTIP_1
#mv target/surefire-reports/TEST-TestSuite.xml TEST-TestSuite-$part.xml
mv target target-$part
done
15 years, 3 months
EMBJOPR SVN: r752 - trunk/core/src/main/webapp.
by embjopr-commits@lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-09-18 19:41:50 -0400 (Fri, 18 Sep 2009)
New Revision: 752
Modified:
trunk/core/src/main/webapp/index.html
trunk/core/src/main/webapp/index.xhtml
Log:
* Added a note about redirection and a link - see EMBJOPR-248
Modified: trunk/core/src/main/webapp/index.html
===================================================================
--- trunk/core/src/main/webapp/index.html 2009-09-15 13:43:27 UTC (rev 751)
+++ trunk/core/src/main/webapp/index.html 2009-09-18 23:41:50 UTC (rev 752)
@@ -21,4 +21,7 @@
<head>
<meta http-equiv="Refresh" content="0; URL=index.seam"/>
</head>
+<body>
+ <p>Redirecting to the <a href="index.seam">start page</a>...</p>
+</body>
</html>
\ No newline at end of file
Modified: trunk/core/src/main/webapp/index.xhtml
===================================================================
--- trunk/core/src/main/webapp/index.xhtml 2009-09-15 13:43:27 UTC (rev 751)
+++ trunk/core/src/main/webapp/index.xhtml 2009-09-18 23:41:50 UTC (rev 752)
@@ -38,7 +38,9 @@
<meta http-equiv="Refresh" content="0; URL=secure/summary.seam"/>
</head>
- <body/>
+ <body>
+ <p>Redirecting to the <a href="secure/summary.seam">login page</a>...</p>
+ </body>
</f:view>
</html>
\ No newline at end of file
15 years, 3 months
EMBJOPR SVN: r751 - trunk/jsfunit/testdata.
by embjopr-commits@lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-09-15 09:43:27 -0400 (Tue, 15 Sep 2009)
New Revision: 751
Modified:
trunk/jsfunit/testdata/hudson_shell_script.sh
Log:
* hudson script updated - kill JBoss AS before next round
Modified: trunk/jsfunit/testdata/hudson_shell_script.sh
===================================================================
--- trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-03 18:46:55 UTC (rev 750)
+++ trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-15 13:43:27 UTC (rev 751)
@@ -63,12 +63,16 @@
echo "Running whole testsuite... (DONT_SPLIT)"
mvn -Pjboss5x -Pfoo$ADD_PROFILES install -Dcargo.jboss.configuration=$JBOSS_CONFIG -Dhtmlunit.browser=$BROWSER --fail-never --update-snapshots -DJBOSS_HOME=$JBOSS_HOME -Dcargo.jboss.bind.address=$MYTESTIP_1
else
+ ## Include functions for Hudson.
+ . ~/config_repository/scripts/common/common_bash.sh
## Split testsuite to parts, because of OOME
for part in Apps ConnFactories Datasources Jms theRest; do
echo "Running tests for part '$part'..."
svn revert pom.xml
echo "Performing 'patch -p0 < testdata/pom_patches/pom-$part.patch'..."
patch -p0 < testdata/pom_patches/pom-$part.patch
+ echo "Killing JBoss AS..."
+ kill-jboss
rm -rf target/jboss5x # Empty Cargo's configuration dir
mvn -Pjboss5x -Pfoo$ADD_PROFILES install -Dcargo.jboss.configuration=$JBOSS_CONFIG -Dhtmlunit.browser=$BROWSER --fail-never --update-snapshots -DJBOSS_HOME=$JBOSS_HOME -Dcargo.jboss.bind.address=$MYTESTIP_1
#mv target/surefire-reports/TEST-TestSuite.xml TEST-TestSuite-$part.xml
15 years, 3 months
EMBJOPR SVN: r750 - trunk/jsfunit/testdata.
by embjopr-commits@lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-09-03 14:46:55 -0400 (Thu, 03 Sep 2009)
New Revision: 750
Modified:
trunk/jsfunit/testdata/hudson_shell_script.sh
Log:
* hudson script updated - wget -nc
Modified: trunk/jsfunit/testdata/hudson_shell_script.sh
===================================================================
--- trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-03 18:36:55 UTC (rev 749)
+++ trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-03 18:46:55 UTC (rev 750)
@@ -16,7 +16,7 @@
### Get and unzip EAP 5 binaries
#if [ -n $EAP_URL ] ; then
if [[ "$EAP_ZIP_PATH" = http:* ]] ; then
- wget -O eap5.zip $EAP_ZIP_PATH
+ wget --no-clobber -O eap5.zip $EAP_ZIP_PATH
EAP_ZIP_PATH=eap5.zip
fi
rm -rf jboss-eap-5.0
15 years, 3 months
EMBJOPR SVN: r749 - trunk/jsfunit/testdata.
by embjopr-commits@lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-09-03 14:36:55 -0400 (Thu, 03 Sep 2009)
New Revision: 749
Modified:
trunk/jsfunit/testdata/hudson_shell_script.sh
Log:
* hudson script updated - M2_HOME taken from the system if on PATH.
Modified: trunk/jsfunit/testdata/hudson_shell_script.sh
===================================================================
--- trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-03 18:24:43 UTC (rev 748)
+++ trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-03 18:36:55 UTC (rev 749)
@@ -4,7 +4,11 @@
rm -rf embjopr/jsfunit/target
### Set path to maven 2.0.10
-export M2_HOME="/home/hudson/ozizka/sw/apache-maven-2.0.10"
+M2_HOME="$(dirname `dirname $(which mvn)`)"
+if [ -z "$M2_HOME" ] ; then
+ M2_HOME="/home/hudson/ozizka/sw/apache-maven-2.0.10"
+fi
+export M2_HOME
export PATH=$M2_HOME"/bin:"$PATH
mvn -version
15 years, 3 months
EMBJOPR SVN: r748 - trunk/jsfunit/testdata.
by embjopr-commits@lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-09-03 14:24:43 -0400 (Thu, 03 Sep 2009)
New Revision: 748
Modified:
trunk/jsfunit/testdata/hudson_shell_script.sh
Log:
* hudson script updated - EAP will be downloaded, when EAP_ZIP_PATH starts with http:
Modified: trunk/jsfunit/testdata/hudson_shell_script.sh
===================================================================
--- trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-03 18:06:06 UTC (rev 747)
+++ trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-03 18:24:43 UTC (rev 748)
@@ -11,11 +11,10 @@
### Get and unzip EAP 5 binaries
#if [ -n $EAP_URL ] ; then
-if [[ "$EAP_ZIP_PATH" = http:* ]]
+if [[ "$EAP_ZIP_PATH" = http:* ]] ; then
wget -O eap5.zip $EAP_ZIP_PATH
EAP_ZIP_PATH=eap5.zip
fi
-
rm -rf jboss-eap-5.0
unzip $EAP_ZIP_PATH
15 years, 3 months
EMBJOPR SVN: r747 - trunk/jsfunit/testdata.
by embjopr-commits@lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-09-03 14:06:06 -0400 (Thu, 03 Sep 2009)
New Revision: 747
Modified:
trunk/jsfunit/testdata/hudson_shell_script.sh
Log:
* hudson script updated - EAP will be downloaded, when EAP_ZIP_PATH starts with http:
Modified: trunk/jsfunit/testdata/hudson_shell_script.sh
===================================================================
--- trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-03 17:52:11 UTC (rev 746)
+++ trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-03 18:06:06 UTC (rev 747)
@@ -10,8 +10,9 @@
### Get and unzip EAP 5 binaries
-if [ -n $EAP_URL ] ; then
- wget -O eap5.zip $EAP_URL
+#if [ -n $EAP_URL ] ; then
+if [[ "$EAP_ZIP_PATH" = http:* ]]
+ wget -O eap5.zip $EAP_ZIP_PATH
EAP_ZIP_PATH=eap5.zip
fi
15 years, 3 months
EMBJOPR SVN: r746 - trunk/jsfunit/testdata.
by embjopr-commits@lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-09-03 13:52:11 -0400 (Thu, 03 Sep 2009)
New Revision: 746
Modified:
trunk/jsfunit/testdata/hudson_shell_script.sh
Log:
* hudson script updated
Modified: trunk/jsfunit/testdata/hudson_shell_script.sh
===================================================================
--- trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-03 16:25:50 UTC (rev 745)
+++ trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-03 17:52:11 UTC (rev 746)
@@ -10,9 +10,12 @@
### Get and unzip EAP 5 binaries
-#wget http://porkchop.devel.redhat.com/devel/candidates/JBEAP5.0.0/CR2/zip/jbos...
+if [ -n $EAP_URL ] ; then
+ wget -O eap5.zip $EAP_URL
+ EAP_ZIP_PATH=eap5.zip
+fi
+
rm -rf jboss-eap-5.0
-#unzip /home/ozizka/JoprEmbedded/binaries/jboss-eap-noauth-5.0.0.CR2.zip
unzip $EAP_ZIP_PATH
15 years, 3 months
EMBJOPR SVN: r745 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories.
by embjopr-commits@lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-09-03 12:25:50 -0400 (Thu, 03 Sep 2009)
New Revision: 745
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryOperationsTest.java
Log:
* ConnFactoryOpsTest updated.
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryOperationsTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryOperationsTest.java 2009-09-03 12:52:10 UTC (rev 744)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryOperationsTest.java 2009-09-03 16:25:50 UTC (rev 745)
@@ -22,19 +22,12 @@
package org.jboss.jopr.jsfunit.as5.connfactories;
-import org.jboss.jopr.jsfunit.*;
-import com.gargoylesoftware.htmlunit.html.*;
-import java.io.*;
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.jboss.jopr.jsfunit.exceptions.*;
-import org.jboss.jopr.jsfunit.as5.ResourceTestBase;
import java.util.ArrayList;
import java.util.Map;
import java.util.LinkedHashMap;
-import javax.resource.cci.ConnectionFactory;
import javax.resource.cci.Connection;
-import org.jboss.metatype.api.values.MetaValue;
import org.jboss.managed.api.ComponentType;
/**
15 years, 3 months
EMBJOPR SVN: r744 - in trunk/jsfunit: src/test/java/org/jboss/jopr/jsfunit/as5 and 2 other directories.
by embjopr-commits@lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-09-03 08:52:10 -0400 (Thu, 03 Sep 2009)
New Revision: 744
Modified:
trunk/jsfunit/pom.xml
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryOperationsTest.java
trunk/jsfunit/testdata/ear/not-malformed-application-xml.ear
Log:
* ConnFactoryOpsTest updated.
Modified: trunk/jsfunit/pom.xml
===================================================================
--- trunk/jsfunit/pom.xml 2009-09-02 17:25:24 UTC (rev 743)
+++ trunk/jsfunit/pom.xml 2009-09-03 12:52:10 UTC (rev 744)
@@ -8,7 +8,8 @@
<jvm.args.profiler></jvm.args.profiler> <!-- Used by the -Pprofile profile. -->
<jvm.args.exposejmx></jvm.args.exposejmx> <!-- Expose JMX - used to enable the Hibernate statistics. -->
<jvm.args.memory></jvm.args.memory> <!-- Used to prevent OOMEs. See the no_GC_limit profile. -->
- <jvm.args.common>-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${project.build.directory}/heapdump -Xmx1536m -XX:PermSize=256m -XX:MaxPermSize=512m</jvm.args.common>
+ <jvm.args.common>-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${project.build.directory}/heapdump-sun -Xmx1536m -XX:PermSize=256m -XX:MaxPermSize=512m</jvm.args.common>
+ <jvm.args.vendor-specific></jvm.args.vendor-specific>
<cargo.jboss.configuration>default</cargo.jboss.configuration><!-- JBoss AS configuration. -->
<cargo.jboss.bind.address>localhost</cargo.jboss.bind.address><!-- Address for JBoss AS to bind to. -->
@@ -424,7 +425,7 @@
<!-- Raise permgen size, allow classes unloading and permgen sweep -->
<!-- xb.builder.useUnorderedSequence=true is the same what run.sh does. -->
<!-- See http://www.nabble.com/changes-in-parsing-with-xb-td22478176.html -->
- <cargo.jvmargs>${jvm.args.debug} ${jvm.args.profiler} ${jvm.args.exposejmx} ${jvm.args.memory} ${jvm.args.common} -Dxb.builder.useUnorderedSequence=true</cargo.jvmargs>
+ <cargo.jvmargs>${jvm.args.debug} ${jvm.args.profiler} ${jvm.args.exposejmx} ${jvm.args.memory} ${jvm.args.common} ${jvm.args.vendor-specific} -Dxb.builder.useUnorderedSequence=true</cargo.jvmargs>
<!-- -XX:+UseConcMarkSweepGC -XX:+CMSPermGenSweepingEnabled -XX:+CMSClassUnloadingEnabled -XX:-UseGCOverheadLimit -->
<!-- JBoss configuration - default, all, standard -->
<cargo.jboss.configuration>${cargo.jboss.configuration}</cargo.jboss.configuration>
@@ -650,7 +651,7 @@
</properties>
</profile>
- <!-- Expose JMX - used to enable the Hibernate statistics. -->
+ <!-- No Garbage collector limit. -->
<profile>
<id>no_GC_limit</id>
<properties>
@@ -658,8 +659,16 @@
</properties>
</profile>
+ <!-- IBM heapdump and big objects allocation logging. -->
+ <profile>
+ <id>ibm-jdk</id>
+ <properties>
+ <jvm.args.vendor-specific>-Xdump:stack:events=allocation,filter=#4k -DIBM_HEAPDUMPDIR=${project.build.directory}/heapdumps-ibm -DIBM_HEAPDUMP=true</jvm.args.vendor-specific>
+ </properties>
+ </profile>
+
<!-- Profiler profile - enables JBoss Profiler. THIS IS FOR JDK 5 ONLY! -->
<profile>
<id>profile</id>
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java 2009-09-02 17:25:24 UTC (rev 743)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java 2009-09-03 12:52:10 UTC (rev 744)
@@ -603,7 +603,7 @@
String condVerb = isRegEx ? "match" : "contain";
if( !isSuccess ){
- fail(errorMessage + " - \nexpected the result to "+condVerb+":\n\n" + expectedBuffer.toString() + "\n\nbut was:\n\n" + actualResult );
+ fail(errorMessage + " - \nexpected the result to "+condVerb+":\n\n>>>" + expectedBuffer.toString() + "<<<\n\nbut was:\n\n>>>" + actualResult + "<<<" );
}
}
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryOperationsTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryOperationsTest.java 2009-09-02 17:25:24 UTC (rev 743)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryOperationsTest.java 2009-09-03 12:52:10 UTC (rev 744)
@@ -320,7 +320,7 @@
try {
// Set up the expected results
- StringBuffer expectedBuffer = new StringBuffer("(?m)");
+ StringBuffer expectedBuffer = new StringBuffer("(?m)(?s)");
expectedBuffer.append("Sub Pool Statistics: \n");
expectedBuffer.append("Sub Pool Count: 1\n");
expectedBuffer.append(POOL_SEPARATOR);
Modified: trunk/jsfunit/testdata/ear/not-malformed-application-xml.ear
===================================================================
(Binary files differ)
15 years, 3 months