Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 139215 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/portage/www-servers/tomcat/tomcat-5.5.17.ebuild (-34 / +43 lines)
Lines 2-8 Link Here
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.17.ebuild,v 1.1 2006/07/03 02:13:09 nichoj Exp $
3
# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.17.ebuild,v 1.1 2006/07/03 02:13:09 nichoj Exp $
4
4
5
inherit eutils java-pkg
5
inherit eutils java-pkg-2 java-ant-2
6
6
7
DESCRIPTION="Apache Servlet-2.4/JSP-2.0 Container"
7
DESCRIPTION="Apache Servlet-2.4/JSP-2.0 Container"
8
8
Lines 13-41 HOMEPAGE="http://jakarta.apache.org/tomc Link Here
13
KEYWORDS="~amd64 ~x86"
13
KEYWORDS="~amd64 ~x86"
14
LICENSE="Apache-2.0"
14
LICENSE="Apache-2.0"
15
15
16
RDEPEND=">=virtual/jdk-1.4
16
RDEPEND="=dev-java/eclipse-ecj-3.1*
17
		=dev-java/eclipse-ecj-3.1*
18
		=dev-java/commons-beanutils-1.7*
17
		=dev-java/commons-beanutils-1.7*
19
		>=dev-java/commons-collections-3.1
18
		>=dev-java/commons-collections-3.1
20
		>=dev-java/commons-daemon-1.0.1
19
		>=dev-java/commons-daemon-1.0.1
21
		>=dev-java/commons-dbcp-1.2.1
20
		>=dev-java/commons-dbcp-1.2.1
22
		>=dev-java/commons-digester-1.7
21
		>=dev-java/commons-digester-1.7
23
		>=dev-java/commons-fileupload-1.0
22
		>=dev-java/commons-fileupload-1.0
24
		>=dev-java/commons-httpclient-2.0
25
		>=dev-java/commons-el-1.0
23
		>=dev-java/commons-el-1.0
26
		>=dev-java/commons-launcher-0.9
24
		>=dev-java/commons-launcher-0.9
27
		>=dev-java/commons-logging-1.0.4
25
		>=dev-java/commons-logging-1.0.4
28
		>=dev-java/commons-modeler-1.1
26
		>=dev-java/commons-modeler-1.1
29
		>=dev-java/commons-pool-1.2
27
		>=dev-java/commons-pool-1.2
30
		~dev-java/jaxen-1.0
31
		>=dev-java/junit-3.8.1
32
		=dev-java/mx4j-3*
33
		>=dev-java/log4j-1.2.9
28
		>=dev-java/log4j-1.2.9
34
		>=dev-java/saxpath-1.0
35
		~dev-java/servletapi-2.4
29
		~dev-java/servletapi-2.4
36
		=dev-java/struts-1.2*
30
		|| (
37
		=dev-java/gnu-jaf-1*
31
			>=virtual/jre-1.5
38
		>=dev-java/xerces-2.7.1"
32
			(
33
				>=dev-java/commons-httpclient-2.0
34
				=virtual/jre-1.4
35
				=dev-java/gnu-jaf-1*
36
				=virtual/jdk-1.4
37
				~dev-java/jaxen-1.0
38
				>=dev-java/junit-3.8.1
39
				=dev-java/mx4j-3*
40
				>=dev-java/saxpath-1.0
41
				>=dev-java/xerces-2.7.1
42
			)
43
		)"
39
DEPEND=">=virtual/jdk-1.4
44
DEPEND=">=virtual/jdk-1.4
40
	${RDEPEND}
45
	${RDEPEND}
41
	sys-apps/sed
46
	sys-apps/sed
Lines 51-59 WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/web Link Here
51
pkg_setup() {
56
pkg_setup() {
52
	enewgroup tomcat
57
	enewgroup tomcat
53
	enewuser tomcat -1 -1 /dev/null tomcat
58
	enewuser tomcat -1 -1 /dev/null tomcat
59
60
	if java-pkg_is-vm-version-ge 1.5; then
61
		JAVA_PKG_WANT_SOURCE="1.5"
62
		JAVA_PKG_WANT_TARGET="1.5"
63
	fi
54
}
64
}
55
65
56
src_unpack() {
66
ant_src_unpack() {
57
	unpack ${A}
67
	unpack ${A}
58
	cd ${S}
68
	cd ${S}
59
69
Lines 73-85 src_unpack() { Link Here
73
83
74
	mkdir ./bin && cd ./bin
84
	mkdir ./bin && cd ./bin
75
	java-pkg_jar-from commons-logging commons-logging-api.jar
85
	java-pkg_jar-from commons-logging commons-logging-api.jar
76
	java-pkg_jar-from mx4j-3.0 mx4j.jar jmx.jar
77
	java-pkg_jar-from mx4j-3.0 mx4j-rjmx.jar jmx-remote.jar
78
	java-pkg_jar-from commons-daemon
86
	java-pkg_jar-from commons-daemon
87
	
88
	if ! java-pkg_is-vm-version-ge 1.5; then
89
		java-pkg_jar-from mx4j-3.0 mx4j.jar jmx.jar
90
		java-pkg_jar-from mx4j-3.0 mx4j-rjmx.jar jmx-remote.jar
91
	fi
79
92
80
	mkdir ../common/endorsed && cd ../common/endorsed
93
	mkdir ../common/endorsed && cd ../common/endorsed
81
	java-pkg_jar-from xerces-2 xml-apis.jar
94
	if ! java-pkg_is-vm-version-ge 1.5; then
82
	java-pkg_jar-from xerces-2 xercesImpl.jar
95
		java-pkg_jar-from xerces-2 xml-apis.jar
96
		java-pkg_jar-from xerces-2 xercesImpl.jar
97
	fi
83
98
84
	mkdir ../lib && cd ../lib
99
	mkdir ../lib && cd ../lib
85
	java-pkg_jar-from ant-core
100
	java-pkg_jar-from ant-core
Lines 99-111 src_unpack() { Link Here
99
src_compile(){
114
src_compile(){
100
	local antflags="-Dbase.path=${T}"
115
	local antflags="-Dbase.path=${T}"
101
116
102
	antflags="${antflags} -Dactivation.jar=$(java-config -p gnu-jaf-1)"
103
	antflags="${antflags} -Dcommons-collections.jar=$(java-config -p commons-collections)"
117
	antflags="${antflags} -Dcommons-collections.jar=$(java-config -p commons-collections)"
104
	antflags="${antflags} -Dcommons-daemon.jar=$(java-config -p commons-daemon)"
118
	antflags="${antflags} -Dcommons-daemon.jar=$(java-config -p commons-daemon)"
105
	antflags="${antflags} -Dcommons-digester.jar=$(java-config -p commons-digester)"
119
	antflags="${antflags} -Dcommons-digester.jar=$(java-config -p commons-digester)"
106
	antflags="${antflags} -Dcommons-dbcp.jar=$(java-config -p commons-dbcp)"
120
	antflags="${antflags} -Dcommons-dbcp.jar=$(java-config -p commons-dbcp)"
107
	antflags="${antflags} -Dcommons-el.jar=$(java-config -p commons-el)"
121
	antflags="${antflags} -Dcommons-el.jar=$(java-config -p commons-el)"
108
	antflags="${antflags} -Dcommons-httpclient.jar=$(java-config -p commons-httpclient)"
109
	antflags="${antflags} -Dcommons-pool.jar=$(java-config -p commons-pool)"
122
	antflags="${antflags} -Dcommons-pool.jar=$(java-config -p commons-pool)"
110
	antflags="${antflags} -Dcommons-fileupload.jar=$(java-config -p commons-fileupload)"
123
	antflags="${antflags} -Dcommons-fileupload.jar=$(java-config -p commons-fileupload)"
111
	antflags="${antflags} -Dcommons-launcher.jar=$(java-config -p commons-launcher)"
124
	antflags="${antflags} -Dcommons-launcher.jar=$(java-config -p commons-launcher)"
Lines 113-134 src_compile(){ Link Here
113
	antflags="${antflags} -Djunit.jar=$(java-config -p junit)"
126
	antflags="${antflags} -Djunit.jar=$(java-config -p junit)"
114
	antflags="${antflags} -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.1 ecj.jar)"
127
	antflags="${antflags} -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.1 ecj.jar)"
115
	antflags="${antflags} -Dlog4j.jar=$(java-config -p log4j)"
128
	antflags="${antflags} -Dlog4j.jar=$(java-config -p log4j)"
116
	antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts-1.2 struts.jar)"
117
	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 commons-beanutils.jar)"
129
	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 commons-beanutils.jar)"
118
	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
130
	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
119
	antflags="${antflags} -Dcommons-logging-api.jar=$(java-pkg_getjar commons-logging commons-logging-api.jar)"
131
	antflags="${antflags} -Dcommons-logging-api.jar=$(java-pkg_getjar commons-logging commons-logging-api.jar)"
120
	antflags="${antflags} -Djaxen.jar=$(java-pkg_getjar jaxen jaxen-full.jar)"
121
	antflags="${antflags} -Djmx.jar=$(java-pkg_getjar mx4j-3.0 mx4j.jar)"
122
	antflags="${antflags} -Djmx-remote.jar=$(java-pkg_getjar mx4j-3.0 mx4j-rjmx.jar)"
123
	antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)"
124
	antflags="${antflags} -DxercesImpl.jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)"
125
	antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xerces-2 xml-apis.jar)"
126
	antflags="${antflags} -Dstruts.home=/usr/share/struts"
127
	antflags="${antflags} -Djasper.home=${S}/jasper"
132
	antflags="${antflags} -Djasper.home=${S}/jasper"
133
	if ! java-pkg_is-vm-version-ge 1.5; then
134
		antflags="${antflags} -Dcommons-httpclient.jar=$(java-config -p commons-httpclient)"
135
		antflags="${antflags} -Dactivation.jar=$(java-config -p gnu-jaf-1)"
136
		antflags="${antflags} -Djaxen.jar=$(java-pkg_getjar jaxen jaxen-full.jar)"
137
		antflags="${antflags} -Djmx.jar=$(java-pkg_getjar mx4j-3.0 mx4j.jar)"
138
		antflags="${antflags} -Djmx-remote.jar=$(java-pkg_getjar mx4j-3.0 mx4j-rjmx.jar)"
139
		antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)"
140
		antflags="${antflags} -DxercesImpl.jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)"
141
		antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xerces-2 xml-apis.jar)"
142
	fi
128
143
129
	ant ${antflags} || die "compile failed"
144
	eant ${antflags}
130
131
}
145
}
146
132
src_install() {
147
src_install() {
133
	cd ${S}/build/build
148
	cd ${S}/build/build
134
149
Lines 184-195 src_install() { Link Here
184
		cd ${base}
199
		cd ${base}
185
	done
200
	done
186
201
187
	# replace a packed struts.jar
188
	cd server/webapps/admin/WEB-INF/lib
189
	rm -f struts.jar
190
	java-pkg_jar-from struts-1.2 struts.jar
191
	cd ${base}
192
193
	# replace the default pw with a random one, see #92281 
202
	# replace the default pw with a random one, see #92281 
194
	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
203
	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
195
	sed -e s:SHUTDOWN:${randpw}: -i conf/{server,server-minimal}.xml
204
	sed -e s:SHUTDOWN:${randpw}: -i conf/{server,server-minimal}.xml

Return to bug 139215