Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/java:master commit in: dev-java/wss4j/, dev-java/wss4j/files/
Date: Mon, 29 Jun 2015 22:03:50
Message-Id: 1435615397.b3783a16ab9beba6b11698c964e22d95a2b629fa.chewi@gentoo
1 commit: b3783a16ab9beba6b11698c964e22d95a2b629fa
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 29 21:02:41 2015 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 29 22:03:17 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=b3783a16
7
8 This version of wss4j is super ancient. It is still maintained but now
9 Maven-based so there's little point in keeping this, especially when
10 it's going to be broken by my upcoming xalan change.
11
12 dev-java/wss4j/ChangeLog | 10 ---
13 dev-java/wss4j/Manifest | 6 --
14 dev-java/wss4j/files/WSSPolicyProcessor.java.patch | 32 ---------
15 dev-java/wss4j/files/build.xml.patch | 55 ---------------
16 dev-java/wss4j/metadata.xml | 5 --
17 dev-java/wss4j/wss4j-1.5.1.ebuild | 81 ----------------------
18 6 files changed, 189 deletions(-)
19
20 diff --git a/dev-java/wss4j/ChangeLog b/dev-java/wss4j/ChangeLog
21 deleted file mode 100644
22 index 28481e3..0000000
23 --- a/dev-java/wss4j/ChangeLog
24 +++ /dev/null
25 @@ -1,10 +0,0 @@
26 -# ChangeLog for dev-java/wss4j
27 -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: $
29 -
30 - 20 Jan 2009; Alistair Bush <ali_bush@g.o> wss4j-1.5.1.ebuild:
31 - Drop ~x86 due to missing deps.
32 -
33 - 24 Feb 2007; kiorky <kiorky@××××××××××.net> ChangeLog:
34 - Adding as a Jboss dependency
35 - See #168284
36
37 diff --git a/dev-java/wss4j/Manifest b/dev-java/wss4j/Manifest
38 deleted file mode 100644
39 index 3947912..0000000
40 --- a/dev-java/wss4j/Manifest
41 +++ /dev/null
42 @@ -1,6 +0,0 @@
43 -AUX WSSPolicyProcessor.java.patch 1311 RMD160 cf574d79a4980b71fd749dde6d107e564467396b SHA1 2c7c8e92d898e440587472c87879956160321964 SHA256 31633937c74104c2fe0c1b476f350bc0ca2a89c01ecb7dc3ad74d47b3ab1a2f4
44 -AUX build.xml.patch 1868 RMD160 58a2549ba72234bb91757ba50b8a93955ba23b3c SHA1 a33ba0fae915335fc8c1a40018f1ac0ee30d34a1 SHA256 a5574f16cc8ef11d3e092a5d1e55aaf2fa5d46cb665b6977c0f1da0e7bc23a6d
45 -DIST wss4j-1.5.1.tar.bz2 12343852 RMD160 7a3c636d95f80eb92ec15d4e0c3a80f02754126e SHA1 e29d5f1dc59d5b5cc204870ad023e4d45f6d913b SHA256 248651eec42eec66bafb11aeed8ec2b0bd1987e0a069b53b1e5fdc4418d52061
46 -EBUILD wss4j-1.5.1.ebuild 3246 RMD160 22b6b04e3973512bd97dd950a7ae059623b2bef7 SHA1 55f4bbc54d8a04750d7add01619353f18dc1c971 SHA256 4071270605dc6a1dc12d4fff3c720705e721c26276a7f6d13d8ee96393d11a36
47 -MISC ChangeLog 322 RMD160 e30895e597809462a54ae11819a940c9493d2f94 SHA1 abb071d4085e414791b38a569a9e0989deff7caf SHA256 e0fcba33b11d64afb8e79dab6b5b9245449f792c25697a5f8857ddfd76499873
48 -MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
49
50 diff --git a/dev-java/wss4j/files/WSSPolicyProcessor.java.patch b/dev-java/wss4j/files/WSSPolicyProcessor.java.patch
51 deleted file mode 100644
52 index cde5f65..0000000
53 --- a/dev-java/wss4j/files/WSSPolicyProcessor.java.patch
54 +++ /dev/null
55 @@ -1,32 +0,0 @@
56 ---- wss4j-1.5.1/src/org/apache/ws/security/policy/parser/WSSPolicyProcessor.java 2007-02-24 21:15:13.150400696 +0100
57 -+++ WSSPolicyProcessor.java 2007-02-25 02:48:31.318004977 +0100
58 -@@ -25,9 +25,9 @@
59 -
60 - import org.apache.commons.logging.Log;
61 - import org.apache.commons.logging.LogFactory;
62 --import org.apache.ws.policy.All;
63 -+import org.apache.neethi.All;
64 - import org.apache.ws.policy.Assertion;
65 --import org.apache.ws.policy.ExactlyOne;
66 -+import org.apache.neethi.ExactlyOne;
67 - import org.apache.ws.policy.Policy;
68 - import org.apache.ws.policy.PrimitiveAssertion;
69 - import org.apache.ws.policy.util.PolicyFactory;
70 -@@ -204,7 +204,7 @@
71 -
72 - ExactlyOne xor = (ExactlyOne) policy.getTerms()
73 - .get(0);
74 -- List listOfPolicyAlternatives = xor.getTerms();
75 -+ List listOfPolicyAlternatives = xor.getPolicyComponents();
76 -
77 - boolean success = false;
78 - int numberOfAlternatives = listOfPolicyAlternatives.size();
79 -@@ -213,7 +213,7 @@
80 - All aPolicyAlternative = (All) listOfPolicyAlternatives
81 - .get(i);
82 -
83 -- List listOfAssertions = aPolicyAlternative.getTerms();
84 -+ List listOfAssertions = aPolicyAlternative.getAssertions();
85 -
86 - Iterator iterator = listOfAssertions.iterator();
87 - /*
88
89 diff --git a/dev-java/wss4j/files/build.xml.patch b/dev-java/wss4j/files/build.xml.patch
90 deleted file mode 100644
91 index e33c6ab..0000000
92 --- a/dev-java/wss4j/files/build.xml.patch
93 +++ /dev/null
94 @@ -1,55 +0,0 @@
95 ---- wss4j-1.5.1/build.xml 2007-02-24 16:12:48.000000000 +0100
96 -+++ build.xml 2007-02-25 03:30:52.718768326 +0100
97 -@@ -113,6 +113,8 @@
98 - <include name="**/*.jar"/>
99 - <!-- <pathelement path="${java.class.path}"/> -->
100 - </fileset>
101 -+ <pathelement path="${gentoo.classpath}"/>
102 -+
103 - </path>
104 -
105 - <path id="classpath.wss4j" description="wss4j classes; first try pure class files, then jars">
106 -@@ -140,12 +142,16 @@
107 - <path id="classpath.test">
108 - <!-- classpath for test is librarypath plus junit -->
109 - <path refid="classpath.library"/>
110 --<!-- <pathelement path="${java.class.path}"/> -->
111 -+
112 -+ <pathelement path="${gentoo.classpath}"/>
113 - </path>
114 -
115 - <path id="classpath.test.jar">
116 - <!-- classpath for test is librarypath plus junit -->
117 -+
118 - <path refid="classpath.library"/>
119 -+ <pathelement path="${gentoo.classpath}"/>
120 -+
121 - <pathelement path="${build.dir}/${jar.library}"/>
122 - <pathelement path="${build.dir}/${jar.tests}"/>
123 - </path>
124 -@@ -323,7 +329,7 @@
125 - description="Target for the gump run"/>
126 -
127 - <target name="compile"
128 -- depends="compile.library,compile.samples, compile.tests,
129 -+ depends="compile.library,compile.samples,
130 - compile.interops, fix.properties"
131 - description="compile everything"/>
132 -
133 -@@ -362,6 +368,7 @@
134 -
135 - <javac srcdir="${dir.test}" destdir="${build.classes}" debug="on">
136 - <classpath refid="classpath.test"/>
137 -+
138 - <!-- <exclude name="**/secconv/**/*.java"/> -->
139 - </javac>
140 -
141 -@@ -702,7 +709,7 @@
142 - </target>
143 -
144 - <target name="jar"
145 -- depends="compile, test"
146 -+ depends="compile"
147 - description="Creates the ${jar.library}">
148 -
149 - <jar jarfile="${build.dir}/${jar.library}"
150
151 diff --git a/dev-java/wss4j/metadata.xml b/dev-java/wss4j/metadata.xml
152 deleted file mode 100644
153 index 838c00a..0000000
154 --- a/dev-java/wss4j/metadata.xml
155 +++ /dev/null
156 @@ -1,5 +0,0 @@
157 -<?xml version="1.0" encoding="UTF-8"?>
158 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
159 -<pkgmetadata>
160 -<herd>java</herd>
161 -</pkgmetadata>
162
163 diff --git a/dev-java/wss4j/wss4j-1.5.1.ebuild b/dev-java/wss4j/wss4j-1.5.1.ebuild
164 deleted file mode 100644
165 index a164f1c..0000000
166 --- a/dev-java/wss4j/wss4j-1.5.1.ebuild
167 +++ /dev/null
168 @@ -1,81 +0,0 @@
169 -# Copyright 1999-2009 Gentoo Foundation
170 -# Distributed under the terms of the GNU General Public License v2
171 -# $Header: $
172 -
173 -inherit java-pkg-2 java-ant-2
174 -
175 -DESCRIPTION="Apache WSS4J is an implementation of the OASIS Web Services Security (WS-Security)"
176 -HOMEPAGE="http://ws.apache.org/wss4j/index.html"
177 -SRC_URI="http://dev.gentooexperimental.org/~kiorky/${P}.tar.bz2"
178 -
179 -LICENSE="Apache-2.0"
180 -SLOT="0"
181 -KEYWORDS=""
182 -IUSE="doc source"
183 -
184 -DEPEND=">=virtual/jdk-1.5
185 - source? ( app-arch/zip )
186 - =dev-java/xerces-2.6*
187 - =dev-java/xml-commons-external-1.3*
188 - dev-java/apache-addressing
189 - =dev-java/xml-security-1.3*
190 - dev-java/xalan
191 - =dev-java/neethi-2*
192 - =dev-java/wsdl4j-1.5*
193 - =dev-java/junit-3.8*
194 - dev-java/commons-logging
195 - =dev-java/commons-httpclient-3*
196 - dev-java/commons-discovery
197 - dev-java/ws-policy
198 - dev-java/commons-codec
199 - dev-java/bcprov
200 - =www-servers/axis-1*
201 - dev-java/log4j
202 - dev-java/opensaml
203 - "
204 -RDEPEND="${DEPEND} >=virtual/jre-1.5"
205 -
206 -EANT_BUILD_TARGET="compile jar"
207 -EANT_DOC_TARGET="javadocs"
208 -EANT_GENTOO_CLASSPATH="apache-addressing,xml-security-1.3,xalan,wsdl4j,junit,commons-httpclient-3,commons-logging,commons-discovery,commons-codec,bcprov,axis-1,opensaml,log4j,neethi,ws-policy"
209 -
210 -src_unpack(){
211 - unpack ${A}
212 -
213 - epatch "${FILESDIR}/WSSPolicyProcessor.java.patch"
214 - epatch "${FILESDIR}/build.xml.patch"
215 -
216 - cd "${S}/endorsed" || die "cd failed"
217 - java-pkg_jar-from xerces-2.6
218 - java-pkg_jar-from xml-commons-external-1.3
219 -
220 - cd "${S}/lib" || die "cd failed"
221 - java-pkg_jar-from apache-addressing addressing.jar addressing-1.0.jar
222 - java-pkg_jar-from xml-security-1.3 xmlsec.jar xmlsec-1.3.0.jar
223 - java-pkg_jar-from xalan xalan.jar xalan-2.7.0.jar
224 - java-pkg_jar-from xalan serializer.jar serializer-2.7.0.jar
225 - java-pkg_jar-from wsdl4j wsdl4j.jar wsdl4j-1.5.1.jar
226 - java-pkg_jar-from junit junit.jar junit-3.8.1.jar
227 - java-pkg_jar-from commons-logging commons-logging.jar commons-logging-1.0.4.jar
228 - java-pkg_jar-from commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.0-rc2.jar
229 - java-pkg_jar-from commons-discovery commons-discovery.jar commons-discovery-0.2.jar
230 - java-pkg_jar-from commons-codec commons-codec.jar commons-codec-1.3.jar
231 - java-pkg_jar-from bcprov bcprov.jar bcprov-jdk13-132.jar
232 - java-pkg_jar-from bcprov bcprov.jar bcprov-jdk15-132.jar
233 - java-pkg_jar-from axis-1 axis-ant.jar axis-ant-1.4.jar
234 - java-pkg_jar-from axis-1 axis.jar axis-1.4.jar
235 - java-pkg_jar-from axis-1 jaxrpc.jar axis-jaxrpc-1.4.jar
236 - java-pkg_jar-from axis-1 saaj.jar axis-saaj-1.4.jar
237 - java-pkg_jar-from log4j log4j.jar log4j-1.2.9.jar
238 - java-pkg_jar-from opensaml opensaml.jar opensaml-1.0.1.jar
239 - java-pkg_jar-from neethi-2 neethi.jar neethi-SNAPSHOT.jar
240 - for i in $(find "${S}"/build*xml);do
241 - java-ant_rewrite-classpath "$i"
242 - done
243 -}
244 -
245 -src_install() {
246 - java-pkg_newjar "${S}/build/wss4j-${PV}.jar" "${PN}.jar"
247 - use doc && java-pkg_dojavadoc "${S}/build/doc"
248 - use source && java-pkg_dosrc "${S}/src"
249 -}