[Jpackage-commits] dist/jboss-jrunit/devel .cvsignore, 1.1, 1.2 jboss-jrunit-DatabaseTestProperties.patch, NONE, 1.1 jboss-jrunit-TestDriver.patch, NONE, 1.1 jboss-jrunit-build_xml.patch, NONE, 1.1 jboss-jrunit-project_properties.patch, NONE, 1.1 jboss-jrunit.spec, NONE, 1.1 sources, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Wed May 28 20:45:39 CEST 2008


Update of /home/projects/jpackage/cvs/dist/jboss-jrunit/devel
In directory ryu.zarb.org:/tmp/cvs-serv9714/devel

Modified Files:
	.cvsignore sources 
Added Files:
	jboss-jrunit-DatabaseTestProperties.patch 
	jboss-jrunit-TestDriver.patch jboss-jrunit-build_xml.patch 
	jboss-jrunit-project_properties.patch jboss-jrunit.spec 
Log Message:
Import from JPP 5.0

--- NEW FILE: jboss-jrunit-DatabaseTestProperties.patch ---
--- src/test/org/jboss/jrunit/web/database/DatabaseTestProperties.java.sav	2006-06-26 12:59:14.000000000 -0400
+++ src/test/org/jboss/jrunit/web/database/DatabaseTestProperties.java	2006-06-26 13:00:19.000000000 -0400
@@ -13,9 +13,10 @@
  * @author <a href="mailto:tclebert.suconic at jboss.com">Clebert Suconic</a>
  */
 public class DatabaseTestProperties {
-    public static final String CONNECTION = System.getProperty("CONNECTION","jdbc:mysql://localhost:3306/jrunit");
-    public static final String JDBC_CLASS = System.getProperty("JDBC_CLASS","com.mysql.jdbc.Driver");
+    public static final String CONNECTION = System.getProperty("CONNECTION","jdbc:hsqldb://db/jrunit");
+    public static final String JDBC_CLASS = System.getProperty("JDBC_CLASS","org.hsqldb.jdbcDriver");
     public static final String JDBC_USER  = System.getProperty("JDBC_USER","jrunit");
     public static final String JDBC_PASSWORD = System.getProperty("JDBC_PASSWORD","jrunit");
 
 }
+

--- NEW FILE: jboss-jrunit-project_properties.patch ---
--- project.properties.sav	2006-04-25 15:44:08.000000000 +0200
+++ project.properties	2006-04-25 15:47:22.000000000 +0200
@@ -4,14 +4,14 @@
 commonslogging-location=lib/commons-logging.jar
 concurrent-location=lib/concurrent.jar
 servlet-location=lib/javax.servlet.jar
-jdbc-driver-location=C:/Runtimes/jboss-4.0.2/server/default/lib/mysql-connector-java-3.0.16-ga-bin.jar
-jdbc-driver-class=com.mysql.jdbc.Driver
-jdbc-driver-url=jdbc:mysql://localhost/jrunit
+jdbc-driver-location=lib/hsqldb.jar
+jdbc-driver-class=org.hsqldb.jdbcDriver
+jdbc-driver-url=jdbc:hsqldb://db/jrunit
 jdbc-driver-user=jrunit
 jdbc-driver-password=jrunit
 
 
 #these properties will help you during deployment
-deploy.activated=true
+deploy.activated=false
 #deploydir.activated=true
-deploy.dir=C:/Runtimes/jboss-4.0.2/server/default/deploy
+deploy.dir=

--- NEW FILE: jboss-jrunit.spec ---
# Copyright (c) 2000-2005, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%define section		free
%define sname		jrunit

Summary:	JBoss JRunit
URL:		http://labs.jboss.com/portal/index.html?ctrl:id=page.default.info&project=jrunit
Source0:	jboss-jrunit-1.0-b2-src.tar.gz
#cvs -d:pserver:anonymous at anoncvs.forge.jboss.com:/cvsroot/jboss export -r HEAD jrunit
# 2006/04/25
Patch0:		jboss-jrunit-build_xml.patch
Patch1:		jboss-jrunit-project_properties.patch
Patch2:		jboss-jrunit-TestDriver.patch
Patch3:		jboss-jrunit-DatabaseTestProperties.patch

Name:		jboss-jrunit
Version:	1.0
Release:	0.b2.2jpp
Epoch:		0
License:	LGPL
Group:		Development/Java
Vendor:		JPackage Project
Distribution:	JPackage
BuildArch:	noarch
BuildRequires:	jpackage-utils >= 0:1.6
BuildRequires:	ant
BuildRequires:	jakarta-commons-beanutils
BuildRequires:	jakarta-commons-logging
BuildRequires:	concurrent
BuildRequires:	hsqldb
BuildRequires:	servletapi5
BuildRequires:	jcommon
BuildRequires:	jfreechart
BuildRequires:	jgroups
BuildRequires:	junit
BuildRequires:	log4j
Requires:	jpackage-utils >= 0:1.6
Requires:	concurrent
Requires:	jakarta-commons-logging
Requires:	jgroups
Requires:	junit
Requires:	log4j
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot

%description
JBoss JRunit is a project to aid in adding benchmarking to 
JUnit based test cases as well as providing a framework 
extension to JUnit to allow for distributed client/server 
based tests. It is important to note that JBoss JRunit is 
not a replacement for the popular test framework JUnit, but 
an extention to it allowing for more enterprise focused features.


%package javadoc
Summary:        Javadoc for %{name}
Group:          Development/Documentation

%description javadoc
%{summary}

%package demo
Summary:        Usage examples for %{name}
Group:          Development/Documentation

%description demo
%{summary}

%prep
%setup -q -n %{sname}
chmod -R go=u-w *
for j in $(find . -name "*.jar"); do
    mv $j $j.no
done
mkdir -p db

%patch0 -b .sav
%patch1 -b .sav
%patch2 -b .sav
%patch3 -b .sav

%build
pushd lib
#BUILD/jrunit/lib/ant.jar.no
ln -sf $(build-classpath ant) .
#BUILD/jrunit/lib/commons-logging.jar.no
ln -sf $(build-classpath commons-logging) .
#BUILD/jrunit/lib/concurrent.jar.no
ln -sf $(build-classpath concurrent) .
#BUILD/jrunit/lib/hsqldb.jar.no
ln -sf $(build-classpath hsqldb) .
#BUILD/jrunit/lib/javax.servlet.jar.no
ln -sf $(build-classpath servletapi5) javax.servlet.jar
#BUILD/jrunit/lib/jgroups.jar.no
ln -sf $(build-classpath jgroups) .
#mv jgroups.jar.no jgroups.jar
#BUILD/jrunit/lib/junit.jar.no
ln -sf $(build-classpath junit) .
#BUILD/jrunit/lib/log4j.jar.no
ln -sf $(build-classpath log4j) .
#
#tst#mkdir endorsed
#tst#pushd endorsed
#tst#ln -sf $(build-classpath xalan-j2-serializer) .
#tst#ln -sf $(build-classpath xalan-j2) .
#tst#ln -sf $(build-classpath xerces-j2) .
#tst#ln -sf $(build-classpath xml-commons-apis) .
#tst#popd
popd
pushd weblib
#BUILD/jrunit/weblib/commons-beanutils.jar.no
ln -sf $(build-classpath commons-beanutils) .
#BUILD/jrunit/weblib/commons-logging-api.jar.no
ln -sf $(build-classpath commons-logging-api) .
#BUILD/jrunit/weblib/commons-logging.jar.no
ln -sf $(build-classpath commons-logging) .
#BUILD/jrunit/weblib/jcommon-1.0.0-rc1.jar.no
ln -sf $(build-classpath jcommon) .
#BUILD/jrunit/weblib/jfreechart-1.0.0-rc1.jar.no
ln -sf $(build-classpath jfreechart) .
popd

#tst#ant -Djava-endorsed.dirs=$(pwd)/lib/endorsed distribution web-app javadocs run-tests
export ANT_OPTS="-Xmx256m"
export OPT_JAR_LIST="ant/ant-junit junit xalan-j2-serializer"
ant distribution web-app javadocs run-tests

%install
rm -rf $RPM_BUILD_ROOT

# jar
install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}
install -p -m 0644 output/jar/jrunit.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
install -p -m 0644 output/war/jrunit-report.war $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}

# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr output/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink

# demo
install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/samples
cp -pr src/samples/*   $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/samples

%clean
rm -rf $RPM_BUILD_ROOT

%post javadoc
rm -f %{_javadocdir}/%{name}
ln -sf %{name}-%{version} %{_javadocdir}/%{name}

%postun javadoc
if [ "$1" = "0" ]; then
  rm -f %{_javadocdir}/%{name}
fi

%files
%defattr(-,root,root,-)
%{_javadir}/*
%{_datadir}/%{name}-%{version}/*.war

%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}
%ghost %doc %{_javadocdir}/%{name}

%files demo
%defattr(0644,root,root,0755)
%{_datadir}/%{name}-%{version}/samples

%changelog
* Mon Jun 26 2006 Ralph Apel <r.apel at r-apel.de> 0:1.0-0.b2.2jpp
- Patch TestDriver to -Djava.net.preferIPv4Stack=true on exec java
- Patch DatabaseTestProperties to use hsqldb

* Mon Jun 12 2006 Ralph Apel <r.apel at r-apel.de> 0:1.0-0.b2.1jpp
- Rectify release to b2

* Wed May 03 2006 Ralph Apel <r.apel at r-apel.de> 0:1.0-0.dev.1jpp
- First JPP-1.7 release

--- NEW FILE: jboss-jrunit-build_xml.patch ---
--- build.xml.sav	2005-09-16 11:55:51.000000000 -0400
+++ build.xml	2006-06-27 00:38:00.000000000 -0400
@@ -66,11 +66,16 @@
 				<pathelement location="${concurrent-location}"/>
 				<pathelement location="${commonslogging-location}"/>
 				<pathelement location="${output-tst-classes}"/>
+				<pathelement location="${output-web-classes}"/>
 				<pathelement location="${output-classes}"/>
+                		<pathelement location="${jdbc-driver-location}"/>
 			</classpath>
+                        <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
+                        <jvmarg value="-Xmx256m"/>
 			<batchtest fork="yes" todir="${tests.dir}">
 		    	<fileset dir="${tests-src}">
-                <include name="**/**/**Test**"/>
+                		<include name="**/**/**Test**"/>
+				<exclude name="**/database/**Test**"/>
 		    	</fileset>
 		    </batchtest>
 			<formatter type="xml"/>
@@ -105,10 +110,9 @@
                 <pathelement location="${output-classes}"/>
                 <pathelement location="${output-tst-classes}"/>
                 <pathelement location="${jdbc-driver-location}"/>
-
-
-            <pathelement location="${output-samples}"/>
+                <pathelement location="${output-samples}"/>
             </classpath>
+            <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
             <batchtest fork="yes" todir="${tests.dir}">
                 <fileset dir="${tests-src}">
                   <include name="**/**/TestJGroupsController**"/>
@@ -148,10 +152,9 @@
                 <pathelement location="${output-classes}"/>
                 <pathelement location="${output-tst-classes}"/>
                 <pathelement location="${jdbc-driver-location}"/>
-
-
-            <pathelement location="${output-samples}"/>
+                <pathelement location="${output-samples}"/>
             </classpath>
+            <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
             <batchtest fork="yes" todir="${tests.dir}">
                 <fileset dir="${tests-src}">
                   <include name="**/**/TestJGroupsController**"/>
@@ -186,8 +189,9 @@
                 <pathelement location="${concurrent-location}"/>
                 <pathelement location="${commonslogging-location}"/>
                 <pathelement location="${output-classes}"/>
-            <pathelement location="${output-samples}"/>
+                <pathelement location="${output-samples}"/>
             </classpath>
+            <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
             <batchtest fork="yes" todir="${tests.dir}">
                 <fileset dir="${samples-src}">
                   <include name="**/**/SimplePlainTestUnderLoad**"/>
@@ -217,8 +221,9 @@
                 <pathelement location="${concurrent-location}"/>
                 <pathelement location="${commonslogging-location}"/>
                 <pathelement location="${output-classes}"/>
-            <pathelement location="${output-samples}"/>
+                <pathelement location="${output-samples}"/>
             </classpath>
+            <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
             <batchtest fork="yes" todir="${tests.dir}">
                 <fileset dir="${samples-src}">
                   <include name="**/**/SampleClientServerTest**"/>
@@ -247,8 +252,9 @@
 				<pathelement location="${concurrent-location}"/>
 				<pathelement location="${commonslogging-location}"/>
 				<pathelement location="${output-classes}"/>
-            <pathelement location="${output-samples}"/>
+                                <pathelement location="${output-samples}"/>
 			</classpath>
+                        <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
 			<batchtest fork="yes" todir="${tests.dir}">
 		    	<fileset dir="${samples-src}">
                   <include name="**/**/SampleMultipleClientServerTest**"/>
@@ -276,8 +282,9 @@
 				<pathelement location="${concurrent-location}"/>
 				<pathelement location="${commonslogging-location}"/>
 				<pathelement location="${output-classes}"/>
-            <pathelement location="${output-samples}"/>
+                                <pathelement location="${output-samples}"/>
 			</classpath>
+                        <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
 			<batchtest fork="yes" todir="${tests.dir}">
 		    	<fileset dir="${samples-src}">
                   <include name="**/**/SampleDecoratedClientServerTest**"/>
@@ -309,6 +316,7 @@
 				<pathelement location="${output-classes}"/>
 				<pathelement location="${output-samples}"/>
 			</classpath>
+                        <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
 			<batchtest fork="yes" todir="${tests.dir}">
 		    	<fileset dir="${samples-src}"></fileset>
 		    </batchtest>
@@ -367,4 +375,21 @@
         <echo message="Documentation generated at ./doc/build/en"/>
     </target>
 
+  <target name="javadocs">
+    <javadoc packagenames="org.jboss.jrunit.*"
+           sourcepath="src/main"
+           defaultexcludes="yes"
+           locale="en_US"
+           destdir="output/api"
+           author="true"
+           version="true"
+           use="true"
+           public="true"
+           nohelp="true"
+           windowtitle="JBoss JRunit">
+      <doctitle><![CDATA[<h1>JBoss JRunit</h1>]]></doctitle>
+      <bottom><![CDATA[<i>JRunit, a JUnit extension for distributed client/server tests.</i>]]></bottom>
+    </javadoc>
+  </target>
+
 </project>

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jboss-jrunit/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	28 May 2008 18:45:15 -0000	1.1
--- sources	28 May 2008 18:45:37 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ 3496a9df3c663336bd4e92a254b3c639  jboss-jrunit-1.0-b2-src.tar.gz

--- NEW FILE: jboss-jrunit-TestDriver.patch ---
--- src/main/org/jboss/jrunit/harness/TestDriver.java.sav	2005-12-05 22:56:53.000000000 -0500
+++ src/main/org/jboss/jrunit/harness/TestDriver.java	2006-06-27 00:52:27.000000000 -0400
@@ -500,12 +500,17 @@
       // wait for other processes to shutdown
       log.debug("Waiting for all other processes to shutdown and leave group.");
       log.debug("Current number of members: " + currentNumberOfMembers);
+      Thread t=Thread.currentThread();
       for(int x = 0; x < 5 && currentNumberOfMembers != 0; x++)
       {
             try
             {
                sendAbortMessage();
-               Thread.currentThread().wait(4000);
+//               Thread.currentThread().wait(4000);
+               synchronized(t)
+               {
+                  t.wait(4000);
+               }
                log.debug("Current number of members: " + currentNumberOfMembers);
             }
             catch(InterruptedException e)
@@ -615,7 +620,7 @@
       {
          public void run()
          {
-            String execCmd = "java" +
+            String execCmd = "java -Djava.net.preferIPv4Stack=true " +
                              getSystemProperties(sysProperties) +
                              "-cp \"" + getExtendedClassPath(extendedClasspath) + System.getProperty("java.class.path") +
                              "\" " + ServerTestHarness.class.getName() +
@@ -841,4 +846,4 @@
 //      }
    }
 
-}
\ No newline at end of file
+}

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jboss-jrunit/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	28 May 2008 18:45:15 -0000	1.1
--- .cvsignore	28 May 2008 18:45:37 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ jboss-jrunit-1.0-b2-src.tar.gz




More information about the JPackage-commits mailing list