[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/jonas/devel jonas-4.3-postgresql.patch, NONE, 1.1 jonas.spec, 1.84, 1.85 jonas-4.3-properties.patch, 1.2, NONE rhdb-jonas.init, 1.2, NONE rhdb-jonas.logrotate, 1.2, NONE rhdb-jonas.sysconfig, 1.1, NONE



Author: gbenson

Update of /cvs/dist/rpms/jonas/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25103

Modified Files:
	jonas.spec 
Added Files:
	jonas-4.3-postgresql.patch 
Removed Files:
	jonas-4.3-properties.patch rhdb-jonas.init 
	rhdb-jonas.logrotate rhdb-jonas.sysconfig 
Log Message:
Don't use PostgreSQL as the default datasource

jonas-4.3-postgresql.patch:
 config_env.sh |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE jonas-4.3-postgresql.patch ---
Index: src/bin/config_env.sh
===================================================================
RCS file: /cvsroot/jonas/jonas/src/bin/config_env.sh,v
retrieving revision 1.4
diff -u -r1.4 config_env.sh
--- src/bin/config_env.sh	7 Apr 2004 12:16:05 -0000	1.4
+++ src/bin/config_env.sh	1 Oct 2004 12:10:58 -0000
@@ -32,7 +32,7 @@
 IDB_CLASSES_1=$IDB_HOME/idb.jar
 IDB_CLASSES_2=$IDB_HOME/idbexmpl.jar
 ORACLE_CLASSES=/usr/local/lib/ojdbc14.jar
-POSTGRE_CLASSES=/usr/lib/pgsql/pg73b1jdbc2.jar
+POSTGRE_CLASSES=/usr/share/java/postgresql-jdbc3.jar
 INTERBASE_CLASSES=/usr/interclient/interclient.jar
 MYSQL_CLASSES=/usr/local/lib/mm.mysql-2.0.14/mm.mysql-2.0.14-bin.jar
 MCKOI_CLASSES=/usr/local/lib/mkjdbc.jar


Index: jonas.spec
===================================================================
RCS file: /cvs/dist/rpms/jonas/devel/jonas.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- jonas.spec	5 Jul 2005 10:18:20 -0000	1.84
+++ jonas.spec	5 Jul 2005 13:06:52 -0000	1.85
@@ -10,7 +10,7 @@
 %if %{?_with_snapshot:1}%{!?_with_snapshot:0}
 %define release		0.%{cvs_version}.1jpp_1rh
 %else
-%define release		1jpp_4fc
+%define release		1jpp_5fc
 %endif
 
 %define section		free
@@ -71,13 +71,10 @@
 # An init script for the default JOnAS server (the one that runs
 # the jonasAdmin application) and corresponding config properties
 Source3: jonas.init 
-Source4: rhdb-jonas.init 
 Source5: jonas.sysconfig
-Source6: rhdb-jonas.sysconfig
 
 # Log rotation configuration for this default JOnAS service
 Source7: jonas.logrotate
-Source8: rhdb-jonas.logrotate
 
 # Patch to adjust a standard jonasbase configuration to allow
 # its use by Eclipse developers for debugging
@@ -116,8 +113,8 @@
 
 # Red Hat specific patches
 
-# Setup PostgreSQL as the default data source jdbc_1
-Patch6: jonas-%{major_version}-properties.patch
+# Setup PostgreSQL (though not as the default data source)
+Patch6: jonas-%{major_version}-postgresql.patch
 
 # Customize strings
 Patch7: jonas-%{major_version}-jadmin.patch
@@ -402,11 +399,6 @@
 # For libgcj only
 Requires: 	jonathan-rmi >= 3.1-2
 
-# For Red Hat only
-Requires: 	postgresql >= 7.3.4
-Requires: 	postgresql-server >= 7.3.4
-Requires: 	postgresql-jdbc >= 7.3.4
-
 # --------------------------------------------------------------------
 # End Execution dependencies
 #
@@ -1108,15 +1100,10 @@
 
 #Red Hat specific  --  SysV init scripts and logrotate configuration
 install -D -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/jonas
-install -D -m 755 %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/rhdb-jonas
 install -D -m 744 %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/jonas
-install -D -m 744 %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/rhdb-jonas
 install -D -m 644 %{SOURCE7} $RPM_BUILD_ROOT/etc/logrotate.d/jonas
-install -D -m 644 %{SOURCE8} $RPM_BUILD_ROOT/etc/logrotate.d/rhdb-jonas
 install -D -m 644 %{SOURCE10} $RPM_BUILD_ROOT/etc/profile.d/jonas.csh
 install -D -m 644 %{SOURCE11} $RPM_BUILD_ROOT/etc/profile.d/jonas.sh
-# PostgreSQL Database (jdbc_1)
-mkdir -p $RPM_BUILD_ROOT%{jonasrootdir}/pgsql
 # Expand manual war and remove it
 (cd doc; jar xf jonas-doc-en.war; rm jonas-doc-en.war; rm -fr WEB-INF; rm -fr META-INF; rm -fr CVS; rm README)
 
@@ -1151,16 +1138,6 @@
 /usr/sbin/groupadd -r jonas 2>/dev/null || :
 /usr/sbin/useradd -c Jonas -r -s $JONAS_SHELL -d %{jonasrootdir} -g jonas jonas 2>/dev/null || :
 
-%pre -n jonas-examples
-
-# Stop the service if it is running
-# Do it here for update
-   if [ $1 = 2 ]; then
-   service rhdb-jonas stop >/dev/null 2>&1
-   # clean return code in case the service was not running already
-   ls >/dev/null
-fi
-
 
 # ----------------------------------------
 # Prepare the uninstallation of JOnAS
@@ -1202,16 +1179,6 @@
 		   -name "*" \
 		   -exec rm -fr {} \;
 
-%preun -n jonas-examples
-
-# last uninstall (delete)
-if [ $1 = 0 ]; then
-    # Stop the service if it is running
-    service rhdb-jonas stop >/dev/null 2>&1
-
-   /sbin/chkconfig --del rhdb-jonas
-fi
-
 
 # ----------------------------------------
 # Finish the installation of JOnAS
@@ -1248,33 +1215,6 @@
 
 %endif
 
-%post -n jonas-examples
-DB=/usr/share/jonas/pgsql
-# first install
-if [ $1 = 1 ] && [ ! -d $DB/base ]; then
-   LANG=C
-   chown postgres:postgres $DB
-   su postgres -s /bin/sh -c "/usr/bin/initdb -D $DB > /dev/null 2>&1"
-   # allow localhost password access to this server instance
-   echo >> $DB/pg_hba.conf
-   echo '# added by jonas.spec' >> $DB/pg_hba.conf
-   echo 'host all all 127.0.0.1 255.255.255.255 password' >> $DB/pg_hba.conf
-   echo >> $DB/postgresql.conf
-   echo '# added by jonas.spec' >> $DB/postgresql.conf
-   echo 'port = 5433' >> $DB/postgresql.conf
-                                                                                
-   # Match /var/lib/jonas/conf/PostgreSQL1.properties
-   su postgres -s /bin/sh -c "/usr/bin/pg_ctl -D $DB -l /dev/null start"
-   su postgres -s /bin/sh -c "/usr/bin/createdb -p 5433 db_jonas"
-   su postgres -s /bin/sh -c "/usr/bin/psql -p 5433 -d db_jonas -c 'alter user postgres with password '\"'postgres'\"';'"
-   su postgres -s /bin/sh -c "/usr/bin/psql -p 5433 -d db_jonas -c 'create user jonas with password '\"'jonas'\"';'"
-   su postgres -s /bin/sh -c "/usr/bin/pg_ctl -D $DB -p 5433 stop"
-fi
-
-# first install
-if [ $1 = 1 ]; then
-   /sbin/chkconfig --add rhdb-jonas
-fi
 
 # ----------------------------------------
 # Finish the installation of JOnAS
@@ -1625,17 +1565,6 @@
 %{ejbjarsdir}/newsamplemdb.jar
 %{ejbjarsdir}/sb.jar
 
-# Red Hat specific
-%defattr(0644,postgres,postgres,0700)
-%dir %{jonasrootdir}/pgsql
-
-# Red Hat specific init scripts and configuration
-%defattr(0655,root,root,0755)
-/etc/rc.d/init.d/rhdb-jonas
-%defattr(0644,root,root,0755)
-%config /etc/sysconfig/rhdb-jonas
-%config /etc/logrotate.d/rhdb-jonas
-
 %if %{with_tests}
 %files tests
 %defattr(0644,jonas,jonas,0755)
@@ -1720,6 +1649,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Tue Jul  5 2005 Gary Benson <gbenson at redhat.com> - 4.3.3-1jpp_5fc
+- Don't use PostgreSQL as the default datasource.
+
 * Tue Jul  5 2005 Gary Benson <gbenson at redhat.com> - 4.3.3-1jpp_4fc
 - Build with system jorm, medor and perseus.
 - Work with PostgreSQL 8 (from Bryce McKinlay).


--- jonas-4.3-properties.patch DELETED ---


--- rhdb-jonas.init DELETED ---


--- rhdb-jonas.logrotate DELETED ---


--- rhdb-jonas.sysconfig DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]