Skip to content

Commit

Permalink
[#6] first steps in removing neccesity for gossip router, added jboss…
Browse files Browse the repository at this point in the history
…-as5-profiles spec file, modified patches
  • Loading branch information
goldmann committed Jan 16, 2009
1 parent b6b7370 commit dec923d
Show file tree
Hide file tree
Showing 7 changed files with 84 additions and 20 deletions.
45 changes: 45 additions & 0 deletions specs/extras/jboss-as5-cloud-profiles.spec
@@ -0,0 +1,45 @@
%define jboss_version 5.0.0.GA
%define __jar_repack %{nil}

Summary: JBoss Cloud profiles
Name: jboss-as5-cloud-profiles
Version: 1.0.0.Beta2
Release: 1
License: LGPL
BuildArch: noarch
Group: Applications/System
Source0: http://internap.dl.sourceforge.net/sourceforge/jboss/jboss-%{jboss_version}-jdk6.zip
Requires: jboss-as5
BuildRoot: /tmp/jboss-cloud-profiles-%{jboss_version}

%description
The JBossAS 5 cloud profiles (cluster and group)

%prep
%setup -n jboss-%{jboss_version}

%install

# create directories
mkdir -p $RPM_BUILD_ROOT/opt/jboss-as5/server/cluster
mkdir -p $RPM_BUILD_ROOT/opt/jboss-as5/server/group

# copy profiles
cp -R %{_topdir}/BUILD/jboss-%{jboss_version}/server/default/* $RPM_BUILD_ROOT/opt/jboss-as5/server/group/
cp -R %{_topdir}/BUILD/jboss-%{jboss_version}/server/all/* $RPM_BUILD_ROOT/opt/jboss-as5/server/cluster/

%clean
rm -Rf $RPM_BUILD_ROOT

%pre
#JBOSS_SHELL=/bin/bash
#/usr/sbin/groupadd -r jboss 2>/dev/null || :
#/usr/sbin/useradd -c JBossAS -r -s $JBOSS_SHELL -d /opt/jboss-as5 -g jboss jboss 2>/dev/null || :

%files
%defattr(-,jboss,jboss)
/
#%attr(0755,root,root) %{_initrddir}/%{name}
#%attr(0755,root,root) /etc/jboss-as5.conf


27 changes: 15 additions & 12 deletions specs/extras/jboss-as5-mod_cluster.spec
Expand Up @@ -6,11 +6,13 @@ Release: 1
License: LGPL
BuildArch: noarch
Group: Applications/System
Requires: jboss-as5
Requires: jboss-as5-cloud-profiles
Requires: patch
Source0: http://labs.jboss.com/file-access/default/members/mod_cluster/freezone/dist/%{version}/mod_cluster-%{version}-src-ssl.tar.gz
Source1: jboss-as5-mod_cluster-server-xml.patch
Source2: jboss-as5-mod_cluster-jboss-beans-xml.patch
Source1: jboss-as5-mod_cluster-server-xml-group.patch
Source2: jboss-as5-mod_cluster-jboss-beans-xml-group.patch
Source3: jboss-as5-mod_cluster-server-xml-cluster.patch
Source4: jboss-as5-mod_cluster-jboss-beans-xml-cluster.patch
Patch: jboss-as5-mod_cluster-%{version}.patch
#BuildRoot: /tmp/%{name}

Expand All @@ -37,8 +39,7 @@ cd mod_cluster-%{version}-src-ssl
cd srclib/mod_cluster/
mvn package -Dmaven.test.skip=true

## every config but minimal
configs=( all default standard web )
configs=( cluster group )

for config in ${configs[@]} ; do
install -d -m 755 $RPM_BUILD_ROOT/opt/jboss-as5/server/${config}/deploy
Expand All @@ -48,20 +49,22 @@ done
install -d -m 755 $RPM_BUILD_ROOT/opt/jboss-as5/mod_cluster-patches/
cp %{SOURCE1} $RPM_BUILD_ROOT/opt/jboss-as5/mod_cluster-patches/
cp %{SOURCE2} $RPM_BUILD_ROOT/opt/jboss-as5/mod_cluster-patches/
cp %{SOURCE3} $RPM_BUILD_ROOT/opt/jboss-as5/mod_cluster-patches/
cp %{SOURCE4} $RPM_BUILD_ROOT/opt/jboss-as5/mod_cluster-patches/

%clean
#rm -Rf $RPM_BUILD_ROOT

%pre

%post
configs=( all default standard web )
configs=( cluster group )

for config in ${configs[@]} ; do
pushd /opt/jboss-as5/server/${config}/deploy/jbossweb.sar/
/usr/bin/patch server.xml < /opt/jboss-as5/mod_cluster-patches/as5-mod_cluster-server-xml.patch
/usr/bin/patch server.xml < /opt/jboss-as5/mod_cluster-patches/jboss-as5-mod_cluster-server-xml-${config}.patch
pushd META-INF
/usr/bin/patch jboss-beans.xml < /opt/jboss-as5/mod_cluster-patches/as5-mod_cluster-jboss-beans-xml.patch
/usr/bin/patch jboss-beans.xml < /opt/jboss-as5/mod_cluster-patches/jboss-as5-mod_cluster-jboss-beans-xml-${config}.patch
popd
popd
done
Expand All @@ -71,19 +74,19 @@ echo "# Comma-separated list of address:port for mod_cluster front-end proxies"
echo "JBOSS_PROXY_LIST=" >> /etc/jboss-as5.conf

%preun
configs=( all default standard web )
configs=( cluster group )

for config in ${configs[@]} ; do
pushd /opt/jboss-as5/server/${config}/deploy/jbossweb.sar/
/usr/bin/patch -R server.xml < /opt/jboss-as5/mod_cluster-patches/as5-mod_cluster-server-xml.patch
/usr/bin/patch -R server.xml < /opt/jboss-as5/mod_cluster-patches/jboss-as5-mod_cluster-server-xml-${config}.patch
pushd META-INF
/usr/bin/patch -R jboss-beans.xml < /opt/jboss-as5/mod_cluster-patches/as5-mod_cluster-jboss-beans-xml.patch
/usr/bin/patch -R jboss-beans.xml < /opt/jboss-as5/mod_cluster-patches/jboss-as5-mod_cluster-jboss-beans-xml-${config}.patch
popd
popd
done

%files
%defattr(-,root,root)
%defattr(-,jboss,jboss)
/


8 changes: 0 additions & 8 deletions specs/extras/jboss-as5.spec
Expand Up @@ -23,14 +23,6 @@ The JBossAS 5 Java Application Server
%setup -n jboss-%{version}
%patch -p1

# add neccessary folders
mkdir %{_topdir}/BUILD/jboss-%{version}/server/cluster
mkdir %{_topdir}/BUILD/jboss-%{version}/server/group

# copy profiles
cp -R %{_topdir}/BUILD/jboss-%{version}/server/default/* %{_topdir}/BUILD/jboss-%{version}/server/group/
cp -R %{_topdir}/BUILD/jboss-%{version}/server/all/* %{_topdir}/BUILD/jboss-%{version}/server/cluster/

%install
mkdir -p $RPM_BUILD_ROOT/opt
cp -R . $RPM_BUILD_ROOT/opt/jboss-as5
Expand Down
10 changes: 10 additions & 0 deletions src/jboss-as5-mod_cluster-jboss-beans-xml-group.patch
@@ -0,0 +1,10 @@
--- jboss-beans.xml 2008-12-22 14:59:14.000000000 -0500
+++ jboss-beans-my.xml 2008-12-22 15:04:13.000000000 -0500
@@ -10,6 +10,7 @@
is enabled in the tomcat server.xml file.
-->
<depends>jboss.jca:service=CachedConnectionManager</depends>
+ <depends>ModClusterService</depends>

<!-- Transaction manager for unfinished transaction checking in the CachedConnectionValve -->
<depends>jboss:service=TransactionManager</depends>
File renamed without changes.
14 changes: 14 additions & 0 deletions src/jboss-as5-mod_cluster-server-xml-group.patch
@@ -0,0 +1,14 @@
--- server.xml 2008-12-22 14:59:14.000000000 -0500
+++ server-my.xml 2008-12-22 15:02:28.000000000 -0500
@@ -5,6 +5,11 @@
<Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
<!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
<Listener className="org.apache.catalina.core.JasperListener" />
+
+ <!-- Initialize the mod-cluster integration listener -->
+ <Listener className="org.jboss.web.tomcat.service.deployers.MicrocontainerIntegrationLifecycleListener"
+ delegateBeanName="ModClusterService"/>
+

<Service name="jboss.web">

0 comments on commit dec923d

Please sign in to comment.