From b3f9f4d904a5940e649e44da61195ea4002a6b6b Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Tue, 20 Nov 2012 16:03:33 +0000
Subject: [PATCH] CR-920 Fix for OPENDJ-651: ./build.sh dsml fails if path to sources contains spaces

---
 opends/resource/dsml/lib/jaxb-xjc.jar  |    0 
 opends/build.xml                       |    5 +++--
 opends/resource/dsml/lib/jaxb-api.jar  |    0 
 opends/resource/dsml/lib/jaxb-impl.jar |    0 
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/opends/build.xml b/opends/build.xml
index 140be66..a8073ed 100644
--- a/opends/build.xml
+++ b/opends/build.xml
@@ -1312,12 +1312,13 @@
     </taskdef>
 
     <mkdir dir="${dsml.gen.dir}/org/opends/dsml/protocol" />
-    <xjc target="${dsml.gen.dir}" schema="${dsml.dir}/schema/DSMLv2.xsd"
+    <xjc destdir="${dsml.gen.dir}" schema="${dsml.dir}/schema/DSMLv2.xsd"
          removeOldOutput="yes" package="org.opends.dsml.protocol"
-         binding="${dsml.dir}/schema/bindings.xjb">
+         binding="${dsml.dir}/schema/bindings.xjb" target="2.1">
       <!-- Don't generate package-info.java as it conflicts with
            the one in src/dsml -->
       <arg value="-npa"/>
+      <arg value="-verbose"/>
       <produces dir="${dsml.gen.dir}/org/opends/dsml/protocol"
            includes="* impl/*" />
     </xjc>
diff --git a/opends/resource/dsml/lib/jaxb-api.jar b/opends/resource/dsml/lib/jaxb-api.jar
index 3918383..ae2adee 100644
--- a/opends/resource/dsml/lib/jaxb-api.jar
+++ b/opends/resource/dsml/lib/jaxb-api.jar
Binary files differ
diff --git a/opends/resource/dsml/lib/jaxb-impl.jar b/opends/resource/dsml/lib/jaxb-impl.jar
index 428119e..cd249e7 100644
--- a/opends/resource/dsml/lib/jaxb-impl.jar
+++ b/opends/resource/dsml/lib/jaxb-impl.jar
Binary files differ
diff --git a/opends/resource/dsml/lib/jaxb-xjc.jar b/opends/resource/dsml/lib/jaxb-xjc.jar
index e388356..7f2d807 100644
--- a/opends/resource/dsml/lib/jaxb-xjc.jar
+++ b/opends/resource/dsml/lib/jaxb-xjc.jar
Binary files differ

--
Gitblit v1.10.0