[gentoo-commits] gentoo-x86 commit in www-servers/resin/files/3.1.3: resin.init resin-3.1.3-gentoo.patch resin.conf

[Krzysiek Pawlik (nelchael)]

nelchael    07/11/09 14:07:03

  Added:                resin.init resin-3.1.3-gentoo.patch resin.conf
  Log:
  Version bump.
  (Portage version: 2.1.3.19)

Revision  Changes    Path
1.1                  www-servers/resin/files/3.1.3/resin.init

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/files/3.1.3/resin.init?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/files/3.1.3/resin.init?rev=1.1&content-type=text/plain

Index: resin.init
===================================================================
#!/sbin/runscript
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/files/3.1.3/resin.init,v 1.1 2007/11/09 14:07:03 nelchael Exp $

depend() {
	need net
	use dns logger mysql postgresql
}

runResin() {

	JAVA_HOME=$(java-config -O)
	[ -n "${GENTOO_VM}" ] && JAVA_HOME=$(java-config --select-vm="${GENTOO_VM}" -O)
	export JAVA_HOME

	local extraArgs=
	if [ "${VERBOSE}" = "yes" ]; then
		extraArgs="-verbose"
	fi

	local msg="${1}"
	shift

	local cmdline="${JAVA_HOME}/bin/java -jar /usr/share/resin/lib/resin.jar ${extraArgs} -resin-home /usr/lib/resin ${@}"

	ebegin "${msg}"
	su - resin -c "${cmdline}"
	eend $?

}

start()	{

	runResin "Starting Resin" "start"

}

stop()	{

	runResin "Stopping Resin" "stop"

}



1.1                  www-servers/resin/files/3.1.3/resin-3.1.3-gentoo.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/files/3.1.3/resin-3.1.3-gentoo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/files/3.1.3/resin-3.1.3-gentoo.patch?rev=1.1&content-type=text/plain

Index: resin-3.1.3-gentoo.patch
===================================================================
diff -Nru resin-3.1.3.vanilla/Makefile.in resin-3.1.3/Makefile.in
--- resin-3.1.3.vanilla/Makefile.in	2007-11-09 14:59:07.000000000 +0100
+++ resin-3.1.3/Makefile.in	2007-11-09 15:00:28.000000000 +0100
@@ -9,20 +9,20 @@
 
 install	:
 	(cd modules/c/src; $(MAKE) install)
-	if test $(PREFIX) != `pwd`; then \
-	  mkdir -p $(PREFIX)/lib; \
-	  mkdir -p $(PREFIX)/$(LIBEXEC); \
-	  cp -r $(LIBEXEC)/* $(PREFIX)/$(LIBEXEC); \
-	  cp lib/*.jar $(PREFIX)/lib; \
-	  mkdir -p $(PREFIX)/bin; \
-	  cp bin/* $(PREFIX)/bin; \
-	  mkdir -p $(PREFIX)/webapps; \
-	  cp -r webapps/* $(PREFIX)/webapps; \
-	  mkdir -p $(PREFIX)/conf; \
-	  cp conf/resin.conf $(PREFIX)/conf/resin.conf.orig; \
-	  cp conf/app-default.xml $(PREFIX)/conf/app-default.xml.orig; \
-	  if test ! -r $(PREFIX)/conf/resin.conf; then \
-	    cp conf/resin.conf $(PREFIX)/conf/resin.conf; \
-	    cp conf/app-default.xml $(PREFIX)/conf/app-default.xml; \
+	if test $(DESTDIR)/$(PREFIX) != `pwd`; then \
+	  mkdir -p $(DESTDIR)/$(PREFIX)/lib; \
+	  mkdir -p $(DESTDIR)/$(PREFIX)/$(LIBEXEC); \
+	  cp -r $(LIBEXEC)/* $(DESTDIR)/$(PREFIX)/$(LIBEXEC); \
+	  cp lib/*.jar $(DESTDIR)/$(PREFIX)/lib; \
+	  mkdir -p $(DESTDIR)/$(PREFIX)/bin; \
+	  cp bin/* $(DESTDIR)/$(PREFIX)/bin; \
+	  mkdir -p $(DESTDIR)/$(PREFIX)/webapps; \
+	  cp -r webapps/* $(DESTDIR)/$(PREFIX)/webapps; \
+	  mkdir -p $(DESTDIR)/$(PREFIX)/conf; \
+	  cp conf/resin.conf $(DESTDIR)/$(PREFIX)/conf/resin.conf.orig; \
+	  cp conf/app-default.xml $(DESTDIR)/$(PREFIX)/conf/app-default.xml.orig; \
+	  if test ! -r $(DESTDIR)/$(PREFIX)/conf/resin.conf; then \
+	    cp conf/resin.conf $(DESTDIR)/$(PREFIX)/conf/resin.conf; \
+	    cp conf/app-default.xml $(DESTDIR)/$(PREFIX)/conf/app-default.xml; \
 	  fi; \
 	fi
diff -Nru resin-3.1.3.vanilla/build.xml resin-3.1.3/build.xml
--- resin-3.1.3.vanilla/build.xml	2007-11-09 14:59:07.000000000 +0100
+++ resin-3.1.3/build.xml	2007-11-09 15:01:17.000000000 +0100
@@ -7,7 +7,6 @@
 
   <property name="modules" location="${basedir}/modules"/>
   <property name="src" location="${basedir}/src"/>
-  <property name="ext" location="${basedir}/modules/ext"/>
   <property name="doc" location="${basedir}/doc"/>
 
   <property name="build" location="${install}/build"/>
@@ -17,14 +16,12 @@
 
 
   <property name="javac.verbose" value="off"/>
-  <property name="javac.debug" value="on"/>
+  <property name="javac.debug" value="off"/>
   <property name="javac.optimize" value="off"/>
   <property name="javac.deprecation" value="off"/>
   <property name="javac.nowarn" value="on"/>
   <property name="javac.memoryMaximumSize" value="512m"/>
 
-  <property name="javac.source" value="1.5"/>
-
   <property name="jar.compress" value="false"/>
   <!--
   <property name="jar.index" value="true"/>
@@ -83,14 +80,13 @@
   </target>
 
   <target name="compile" 
-          depends="init, jaxrpc, ejb, jpa, j2ee-deploy, j2ee-management, jca, jms, jsdk, jstl, jsf, jta, portlet, script, resin-util, quercus, resin, ecmascript, webutil, deploy, conf, ext">
+          depends="init, jaxrpc, ejb, jpa, j2ee-deploy, j2ee-management, jca, jms, jstl, jsf, jta, portlet, script, resin-util, quercus, resin, ecmascript, webutil, deploy, conf">
   </target>
 
   <target name="ant" depends="init">
     <antcall target="module" inheritRefs="true">
       <param name="module.name" value="ant"/>
       <param name="module.jar" value="resin-ant.jar"/>
-      <param name="javac.source" value="1.5"/>
     </antcall>
   </target>
 
@@ -98,7 +94,6 @@
     <antcall target="module" inheritRefs="true">
       <param name="module.name" value="ejb"/>
       <param name="module.jar" value="ejb-15.jar"/>
-      <param name="javac.source" value="1.5"/>
     </antcall>
   </target>
 
@@ -106,7 +101,6 @@
     <antcall target="module" inheritRefs="true">
       <param name="module.name" value="jpa"/>
       <param name="module.jar" value="jpa-15.jar"/>
-      <param name="javac.source" value="1.5"/>
     </antcall>
   </target>
 
@@ -124,11 +118,10 @@
     </antcall>
   </target>
 
-  <target name="jaxrpc" depends="init,saaj,jsdk">
+  <target name="jaxrpc" depends="init,saaj">
     <antcall target="module" inheritRefs="true">
       <param name="module.name" value="jaxrpc"/>
       <param name="module.jar" value="jaxrpc-15.jar"/>
-      <param name="javac.source" value="1.5"/>
     </antcall>
   </target>
 
@@ -167,7 +160,7 @@
     </antcall>
   </target>
 
-  <target name="jstl" depends="init, jsdk">
+  <target name="jstl" depends="init">
     <antcall target="module" inheritRefs="true">
       <param name="module.name" value="jstl"/>
       <param name="module.jar" value="jstl-11.jar"/>
@@ -221,7 +214,7 @@
     </antcall>
   </target>
 
-  <target name="resin-dev" depends="init, ejb, jca, jcr, jms, jsdk, jstl, jsf, jta, j2ee-deploy, j2ee-management, saaj, jaxrpc, portlet, script, resin-util">
+  <target name="resin-dev" depends="init, ejb, jca, jcr, jms, jstl, jsf, jta, j2ee-deploy, j2ee-management, saaj, jaxrpc, portlet, script, resin-util">
 
     <!-- filter to insert version -->
 
@@ -251,7 +244,6 @@
 
     <antcall target="module" inheritRefs="true">
       <param name="module.name" value="resin"/>
-      <param name="javac.source" value="1.5"/>
     </antcall>
   </target>
   
@@ -276,14 +268,12 @@
   <target name="webutil" depends="init, resin">
     <antcall target="module" inheritRefs="true">
       <param name="module.name" value="webutil"/>
-      <param name="javac.source" value="1.5"/>
     </antcall>
   </target>
 
   <target name="quercus-dev" depends="init">
     <antcall target="module" inheritRefs="true">
       <param name="module.name" value="quercus"/>
-      <param name="javac.source" value="1.5"/>
     </antcall>
   </target>
 
@@ -292,7 +282,6 @@
   <target name="ecmascript" depends="init">
     <antcall target="module" inheritRefs="true">
       <param name="module.name" value="ecmascript"/>
-      <param name="javac.source" value="1.5"/>
     </antcall>
   </target>
 
@@ -325,16 +314,15 @@
            verbose="${javac.verbose}" 
            debug="${javac.debug}" optimize="${javac.optimize}"
            deprecation="${javac.deprecation}" nowarn="${javac.nowarn}"
-           source="${javac.source}"
            excludes="**/.svn/**"
            memoryMaximumSize="${javac.memoryMaximumSize}">
       <classpath>
         <dirset dir="${modules}">
           <include name="*/classes"/>
        </dirset>
-        <fileset dir="${ext}">
-          <include name="**/*.jar"/>
-        </fileset>
+       <fileset dir="lib/">
+           <include name="*.jar"/>
+       </fileset>
       </classpath>
     </javac>
 
@@ -428,13 +416,6 @@
     </copy>
   </target>
 
-  <target name="ext" depends="init, resin">
-    <copy todir="${install}/lib" preservelastmodified="true">
-      <fileset dir="${ext}">
-      </fileset>
-    </copy>
-  </target>
-
   <target name="webapps" depends="init, doc, quercus">
   </target>
 
@@ -536,9 +517,6 @@
           <dirset dir="${modules}">
             <include name="*/classes"/>
           </dirset>
-          <fileset dir="${modules}/ext">
-            <include name="**/*.jar"/>
-          </fileset>
         </classpath>
       </java>
 
@@ -667,7 +645,6 @@
         <include name="lib/j2ee-management-10.jar"/>
         <include name="lib/jca-15.jar"/>
         <include name="lib/jms-11.jar"/>
-        <include name="lib/jsdk-15.jar"/>
         <include name="lib/jsf-12.jar"/>
         <include name="lib/jstl-11.jar"/>
         <include name="lib/jta-101.jar"/>



1.1                  www-servers/resin/files/3.1.3/resin.conf

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/files/3.1.3/resin.conf?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/files/3.1.3/resin.conf?rev=1.1&content-type=text/plain

Index: resin.conf
===================================================================
# JVM Runtime
# Using the default setting, it will determine your JVM from the system-vm
# set using java-config.
# See java-config(1) manual page for assistance in determining this value.

# You can override this value with whatever JDK 1.5 you want.
# For a list of valid values for GENTOO_VM see output of
#   java-config -L
#GENTOO_VM=sun-jdk-1.5

# Verbose starting and stopping? (yes/no, defaults to no)
#VERBOSE="yes"



-- 
gentoo-commits@g.o mailing list