[gentoo-commits] dev/ultrabug:master commit in: www-servers/jetty/files/, www-servers/jetty/, www-servers/solr/files/, ...

[Alexys Jacob]

commit:     edbd8cd876351d7b208b30a9ba4eaaeb63e84b82
Author:     Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  6 10:29:35 2012 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Fri Apr  6 10:29:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=edbd8cd8

jetty and solr bump

---
 www-servers/jetty/Manifest                         |    6 +
 www-servers/jetty/files/jetty.conf                 |    1 +
 www-servers/jetty/files/jetty.confd                |   30 ++++
 www-servers/jetty/files/jetty.initd                |   36 +++++
 www-servers/jetty/files/jetty.xml                  |  143 ++++++++++++++++++++
 www-servers/jetty/jetty-6.1.26.ebuild              |   55 ++++++++
 www-servers/solr/Manifest                          |    5 +-
 .../solr/files/{jetty-env.xml => jetty-solr.xml}   |    4 +-
 www-servers/solr/files/solr.xml                    |   34 +++++
 www-servers/solr/solr-3.5.0.ebuild                 |   52 +++-----
 10 files changed, 330 insertions(+), 36 deletions(-)

diff --git a/www-servers/jetty/Manifest b/www-servers/jetty/Manifest
new file mode 100644
index 0000000..7f1b4bc
--- /dev/null
+++ b/www-servers/jetty/Manifest
@@ -0,0 +1,6 @@
+AUX jetty.conf 21 RMD160 a8c154d733ca49824e576de3ad7584a2fb9f154e SHA1 9c044b7e0b6cd4560bdb1b137570bd74071e79f2 SHA256 03fbba4876f4f3733ea8a00ac4f40fd5be5eccee728c4e501d9f6d7e9ebfad13
+AUX jetty.confd 933 RMD160 9f666b8184a89f0e8d671c0fc87afefa0a3f7df1 SHA1 f9f7b052672e7182f794c0ca8b1af0c0a04834ac SHA256 9edd437baa0eb556daf61ce93c53b8b36a1e9010f06280ed2f547c01c97fbfc1
+AUX jetty.initd 1002 RMD160 efbeabe8317a1a62a94cab7e560be540271626f6 SHA1 e1b1c02f6a25fef6e6280cd0d5845ec3e0c0a475 SHA256 1e244c66f155d198d6a9abaac80b23107c9e8c13bf4b9885f3d235c524bec5e4
+AUX jetty.xml 6165 RMD160 f620f74b257c620c0fd69d9438e295e8d1b27ce4 SHA1 3387f4606a1168e3a22bde1516987dd3a2449dc2 SHA256 e23234537cfd42b48d91e550b2a30b46b4e84b9c6d17cb73f0e9948a6a3a7a71
+DIST jetty-6.1.26.zip 25894195 RMD160 6e960763e720641e1bfd69ca8e5d54f0bc7d8def SHA1 9485913f1a1945a849a90f1a34853d22350bc524 SHA256 96c08eb87ec3772dccc2b3dba54fea85ccc3f804faf7429eecfba3ed55648187
+EBUILD jetty-6.1.26.ebuild 1224 RMD160 b68d9c6959e37a3360c03a863db4f0accf62e264 SHA1 0064d34f915202ae066ce73d01190a22e096330f SHA256 31c884534a45efb5ff2aa5ed13220839c0d0e497a671471a814ea15f3d80df9f

diff --git a/www-servers/jetty/files/jetty.conf b/www-servers/jetty/files/jetty.conf
new file mode 100755
index 0000000..b5da826
--- /dev/null
+++ b/www-servers/jetty/files/jetty.conf
@@ -0,0 +1 @@
+/etc/jetty/jetty.xml

diff --git a/www-servers/jetty/files/jetty.confd b/www-servers/jetty/files/jetty.confd
new file mode 100755
index 0000000..ca72909
--- /dev/null
+++ b/www-servers/jetty/files/jetty.confd
@@ -0,0 +1,30 @@
+# 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 path you wish.  
+# Example: JAVA_HOME="/opt/sun-jdk-1.4.1.01"
+
+# Set's JAVA_HOME to current selected JRE
+JAVA_HOME="$(java-config -O)"
+
+# (Optional) Java runtime options used when the "start", "stop", or "run"
+# commands are executed.
+# JAVA_OPTIONS=""
+
+# Where your web applications are located
+JETTY_HOME="/opt/jetty"
+
+# Jetty's User
+JETTY_USER="jetty"
+
+JETTY_PORT="8080"
+
+# Jetty is quite skilled where to look for configuration
+# setup files. If JETTY_CONF is not set it defaults to
+# /etc/jetty.conf $JETTY_HOME/etc/jetty.conf (see jetty.sh)
+JETTY_CONF="/etc/jetty/jetty.conf"
+
+# Additional CLASSPATH for Jetty to use, plus any others you need.
+#CLASSPATH="${CLASSPATH}:/YOUR_SPECIFIC_LIBDIR"

diff --git a/www-servers/jetty/files/jetty.initd b/www-servers/jetty/files/jetty.initd
new file mode 100755
index 0000000..bbdf39b
--- /dev/null
+++ b/www-servers/jetty/files/jetty.initd
@@ -0,0 +1,36 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: $
+
+JETTY_ENV="JAVA_HOME=${JAVA_HOME} JAVA_OPTIONS=\"${JAVA_OPTIONS}\""
+JETTY_ENV="${JETTY_ENV} JETTY_HOME=${JETTY_HOME} JETTY_CONSOLE=/var/log/jetty/jetty.log"
+JETTY_ENV="${JETTY_ENV} JETTY_PORT=${JETTY_PORT} JETTY_CONF=${JETTY_CONF} JETTY_RUN=/var/run/jetty"
+JETTY_ENV="${JETTY_ENV} CLASSPATH=${CLASSPATH}:${JETTY_ADD_CLASSPATH}"
+
+depend() {
+	need net
+	use dns logger postgresql mysql
+}
+
+start()	{
+	ebegin "Starting Jetty"
+	su - ${JETTY_USER} -c "${JETTY_ENV} ${JETTY_HOME}/bin/jetty.sh start"
+	eend $?
+}
+
+stop ()	{
+	ebegin "Stopping Jetty"
+	su - ${JETTY_USER} -c "${JETTY_ENV} ${JETTY_HOME}/bin/jetty.sh stop"
+	sleep 2
+	eend $?
+}
+
+svc_restart () {
+	ebegin "Restarting Jetty"
+	su - ${JETTY_USER} -c "${JETTY_ENV} ${JETTY_HOME}/bin/jetty.sh stop"
+	sleep 5
+	cd ${JETTY_HOME}
+	su - ${JETTY_USER} -c "${JETTY_ENV} ${JETTY_HOME}/bin/jetty.sh start"
+	eend $?
+}

diff --git a/www-servers/jetty/files/jetty.xml b/www-servers/jetty/files/jetty.xml
new file mode 100755
index 0000000..3ef3d67
--- /dev/null
+++ b/www-servers/jetty/files/jetty.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+
+<Configure id="Server" class="org.mortbay.jetty.Server">
+
+    <!-- =========================================================== -->
+    <!-- Server Thread Pool                                          -->
+    <!-- =========================================================== -->
+    <Set name="ThreadPool">
+
+      <New class="org.mortbay.thread.QueuedThreadPool">
+        <Set name="minThreads">10</Set>
+        <Set name="maxThreads">200</Set>
+        <Set name="lowThreads">20</Set>
+        <Set name="SpawnOrShrinkAt">2</Set>
+      </New>
+
+    </Set>
+
+
+
+    <!-- =========================================================== -->
+    <!-- Set connectors                                              -->
+    <!-- =========================================================== -->
+    <!-- One of each type!                                           -->
+    <!-- =========================================================== -->
+
+    <!-- Use this connector for many frequently idle connections
+         and for threadless continuations.
+    -->
+    <Call name="addConnector">
+      <Arg>
+          <New class="org.mortbay.jetty.nio.SelectChannelConnector">
+            <Set name="host">127.0.0.1</Set>
+            <Set name="port">8080</Set>
+            <Set name="maxIdleTime">10000</Set>
+            <Set name="Acceptors">2</Set>
+            <Set name="statsOn">false</Set>
+            <Set name="confidentialPort">8443</Set>
+            <Set name="lowResourcesConnections">5000</Set>
+            <Set name="lowResourcesMaxIdleTime">5000</Set>
+          </New>
+      </Arg>
+    </Call>
+
+    <!-- =========================================================== -->
+    <!-- Set up global session ID manager                            -->
+    <!-- =========================================================== -->
+    <!--
+    <Set name="sessionIdManager">
+      <New class="org.mortbay.jetty.servlet.HashSessionIdManager">
+        <Set name="workerName">node1</Set>
+      </New>
+    </Set>
+    -->
+
+    <!-- =========================================================== -->
+    <!-- Set handler Collection Structure                            -->
+    <!-- =========================================================== -->
+    <Set name="handler">
+      <New id="Handlers" class="org.mortbay.jetty.handler.HandlerCollection">
+        <Set name="handlers">
+         <Array type="org.mortbay.jetty.Handler">
+           <Item>
+             <New id="Contexts" class="org.mortbay.jetty.handler.ContextHandlerCollection"/>
+           </Item>
+           <Item>
+             <New id="DefaultHandler" class="org.mortbay.jetty.handler.DefaultHandler"/>
+           </Item>
+           <Item>
+             <New id="RequestLog" class="org.mortbay.jetty.handler.RequestLogHandler"/>
+           </Item>
+         </Array>
+        </Set>
+      </New>
+    </Set>
+
+    <!-- =========================================================== -->
+    <!-- Configure the context deployer                              -->
+    <!-- A context deployer will deploy contexts described in        -->
+    <!-- configuration files discovered in a directory.              -->
+    <!-- The configuration directory can be scanned for hot          -->
+    <!-- deployments at the configured scanInterval.                 -->
+    <!--                                                             -->
+    <!-- This deployer is configured to deploy contexts configured   -->
+    <!-- in the $JETTY_HOME/contexts directory                       -->
+    <!--                                                             -->
+    <!-- =========================================================== -->
+
+    <Call name="addLifeCycle">
+      <Arg>
+        <New class="org.mortbay.jetty.deployer.ContextDeployer">
+          <Set name="contexts"><Ref id="Contexts"/></Set>
+          <Set name="configurationDir">/etc/jetty/contexts</Set>
+          <Set name="scanInterval">1</Set>
+        </New>
+      </Arg>
+    </Call>
+
+    <!-- =========================================================== -->
+    <!-- Configure Request Log                                       -->
+    <!-- Request logs  may be configured for the entire server here, -->
+    <!-- or they can be configured for a specific web app in a       -->
+    <!-- contexts configuration (see $(jetty.home)/contexts/test.xml -->
+                    <!-- for an example).                                            -->
+    <!-- =========================================================== -->
+    <Ref id="RequestLog">
+      <Set name="requestLog">
+        <New id="RequestLogImpl" class="org.mortbay.jetty.NCSARequestLog">
+          <Set name="filename">/var/log/jetty/access.yyyy_mm_dd.log</Set>
+          <Set name="filenameDateFormat">yyyy_MM_dd</Set>
+          <Set name="retainDays">90</Set>
+          <Set name="append">true</Set>
+          <Set name="extended">true</Set>
+          <Set name="logCookies">false</Set>
+          <Set name="LogTimeZone">GMT</Set>
+        </New>
+      </Set>
+    </Ref>
+
+    <New id="ServerLog" class="java.io.PrintStream">
+      <Arg>
+        <New class="org.mortbay.util.RolloverFileOutputStream">
+          <Arg>/var/log/jetty/error.yyyy_mm_dd.log</Arg>
+          <Arg type="boolean">false</Arg>
+          <Arg type="int">90</Arg>
+          <Arg><Call class="java.util.TimeZone" name="getTimeZone"><Arg>GMT</Arg></Call></Arg>
+          <Get id="ServerLogName" name="datedFilename"/>
+        </New>
+      </Arg>
+    </New>
+    <Call class="java.lang.System" name="setErr"><Arg><Ref id="ServerLog"/></Arg></Call>
+    <Call class="java.lang.System" name="setOut"><Arg><Ref id="ServerLog"/></Arg></Call>
+
+    <!-- =========================================================== -->
+    <!-- extra options                                               -->
+    <!-- =========================================================== -->
+    <Set name="stopAtShutdown">true</Set>
+    <Set name="sendServerVersion">false</Set>
+    <Set name="sendDateHeader">true</Set>
+    <Set name="gracefulShutdown">1000</Set>
+
+</Configure>

diff --git a/www-servers/jetty/jetty-6.1.26.ebuild b/www-servers/jetty/jetty-6.1.26.ebuild
new file mode 100755
index 0000000..cf4f998
--- /dev/null
+++ b/www-servers/jetty/jetty-6.1.26.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+
+DESCRIPTION="Jetty is an full-featured web and applicaction server implemented entirely in Java."
+HOMEPAGE="http://www.mortbay.org/jetty-6/"
+SRC_URI="http://dist.codehaus.org/jetty/${P}/${P}.zip"
+SLOT="0"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	dev-java/java-config"
+RDEPEND=">=virtual/jdk-1.5"
+
+JETTY_HOME="/opt/${PN}"
+
+pkg_setup() {
+	enewgroup jetty
+	enewuser jetty -1 /bin/bash "${JETTY_HOME}" jetty
+}
+
+src_install() {
+	sed -i -e 's@default="./logs"@default="/var/log/jetty"@g' etc/jetty.xml || die
+
+# 	newinitd "${FILESDIR}"/jetty.initd jetty
+# 	newconfd "${FILESDIR}"/jetty.confd jetty
+
+	dodir "${JETTY_HOME}"
+	insinto "${JETTY_HOME}"
+	doins start.jar
+	doins -r etc
+	doins -r lib
+	doins -r resources
+
+	dodir "${JETTY_HOME}"/webapps
+	dodir "${JETTY_HOME}"/etc/contexts
+	dosym "${JETTY_HOME}"/etc /etc/jetty
+
+# 	exeinto "${JETTY_HOME}"/bin
+# 	doexe bin/jetty.sh
+
+	fowners -R jetty:jetty "${JETTY_HOME}"
+
+	keepdir /var/log/jetty
+	fowners jetty:jetty /var/log/jetty
+
+	keepdir /var/run/jetty
+	fowners jetty:jetty /var/run/jetty
+}

diff --git a/www-servers/solr/Manifest b/www-servers/solr/Manifest
index 27edcda..8d8643b 100644
--- a/www-servers/solr/Manifest
+++ b/www-servers/solr/Manifest
@@ -1,3 +1,4 @@
-AUX jetty-env.xml 433 RMD160 c045cf668c894da6b9d8c65dd6867c9868460f75 SHA1 3118bc66892d6c754ec98ba249897987b47283ab SHA256 f5e94950c8ba6d2c4815eb2e0f8d65908e3ee2649c714f19247ddfe536d6b073
+AUX jetty-solr.xml 431 RMD160 52b20e7cbb74c70ebd8650007313a15c423eff3b SHA1 c17d71e161cbebb466c42b1d6266967128d29f81 SHA256 e3f5a4499db74586d56df7fabfaeeaef14e83caa7c1e003a004087604468660a
+AUX solr.xml 1320 RMD160 206cf52b217afec7ab83b16599d72f33e128753d SHA1 c5b1512c5c153c760063a38db085bdb73187b4d8 SHA256 45f7ea56648a651389e95ad9f653591331dcf47a3dae11aadbd8e806ec736dca
 DIST apache-solr-3.5.0.tgz 78673382 RMD160 365d4b27753375ea3a39b9d42c06b80dce474731 SHA1 020fc86dfd2405212c0f706111d8576dbb8e54b4 SHA256 804f3ba9d1296f81388605a79538b7362355693fbdd03b7b2dbf9a706bf1d1d0
-EBUILD solr-3.5.0.ebuild 1643 RMD160 c7b533d41bdb0c3405a0ef820dd1904cb0e7a960 SHA1 ce16d66d8f3be8ae6481972bcd7df95ec9340e6c SHA256 f5efd5b9435ecdc7c68cf84a0476fb127350037890f1dcfc22c44aca141867bb
+EBUILD solr-3.5.0.ebuild 1165 RMD160 349aa7d7984e44f12ae69153db29bc07584122c8 SHA1 dac4b6c2244d3b14842e2fc213ec774ae2081dd4 SHA256 fe0f001ac5459743bf5cb37c4ba89380dcb6559f1b1b6730f977b138ad5e3146

diff --git a/www-servers/solr/files/jetty-env.xml b/www-servers/solr/files/jetty-solr.xml
similarity index 85%
rename from www-servers/solr/files/jetty-env.xml
rename to www-servers/solr/files/jetty-solr.xml
index 3beae8c..88490a0 100644
--- a/www-servers/solr/files/jetty-env.xml
+++ b/www-servers/solr/files/jetty-solr.xml
@@ -2,11 +2,9 @@
 <!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
 
 <!-- Set the solr.solr.home system property -->
-<Configure class="org.eclipse.jetty.webapp.WebAppContext">
+<Configure class="org.mortbay.jetty.webapp.WebAppContext">
   <Call name="setProperty" class="java.lang.System">
     <Arg type="String">solr.solr.home</Arg>
     <Arg type="String">/usr/share/solr</Arg>
   </Call>
 </Configure>
-
-

diff --git a/www-servers/solr/files/solr.xml b/www-servers/solr/files/solr.xml
new file mode 100644
index 0000000..4d1a84e
--- /dev/null
+++ b/www-servers/solr/files/solr.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--
+ All (relative) paths are relative to the installation path
+  
+  persistent: Save changes made via the API to this file
+  sharedLib: path to a lib directory that will be shared across all cores
+-->
+<solr persistent="false">
+
+  <!--
+  adminPath: RequestHandler path to manage cores.  
+    If 'null' (or absent), cores will not be manageable via request handler
+  -->
+  <cores adminPath="/admin/cores" defaultCoreName="collection1">
+    <core name="collection1" instanceDir="." />
+  </cores>
+</solr>

diff --git a/www-servers/solr/solr-3.5.0.ebuild b/www-servers/solr/solr-3.5.0.ebuild
index 928d382..61cb485 100644
--- a/www-servers/solr/solr-3.5.0.ebuild
+++ b/www-servers/solr/solr-3.5.0.ebuild
@@ -4,8 +4,6 @@
 
 EAPI="4"
 
-# inherit apache-module python multilib ruby-ng
-
 DESCRIPTION="Popular, blazing fast open source enterprise search platform from the Apache Lucene project"
 HOMEPAGE="http://lucene.apache.org/solr/"
 SRC_URI="http://www.apache.org/dist/lucene/${PN}/${PV}/apache-${P}.tgz"
@@ -15,42 +13,34 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="www-servers/jetty-bin"
+CDEPEND="app-arch/unzip"
+DEPEND="www-servers/jetty"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/apache-${P}"
 
-
-# 	cd "$srcdir/apache-solr-$pkgver"
-# 
-# 	install -d "$pkgdir/etc/solr"
-# 	install -d "$pkgdir/usr/share/solr"
-# 	install -d "$pkgdir/opt/jetty/webapps"
-# 
-# 	unzip "dist/apache-solr-$pkgver.war" -d "$pkgdir/usr/share/solr"
-# 	rm -rf "$pkgdir/usr/share/solr/META-INF"
-# 
-# 	cp -R example/solr/conf "$pkgdir/etc/solr"
-# 	ln -s /etc/solr/conf "$pkgdir/usr/share/solr/conf"
-# 
-# 	mv "$pkgdir/usr/share/solr/WEB-INF/web.xml" "$pkgdir/etc/solr"
-# 	ln -s /etc/solr/web.xml "$pkgdir/usr/share/solr/WEB-INF/web.xml"
-# 
-# 	install -m0644 "$srcdir/jetty-env.xml" "$pkgdir/usr/share/solr/WEB-INF/jetty-env.xml"
-# 	ln -s /usr/share/solr "$pkgdir/opt/jetty/webapps/solr"
-
+SOLR_HOME="/usr/share/solr"
 
 src_install() {
-	dodir /usr/share/solr
-	unzip dist/apache-"${P}.war" -d "${D}"/usr/share/solr || die
-	rm -rf "${D}"/usr/share/solr/META-INF  || die
-
+	dodir "${SOLR_HOME}"
 	dodir /etc/solr
-	cp -R example/solr/conf "${D}"/etc/solr || die
-	dosym /etc/solr/conf /usr/share/solr/conf
 
-	mv "${D}"/usr/share/solr/WEB-INF/web.xml "${D}"/etc/solr/ || die
-	dosym /etc/solr/web.xml /usr/share/solr/WEB-INF/web.xml
+	unzip dist/apache-"${P}.war" -d "${D}/${SOLR_HOME}" || die
+	sed -i -e 's@\.\./\.\./@\./@g' example/solr/conf/solrconfig.xml || die
+	rm -rf "${D}/${SOLR_HOME}"/META-INF  || die
+
+	insinto "${SOLR_HOME}"
+	doins -r dist
+	doins -r contrib
+	doins -r example/solr/conf
+	doins "${FILESDIR}"/solr.xml
+
+	dosym "${SOLR_HOME}"/conf /etc/solr/conf
+	dosym "${SOLR_HOME}"/WEB-INF/web.xml /etc/solr/web.xml
 
-	cp ${FILESDIR}/jetty-env.xml ${D}/usr/share/solr/WEB-INF/
+	# jetty env
+	insinto /opt/jetty/etc
+	doins "${FILESDIR}"/jetty-solr.xml
+	dosym "${SOLR_HOME}" /opt/jetty/webapps/solr
+	dosym "${SOLR_HOME}"/solr.xml /opt/jetty/etc/solr.xml
 }