From 2d5ae5f32f5698bceea30ab01b4ac051da8429b5 Mon Sep 17 00:00:00 2001
From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Sat, 27 Feb 2010 23:05:37 +0000
Subject: [PATCH] Remove the DTD and its resolver from the java bindings since
 we use the flexml parser

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7129 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 src/Makefile.am                       |  4 +-
 src/java/simgrid/msg/DTDResolver.java | 59 ---------------------------
 2 files changed, 1 insertion(+), 62 deletions(-)
 delete mode 100644 src/java/simgrid/msg/DTDResolver.java

diff --git a/src/Makefile.am b/src/Makefile.am
index 3e82357ed6..0a5134520c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -259,7 +259,6 @@ JMSG_JAVA_SRC = \
   java/simgrid/msg/Task.java                         \
   \
   java/simgrid/msg/MsgNative.java                    \
-  java/simgrid/msg/DTDResolver.java                  \
   java/simgrid/msg/ApplicationHandler.java           \
   \
   java/simgrid/msg/Sem.java
@@ -370,11 +369,10 @@ clean-local:
 jardir = $(prefix)/jar
 jar_DATA =  simgrid.jar
 
-simgrid.jar: $(JMSG_JAVA_SRC) $(srcdir)/surf/simgrid.dtd
+simgrid.jar: $(JMSG_JAVA_SRC)
 	[ -e .classes ] || mkdir .classes
 	$(JAVAC) -d .classes -source 6 $(foreach file,$(JMSG_JAVA_SRC),$(srcdir)/$(file))
 	[ -e .classes/surf ] || mkdir .classes/surf
-	cp $(srcdir)/surf/simgrid.dtd .classes/surf
 	$(JAR) cvf simgrid.jar -C .classes .
 else
 EXTRA_DIST+=$(JMSG_C_SRC) $(JMSG_JAVA_SRC) $(MSG_SRC)
diff --git a/src/java/simgrid/msg/DTDResolver.java b/src/java/simgrid/msg/DTDResolver.java
deleted file mode 100644
index 850d79b2d2..0000000000
--- a/src/java/simgrid/msg/DTDResolver.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * simgrid.msg.DTDResolver.java    1.00 07/05/01
- *
- * Copyright 2006,2007 Martin Quinson, Malek Cherier           
- * All right reserved. 
- *
- * This program is free software; you can redistribute 
- * it and/or modify it under the terms of the license 
- *(GNU LGPL) which comes with this package. 
- */  
-  package simgrid.msg;
-import java.io.InputStream;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-public class DTDResolver implements EntityResolver {
-  public InputSource resolveEntity(String publicID, String systemID) 
-    throws SAXException {
-    if (!systemID.endsWith("simgrid.dtd")) {
-      System.out.
-        println("\n MSG - Warning - the platform used seams invalid\n");
-      return null;
-    }
-    
-      /* try to get the DTD from the classpath */ 
-      InputStream in = getClass().getResourceAsStream("/simgrid.dtd");
-    if (null == in)
-      
-        /* try to get the DTD from the surf dir in the jar */ 
-        in = getClass().getResourceAsStream("/surf/simgrid.dtd");
-    if (null == in)
-      
-        /* try to get the DTD from the directory Simgrid */ 
-        in = getClass().getResourceAsStream("/Simgrid/simgrid.dtd");
-    if (null == in)
-      
-        /* try to get the DTD from the directory Simgrid/msg */ 
-        in = getClass().getResourceAsStream("/Simgrid/msg/simgrid.dtd");
-    if (null == in) {
-      System.err.println("\nMSG - XML DTD not found (" +
-                          systemID.toString() +
-                          ").\n\nPlease put this file in one of the following destinations :\n\n"
-                          + "   - classpath;\n" +
-                          "   - the directory Simgrid;\n" +
-                          "   - the directory Simgrid/msg;\n" +
-                          "   - the directory of you simulation.\n\n" +
-                          "Once the DTD puted in one of the previouse destinations, retry you simulation.\n");
-      
-        /* 
-         * If not founded, returning null makes process continue normally (try to get 
-         * the DTD from the current directory 
-         */ 
-        return null;
-    }
-    return new InputSource(in);
-  }
-}
-
-
-- 
2.20.1