Author: jochen Date: Thu Nov 19 13:57:11 2009 New Revision: 882146 URL: http://svn.apache.org/viewvc?rev=882146&view=rev Log: The Java5REHandler didn't work with the IBM JDK. Fixed by adding the new JavaUtilREHandler. Additionally, the XercesREHandler wasn't instantiated, due to a typo. Submitted-By: Tobias Huehner <tobias.hueh...@softwareag.com>
Added: webservices/jaxme/trunk/ws-jaxme/jaxme-jm/src/main/java/org/apache/ws/jaxme/impl/JavaUtilREHandler.java Modified: webservices/jaxme/trunk/ws-jaxme/jaxme-jm/src/changes/changes.xml webservices/jaxme/trunk/ws-jaxme/jaxme-jm/src/main/java/org/apache/ws/jaxme/impl/REFactory.java Modified: webservices/jaxme/trunk/ws-jaxme/jaxme-jm/src/changes/changes.xml URL: http://svn.apache.org/viewvc/webservices/jaxme/trunk/ws-jaxme/jaxme-jm/src/changes/changes.xml?rev=882146&r1=882145&r2=882146&view=diff ============================================================================== --- webservices/jaxme/trunk/ws-jaxme/jaxme-jm/src/changes/changes.xml (original) +++ webservices/jaxme/trunk/ws-jaxme/jaxme-jm/src/changes/changes.xml Thu Nov 19 13:57:11 2009 @@ -4,6 +4,11 @@ </properties> <body> <release version="0.6-dev" date="Not yet published"> + <action dev="jochen" type="fix" due-to="Tobias Hühner" due-to-email="tobias.hueh...@softwareag.com"> + The Java5REHandler didn't work with the IBM JDK. Fixed by adding the + new JavaUtilREHandler. Additionally, the XercesREHandler wasn't + instantiated, due to a typo. + </action> <action dev="jochen" type="fix"> The IDREF type has been implemented as string and not as a reference to another object, as it should be. Added: webservices/jaxme/trunk/ws-jaxme/jaxme-jm/src/main/java/org/apache/ws/jaxme/impl/JavaUtilREHandler.java URL: http://svn.apache.org/viewvc/webservices/jaxme/trunk/ws-jaxme/jaxme-jm/src/main/java/org/apache/ws/jaxme/impl/JavaUtilREHandler.java?rev=882146&view=auto ============================================================================== --- webservices/jaxme/trunk/ws-jaxme/jaxme-jm/src/main/java/org/apache/ws/jaxme/impl/JavaUtilREHandler.java (added) +++ webservices/jaxme/trunk/ws-jaxme/jaxme-jm/src/main/java/org/apache/ws/jaxme/impl/JavaUtilREHandler.java Thu Nov 19 13:57:11 2009 @@ -0,0 +1,32 @@ +/* + * Copyright 2003, 2004 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.ws.jaxme.impl; + +import java.util.regex.Pattern; + +/** Implementation of {...@link REHandler}, using Java API. + */ +public class JavaUtilREHandler implements REHandler { + public Matcher getMatcher(final String pPattern) { + final Pattern p = Pattern.compile(pPattern); + return new Matcher(){ + public String getPattern() { return pPattern; } + public boolean matches(String pValue) { + return p.matcher(pValue).matches(); + } + }; + } +} Modified: webservices/jaxme/trunk/ws-jaxme/jaxme-jm/src/main/java/org/apache/ws/jaxme/impl/REFactory.java URL: http://svn.apache.org/viewvc/webservices/jaxme/trunk/ws-jaxme/jaxme-jm/src/main/java/org/apache/ws/jaxme/impl/REFactory.java?rev=882146&r1=882145&r2=882146&view=diff ============================================================================== --- webservices/jaxme/trunk/ws-jaxme/jaxme-jm/src/main/java/org/apache/ws/jaxme/impl/REFactory.java (original) +++ webservices/jaxme/trunk/ws-jaxme/jaxme-jm/src/main/java/org/apache/ws/jaxme/impl/REFactory.java Thu Nov 19 13:57:11 2009 @@ -37,14 +37,16 @@ p = REFactory.class.getName(); p = p.substring(0, p.lastIndexOf('.')+1); try { - Class c = Class.forName(p + "Java5REHandler"); - reh = (REHandler) c.newInstance(); - } catch (Throwable t1) { + reh = (REHandler) Class.forName(p + "JavaUtilREHandler").newInstance(); + } catch (Throwable t0) { try { - Class c = Class.forName(p + "XercerREHandler"); - reh = (REHandler) c.newInstance(); - } catch (Throwable t2) { - reh = new DummyREHandler(); + reh = (REHandler) Class.forName(p + "Java5REHandler").newInstance(); + } catch (Throwable t1) { + try { + reh = (REHandler) Class.forName(p + "XercesREHandler").newInstance(); + } catch (Throwable t2) { + reh = new DummyREHandler(); + } } } } --------------------------------------------------------------------- To unsubscribe, e-mail: jaxme-dev-unsubscr...@ws.apache.org For additional commands, e-mail: jaxme-dev-h...@ws.apache.org