Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Patrice Clement (monsieurp)" <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/jldap/files: jldap-4.6-Debug.java.patch jldap-4.6-build.xml.patch
Date: Sun, 05 Jul 2015 17:32:19
Message-Id: 20150705173214.4ACED754@oystercatcher.gentoo.org
1 monsieurp 15/07/05 17:32:14
2
3 Added: jldap-4.6-Debug.java.patch
4 jldap-4.6-build.xml.patch
5 Log:
6 Version bump. EAPI 5 bump. dev-java/commons-httpclient SLOT bump. Fix bug 442292 and bug 554030.
7
8 Signed-off-by: Patrice Clement <monsieurp@g.o>
9 (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)
10
11 Revision Changes Path
12 1.1 dev-java/jldap/files/jldap-4.6-Debug.java.patch
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jldap/files/jldap-4.6-Debug.java.patch?rev=1.1&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jldap/files/jldap-4.6-Debug.java.patch?rev=1.1&content-type=text/plain
16
17 Index: jldap-4.6-Debug.java.patch
18 ===================================================================
19 --- com/novell/ldap/client/Debug.java.orig 2015-07-05 13:50:26.469000000 +0000
20 +++ com/novell/ldap/client/Debug.java 2015-07-05 13:53:12.456000000 +0000
21 @@ -80,7 +80,7 @@
22 * The value for this variable is set during compile time
23 * TRUE = Debug build, FALSE = Release build
24 */
25 - public static final boolean LDAP_DEBUG = true;
26 + public static final boolean LDAP_DEBUG = false;
27
28 /**
29 * The string value used to enable all debug tracing.
30
31
32
33 1.1 dev-java/jldap/files/jldap-4.6-build.xml.patch
34
35 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jldap/files/jldap-4.6-build.xml.patch?rev=1.1&view=markup
36 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jldap/files/jldap-4.6-build.xml.patch?rev=1.1&content-type=text/plain
37
38 Index: jldap-4.6-build.xml.patch
39 ===================================================================
40 --- build.xml.orig 2015-07-05 18:20:19.947000000 +0000
41 +++ build.xml 2015-07-05 18:20:34.996000000 +0000
42 @@ -42,12 +42,20 @@
43 <property name="src" value="."/>
44 <property name="ext" value="ext"/>
45 <property name="ldap" value="ldap"/>
46 +<property name="jldap" value ="jldap"/>
47 +
48 +
49
50 <property name="lib" value="lib"/>
51 <property name="lib.debug" value="lib_debug"/>
52
53 <property name="build" value="classes"/>
54 <property name="build.debug" value="classes_debug"/>
55 +<property name="build.testDir" value="tests/junit/"/>
56 +<property name="build.testOutputDir" value="${build.testDir}/test-classes"/>
57 +<property name="build.testResourceDir" value="src/test/resources"/>
58 +
59 +<property name="test.reports" value="${build}/test-reports"/>
60
61 <property name="doc" value="doc"/>
62 <property name="ietfdoc" value="ietfdoc"/>
63 @@ -60,6 +68,9 @@
64 <property name="pkg.ietfdoc" value="${pkg}/${ietfdoc}"/>
65 <property name="pkg.wars" value="${pkg}/wars"/>
66
67 +<path id="build.test.classpath">
68 +</path>
69 +
70 <!-- =================================================================== -->
71 <!-- Initialization -->
72 <!-- =================================================================== -->
73 @@ -166,12 +177,12 @@
74 <!-- =================================================================== -->
75 <!-- build Servlets -->
76 <!-- =================================================================== -->
77 - <target name="servlet_stream" depends="debug, release">
78 + <target name="servlet_stream" depends="debug">
79 <ant dir="${basedir}/com/novell/services/dsml/stream" target="all">
80 <property name="top" location="."/>
81 </ant>
82 </target>
83 - <target name="servlet_dom" depends="debug, release">
84 + <target name="servlet_dom" depends="debug">
85 <ant dir="${basedir}/com/novell/services/dsml/dom" target="all">
86 <property name="top" location="."/>
87 </ant>
88 @@ -201,42 +212,152 @@
89
90 <target name="clone_wars" depends="wars"/>
91
92 + <!-- Imported from javac.xml -->
93 + <!-- START -->
94 +
95 <!-- =================================================================== -->
96 <!-- build debug classes -->
97 <!-- =================================================================== -->
98 - <target name="debug" depends="init">
99 - <ant antfile="javac.xml" target="debug">
100 - <property name="DEBUG_VALUE" value="true"/>
101 - </ant>
102 + <target name="debug" >
103 +
104 + <echo message="DEBUG compile in com/novell"/>
105 + <mkdir dir="${build.debug}"/>
106 + <javac
107 + srcdir="${src}"
108 + includes="com/novell/**/*.java,jldap/com/novell/security/sasl/*.java,org/ietf/**/*.java"
109 + excludes="com/novell/services/**/*.java,${exclude.dsmlconnection},${exclude.spmlconnection}"
110 + destdir="${build.debug}"
111 + target="1.2"
112 + deprecation="off"
113 + debug="on"
114 + optimize="off">
115 + <classpath>
116 + <pathelement location="external/ssl/domestic/nssl1.2_dom.jar"/>
117 + <pathelement location="external/jsse/lib/jcert.jar"/>
118 + <pathelement location="external/jsse/lib/jnet.jar"/>
119 + <pathelement location="external/jsse/lib/jsse.jar"/>
120 +
121 + <!-- Take care of optional components -->
122 + <fileset dir="${ext}">
123 + <include name="commons-httpclient-*.jar"/>
124 + <include name="openspml*.jar"/>
125 + </fileset>
126 + </classpath>
127 + </javac>
128 +
129 + <echo message="Creating DEBUG ${lib.debug}/${ldap}.jar file"/>
130 + <mkdir dir="${lib.debug}"/>
131 + <jar
132 + jarfile="${lib.debug}/${ldap}.jar"
133 + basedir="${build.debug}"
134 + />
135 </target>
136
137 <!-- =================================================================== -->
138 <!-- build release classes -->
139 <!-- =================================================================== -->
140 - <target name="release" depends="init">
141 - <ant antfile="javac.xml" target="release">
142 - <property name="DEBUG_VALUE" value="false"/>
143 - </ant>
144 + <target name="release">
145 +
146 + <echo message="RELEASE compile in com/novell"/>
147 + <mkdir dir="${build}"/>
148 + <javac
149 + srcdir="."
150 + includes="com/novell/**/*.java,jldap/com/novell/security/sasl/*.java,org/ietf/**/*.java"
151 + excludes="com/novell/services/**/*.java"
152 + destdir="${build}"
153 + encoding="UTF-8"
154 + target="1.6"
155 + source="1.6"
156 + deprecation="off"
157 + debug="off"
158 + optimize="on">
159 + <classpath>
160 + <pathelement location="external/ssl/domestic/nssl1.2_dom.jar"/>
161 + <pathelement location="external/jsse/lib/jcert.jar"/>
162 + <pathelement location="external/jsse/lib/jnet.jar"/>
163 + <pathelement location="external/jsse/lib/jsse.jar"/>
164 + <pathelement location="external/commons-httpclient-2.0-rc2.jar"/>
165 + </classpath>
166 + </javac>
167 +
168 + <echo message="Creating RELEASE ${lib}/${ldap}.jar file"/>
169 + <mkdir dir="${lib}"/>
170 + <jar jarfile="${lib}/${jldap}.jar"
171 + basedir="${build}"
172 + />
173 </target>
174
175 - <!-- =================================================================== -->
176 - <!-- setup for javadoc -->
177 - <!-- =================================================================== -->
178 - <target name="setupDoc" depends="init">
179 - <ant antfile="javac.xml" target="setupDebug">
180 - <property name="DEBUG_VALUE" value="true"/>
181 - </ant>
182 + <!-- ====================================================================== -->
183 + <!-- Test-compilation target -->
184 + <!-- ====================================================================== -->
185 +
186 + <target name="compile-tests"
187 + description="Compile the test code">
188 + <mkdir dir="${build.testOutputDir}"/>
189 + <mkdir dir="${build.testResourceDir}"/>
190 + <javac destdir="${build.testOutputDir}"
191 + encoding="UTF-8"
192 + nowarn="false"
193 + debug="true"
194 + optimize="false"
195 + deprecation="true"
196 + target="1.6"
197 + verbose="false"
198 + fork="false"
199 + source="1.6">
200 + <src>
201 + <pathelement location="${build.testDir}"/>
202 + </src>
203 + <classpath>
204 + <path refid="build.test.classpath"/>
205 + <pathelement location="${build.outputDir}"/>
206 + </classpath>
207 + </javac>
208 + <copy todir="${build.testOutputDir}">
209 + <fileset dir="${build.testResourceDir}"/>
210 + </copy>
211 </target>
212
213 - <!-- =================================================================== -->
214 - <!-- final is synonym for build release classes -->
215 - <!-- =================================================================== -->
216 - <target name="final" depends="release" />
217 + <!-- ====================================================================== -->
218 + <!-- Run all tests -->
219 + <!-- ====================================================================== -->
220 +
221 + <target name="test"
222 + depends="compile-tests"
223 + description="Run the test cases">
224 + <mkdir dir="${test.reports}"/>
225 + <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
226 + <sysproperty key="basedir" value="."/>
227 + <formatter type="xml"/>
228 + <formatter type="plain" usefile="false"/>
229 + <classpath>
230 + <path refid="build.test.classpath"/>
231 + <pathelement location="${build.outputDir}"/>
232 + <pathelement location="${build.testOutputDir}"/>
233 + </classpath>
234 + <batchtest todir="${test.reports}" unless="test">
235 + <fileset dir="${build.testDir}">
236 + <include name="**/Test*.java"/>
237 + <include name="**/*Test.java"/>
238 + <include name="**/*TestCase.java"/>
239 + <exclude name="**/*Abstract*Test.java"/>
240 + </fileset>
241 + </batchtest>
242 + <batchtest todir="${test.reports}" if="test">
243 + <fileset dir="${build.testDir}">
244 + <include name="**/${test}.java"/>
245 + <exclude name="**/*Abstract*Test.java"/>
246 + </fileset>
247 + </batchtest>
248 + </junit>
249 + </target>
250 +
251 + <!-- END -->
252
253 <!-- =================================================================== -->
254 <!-- build lib files -->
255 <!-- =================================================================== -->
256 - <target name="lib" depends="debug, release"/>
257 + <target name="lib" depends="debug"/>
258
259 <!-- =================================================================== -->
260 <!-- jar is synonym for build lib files -->
261 @@ -284,7 +405,7 @@
262 <!-- =================================================================== -->
263 <!-- create javadoc for Novell ldap classes -->
264 <!-- =================================================================== -->
265 - <target name="docnovellldap" depends="init, setupDoc">
266 + <target name="docnovellldap" depends="init">
267 <delete dir="${pkg.doc}"/>
268 <echo message="Creating distribution ldap javadoc"/>
269 <mkdir dir="${pkg.doc}"/>
270 @@ -305,7 +426,7 @@
271 <!-- =================================================================== -->
272 <!-- create javadoc for IETF ldap classes -->
273 <!-- =================================================================== -->
274 - <target name="docietfldap" depends="init, setupDoc">
275 + <target name="docietfldap" depends="init">
276 <delete dir="${pkg.ietfdoc}"/>
277 <echo message="Creating distribution ldap javadoc"/>
278 <mkdir dir="${pkg.ietfdoc}"/>
279 @@ -326,7 +447,7 @@
280 <!-- =================================================================== -->
281 <!-- create javadoc for all LDAP classes for internal developer use only -->
282 <!-- =================================================================== -->
283 - <target name="docdeveloper" depends="init, setupDoc">
284 + <target name="docdeveloper" depends="init">
285 <delete dir="${pkg.developer}"/>
286 <echo message="Creating internal developer ldap javadoc"/>
287 <mkdir dir="${doc.developer}"/>
288 @@ -335,6 +456,8 @@
289 destdir="${doc.developer}"
290 classpath="${lib.debug}/${ldap}.jar;external/jsse/lib/jcert.jar;external/jsse/lib/jnet.jar;external/jsse/lib/jsse.jar;external/jaxp/jaxp.jar;external/jaxp/xerces.jar"
291 packagenames="org.ietf.ldap,com.novell.security.sasl,com.novell.sasl.client,com.novell.ldap.asn1,com.novell.ldap.client,com.novell.ldap.rfc2251,com.novell.ldap.resources,com.novell.ldap.extensions,com.novell.ldap.controls,com.novell.ldap.util,com.novell.ldap"
292 + encoding="UTF-8"
293 + failonerror="no"
294 Windowtitle="LDAP Classes"
295 Splitindex="true"
296 Private="true"
Report Message
Find on MARC Find on Google Groups