Ticket #855: xp.diff

components/app/build.xml

@@ -5 +5 @@
 <!-- ======================================================================= -->
 
 <project name="app" default="help" basedir=".">
-
+
     <property name="import.dir" value="${basedir}/../antlib/resources"/>
     <import file="${import.dir}/global.xml"/>
     <import file="${import.dir}/dependencies.xml"/>
@@ -13 +13 @@
     <import file="${import.dir}/hibernate.xml"/>
     <import file="${import.dir}/server.xml"/>
     <import file="${import.dir}/setup.xml"/>
+
+    <!-- Reseting classpaths to empty to allow ant to delete the
+         jars on windows. See ticket:855 -->
+    <path id="omero.compile.classpath"/>
+    <path id="omero.classpath"/>
+    <path id="omero.test.classpath"/>
 
    <!--
    =======================================================================
@@ -23 +29 @@
    -->
    <target name="package" depends="generate"
            description="Packages the EAR by assembling all modules and deployment descriptors">
-      
+      
       <delete>
         <fileset dir="${target.dir}/libs" includes="commons-logging*"/>
         <fileset dir="${target.dir}/libs" includes="jboss*"/>

components/dsl/src/ome/dsl/DSLTask.java

@@ -110 +110 @@
                     String className = st.getShortname();
                     String packageName = st.getId();
                     packageName = packageName.substring(0, packageName
-                            .lastIndexOf("."));
-                    packageName = packageName.replaceAll("[.]", File.separator);
+                            .lastIndexOf("."));
+                    // What silliness!
+                    String sep = File.separator.replaceAll("\\\\","\\\\\\\\");
+                    packageName = packageName.replaceAll("[.]", sep);
 
                     String target = _filepattern;
                     target = target.replace(CLS_PLACEHOLDER, className);