1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
|
Description: Allow ant based upstream build system to work in Debian
Author: Miguel Landaeta <miguel@miguel.cc>
Forwarded: no
Last-Update: 2012-01-21
diff --git a/anttask/build.xml b/anttask/build.xml
index d3300aa..2f2263d 100644
--- a/anttask/build.xml
+++ b/anttask/build.xml
@@ -1,5 +1,4 @@
-<project name="Ant task definition for Castor XML code generator" default="compile.anttask" basedir="."
- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+<project name="Ant task definition for Castor XML code generator" default="compile.anttask" basedir=".">
<property environment="env" />
<property name="source" value="${basedir}/src"/>
@@ -7,11 +6,13 @@
<property name="main.resources" value="${source}/main/resources" />
<property name="build" value="${basedir}/build"/>
<property name="classes" value="${build}/classes"/>
- <property name="archive" value="${project}-${version}${release}-anttasks"/>
+ <property name="archive" value="${project}-anttasks-${version}${release}"/>
+ <!--
<artifact:dependencies filesetId="dependency.fileset" useScope="test">
<artifact:pom id="core" file="${basedir}/pom.xml" />
</artifact:dependencies>
+ -->
<path id="build.classpath">
<pathelement location="${basedir}/../build/classes"/>
@@ -19,14 +20,17 @@
<pathelement location="${basedir}/../ddlgen/build/classes"/>
<pathelement location="${basedir}/../codegen/build/classes"/>
<pathelement location="${basedir}/../schema/build/classes"/>
+ <fileset dir="/" includesfile="${basedir}/../debian/classpath-debian"/>
</path>
<target name="derive.libs">
<mkdir dir="${basedir}/lib" />
+ <!--
<copy todir="${basedir}/lib" verbose="true">
<fileset refid="dependency.fileset"/>
<mapper type="flatten"/>
</copy>
+ -->
</target>
<target name="prepare.anttask" depends="derive.libs" unless="prepare.anttask.executed">
diff --git a/codegen/build.xml b/codegen/build.xml
index 3cc1442..71652f4 100644
--- a/codegen/build.xml
+++ b/codegen/build.xml
@@ -1,5 +1,4 @@
-<project name="Castor XML - code generator" default="compile.codegen" basedir="."
- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+<project name="Castor XML - code generator" default="compile.codegen" basedir=".">
<property environment="env" />
<property name="source" value="${basedir}/src"/>
@@ -11,12 +10,14 @@
<property name="build" value="${basedir}/build"/>
<property name="classes" value="${build}/classes"/>
<property name="test.classes" value="${build}/test"/>
- <property name="archive" value="${project}-${version}${release}-codegen"/>
+ <property name="archive" value="${project}-codegen-${version}${release}"/>
<property name="gen.src" value="${build}/generated-sources"/>
+ <!--
<artifact:dependencies filesetId="dependency.fileset" useScope="test">
<artifact:pom id="core" file="${basedir}/pom.xml" />
</artifact:dependencies>
+ -->
<path id="build.compile.classpath">
<pathelement location="${basedir}/build/classes"/>
@@ -24,6 +25,7 @@
<pathelement location="${basedir}/../schema/build/classes"/>
<pathelement location="${basedir}/../anttask/build/classes"/>
<pathelement location="${basedir}/../core/build/classes"/>
+ <fileset dir="/" includesfile="${basedir}/../debian/classpath-debian"/>
<!-- JARs -->
<!--
@@ -55,10 +57,12 @@
<target name="derive.codegen.libs">
<mkdir dir="${basedir}/lib" />
+ <!--
<copy todir="${basedir}/lib" verbose="true">
<fileset refid="dependency.fileset"/>
<mapper type="flatten"/>
</copy>
+ -->
</target>
<target name="prepare.codegen" unless="prepare.codegen.executed">
diff --git a/core/build.xml b/core/build.xml
index e189839..414e770 100644
--- a/core/build.xml
+++ b/core/build.xml
@@ -1,5 +1,4 @@
-<project name="Castor core" default="compile.core" basedir="."
- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+<project name="Castor core" default="compile.core" basedir=".">
<property environment="env" />
<property name="source" value="${basedir}/src"/>
@@ -10,15 +9,18 @@
<property name="build" value="${basedir}/build"/>
<property name="classes" value="${build}/classes"/>
<property name="test.classes" value="${build}/test"/>
- <property name="archive" value="${project}-${version}${release}-core"/>
+ <property name="archive" value="${project}-core-${version}${release}"/>
+ <!--
<artifact:dependencies filesetId="dependency.fileset" useScope="test">
<artifact:pom id="core" file="${basedir}/pom.xml" />
</artifact:dependencies>
+ -->
<path id="build.classpath">
<pathelement location="${basedir}/build/classes"/>
<pathelement location="${basedir}/../build/classes"/>
+ <fileset dir="/" includesfile="${basedir}/../debian/classpath-debian"/>
<!--
<pathelement location="${basedir}/../lib/commons-logging-1.1.jar"/>
<pathelement location="${basedir}/../lib/junit_3.8.2.jar"/>
@@ -32,10 +34,12 @@
<target name="derive.core.libs">
<mkdir dir="${basedir}/lib" />
+ <!--
<copy todir="${basedir}/lib" verbose="true">
<fileset refid="dependency.fileset"/>
<mapper type="flatten"/>
</copy>
+ -->
</target>
<target name="prepare.core" unless="prepare.executed">
diff --git a/cpa/build.xml b/cpa/build.xml
index 2b32ea2..d481e01 100644
--- a/cpa/build.xml
+++ b/cpa/build.xml
@@ -1,5 +1,4 @@
-<project name="Castor JDO - persistence framework" default="compile.cpa" basedir="."
- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+<project name="Castor JDO - persistence framework" default="compile.cpa" basedir=".">
<property environment="env" />
<property name="source" value="${basedir}/src"/>
@@ -9,16 +8,18 @@
<property name="main.jjtree" value="${source}/main/jjtree"/>
<property name="jjtree.target" value="${target}/generated-sources/jjtree"/>
<property name="javacc.target" value="${target}/generated-sources/javacc"/>
- <property name="javacc.home" value="${basedir}/../lib" />
+ <property name="javacc.home" value="/usr/share/java" />
<property name="build" value="${basedir}/build"/>
<property name="castor.target" value="${basedir}/target/generated-sources/castor"/>
<property name="classes" value="${build}/classes"/>
- <property name="archive" value="${project}-${version}${release}-jdo"/>
+ <property name="archive" value="${project}-jdo-${version}${release}"/>
<property name="gen.src" value="${build}/generated-sources"/>
+ <!--
<artifact:dependencies filesetId="dependency.fileset" useScope="test">
<artifact:pom id="core" file="${basedir}/pom.xml" />
</artifact:dependencies>
+ -->
<path id="build.classpath">
<!-- inter-module dependencies -->
@@ -28,6 +29,7 @@
<pathelement location="${basedir}/../schema/build/classes"/>
<pathelement location="${basedir}/../anttask/build/classes"/>
<pathelement location="${basedir}/../codegen/build/classes"/>
+ <fileset dir="/" includesfile="${basedir}/../debian/classpath-debian"/>
<!-- third-party libs -->
<!--
@@ -41,10 +43,12 @@
<target name="derive.cpa.libs">
<mkdir dir="${basedir}/lib" />
+ <!--
<copy todir="${basedir}/lib" verbose="true">
<fileset refid="dependency.fileset"/>
<mapper type="flatten"/>
</copy>
+ -->
</target>
<target name="prepare.cpa" unless="prepare.cpa.executed">
@@ -97,6 +101,17 @@
</target>
<target name="compile.cpa" depends="gen.parser, derive.cpa.libs" description="Compile Castor JDO">
+ <javac destdir="${classes}"
+ debug="on" encoding="ISO-8859-1" deprecation="false">
+ <src path="${javacc.target}"/>
+ <src path="${castor.target}"/>
+ <src path="${main.java}"/>
+ <classpath refid="build.classpath"/>
+ <classpath>
+ <fileset dir="${basedir}/lib"/>
+ </classpath>
+ </javac>
+ <!--
<javac srcdir="${javacc.target}" destdir="${classes}"
debug="on" encoding="ISO-8859-1" deprecation="false">
<classpath refid="build.classpath"/>
@@ -118,6 +133,7 @@
<fileset dir="${basedir}/lib"/>
</classpath>
</javac>
+ -->
<copy todir="${classes}">
<fileset dir="${main.resources}">
<include name="**"/>
diff --git a/ddlgen/build.xml b/ddlgen/build.xml
index 4876ce4..2963db7 100644
--- a/ddlgen/build.xml
+++ b/ddlgen/build.xml
@@ -1,5 +1,4 @@
-<project name="Castor DDL generator" default="compile.ddlgen" basedir="."
- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+<project name="Castor DDL generator" default="compile.ddlgen" basedir=".">
<property environment="env"/>
<property name="source" value="${basedir}/src"/>
@@ -9,14 +8,17 @@
<property name="classes" value="${build}/classes"/>
<property name="doc" value="${build}/doc"/>
<property name="javadoc" value="${doc}/javadoc"/>
- <property name="archive" value="${project}-${version}${release}-ddlgen"/>
+ <property name="archive" value="${project}-ddlgen-${version}${release}"/>
+ <!--
<artifact:dependencies filesetId="dependency.fileset" useScope="test">
<artifact:pom id="core" file="${basedir}/pom.xml" />
</artifact:dependencies>
+ -->
<path id="build.classpath">
<pathelement location="${basedir}/../build/classes"/>
+ <fileset dir="/" includesfile="${basedir}/../debian/classpath-debian"/>
<!--
<pathelement location="${basedir}/../lib/commons-logging-1.1.jar" />
@@ -25,10 +27,12 @@
<target name="derive.libs">
<mkdir dir="${basedir}/lib" />
+ <!--
<copy todir="${basedir}/lib" verbose="true">
<fileset refid="dependency.fileset"/>
<mapper type="flatten"/>
</copy>
+ -->
</target>
<target name="prepare.ddlgen" depends="derive.libs" unless="prepare.ddlgen.executed">
diff --git a/diff/build.xml b/diff/build.xml
index 5e4a098..1f9bea1 100644
--- a/diff/build.xml
+++ b/diff/build.xml
@@ -1,5 +1,4 @@
-<project name="Castor XML - XML diff" default="compile.diff" basedir="."
- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+<project name="Castor XML - XML diff" default="compile.diff" basedir=".">
<!-- $Id: build.xml 0000 2007-01-19 21:12:08Z ekuns $ -->
@@ -10,16 +9,19 @@
<property name="test.resources" value="${source}/test/resources"/>
<property name="build" value="${basedir}/build"/>
<property name="classes" value="${build}/classes"/>
- <property name="archive" value="${project}-${version}${release}-xml-diff"/>
+ <property name="archive" value="${project}-xml-diff-${version}${release}"/>
+ <!--
<artifact:dependencies filesetId="dependency.fileset" useScope="test">
<artifact:pom id="core" file="${basedir}/pom.xml" />
</artifact:dependencies>
+ -->
<path id="build.classpath">
<pathelement location="${basedir}/build/classes"/>
<pathelement location="${basedir}/../build/classes"/>
<pathelement location="${basedir}/../core/build/classes"/>
+ <fileset dir="/" includesfile="${basedir}/../debian/classpath-debian"/>
<!--
<pathelement location="${basedir}/../lib/commons-logging-1.1.jar"/>
<pathelement location="${basedir}/../lib/junit_3.8.2.jar"/>
@@ -28,10 +30,12 @@
<target name="derive.diff.libs">
<mkdir dir="${basedir}/lib" />
+ <!--
<copy todir="${basedir}/lib" verbose="true">
<fileset refid="dependency.fileset"/>
<mapper type="flatten"/>
</copy>
+ -->
</target>
<target name="prepare.diff" unless="prepare.diff.executed">
diff --git a/examples/build.xml b/examples/build.xml
index adfb65d..ea4535d 100644
--- a/examples/build.xml
+++ b/examples/build.xml
@@ -1,5 +1,4 @@
-<project name="Castor CPA - PTF" default="compile.examples" basedir="."
- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+<project name="Castor CPA - PTF" default="compile.examples" basedir=".">
<!-- $Id: build.xml 0000 2007-01-19 21:12:08Z ekuns $ -->
@@ -11,14 +10,16 @@
<property name="test.resources" value="${source}/test/resources"/>
<property name="build" value="${basedir}/build"/>
<property name="classes" value="${build}/classes"/>
- <property name="archive" value="${project}-${version}${release}-examples"/>
- <property name="archive-sources" value="${project}-${version}${release}-examples-sources"/>
+ <property name="archive" value="${project}-examples-${version}${release}"/>
+ <property name="archive-sources" value="${project}-examples-sources-${version}${release}"/>
<property name="exampleexcludes" value="codegen/*,**/dax/**"/>
+ <!--
<artifact:dependencies filesetId="dependency.fileset" useScope="test">
<artifact:pom file="${basedir}/pom.xml" />
</artifact:dependencies>
+ -->
<path id="build.classpath">
<pathelement location="${basedir}/build/classes"/>
diff --git a/schema/build.xml b/schema/build.xml
index 7aa2944..dfc379f 100644
--- a/schema/build.xml
+++ b/schema/build.xml
@@ -1,5 +1,4 @@
-<project name="Castor XML schema" default="compile.schema" basedir="."
- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+<project name="Castor XML schema" default="compile.schema" basedir=".">
<property environment="env" />
<property name="source" value="${basedir}/src"/>
@@ -11,18 +10,21 @@
<property name="build" value="${basedir}/build"/>
<property name="classes" value="${build}/classes"/>
<property name="test.classes" value="${build}/test"/>
- <property name="archive" value="${project}-${version}${release}-xml-schema"/>
+ <property name="archive" value="${project}-xml-schema-${version}${release}"/>
<property name="gen.src" value="${basedir}/target/generated-sources/castor"/>
+ <!--
<artifact:dependencies filesetId="dependency.fileset" useScope="test">
<artifact:pom id="core" file="${basedir}/pom.xml" />
</artifact:dependencies>
+ -->
<path id="build.classpath">
<pathelement location="${basedir}/build/classes"/>
<pathelement location="${basedir}/../build/classes"/>
<pathelement location="${basedir}/../xml/build/classes"/>
<pathelement location="${basedir}/../core/build/classes"/>
+ <fileset dir="/" includesfile="${basedir}/../debian/classpath-debian"/>
<!--
<pathelement location="${basedir}/../lib/commons-logging-1.1.jar"/>
@@ -37,10 +39,12 @@
<target name="derive.libs">
<mkdir dir="${basedir}/lib" />
+ <!--
<copy todir="${basedir}/lib" verbose="true">
<fileset refid="dependency.fileset"/>
<mapper type="flatten"/>
</copy>
+ -->
</target>
<target name="prepare.schema" depends="derive.libs" unless="prepare.executed">
diff --git a/src/build.xml b/src/build.xml
index 6316674..a7babdf 100644
--- a/src/build.xml
+++ b/src/build.xml
@@ -2,8 +2,7 @@
<!-- $Id: build.xml 8787 2011-02-20 08:02:41Z wguttmn $ -->
-<project name="Castor" default="compile" basedir=".."
- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+<project name="Castor" default="compile" basedir="..">
<!-- ================================================================== -->
<!-- Properties -->
@@ -60,9 +59,12 @@
<pathelement location="${classes}"/>
<pathelement location="tests"/>
<pathelement location="${tests}" />
+ <!--
<fileset dir="${lib}">
<include name="*.jar"/>
</fileset>
+ -->
+ <fileset dir="/" includesfile="${basedir}/debian/classpath-debian"/>
<pathelement location="${basedir}/ddlgen/build/classes" />
<pathelement location="${basedir}/codegen/build/classes" />
<pathelement location="${basedir}/cpa/build/classes" />
@@ -84,12 +86,17 @@
</path>
<path id="javadoc.classpath">
+ <!--
<fileset dir="${lib}">
<include name="*.jar"/>
</fileset>
+ -->
+ <fileset dir="/" includesfile="${basedir}/debian/classpath-debian"/>
+ <!--
<fileset dir="${basedir}/bin/lib">
<include name="ant-1.6.jar" />
</fileset>
+ -->
</path>
<!-- ================================================================== -->
@@ -135,16 +142,20 @@
org/castor/jdo/**/*.java,
org/castor/persist/**/*.java" />
+ <!--
<artifact:dependencies filesetId="dependency.root.fileset" useScope="test">
<artifact:pom id="schema" file="${basedir}/xml/pom.xml" />
</artifact:dependencies>
+ -->
<target name="derive.root.libs">
<mkdir dir="newlib" />
+ <!--
<copy todir="newlib" verbose="true">
<fileset refid="dependency.root.fileset"/>
<mapper type="flatten"/>
</copy>
+ -->
</target>
<target name="targets" description="Prints static list of available targets">
@@ -305,7 +316,7 @@
includes="${castor.commons.files}">
<classpath refid="build.classpath"/>
<classpath>
- <fileset dir="${basedir}/newlib"/>
+ <!--<fileset dir="${basedir}/newlib"/>-->
</classpath>
</javac>
</target>
@@ -318,11 +329,13 @@
<property name="release" value="${release}"/>
</ant>
<!-- compile artifacts in XML module -->
+ <!--
<javac srcdir="${basedir}/xml/target/generated-sources/castor" destdir="${classes}" excludes="${excludes}"
debug="on" encoding="ISO-8859-1" deprecation="${deprecation}"
includes="${castor.xml.files}">
<classpath refid="build.classpath"/>
</javac>
+ -->
<javac srcdir="${java}" destdir="${classes}" excludes="${excludes}"
debug="on" encoding="ISO-8859-1" deprecation="${deprecation}"
includes="${castor.xml.files}">
@@ -332,9 +345,11 @@
</classpath>
</javac>
<copy todir="${classes}">
+ <!--
<fileset dir="${basedir}/xml/target/generated-sources/castor">
<include name="**/*.cdr"/>
</fileset>
+ -->
<fileset dir="${java}">
<patternset refid="support.files" />
</fileset>
@@ -344,6 +359,7 @@
</copy>
<!-- compile test classes -->
+ <!--
<javac srcdir="${test.java}" destdir="${test.classes}"
debug="on" encoding="ISO-8859-1" deprecation="${deprecation}">
<classpath refid="build.classpath"/>
@@ -351,6 +367,7 @@
<fileset dir="${basedir}/newlib"/>
</classpath>
</javac>
+ -->
<copy todir="${test.classes}">
<fileset dir="${test.java}">
<patternset refid="support.files" />
@@ -365,6 +382,7 @@
debug="on" encoding="ISO-8859-1" deprecation="${deprecation}"
includes="${castor.jdo.files}">
<classpath refid="build.classpath"/>
+ <exclude name="**/org/exolab/castor/dsml/mozilla/**"/>
<classpath>
<fileset dir="${basedir}/newlib"/>
</classpath>
@@ -416,12 +434,10 @@
<property name="release" value="${release}"/>
</ant>
<!-- build Castor JDO -->
-<!--
<ant antfile="${basedir}/cpa/build.xml" target="compile.cpa" inheritAll="false">
<property name="version" value="${version}"/>
<property name="release" value="${release}"/>
</ant>
--->
<!-- build examples -->
<!--
<ant antfile="${basedir}/examples/build.xml" target="compile.examples" inheritAll="false">
@@ -599,6 +615,7 @@
<include name="${archive.name}.jar" />
</fileset>
</copy>
+ <!--
<copy todir="target/lib">
<fileset dir="${lib}">
<include name="commons-logging.jar" />
@@ -608,6 +625,7 @@
<include name="derby-10.1.2.1.jar" />
</fileset>
</copy>
+ -->
<zip zipfile="${dist}/${archive.name}-examples.zip" basedir="target" includes="**"/>
</target>
@@ -639,7 +657,8 @@
<replace file="${classes}/MANIFEST.MF" token="$$RELEASE$$" value="${release}"/>
<!-- create Castor XML Only Jar -->
- <jar jarfile="${dist}/${archive.name}-xml.jar" basedir="${classes}"
+ <!--<jar jarfile="${dist}/${archive.name}-xml.jar" basedir="${classes}"-->
+ <jar jarfile="${dist}/castor-xml-${version}.jar" basedir="${classes}"
manifest="${classes}/MANIFEST.MF"
includes="LICENSE,LICENSE.APACHE2,README,
org/castor/messages.properties,
@@ -680,13 +699,11 @@
<property name="release" value="${release}"/>
</ant>
<!-- create JAR for JDO, calling module build file recursively -->
-<!--
<ant antfile="${basedir}/cpa/build.xml" target="jar.cpa" inheritAll="false">
<property name="project" value="${project}"/>
<property name="version" value="${version}"/>
<property name="release" value="${release}"/>
</ant>
--->
<!-- create JAR for XML code generator, calling module build file recursively -->
<ant antfile="${basedir}/codegen/build.xml" target="jar.codegen" inheritAll="false">
<property name="project" value="${project}"/>
@@ -917,9 +934,11 @@
<copy todir="${build}/${archive.name}/src">
<fileset dir="${source}" />
</copy>
+ <!--
<copy todir="${build}/${archive.name}/lib">
<fileset dir="${lib}" excludes="jconn2.jar"/>
</copy>
+ -->
<copy todir="${build}/${archive.name}/bin">
<fileset dir="./bin" includes="*.sh,*.bat"/>
</copy>
@@ -1098,9 +1117,11 @@
<include name="${archive.name}-core.jar"/>
</fileset>
</copy>
+ <!--
<copy todir="${build}/${archive.name}">
<fileset dir="${lib}" includes="jdbc-se2.0.jar,jndi.jar,jta1.0.1.jar,xerces.jar,ldapjdk.jar,xslp.jar"/>
</copy>
+ -->
<!--
<copy todir="${build}/${archive.name}/schema">
<fileset dir="${schema}" />
diff --git a/xml/build.xml b/xml/build.xml
index 5a69343..8cae367 100644
--- a/xml/build.xml
+++ b/xml/build.xml
@@ -1,5 +1,4 @@
-<project name="Castor XML - Core module" default="compile" basedir="."
- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+<project name="Castor XML - Core module" default="compile" basedir=".">
<property environment="env" />
<property name="source" value="${basedir}/src"/>
@@ -14,9 +13,11 @@
<property name="archive" value="${project}-${version}${release}"/>
<property name="gen.src" value="${build}/generated-sources"/>
+ <!--
<artifact:dependencies filesetId="dependency.fileset" useScope="test">
<artifact:pom id="core" file="${basedir}/pom.xml" />
</artifact:dependencies>
+ -->
<path id="build.classpath">
<pathelement location="${basedir}/build/classes"/>
@@ -62,18 +63,22 @@
<fileset dir="${basedir}/lib"/>
</classpath>
</javac>
+ <!--
<javac srcdir="${main.generated}" destdir="${classes}"
debug="on" encoding="ISO-8859-1" deprecation="false"
source="1.5" target="1.5">
<classpath refid="build.classpath"/>
</javac>
+ -->
<copy todir="${classes}">
<fileset dir="${main.resources}">
<include name="**"/>
</fileset>
+ <!--
<fileset dir="${main.generated}">
<include name="**/*.cdr"/>
</fileset>
+ -->
<filterset begintoken="$$" endtoken="$$">
<filter token="VERSION" value="${version}"/>
<filter token="RELEASE" value="${release}"/>
|
