Nachhalten der Änderungen in release 2.0 in Zusammenhang mit Erstellung und Veröffentlichung Beta 1 (Teile aus r1671,r1672,r1673).

git-svn-id: https://svn.libreccm.org/ccm/trunk@1674 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2012-05-21 06:17:59 +00:00
parent 79dae1c4b9
commit 26395fc5a8
15 changed files with 100 additions and 73 deletions

View File

@ -89,6 +89,7 @@
<servlet>
<servlet-name>ccm-dispatcher</servlet-name>
<servlet-class>com.arsdigita.web.DispatcherServlet</servlet-class>
<load-on-startup>2</load-on-startup>
</servlet>
<servlet>

View File

@ -11,7 +11,7 @@
<ccm:project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ccm="http://ccm.redhat.com/ccm-project"
ccmVersion="6.1"
name="ScientificCMS"
name="scientificcms"
prettyName="Scientific CMS"
version="2-0-0"
release="base"

View File

@ -6,7 +6,7 @@
<ccm:project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ccm="http://ccm.redhat.com/ccm-project"
ccmVersion="6.1"
name="ScientificCMS"
name="scientificcms"
prettyName="Scientific CMS"
version="2-0-0"
release="devel"

View File

@ -6,7 +6,7 @@
<ccm:project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ccm="http://ccm.redhat.com/ccm-project"
ccmVersion="6.1"
name="ScientificCMS"
name="scientificcms"
prettyName="Scientific CMS"
version="2-0-0"
release="std"

View File

@ -1090,12 +1090,23 @@
<!-- Deploy bin -->
<target name="deploy-bin-{$name}" depends="init">
<!-- copy task is not able to preserve file permissions on unix
systems but uses the target's system default umask. On most
systems the execute bit will not be preserved. -->
<copy todir="${{this.deploy.bin.dir}}">
<fileset dir="{$name}">
<include name="${{bin.dir}}/**"/>
</fileset>
<mapper type="glob" to="*" from="${{bin.dir}}${{file.separator}}*"/>
</copy>
<!-- In order tp preseve file permissions on unix, we could try (but
doesn't work under Windows).
<exec executable="cp">
<arg line="-p -R ${srcDir} ${destDir}"/>
</exec>
-->
</target>
<!-- Deploy Javadoc -->

View File

@ -37,13 +37,14 @@
%define dist .openccm
%global apuid 291
%global apusr aplaws
%global arch noarch
# Servlet Container Details
%global sc_name tomcat6
%global sc_major_version 6
%global sc_minor_version 0
%global sc_micro_version 32
%global sc_micro_version 35
%global packdname apache-tomcat-%{sc_major_version}.%{sc_minor_version}.%{sc_micro_version}
%global jspspec 2.1
@ -95,10 +96,10 @@ Source5: %{name}-%{major_version}.%{minor_version}.logrotate
# Source6: %{sc_name}-%{sc_major_version}.%{sc_minor_version}-digest.script
# Source7: %{sc_name}-%{sc_major_version}.%{sc_minor_version}-tool-wrapper.script
# APLAWS+ stuff
Source8: %{name}-%{bundle}-%{major_version}-%{minor_version}-%{micro_version}-beta-1.war
Source8: %{name}-%{major_version}-%{minor_version}-%{micro_version}-%{bundle}.war
Source9: postgresql-jdbc-8.4.701.jar
Source10: ojdbc14.jar
Source11: %{name}-%{bundle}-addon-%{major_version}-%{minor_version}-%{micro_version}-beta-1.zip
Source11: %{name}-addon-%{major_version}-%{minor_version}-%{micro_version}-%{bundle}.zip
Patch0: %{sc_name}-%{sc_major_version}.%{sc_minor_version}-tomcat-users-webapp.patch
Patch1: %{sc_name}-%{sc_major_version}.%{sc_minor_version}-server-xml.patch
@ -227,14 +228,14 @@ rm -rf $RPM_BUILD_ROOT
-e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
-e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" \
-e "s|\@\@\@TCPID\@\@\@|%{name}|g" \
-e "s|\@\@\@TCUSER\@\@\@|%{name}|g" %{SOURCE1} \
-e "s|\@\@\@TCUSER\@\@\@|%{apusr}|g" %{SOURCE1} \
> ${RPM_BUILD_ROOT}%{confdir}/%{name}.conf
%{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
-e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
-e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" \
-e "s|\@\@\@TCPID\@\@\@|%{name}|g" \
-e "s|\@\@\@TCUSER\@\@\@|%{name}|g" %{SOURCE3} \
-e "s|\@\@\@TCUSER\@\@\@|%{apusr}|g" %{SOURCE3} \
> ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name}
%{__install} -m 0644 %{SOURCE2} \
@ -270,9 +271,9 @@ popd
%pre
# add the aplaws user and group
%{_sbindir}/groupadd -g %{apuid} -r aplaws-admin 2>/dev/null || :
%{_sbindir}/useradd -c "APLAWS+" -u %{apuid} -g nobody -N \
-s /bin/bash -r -d %{homedir} aplaws 2>/dev/null || :
groupadd -g %{apuid} -r %{apusr}-admin 2>/dev/null || :
useradd -c "APLAWS+" -u %{apuid} -g nobody -N \
-s /bin/bash -r -d %{homedir} %{apusr} 2>/dev/null || :
%post
@ -346,6 +347,12 @@ fi
%defattr(0664,aplaws,aplaws-admin,0775)
%{webappdir}/ROOT
%attr(0774,aplaws,aplaws-admin) %{webappdir}/ROOT/WEB-INF/bin/ccm
%attr(0774,aplaws,aplaws-admin) %{webappdir}/ROOT/WEB-INF/bin/ccm-hostinit
%attr(0774,aplaws,aplaws-admin) %{webappdir}/ROOT/WEB-INF/bin/ccm-run
%attr(0774,aplaws,aplaws-admin) %{webappdir}/ROOT/WEB-INF/bin/libexec/ant/bin/ant
%attr(0774,aplaws,aplaws-admin) %{webappdir}/ROOT/WEB-INF/bin/libexec/ant/bin/antRun
%files addons
%defattr(0664,aplaws,aplaws-admin,0775)
%{addondir}

View File

@ -1,5 +1,5 @@
# System-wide configuration file for APLAWS+ service.
# This will be sourced by APLAWS+ and any of its secondary services.
# System-wide configuration file for ScientificCMS service.
# This will be sourced by ScientificCMS and any of its secondary services.
# Values will be overridden by service-specific configuration
# files in /etc/sysconfig
#

View File

@ -1,20 +1,20 @@
#!/bin/bash
#
# aplaws This shell script takes care of starting and stopping the
# embedded Tomcat Servlet Containere for aplaws
# scientificcms This shell script takes care of starting and stopping the
# embedded Tomcat Servlet Containere for ScientificCMS
#
# Copied from jpackage.org / Fedora Tomcat scripts. All honours granted.
#
# chkconfig: - 80 20
#
### BEGIN INIT INFO
# Provides: aplaws
# Provides: scientificcms
# Required-Start: $network $syslog
# Required-Stop: $network $syslog
# Default-Start:
# Default-Stop:
# Description: RPM edition of aplaws
# Short-Description: start and stop aplaws
# Description: RPM edition of scientificcms
# Short-Description: start and stop scientificcms
### END INIT INFO
#
# - originally written by Henri Gomez, Keith Irwin, and Nicolas Mailhot
@ -47,7 +47,7 @@ else
fi
# Get the tomcat config (use this for environment specific settings)
TOMCAT_CFG="/etc/aplaws/aplaws.conf"
TOMCAT_CFG="/etc/scientificcms/scientificcms.conf"
if [ -r "$TOMCAT_CFG" ]; then
. $TOMCAT_CFG
fi
@ -61,15 +61,15 @@ fi
CONNECTOR_PORT="${CONNECTOR_PORT:-8080}"
# Path to the tomcat launch script
TOMCAT_SCRIPT="/usr/sbin/aplaws"
TOMCAT_SCRIPT="/usr/sbin/scientificcms"
# Tomcat program name
TOMCAT_PROG="${NAME}"
# Define the tomcat username
# Tomcat_USER and ~GROUP are defined in sourced aplaws.conf file!
# TOMCAT_USER="${TOMCAT_USER:-aplaws}"
# TOMCAT_GROUP="${TOMCAT_GROUP:-aplaws-admin}"
# Tomcat_USER and ~GROUP are defined in sourced scientificcms.conf file!
# TOMCAT_USER="${TOMCAT_USER:-scicms}"
# TOMCAT_GROUP="${TOMCAT_GROUP:-scicms-admin}"
# Define the tomcat log file
TOMCAT_LOG="${TOMCAT_LOG:-/var/log/${NAME}/catalina.out}"
@ -113,7 +113,7 @@ function makeHomeDir() {
echo "$CATALINA_HOME does not exist, creating"
if [ ! -d "/usr/share/${NAME}" ]; then
mkdir /usr/share/${NAME}
cp -pLR /usr/share/aplaws/* /usr/share/${NAME}
cp -pLR /usr/share/scientificcms/* /usr/share/${NAME}
fi
mkdir -p /var/log/${NAME} \
/var/cache/${NAME} \
@ -123,8 +123,8 @@ function makeHomeDir() {
ln -fs /var/log/${NAME} ${CATALINA_HOME}/logs
cp -pLR /usr/share/${NAME}/bin $CATALINA_HOME
cp -pLR /usr/share/${NAME}/conf $CATALINA_HOME
ln -fs /usr/share/java/aplaws ${CATALINA_HOME}/lib
ln -fs /usr/share/aplaws/webapps ${CATALINA_HOME}/webapps
ln -fs /usr/share/java/scientificcms ${CATALINA_HOME}/lib
ln -fs /usr/share/scientificcms/webapps ${CATALINA_HOME}/webapps
chown ${TOMCAT_USER}:${TOMCAT_GROUP} /var/log/${NAME}
fi
}
@ -177,8 +177,8 @@ function start() {
if [ "$RETVAL" -eq "0" -a "$?" -eq "0" ]; then
chown ${TOMCAT_USER}:${TOMCAT_GROUP} $TOMCAT_LOG
fi
if [ "$CATALINA_HOME" != "/usr/share/aplaws" -a "$RETVAL" -eq "0" ]; then
# Create an aplaws directory if it doesn't exist
if [ "$CATALINA_HOME" != "/usr/share/scientificcms" -a "$RETVAL" -eq "0" ]; then
# Create an scientificcms directory if it doesn't exist
makeHomeDir
# If CATALINA_HOME doesn't exist modify port number so that
# multiple instances don't interfere with each other

View File

@ -4,5 +4,5 @@
rotate 52
compress
missingok
create 0644 aplaws aplaws-admin
create 0644 scicms scicms-admin
}

View File

@ -1,15 +1,15 @@
# Service-wide configuration file for APLAWS+ service.
# This will be sourced by APLAWS+ init script after the system-wide configuration
# file /etc/aplaws/aplaws.conf, thus allowing values to be overridden in a
# per-service manner.
# Service-wide configuration file for ScientificCMS service.
# This will be sourced by ScientificCMS init script after the system-wide
# configuration file /etc/scientificcms/scientificcms.conf, thus allowing values
# to be overridden in a per-service manner.
#
# NEVER change the init script itself. To change values for all services make
# your changes in /etc/aplaws/aplaws.conf!
# your changes in /etc/scientificcms/scientificcms.conf!
#
# To change values for a specific service make your edits here.
# To create a new service create a link from /etc/init.d/<your new service> to
# /etc/init.d/aplaws (do not copy the init script) and make a copy of the
# /etc/sysconfig/aplaws file to /etc/sysconfig/<your new service> and change
# /etc/init.d/scientificcms (do not copy the init script) and make a copy of the
# /etc/sysconfig/scientificcms file to /etc/sysconfig/<your new service> and change
# the property values so the two services won't conflict. Register the new
# service in the system as usual (see chkconfig and similars).
#

View File

@ -28,22 +28,23 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
# APLAWS+ details
# ScientificCMS details
%global bundle std
%global major_version 2
%global minor_version 0
%global micro_version 0
%global revision beta1.r1669
%global revision beta1.r1668
%define dist .openccm
%global apuid 291
%global scuid 295
%global scusr scicms
%global arch noarch
# Servlet Container Details
%global sc_name tomcat6
%global sc_major_version 6
%global sc_minor_version 0
%global sc_micro_version 32
%global sc_micro_version 35
%global packdname apache-tomcat-%{sc_major_version}.%{sc_minor_version}.%{sc_micro_version}
%global jspspec 2.1
@ -84,7 +85,7 @@ Release: %{bundle}.%{revision}
Summary: ScientificCMS Collaboration and Content Management System bundled with Tomcat6 servlet container.
License: LGPL
URL: http://apalaws.org/
URL: http://scientificcms.org/
# Tomcat stuff
Source0: apache-tomcat-%{sc_major_version}.%{sc_minor_version}.%{sc_micro_version}.tar.gz
Source1: %{name}-%{major_version}.%{minor_version}.conf
@ -94,11 +95,11 @@ Source4: %{name}-%{major_version}.%{minor_version}.wrapper
Source5: %{name}-%{major_version}.%{minor_version}.logrotate
# Source6: %{sc_name}-%{sc_major_version}.%{sc_minor_version}-digest.script
# Source7: %{sc_name}-%{sc_major_version}.%{sc_minor_version}-tool-wrapper.script
# APLAWS+ stuff
Source8: %{name}-%{bundle}-%{major_version}-%{minor_version}-%{micro_version}-beta-1.war
# ScientificCMS stuff
Source8: %{name}-%{major_version}-%{minor_version}-%{micro_version}-%{bundle}.war
Source9: postgresql-jdbc-8.4.701.jar
Source10: ojdbc14.jar
Source11: %{name}-%{bundle}-addon-%{major_version}-%{minor_version}-%{micro_version}-beta-1.zip
Source11: %{name}-addon-%{major_version}-%{minor_version}-%{micro_version}-%{bundle}.zip
Patch0: %{sc_name}-%{sc_major_version}.%{sc_minor_version}-tomcat-users-webapp.patch
Patch1: %{sc_name}-%{sc_major_version}.%{sc_minor_version}-server-xml.patch
@ -125,7 +126,8 @@ Requires(postun): jpackage-utils
%description
ScientificCMS is content and collaboration management web application.
ScientificCMS is content and collaboration management web application to help
scientific institutes to maintain their web content.
This package distributes ScientificCMS with the original, unmodified binary
Apache Tomcat distribution integrated in a FHS compliant structure and
@ -139,7 +141,7 @@ Summary: Provides additional packages not included in the ScientificCMS ${bundle
Requires: %{name} = %{epoch}:%{version}-%{release}
%description addons
Provides additional packages not included in the APLAWS ${bundle} bundle.
Provides additional packages not included in the ScientificCMS ${bundle} bundle.
# --------------------------------------------------------------------------
@ -227,14 +229,14 @@ rm -rf $RPM_BUILD_ROOT
-e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
-e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" \
-e "s|\@\@\@TCPID\@\@\@|%{name}|g" \
-e "s|\@\@\@TCUSER\@\@\@|%{name}|g" %{SOURCE1} \
-e "s|\@\@\@TCUSER\@\@\@|%{scusr}|g" %{SOURCE1} \
> ${RPM_BUILD_ROOT}%{confdir}/%{name}.conf
%{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
-e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
-e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" \
-e "s|\@\@\@TCPID\@\@\@|%{name}|g" \
-e "s|\@\@\@TCUSER\@\@\@|%{name}|g" %{SOURCE3} \
-e "s|\@\@\@TCUSER\@\@\@|%{scusr}|g" %{SOURCE3} \
> ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name}
%{__install} -m 0644 %{SOURCE2} \
@ -269,10 +271,10 @@ popd
%pre
# add the aplaws user and group
%{_sbindir}/groupadd -g %{apuid} -r aplaws-admin 2>/dev/null || :
%{_sbindir}/useradd -c "ScientificCMS" -u %{apuid} -g nobody -N \
-s /bin/bash -r -d %{homedir} aplaws 2>/dev/null || :
# add the scicms user and group
groupadd -g %{scuid} -r %{scusr}-admin 2>/dev/null || :
useradd -c "ScientificCMS" -u %{scuid} -g nobody -N \
-s /bin/bash -r -d %{homedir} %{scusr} 2>/dev/null || :
%post
@ -303,29 +305,29 @@ fi
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
# attribute flags for basic tomcat directories and config files
%attr(2775,aplaws,aplaws-admin) %dir %{basedir}
%attr(7775,aplaws,aplaws-admin) %dir %{webappdir}
%attr(0775,aplaws,aplaws-admin) %dir %{cachedir}
%attr(0775,aplaws,aplaws-admin) %dir %{tempdir}
%attr(0775,aplaws,aplaws-admin) %dir %{workdir}
%attr(2775,scicms,scicms-admin) %dir %{basedir}
%attr(7775,scicms,scicms-admin) %dir %{webappdir}
%attr(0775,scicms,scicms-admin) %dir %{cachedir}
%attr(0775,scicms,scicms-admin) %dir %{tempdir}
%attr(0775,scicms,scicms-admin) %dir %{workdir}
# (from sl spec)
%attr(0775,aplaws,aplaws-admin) %dir %{logdir}
%attr(0644,aplaws,aplaws-admin) %{logdir}/catalina.out
%attr(0775,scicms,scicms-admin) %dir %{logdir}
%attr(0644,scicms,scicms-admin) %{logdir}/catalina.out
%attr(0775,root,aplaws-admin) %dir %{confdir}
%attr(0775,root,aplaws-admin) %dir %{confdir}/Catalina
%attr(0775,root,aplaws-admin) %dir %{confdir}/Catalina/localhost
%attr(0664,aplaws,aplaws-admin) %config(noreplace) %{confdir}/%{name}.conf
%attr(0664,aplaws,aplaws-admin) %config(noreplace) %{confdir}/*.policy
%attr(0664,aplaws,aplaws-admin) %config(noreplace) %{confdir}/*.properties
%attr(0664,aplaws,aplaws-admin) %config(noreplace) %{confdir}/context.xml
%attr(0664,aplaws,aplaws-admin) %config(noreplace) %{confdir}/server.xml
%attr(0664,aplaws,aplaws-admin) %config(noreplace) %{confdir}/tomcat-users.xml
%attr(0666,aplaws,aplaws-admin) %config(noreplace) %{confdir}/web.xml
%attr(0775,root,scicms-admin) %dir %{confdir}
%attr(0775,root,scicms-admin) %dir %{confdir}/Catalina
%attr(0775,root,scicms-admin) %dir %{confdir}/Catalina/localhost
%attr(0664,scicms,scicms-admin) %config(noreplace) %{confdir}/%{name}.conf
%attr(0664,scicms,scicms-admin) %config(noreplace) %{confdir}/*.policy
%attr(0664,scicms,scicms-admin) %config(noreplace) %{confdir}/*.properties
%attr(0664,scicms,scicms-admin) %config(noreplace) %{confdir}/context.xml
%attr(0664,scicms,scicms-admin) %config(noreplace) %{confdir}/server.xml
%attr(0664,scicms,scicms-admin) %config(noreplace) %{confdir}/tomcat-users.xml
%attr(0666,scicms,scicms-admin) %config(noreplace) %{confdir}/web.xml
%dir %{homedir}
# specify files to include in package for installation
%defattr(0664,aplaws,aplaws-admin,0775)
%defattr(0664,scicms,scicms-admin,0775)
%{homedir}/LICENSE
%{homedir}/NOTICE
%{homedir}/RELEASE*
@ -338,16 +340,22 @@ fi
%{homedir}/conf
# %files admin-webapps
%defattr(0664,aplaws,aplaws-admin,0775)
%defattr(0664,scicms,scicms-admin,0775)
%{webappdir}/host-manager
%{webappdir}/manager
#%files webapps
%defattr(0664,aplaws,aplaws-admin,0775)
%defattr(0664,scicms,scicms-admin,0775)
%{webappdir}/ROOT
%attr(0774,scicms,scicms-admin) %{webappdir}/ROOT/WEB-INF/bin/ccm
%attr(0774,scicms,scicms-admin) %{webappdir}/ROOT/WEB-INF/bin/ccm-hostinit
%attr(0774,scicms,scicms-admin) %{webappdir}/ROOT/WEB-INF/bin/ccm-run
%attr(0774,scicms,scicms-admin) %{webappdir}/ROOT/WEB-INF/bin/libexec/ant/bin/ant
%attr(0774,scicms,scicms-admin) %{webappdir}/ROOT/WEB-INF/bin/libexec/ant/bin/antRun
%files addons
%defattr(0664,aplaws,aplaws-admin,0775)
%defattr(0664,scicms,scicms-admin,0775)
%{addondir}