JBoss Native SVN: r1829 - trunk/build/patch.
by jbossnative-commits@lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-09-15 06:05:08 -0400 (Mon, 15 Sep 2008)
New Revision: 1829
Added:
trunk/build/patch/openssl-0.9.8h.patch
trunk/build/patch/tomcat-native-1.1.15.patch
Log:
Add patches for openssl and tcnative
Added: trunk/build/patch/openssl-0.9.8h.patch
===================================================================
--- trunk/build/patch/openssl-0.9.8h.patch (rev 0)
+++ trunk/build/patch/openssl-0.9.8h.patch 2008-09-15 10:05:08 UTC (rev 1829)
@@ -0,0 +1,11 @@
+--- crypto/sha/asm/sha1-586.pl
++++ crypto/sha/asm/sha1-586.pl
+@@ -149,7 +149,7 @@
+ &add($f,$e); # f+=ROTATE(a,5)
+ }
+
+-&function_begin("sha1_block_data_order",16);
++&function_begin("sha1_block_data_order");
+ &mov($tmp1,&wparam(0)); # SHA_CTX *c
+ &mov($T,&wparam(1)); # const void *input
+ &mov($A,&wparam(2)); # size_t num
Added: trunk/build/patch/tomcat-native-1.1.15.patch
===================================================================
--- trunk/build/patch/tomcat-native-1.1.15.patch (rev 0)
+++ trunk/build/patch/tomcat-native-1.1.15.patch 2008-09-15 10:05:08 UTC (rev 1829)
@@ -0,0 +1,28 @@
+--- os/win32/registry.c
++++ os/win32/registry.c
+@@ -21,12 +21,13 @@
+ */
+
+ #ifndef _WIN32_WINNT
+-#define _WIN32_WINNT 0x0500
++#define _WIN32_WINNT 0x0501
+ #endif
+ #include <winsock2.h>
+ #include <mswsock.h>
+ #include <ws2tcpip.h>
+ #include <shlwapi.h>
++#include <tlhelp32.h>
+
+ #include "apr.h"
+ #include "apr_pools.h"
+--- os/win32/system.c
++++ os/win32/system.c
+@@ -26,6 +26,8 @@
+ #include <winsock2.h>
+ #include <mswsock.h>
+ #include <ws2tcpip.h>
++#include <tlhelp32.h>
++
+ #include "apr.h"
+ #include "apr_pools.h"
+ #include "apr_poll.h"
15 years, 8 months
JBoss Native SVN: r1828 - trunk/mod_cluster/test/java.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-09-15 05:11:07 -0400 (Mon, 15 Sep 2008)
New Revision: 1828
Modified:
trunk/mod_cluster/test/java/README.txt
Log:
Add allow/deny example...
Modified: trunk/mod_cluster/test/java/README.txt
===================================================================
--- trunk/mod_cluster/test/java/README.txt 2008-09-15 09:10:17 UTC (rev 1827)
+++ trunk/mod_cluster/test/java/README.txt 2008-09-15 09:11:07 UTC (rev 1828)
@@ -10,9 +10,16 @@
<IfModule manager_module>
Listen jfcpc:6666
<VirtualHost jfcpc:6666>
+ <Directory />
+ Order deny,allow
+ Deny from all
+ Allow from 10.33.144
+ </Directory>
+
KeepAliveTimeout 300
MaxKeepAliveRequests 0
AdvertiseFrequency 5
</VirtualHost>
</IfModule>
-(replace jfpc by your hostname or your IP address).
+(replace jfpc by your hostname or your IP address)
+(replace 10.33.144 by the subnet you want to allow)
15 years, 8 months
JBoss Native SVN: r1827 - trunk/mod_cluster/test/java.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-09-15 05:10:17 -0400 (Mon, 15 Sep 2008)
New Revision: 1827
Modified:
trunk/mod_cluster/test/java/build.properties.default
trunk/mod_cluster/test/java/build.xml
Log:
Need for anotations...
Modified: trunk/mod_cluster/test/java/build.properties.default
===================================================================
--- trunk/mod_cluster/test/java/build.properties.default 2008-09-15 09:09:08 UTC (rev 1826)
+++ trunk/mod_cluster/test/java/build.properties.default 2008-09-15 09:10:17 UTC (rev 1827)
@@ -28,7 +28,13 @@
servlet-api.jar=${base.path}/${jbossweb.version}/servlet-api-${jbossweb.version}.jar
base-jboss.loc=http://repository.jboss.com/maven2/jboss
+
jboss-logging.version=2.0.3.GA
base-jboss-logging.home=${base.path}/${jboss-logging.version}/lib
jboss-logging.jar.loc=${base-jboss.loc}/jboss-logging-spi/${jboss-logging.version}/jboss-logging-spi-${jboss-logging.version}.jar
jboss-logging.jar=${base.path}/${jboss-logging.version}/jboss-logging-spi-${jboss-logging.version}.jar
+
+jboss-ejb-api.version=4.2.1.GA
+base-jboss-ejb-api.home=${base.path}/${jboss-ejb-api.version}/lib
+jboss-ejb-api.jar.loc=${base-jboss.loc}/jboss-ejb-api/${jboss-ejb-api.version}/jboss-ejb-api-${jboss-ejb-api.version}.jar
+jboss-ejb-api.jar=${base.path}/${jboss-ejb-api.version}/jboss-ejb-api-spi-${jboss-ejb-api.version}.jar
Modified: trunk/mod_cluster/test/java/build.xml
===================================================================
--- trunk/mod_cluster/test/java/build.xml 2008-09-15 09:09:08 UTC (rev 1826)
+++ trunk/mod_cluster/test/java/build.xml 2008-09-15 09:10:17 UTC (rev 1827)
@@ -50,6 +50,7 @@
<pathelement location="${jboss-logging.jar}"/>
+ <pathelement location="${jboss-ejb-api.jar}"/>
<!--
<fileset dir="${jbossweb.build}/bin/">
<include name="tomcat-juli.jar"/>
@@ -167,6 +168,12 @@
</antcall>
<antcall target="downloadfile">
+ <param name="sourcefile" value="${jboss-ejb-api.jar.loc}"/>
+ <param name="destfile" value="${jboss-ejb-api.jar}"/>
+ <param name="destdir" value="${base-jboss-ejb-api.home}"/>
+ </antcall>
+
+ <antcall target="downloadfile">
<param name="sourcefile" value="${junit.jar.loc}"/>
<param name="destfile" value="${junit.jar}"/>
<param name="destdir" value="${base-junit.home}"/>
15 years, 8 months
JBoss Native SVN: r1826 - trunk/mod_cluster/native/mod_manager.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-09-15 05:09:08 -0400 (Mon, 15 Sep 2008)
New Revision: 1826
Modified:
trunk/mod_cluster/native/mod_manager/mod_manager.c
Log:
Arrange the filename to prevent the message:
"Module bug? Request filename is missing for URI"
Now the stuff like:
<Directory />
Order deny,allow
Deny from all
Allow from 10.33.144
</Directory>
In the mod_cluster virtual host is working :-)
Modified: trunk/mod_cluster/native/mod_manager/mod_manager.c
===================================================================
--- trunk/mod_cluster/native/mod_manager/mod_manager.c 2008-09-15 06:48:29 UTC (rev 1825)
+++ trunk/mod_cluster/native/mod_manager/mod_manager.c 2008-09-15 09:09:08 UTC (rev 1826)
@@ -1078,7 +1078,10 @@
ours = 1;
if (ours) {
/* The method one of ours */
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+ "manager_trans %s (%s)", r->method, r->uri);
r->handler = "mod-cluster";
+ r->filename = apr_pstrdup(r->pool, r->uri);
return OK;
}
15 years, 8 months
JBoss Native SVN: r1825 - trunk/mod_cluster/test/java.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-09-15 02:48:29 -0400 (Mon, 15 Sep 2008)
New Revision: 1825
Modified:
trunk/mod_cluster/test/java/build.properties.default
trunk/mod_cluster/test/java/build.xml
Log:
Fix jboss-logging location.
Modified: trunk/mod_cluster/test/java/build.properties.default
===================================================================
--- trunk/mod_cluster/test/java/build.properties.default 2008-09-15 06:41:59 UTC (rev 1824)
+++ trunk/mod_cluster/test/java/build.properties.default 2008-09-15 06:48:29 UTC (rev 1825)
@@ -29,5 +29,6 @@
base-jboss.loc=http://repository.jboss.com/maven2/jboss
jboss-logging.version=2.0.3.GA
+base-jboss-logging.home=${base.path}/${jboss-logging.version}/lib
jboss-logging.jar.loc=${base-jboss.loc}/jboss-logging-spi/${jboss-logging.version}/jboss-logging-spi-${jboss-logging.version}.jar
jboss-logging.jar=${base.path}/${jboss-logging.version}/jboss-logging-spi-${jboss-logging.version}.jar
Modified: trunk/mod_cluster/test/java/build.xml
===================================================================
--- trunk/mod_cluster/test/java/build.xml 2008-09-15 06:41:59 UTC (rev 1824)
+++ trunk/mod_cluster/test/java/build.xml 2008-09-15 06:48:29 UTC (rev 1825)
@@ -163,7 +163,7 @@
<antcall target="downloadfile">
<param name="sourcefile" value="${jboss-logging.jar.loc}"/>
<param name="destfile" value="${jboss-logging.jar}"/>
- <param name="destdir" value="${base-jboss.home}"/>
+ <param name="destdir" value="${base-jboss-logging.home}"/>
</antcall>
<antcall target="downloadfile">
15 years, 8 months
JBoss Native SVN: r1824 - trunk/mod_cluster/test/java/org/jboss/mod_cluster.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-09-15 02:41:59 -0400 (Mon, 15 Sep 2008)
New Revision: 1824
Added:
trunk/mod_cluster/test/java/org/jboss/mod_cluster/MyCount.java
Log:
Missing file. (Small servlet).
Added: trunk/mod_cluster/test/java/org/jboss/mod_cluster/MyCount.java
===================================================================
--- trunk/mod_cluster/test/java/org/jboss/mod_cluster/MyCount.java (rev 0)
+++ trunk/mod_cluster/test/java/org/jboss/mod_cluster/MyCount.java 2008-09-15 06:41:59 UTC (rev 1824)
@@ -0,0 +1,140 @@
+/*
+ * Copyright(c) 2006 Red Hat Middleware, LLC,
+ * and individual contributors as indicated by the @authors tag.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This library 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 of the License, or (at your option) any later version.
+ *
+ * This library 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 library in the file COPYING.LIB;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * @author Jean-Frederic Clere
+ * @version $Revision: 420067 $, $Date: 2006-07-08 09:16:58 +0200 (sub, 08 srp 2006) $
+ */
+
+import java.io.*;
+import java.text.*;
+import java.util.*;
+import javax.servlet.*;
+import javax.servlet.http.*;
+
+
+
+/**
+ * Example servlet showing cookies handling (counter).
+ *
+ */
+
+public class MyCount extends HttpServlet {
+
+ public void doGet(HttpServletRequest request,
+ HttpServletResponse response)
+ throws IOException, ServletException
+ {
+ response.setContentType("text/html");
+
+ PrintWriter out = response.getWriter();
+ out.println("<html>");
+ out.println("<body bgcolor=\"white\">");
+ out.println("<head>");
+
+ String title = "sessions.title";
+ out.println("<title>" + title + "</title>");
+ out.println("</head>");
+ out.println("<body>");
+
+ out.println("<h3>" + title + "</h3>");
+
+ HttpSession session = request.getSession(false);
+ Integer ii = new Integer(0);
+ if (session == null) {
+ // Create it.
+ out.println("create");
+ session = request.getSession(true);
+ session.setAttribute("count", ii);
+ }
+ out.println("sessions.id " + session.getId());
+ out.println("<br>");
+ out.println("sessions.created ");
+ out.println(new Date(session.getCreationTime()) + "<br>");
+ out.println("sessions.lastaccessed ");
+ out.println(new Date(session.getLastAccessedTime()));
+ out.println("sessions.count ");
+ out.println(session.getAttribute("count"));
+
+ ii = (Integer) session.getAttribute("count");
+ int i = 0;
+ if (ii != null)
+ i = ii.intValue();
+ i++;
+ ii = new Integer(i); // JAVA5 : ii.valueOf(i);
+ session.setAttribute("count", ii);
+
+ out.println("<P>");
+ out.println("sessions.data<br>");
+ Enumeration names = session.getAttributeNames();
+ while (names.hasMoreElements()) {
+ String name = (String) names.nextElement();
+ String value = session.getAttribute(name).toString();
+ out.println(name + " = " + value + "<br>");
+ // response.addHeader(name, value);
+ }
+
+ out.println("<P>");
+ out.print("<form action=\"");
+ out.print(response.encodeURL("MyCount"));
+ out.print("\" ");
+ out.println("method=POST>");
+ out.println("sessions.dataname");
+ out.println("<input type=text size=20 name=dataname>");
+ out.println("<br>");
+ out.println("sessions.datavalue");
+ out.println("<input type=text size=20 name=datavalue>");
+ out.println("<br>");
+ out.println("<input type=submit>");
+ out.println("</form>");
+
+ out.println("<P>GET based form:<br>");
+ out.print("<form action=\"");
+ out.print(response.encodeURL("MyCount"));
+ out.print("\" ");
+ out.println("method=GET>");
+ out.println("sessions.dataname");
+ out.println("<input type=text size=20 name=dataname>");
+ out.println("<br>");
+ out.println("sessions.datavalue");
+ out.println("<input type=text size=20 name=datavalue>");
+ out.println("<br>");
+ out.println("<input type=submit>");
+ out.println("</form>");
+
+ out.print("<p><a href=\"");
+ out.print(response.encodeURL("MyCount?dataname=foo&datavalue=bar"));
+ out.println("\" >URL encoded </a>");
+
+ out.println("</body>");
+ out.println("</html>");
+
+ out.println("</body>");
+ out.println("</html>");
+ }
+
+ public void doPost(HttpServletRequest request,
+ HttpServletResponse response)
+ throws IOException, ServletException
+ {
+ doGet(request, response);
+ }
+
+}
Property changes on: trunk/mod_cluster/test/java/org/jboss/mod_cluster/MyCount.java
___________________________________________________________________
Name: svn:executable
+ *
15 years, 8 months
JBoss Native SVN: r1823 - in trunk/mod_cluster/test/java: Clients/JBWEB-117 and 1 other directory.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-09-14 18:00:45 -0400 (Sun, 14 Sep 2008)
New Revision: 1823
Modified:
trunk/mod_cluster/test/java/Clients/JBWEB-117/build.xml
trunk/mod_cluster/test/java/build.properties.default
trunk/mod_cluster/test/java/build.xml
Log:
Arrange dependancies.
Modified: trunk/mod_cluster/test/java/Clients/JBWEB-117/build.xml
===================================================================
--- trunk/mod_cluster/test/java/Clients/JBWEB-117/build.xml 2008-09-14 20:45:23 UTC (rev 1822)
+++ trunk/mod_cluster/test/java/Clients/JBWEB-117/build.xml 2008-09-14 22:00:45 UTC (rev 1823)
@@ -4,10 +4,7 @@
<property file="../../build.properties.default"/>
<path id="tomcat.test.classpath">
- <fileset dir="${jbosswebjar}/">
- <include name="jbossweb.jar"/>
- <include name="servlet-api.jar"/>
- </fileset>
+ <pathelement location="${servlet-api.jar}"/>
</path>
<target name="build" depends="compile">
Modified: trunk/mod_cluster/test/java/build.properties.default
===================================================================
--- trunk/mod_cluster/test/java/build.properties.default 2008-09-14 20:45:23 UTC (rev 1822)
+++ trunk/mod_cluster/test/java/build.properties.default 2008-09-14 22:00:45 UTC (rev 1823)
@@ -1,8 +1,33 @@
-commons-httpclient.jar=${user.home}/java/commons-httpclient-3.1/commons-httpclient-3.1.jar
-commons-logging.jar=${user.home}/java/commons-logging-1.0.4/commons-logging.jar
-commons-codec.jar=${user.home}/java/commons-codec-1.3/commons-codec-1.3.jar
+base-apache.loc=http://archive.apache.org/dist/
+base.path=${user.home}/java
+commons-httpclient.loc=${base-apache.loc}/httpcomponents/commons-httpclient/binary/commons-httpclient-3.1.tar.gz
+commons-httpclient.jar=${base.path}/commons-httpclient-3.1/commons-httpclient-3.1.jar
+
+commons-logging.loc=${base-apache.loc}/commons/logging/binaries/commons-logging-1.0.4.tar.gz
+commons-logging.jar=${base.path}/commons-logging-1.0.4/commons-logging.jar
+
+commons-codec.loc=${base-apache.loc}/commons/codec/binaries/commons-codec-1.3.tar.gz
+commons-codec.jar=${base.path}/commons-codec-1.3.jar
+
+# junit stuff
+junit.version=4.5
+junit.jar.loc=http://kent.dl.sourceforge.net/sourceforge/junit/junit-${junit.version}.jar
+junit.jar=${base.path}/junit-${junit.version}/junit-${junit.version}.jar
+base-junit.home=${base.path}/junit-${junit.version}
+
# Location of jbossweb jar files.
-jbosswebjar=${user.home}/jbossweb_trunk/output/jars
-bootstrap.jar=${user.home}/jbossweb_trunk/output/build/bin/bootstrap.jar
-annotations-api.jar=${user.home}/jbossweb_trunk//output/build/lib/annotations-api.jar
+base-jbossweb.loc=http://repository.jboss.com/maven2/jboss/web/
+jbossweb.version=2.1.1.CR7
+base-jbossweb.home=${base.path}/${jbossweb.version}/lib
+
+jbossweb.jar.loc=${base-jbossweb.loc}/jbossweb/${jbossweb.version}/jbossweb-${jbossweb.version}.jar
+jbossweb.jar=${base.path}/${jbossweb.version}/jbossweb-${jbossweb.version}.jar
+
+servlet-api.jar.loc=${base-jbossweb.loc}/servlet-api/${jbossweb.version}/servlet-api-${jbossweb.version}.jar
+servlet-api.jar=${base.path}/${jbossweb.version}/servlet-api-${jbossweb.version}.jar
+
+base-jboss.loc=http://repository.jboss.com/maven2/jboss
+jboss-logging.version=2.0.3.GA
+jboss-logging.jar.loc=${base-jboss.loc}/jboss-logging-spi/${jboss-logging.version}/jboss-logging-spi-${jboss-logging.version}.jar
+jboss-logging.jar=${base.path}/${jboss-logging.version}/jboss-logging-spi-${jboss-logging.version}.jar
Modified: trunk/mod_cluster/test/java/build.xml
===================================================================
--- trunk/mod_cluster/test/java/build.xml 2008-09-14 20:45:23 UTC (rev 1822)
+++ trunk/mod_cluster/test/java/build.xml 2008-09-14 22:00:45 UTC (rev 1823)
@@ -36,7 +36,6 @@
<property name="compile.source" value="1.5"/>
- <property name="junit.jar" value="${junit.home}/junit.jar"/>
<property name="test.runner" value="junit.textui.TestRunner"/>
<path id="tomcat.test.classpath">
@@ -45,14 +44,12 @@
<pathelement location="${commons-httpclient.jar}"/>
<pathelement location="${commons-logging.jar}"/>
<pathelement location="${commons-codec.jar}"/>
- <pathelement location="${bootstrap.jar}"/>
- <pathelement location="${annotations-api.jar}"/>
- <fileset dir="${jbosswebjar}/">
- <include name="jbossweb.jar"/>
- <include name="servlet-api.jar"/>
- </fileset>
+ <pathelement location="${jbossweb.jar}"/>
+ <pathelement location="${servlet-api.jar}"/>
+ <pathelement location="${jboss-logging.jar}"/>
+
<!--
<fileset dir="${jbossweb.build}/bin/">
<include name="tomcat-juli.jar"/>
@@ -98,4 +95,81 @@
</java>
</target>
+
+ <!-- Download and dependency building -->
+ <target name="proxyflags">
+ <!-- check proxy parameters. -->
+ <condition property="useproxy">
+ <equals arg1="${proxy.use}" arg2="on" />
+ </condition>
+ </target>
+
+ <target name="setproxy" depends="proxyflags" if="useproxy">
+ <taskdef name="setproxy"
+ classname="org.apache.tools.ant.taskdefs.optional.net.SetProxy" />
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+ <target name="testexist">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+
+ <target name="downloadgz" unless="exist" depends="setproxy,testexist">
+ <!-- Download and extract the package -->
+ <get src="${sourcefile}" dest="${base.path}/file.tar.gz" />
+ <gunzip src="${base.path}/file.tar.gz" dest="${base.path}/file.tar"/>
+ <untar src="${base.path}/file.tar" dest="${base.path}"/>
+ <delete file="${base.path}/file.tar"/>
+ <delete file="${base.path}/file.tar.gz"/>
+ </target>
+
+ <target name="downloadfile" unless="exist" depends="setproxy,testexist">
+ <!-- Download extract the file -->
+ <mkdir dir="${destdir}" />
+ <get src="${sourcefile}" dest="${destfile}" />
+ </target>
+
+ <target name="download" description="Builds and download dependent components">
+ <antcall target="downloadgz">
+ <param name="sourcefile" value="${commons-httpclient.loc}"/>
+ <param name="destfile" value="${commons-httpclient.jar}"/>
+ </antcall>
+
+ <antcall target="downloadgz">
+ <param name="sourcefile" value="${commons-logging.loc}"/>
+ <param name="destfile" value="${commons-logging.jar}"/>
+ </antcall>
+
+ <antcall target="downloadgz">
+ <param name="sourcefile" value="${commons-codec.loc}"/>
+ <param name="destfile" value="${commons-codec.jar}"/>
+ </antcall>
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${jbossweb.jar.loc}"/>
+ <param name="destfile" value="${jbossweb.jar}"/>
+ <param name="destdir" value="${base-jbossweb.home}"/>
+ </antcall>
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${servlet-api.jar.loc}"/>
+ <param name="destfile" value="${servlet-api.jar}"/>
+ <param name="destdir" value="${base-jbossweb.home}"/>
+ </antcall>
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${jboss-logging.jar.loc}"/>
+ <param name="destfile" value="${jboss-logging.jar}"/>
+ <param name="destdir" value="${base-jboss.home}"/>
+ </antcall>
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.jar.loc}"/>
+ <param name="destfile" value="${junit.jar}"/>
+ <param name="destdir" value="${base-junit.home}"/>
+ </antcall>
+ </target>
</project>
15 years, 8 months
JBoss Native SVN: r1822 - trunk/mod_cluster/test/java/org/jboss/mod_cluster.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-09-14 16:45:23 -0400 (Sun, 14 Sep 2008)
New Revision: 1822
Added:
trunk/mod_cluster/test/java/org/jboss/mod_cluster/Test_Native_JBWEB_117.java
Log:
Add missing file.
Added: trunk/mod_cluster/test/java/org/jboss/mod_cluster/Test_Native_JBWEB_117.java
===================================================================
--- trunk/mod_cluster/test/java/org/jboss/mod_cluster/Test_Native_JBWEB_117.java (rev 0)
+++ trunk/mod_cluster/test/java/org/jboss/mod_cluster/Test_Native_JBWEB_117.java 2008-09-14 20:45:23 UTC (rev 1822)
@@ -0,0 +1,55 @@
+/*
+ * mod_cluster
+ *
+ * Copyright(c) 2008 Red Hat Middleware, LLC,
+ * and individual contributors as indicated by the @authors tag.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This library 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 of the License, or (at your option) any later version.
+ *
+ * This library 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 library in the file COPYING.LIB;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * @author Jean-Frederic Clere
+ * @version $Revision$
+ */
+
+package org.jboss.mod_cluster;
+
+import java.io.IOException;
+import java.io.File;
+
+import junit.framework.TestCase;
+
+import org.apache.catalina.Engine;
+import org.apache.catalina.ServerFactory;
+import org.apache.catalina.Service;
+import org.apache.catalina.LifecycleListener;
+import org.apache.catalina.LifecycleException;
+import org.apache.catalina.connector.Connector;
+import org.apache.catalina.core.StandardServer;
+
+import org.jboss.web.cluster.ClusterListener;
+
+import org.apache.catalina.core.AprLifecycleListener;
+
+public class Test_Native_JBWEB_117 extends TestCase {
+
+ /* Test for JBWEB-117 using tc-native/APR */
+ public void test_Native_JBWEB_117() {
+ String result = ClientBasicAuthen.test(true, (File) null);
+ if (result != null)
+ fail(result);
+ }
+}
15 years, 8 months
JBoss Native SVN: r1821 - trunk/mod_cluster/test/java.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-09-14 12:46:44 -0400 (Sun, 14 Sep 2008)
New Revision: 1821
Added:
trunk/mod_cluster/test/java/build.properties.default
Log:
Add missing file.
Added: trunk/mod_cluster/test/java/build.properties.default
===================================================================
--- trunk/mod_cluster/test/java/build.properties.default (rev 0)
+++ trunk/mod_cluster/test/java/build.properties.default 2008-09-14 16:46:44 UTC (rev 1821)
@@ -0,0 +1,8 @@
+commons-httpclient.jar=${user.home}/java/commons-httpclient-3.1/commons-httpclient-3.1.jar
+commons-logging.jar=${user.home}/java/commons-logging-1.0.4/commons-logging.jar
+commons-codec.jar=${user.home}/java/commons-codec-1.3/commons-codec-1.3.jar
+
+# Location of jbossweb jar files.
+jbosswebjar=${user.home}/jbossweb_trunk/output/jars
+bootstrap.jar=${user.home}/jbossweb_trunk/output/build/bin/bootstrap.jar
+annotations-api.jar=${user.home}/jbossweb_trunk//output/build/lib/annotations-api.jar
15 years, 8 months
JBoss Native SVN: r1820 - trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/impl.
by jbossnative-commits@lists.jboss.org
Author: pferraro
Date: 2008-09-12 18:22:14 -0400 (Fri, 12 Sep 2008)
New Revision: 1820
Modified:
trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/impl/DefaultMCMPHandler.java
Log:
init(...) needs to use a write lock, since it will trigger status(...) which requires a write lock - and lock upgrading is not allowed.
Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/impl/DefaultMCMPHandler.java
===================================================================
--- trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/impl/DefaultMCMPHandler.java 2008-09-12 22:18:06 UTC (rev 1819)
+++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/impl/DefaultMCMPHandler.java 2008-09-12 22:22:14 UTC (rev 1820)
@@ -121,7 +121,7 @@
public void init(List<AddressPort> initialProxies)
{
- Lock lock = this.proxiesLock.readLock();
+ Lock lock = this.proxiesLock.writeLock();
lock.lock();
try
15 years, 8 months