Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmoore2010-01-19 18:20:52 +0000
committerkmoore2010-01-19 18:20:52 +0000
commit04d8fcd7a4df6c52abeecb2066633d4565c7f04b (patch)
tree05a7f0376412de95255f12e0f6e4f47bc55597de
parent09aa5d96b1d3eb33275f659acdaefa47121a1840 (diff)
downloadwebtools.dali-04d8fcd7a4df6c52abeecb2066633d4565c7f04b.tar.gz
webtools.dali-04d8fcd7a4df6c52abeecb2066633d4565c7f04b.tar.xz
webtools.dali-04d8fcd7a4df6c52abeecb2066633d4565c7f04b.zip
296544 - xml resource change - avoids internet access when finding the schema during tests
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/xml/JpaXmlResource.java13
1 files changed, 10 insertions, 3 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/xml/JpaXmlResource.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/xml/JpaXmlResource.java
index 31fe3ab750..245e8b5318 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/xml/JpaXmlResource.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/xml/JpaXmlResource.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2009 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2010 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -32,9 +32,11 @@ import org.eclipse.jpt.core.JpaResourceType;
import org.eclipse.jpt.core.JptCorePlugin;
import org.eclipse.jpt.utility.internal.ListenerList;
import org.eclipse.jpt.utility.internal.StringTools;
+import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver;
import org.eclipse.wst.common.internal.emf.resource.Renderer;
import org.eclipse.wst.common.internal.emf.resource.Translator;
import org.eclipse.wst.common.internal.emf.resource.TranslatorResourceImpl;
+import org.xml.sax.EntityResolver;
/**
* Provisional API: This interface is part of an interim API that is still
@@ -64,8 +66,13 @@ public class JpaXmlResource
this.rootTranslator = rootTranslator;
this.resourceModelListenerList = new ListenerList<JpaResourceModelListener>(JpaResourceModelListener.class);
}
-
-
+
+ //296544 - override this to avoid internet access finding the schema during tests
+ @Override
+ public EntityResolver getEntityResolver() {
+ return J2EEXmlDtDEntityResolver.INSTANCE;
+ }
+
public IContentType getContentType() {
return this.contentType;
}

Back to the top