You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2007/03/08 00:11:30 UTC
svn commit: r515836 -
/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
Author: dblevins
Date: Wed Mar 7 15:11:29 2007
New Revision: 515836
URL: http://svn.apache.org/viewvc?view=rev&rev=515836
Log:
More rigerous checking to determine if it's a v2 file vs a v3 file.
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java?view=diff&rev=515836&r1=515835&r2=515836
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java Wed Mar 7 15:11:29 2007
@@ -160,7 +160,12 @@
SAXParser parser = factory.newSAXParser();
parser.parse(source.get(), new DefaultHandler() {
public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
- if (uri != null && uri.contains("openejb-jar-2.")) {
+ if (localName.equals("environment")) {
+ realIssue[0] = v2ParsingException;
+ throw new SAXException("Throw exception to stop parsing");
+ }
+ if (uri == null) return;
+ if (uri.contains("openejb-jar-2.") || uri.contains("geronimo.apache.org/xml/ns")) {
realIssue[0] = v2ParsingException;
throw new SAXException("Throw exception to stop parsing");
}