You are viewing a plain text version of this content. The canonical link for it is here.
Posted to woden-dev@ws.apache.org by jk...@apache.org on 2008/02/21 14:19:30 UTC
svn commit: r629774 - in /webservices/woden/branches/woden62:
src/org/apache/woden/internal/wsdl20/assertions/
src/org/apache/woden/internal/wsdl20/validation/
src/org/apache/woden/wsdl20/validation/
test/org/apache/woden/internal/wsdl20/assertions/
Author: jkaputin
Date: Thu Feb 21 05:19:27 2008
New Revision: 629774
URL: http://svn.apache.org/viewvc?rev=629774&view=rev
Log:
Changed AssertionContext to WodenContext in woden62 branch.
Added:
webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/validation/WodenContextImpl.java
- copied, changed from r629481, webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/validation/AssertionContextImpl.java
webservices/woden/branches/woden62/src/org/apache/woden/wsdl20/validation/WodenContext.java
- copied, changed from r629481, webservices/woden/branches/woden62/src/org/apache/woden/wsdl20/validation/AssertionContext.java
webservices/woden/branches/woden62/test/org/apache/woden/internal/wsdl20/assertions/WodenContextImpl.java
- copied, changed from r629481, webservices/woden/branches/woden62/test/org/apache/woden/internal/wsdl20/assertions/AssertionContextImpl.java
Removed:
webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/validation/AssertionContextImpl.java
webservices/woden/branches/woden62/src/org/apache/woden/wsdl20/validation/AssertionContext.java
webservices/woden/branches/woden62/test/org/apache/woden/internal/wsdl20/assertions/AssertionContextImpl.java
Modified:
webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/assertions/Description1001.java
webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/assertions/Description1002.java
webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/assertions/Description1003.java
webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/assertions/Interface1009.java
webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/assertions/Interface1010.java
webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/validation/WSDLValidator.java
webservices/woden/branches/woden62/src/org/apache/woden/wsdl20/validation/Assertion.java
webservices/woden/branches/woden62/test/org/apache/woden/internal/wsdl20/assertions/TestInterface1009.java
webservices/woden/branches/woden62/test/org/apache/woden/internal/wsdl20/assertions/TestInterface1010.java
Modified: webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/assertions/Description1001.java
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/assertions/Description1001.java?rev=629774&r1=629773&r2=629774&view=diff
==============================================================================
--- webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/assertions/Description1001.java (original)
+++ webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/assertions/Description1001.java Thu Feb 21 05:19:27 2008
@@ -1,5 +1,6 @@
package org.apache.woden.internal.wsdl20.assertions;
+import java.io.FileNotFoundException;
import java.net.URI;
import java.net.URL;
@@ -7,7 +8,7 @@
import org.apache.woden.WSDLException;
import org.apache.woden.internal.ErrorLocatorImpl;
import org.apache.woden.wsdl20.validation.Assertion;
-import org.apache.woden.wsdl20.validation.AssertionContext;
+import org.apache.woden.wsdl20.validation.WodenContext;
import org.apache.woden.wsdl20.xml.DescriptionElement;
public class Description1001 implements Assertion {
@@ -16,31 +17,31 @@
return "Description-1001".intern();
}
- public void validate(Object target, AssertionContext assertionCtx) throws WSDLException {
+ public void validate(Object target, WodenContext wodenCtx) throws WSDLException {
DescriptionElement descElem = (DescriptionElement) target;
URI tns = descElem.getTargetNamespace();
try {
- URI resolvedUri = assertionCtx.getUriResolver().resolveURI(tns);
+ URI resolvedUri = wodenCtx.getUriResolver().resolveURI(tns);
URI uri = resolvedUri != null ? resolvedUri : tns;
URL url = uri.toURL();
Object o = url.getContent();
if(o == null) {
- assertionCtx.getErrorReporter().reportError(
+ wodenCtx.getErrorReporter().reportError(
new ErrorLocatorImpl(), getId(), new Object[] {tns}, ErrorReporter.SEVERITY_WARNING);
}
+ } catch (FileNotFoundException e1) {
+ wodenCtx.getErrorReporter().reportError(
+ new ErrorLocatorImpl(), getId(), new Object[] {tns}, ErrorReporter.SEVERITY_WARNING);
+
+ } catch (WSDLException e2) {
+ throw e2;
} catch (Exception e) {
- // WSDLException
// IOException
// MalformedURLException
- if(e instanceof WSDLException) {
- throw (WSDLException)e;
- }
- else {
- throw new WSDLException(WSDLException.OTHER_ERROR,
- "Fatal error.",
- e);
- }
+ throw new WSDLException(WSDLException.OTHER_ERROR,
+ "Fatal error.",
+ e);
}
}
Modified: webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/assertions/Description1002.java
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/assertions/Description1002.java?rev=629774&r1=629773&r2=629774&view=diff
==============================================================================
--- webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/assertions/Description1002.java (original)
+++ webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/assertions/Description1002.java Thu Feb 21 05:19:27 2008
@@ -2,7 +2,7 @@
import org.apache.woden.WSDLException;
import org.apache.woden.wsdl20.validation.Assertion;
-import org.apache.woden.wsdl20.validation.AssertionContext;
+import org.apache.woden.wsdl20.validation.WodenContext;
public class Description1002 implements Assertion {
@@ -10,7 +10,7 @@
return "Description-1002".intern();
}
- public void validate(Object target, AssertionContext assertionCtx) throws WSDLException {
+ public void validate(Object target, WodenContext wodenCtx) throws WSDLException {
// TODO Auto-generated method stub
}
Modified: webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/assertions/Description1003.java
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/assertions/Description1003.java?rev=629774&r1=629773&r2=629774&view=diff
==============================================================================
--- webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/assertions/Description1003.java (original)
+++ webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/assertions/Description1003.java Thu Feb 21 05:19:27 2008
@@ -2,7 +2,7 @@
import org.apache.woden.WSDLException;
import org.apache.woden.wsdl20.validation.Assertion;
-import org.apache.woden.wsdl20.validation.AssertionContext;
+import org.apache.woden.wsdl20.validation.WodenContext;
public class Description1003 implements Assertion {
@@ -10,7 +10,7 @@
return "Description-1003".intern();
}
- public void validate(Object target, AssertionContext assertionCtx) throws WSDLException {
+ public void validate(Object target, WodenContext wodenCtx) throws WSDLException {
// TODO Auto-generated method stub
}
Modified: webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/assertions/Interface1009.java
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/assertions/Interface1009.java?rev=629774&r1=629773&r2=629774&view=diff
==============================================================================
--- webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/assertions/Interface1009.java (original)
+++ webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/assertions/Interface1009.java Thu Feb 21 05:19:27 2008
@@ -21,7 +21,7 @@
import org.apache.woden.internal.ErrorLocatorImpl;
import org.apache.woden.wsdl20.Interface;
import org.apache.woden.wsdl20.validation.Assertion;
-import org.apache.woden.wsdl20.validation.AssertionContext;
+import org.apache.woden.wsdl20.validation.WodenContext;
/**
* This class represents assertion Interface-1009 from the WSDL 2.0 specification.
@@ -42,14 +42,14 @@
}
/* (non-Javadoc)
- * @see org.apache.woden.wsdl20.validation.Assertion#validate(java.lang.Object, org.apache.woden.ErrorReporter)
+ * @see org.apache.woden.wsdl20.validation.Assertion#validate(java.lang.Object, org.apache.woden.wsdl20.validation.WodenContext)
*/
- public void validate(Object target, AssertionContext assertionCtx) throws WSDLException {
+ public void validate(Object target, WodenContext wodenCtx) throws WSDLException {
Interface interfac = (Interface)target;
Interface[] extendedInterfaces = interfac.getExtendedInterfaces();
if(containsInterface(interfac, extendedInterfaces)) {
try {
- assertionCtx.getErrorReporter().reportError(new ErrorLocatorImpl(), ID , new Object[]{interfac.getName()}, ErrorReporter.SEVERITY_ERROR);
+ wodenCtx.getErrorReporter().reportError(new ErrorLocatorImpl(), ID , new Object[]{interfac.getName()}, ErrorReporter.SEVERITY_ERROR);
}catch(WSDLException e) {
//TODO: Log problem reporting error.
}
Modified: webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/assertions/Interface1010.java
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/assertions/Interface1010.java?rev=629774&r1=629773&r2=629774&view=diff
==============================================================================
--- webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/assertions/Interface1010.java (original)
+++ webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/assertions/Interface1010.java Thu Feb 21 05:19:27 2008
@@ -27,7 +27,7 @@
import org.apache.woden.wsdl20.Description;
import org.apache.woden.wsdl20.Interface;
import org.apache.woden.wsdl20.validation.Assertion;
-import org.apache.woden.wsdl20.validation.AssertionContext;
+import org.apache.woden.wsdl20.validation.WodenContext;
/**
* This class represents assertion Interface-1010 from the WSDL 2.0 specification.
@@ -48,9 +48,9 @@
}
/* (non-Javadoc)
- * @see org.apache.woden.wsdl20.validation.Assertion#validate(java.lang.Object, org.apache.woden.ErrorReporter)
+ * @see org.apache.woden.wsdl20.validation.Assertion#validate(java.lang.Object, org.apache.woden.wsdl20.validation.WodenContext)
*/
- public void validate(Object target, AssertionContext assertionCtx) throws WSDLException {
+ public void validate(Object target, WodenContext wodenCtx) throws WSDLException {
Description desc = (Description)target;
Interface[] interfaces = desc.getInterfaces();
@@ -62,7 +62,7 @@
continue;
if(names.contains(name)) {
try {
- assertionCtx.getErrorReporter().reportError(new ErrorLocatorImpl(), ID, new Object[]{name}, ErrorReporter.SEVERITY_ERROR);
+ wodenCtx.getErrorReporter().reportError(new ErrorLocatorImpl(), ID, new Object[]{name}, ErrorReporter.SEVERITY_ERROR);
}catch(WSDLException e) {
//TODO: Log problem reporting error.
}
Modified: webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/validation/WSDLValidator.java
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/validation/WSDLValidator.java?rev=629774&r1=629773&r2=629774&view=diff
==============================================================================
--- webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/validation/WSDLValidator.java (original)
+++ webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/validation/WSDLValidator.java Thu Feb 21 05:19:27 2008
@@ -31,7 +31,7 @@
import org.apache.woden.wsdl20.Description;
import org.apache.woden.wsdl20.Interface;
import org.apache.woden.wsdl20.validation.Assertion;
-import org.apache.woden.wsdl20.validation.AssertionContext;
+import org.apache.woden.wsdl20.validation.WodenContext;
import org.apache.woden.wsdl20.validation.AssertionInfo;
import org.apache.woden.wsdl20.xml.DescriptionElement;
@@ -48,7 +48,7 @@
public class WSDLValidator {
private WSDLContext fWsdlCtx;
- private AssertionContext fAssertionCtx;
+ private WodenContext fWodenCtx;
//not needed? ... private Map fAssertions; //map of assertion id string -> AssertionInfo
@@ -58,7 +58,7 @@
public void validate(Description description, WSDLContext wsdlContext) throws WSDLException {
int len = 0;
this.fWsdlCtx = wsdlContext;
- this.fAssertionCtx = new AssertionContextImpl(fWsdlCtx.errorReporter, fWsdlCtx.uriResolver);
+ this.fWodenCtx = new WodenContextImpl(fWsdlCtx.errorReporter, fWsdlCtx.uriResolver);
//setup the WSDL 2.0 assertions
//TODO do this once per wsdl reader object, not per document
@@ -106,7 +106,7 @@
if (wsdlAsserts != null) {
for (Iterator i = wsdlAsserts.iterator(); i.hasNext();) {
a = (Assertion) i.next();
- a.validate(target, fAssertionCtx);
+ a.validate(target, fWodenCtx);
}
}
//Check extension assertions (get them from ExtensionRegistry)
@@ -114,7 +114,7 @@
if (extAsserts != null) {
for (Iterator i = extAsserts.iterator(); i.hasNext();) {
a = (Assertion) i.next();
- a.validate(target, fAssertionCtx);
+ a.validate(target, fWodenCtx);
}
}
Copied: webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/validation/WodenContextImpl.java (from r629481, webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/validation/AssertionContextImpl.java)
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/validation/WodenContextImpl.java?p2=webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/validation/WodenContextImpl.java&p1=webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/validation/AssertionContextImpl.java&r1=629481&r2=629774&rev=629774&view=diff
==============================================================================
--- webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/validation/AssertionContextImpl.java (original)
+++ webservices/woden/branches/woden62/src/org/apache/woden/internal/wsdl20/validation/WodenContextImpl.java Thu Feb 21 05:19:27 2008
@@ -18,31 +18,31 @@
import org.apache.woden.ErrorReporter;
import org.apache.woden.resolver.URIResolver;
-import org.apache.woden.wsdl20.validation.AssertionContext;
+import org.apache.woden.wsdl20.validation.WodenContext;
/**
* @author John Kaputin (jkaputin@apache.org)
*/
-public class AssertionContextImpl implements AssertionContext {
+public class WodenContextImpl implements WodenContext {
private ErrorReporter errReporter;
private URIResolver uriResolver;
//package private ctor
- AssertionContextImpl(ErrorReporter errReporter, URIResolver uriResolver) {
+ WodenContextImpl(ErrorReporter errReporter, URIResolver uriResolver) {
this.errReporter = errReporter;
this.uriResolver = uriResolver;
}
/* (non-Javadoc)
- * @see org.apache.woden.wsdl20.validation.AssertionContext#getErrorReporter()
+ * @see org.apache.woden.wsdl20.validation.WodenContext#getErrorReporter()
*/
public ErrorReporter getErrorReporter() {
return this.errReporter;
}
/* (non-Javadoc)
- * @see org.apache.woden.wsdl20.validation.AssertionContext#getUriResolver()
+ * @see org.apache.woden.wsdl20.validation.WodenContext#getUriResolver()
*/
public URIResolver getUriResolver() {
return this.uriResolver;
Modified: webservices/woden/branches/woden62/src/org/apache/woden/wsdl20/validation/Assertion.java
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden62/src/org/apache/woden/wsdl20/validation/Assertion.java?rev=629774&r1=629773&r2=629774&view=diff
==============================================================================
--- webservices/woden/branches/woden62/src/org/apache/woden/wsdl20/validation/Assertion.java (original)
+++ webservices/woden/branches/woden62/src/org/apache/woden/wsdl20/validation/Assertion.java Thu Feb 21 05:19:27 2008
@@ -46,9 +46,9 @@
* Validates the specified WSDL object against this assertion.
*
* @param target the WSDL object that is the target of the assertion
- * @param assertionCtx AssertionContext containing helper objects useful to
+ * @param wodenCtx WodenContext containing helper objects useful to
* Assertion implementors
*/
- public void validate(Object target, AssertionContext assertionCtx) throws WSDLException;
+ public void validate(Object target, WodenContext wodenCtx) throws WSDLException;
}
Copied: webservices/woden/branches/woden62/src/org/apache/woden/wsdl20/validation/WodenContext.java (from r629481, webservices/woden/branches/woden62/src/org/apache/woden/wsdl20/validation/AssertionContext.java)
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden62/src/org/apache/woden/wsdl20/validation/WodenContext.java?p2=webservices/woden/branches/woden62/src/org/apache/woden/wsdl20/validation/WodenContext.java&p1=webservices/woden/branches/woden62/src/org/apache/woden/wsdl20/validation/AssertionContext.java&r1=629481&r2=629774&rev=629774&view=diff
==============================================================================
--- webservices/woden/branches/woden62/src/org/apache/woden/wsdl20/validation/AssertionContext.java (original)
+++ webservices/woden/branches/woden62/src/org/apache/woden/wsdl20/validation/WodenContext.java Thu Feb 21 05:19:27 2008
@@ -22,11 +22,13 @@
/**
* Represents a container of 'helper' objects which can be used
* by Assertion implementors
+ * <p>
+ * TODO consider moving this to org.apache.woden package for general use by all Woden framework extension points (ser/deserializers, assertions, BaseCompExtCtx, ExtReg subclasses, XMLAttr impls)
*
* @author John Kaputin (jkaputin@apache.org)
*
*/
-public interface AssertionContext {
+public interface WodenContext {
public ErrorReporter getErrorReporter();
Modified: webservices/woden/branches/woden62/test/org/apache/woden/internal/wsdl20/assertions/TestInterface1009.java
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden62/test/org/apache/woden/internal/wsdl20/assertions/TestInterface1009.java?rev=629774&r1=629773&r2=629774&view=diff
==============================================================================
--- webservices/woden/branches/woden62/test/org/apache/woden/internal/wsdl20/assertions/TestInterface1009.java (original)
+++ webservices/woden/branches/woden62/test/org/apache/woden/internal/wsdl20/assertions/TestInterface1009.java Thu Feb 21 05:19:27 2008
@@ -28,7 +28,7 @@
import org.apache.woden.tests.TestErrorHandler;
import org.apache.woden.types.NCName;
import org.apache.woden.wsdl20.Description;
-import org.apache.woden.wsdl20.validation.AssertionContext;
+import org.apache.woden.wsdl20.validation.WodenContext;
import org.apache.woden.wsdl20.xml.DescriptionElement;
import org.apache.woden.wsdl20.xml.InterfaceElement;
@@ -43,7 +43,7 @@
private Interface1009 assertion = new Interface1009();
private ErrorReporter reporter;
private TestErrorHandler handler;
- private AssertionContext assertionContext;
+ private WodenContext wodenContext;
protected void setUp() throws Exception {
try {
@@ -57,14 +57,14 @@
reporter = reader.getErrorReporter();
handler = new TestErrorHandler();
reporter.setErrorHandler(handler);
- assertionContext = new AssertionContextImpl(reporter, null);
+ wodenContext = new WodenContextImpl(reporter, null);
}
protected void tearDown() throws Exception {
factory = null;
reporter = null;
handler = null;
- assertionContext = null;
+ wodenContext = null;
}
/**
@@ -82,7 +82,7 @@
// init Interface's ref to its Description, needed for interface extension.
descComp.getInterfaces();
try {
- assertion.validate(interfac, assertionContext);
+ assertion.validate(interfac, wodenContext);
} catch(WSDLException e){
fail("Assertion Interface1009 threw a WSDLException.");
}
@@ -108,7 +108,7 @@
descComp.getInterfaces();
try {
- assertion.validate(interfac, assertionContext);
+ assertion.validate(interfac, wodenContext);
} catch(WSDLException e) {
fail("Assertion Interface1009 threw a WSDLException.");
}
@@ -137,7 +137,7 @@
descComp.getInterfaces();
try {
- assertion.validate(interfac, assertionContext);
+ assertion.validate(interfac, wodenContext);
} catch(WSDLException e){
fail("Assertion Interface1009 threw a WSDLException.");
}
@@ -179,7 +179,7 @@
// init Interface's ref to its Description, needed for interface extension.
descComp.getInterfaces();
try {
- assertion.validate(interfac, assertionContext);
+ assertion.validate(interfac, wodenContext);
} catch(WSDLException e){
fail("Assertion Interface1009 threw a WSDLException.");
}
Modified: webservices/woden/branches/woden62/test/org/apache/woden/internal/wsdl20/assertions/TestInterface1010.java
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden62/test/org/apache/woden/internal/wsdl20/assertions/TestInterface1010.java?rev=629774&r1=629773&r2=629774&view=diff
==============================================================================
--- webservices/woden/branches/woden62/test/org/apache/woden/internal/wsdl20/assertions/TestInterface1010.java (original)
+++ webservices/woden/branches/woden62/test/org/apache/woden/internal/wsdl20/assertions/TestInterface1010.java Thu Feb 21 05:19:27 2008
@@ -28,7 +28,7 @@
import org.apache.woden.tests.TestErrorHandler;
import org.apache.woden.types.NCName;
import org.apache.woden.wsdl20.Description;
-import org.apache.woden.wsdl20.validation.AssertionContext;
+import org.apache.woden.wsdl20.validation.WodenContext;
import org.apache.woden.wsdl20.xml.DescriptionElement;
import org.apache.woden.wsdl20.xml.InterfaceElement;
@@ -43,7 +43,7 @@
private Interface1010 assertion = new Interface1010();
private ErrorReporter reporter;
private TestErrorHandler handler;
- private AssertionContext assertionContext;
+ private WodenContext wodenContext;
protected void setUp() throws Exception {
try {
@@ -55,14 +55,14 @@
handler = new TestErrorHandler();
reporter = factory.newWSDLReader().getErrorReporter();
reporter.setErrorHandler(handler);
- assertionContext = new AssertionContextImpl(reporter, null);
+ wodenContext = new WodenContextImpl(reporter, null);
}
protected void tearDown() throws Exception {
factory = null;
reporter = null;
handler = null;
- assertionContext = null;
+ wodenContext = null;
}
/**
@@ -79,7 +79,7 @@
}
try {
- assertion.validate(descComp, assertionContext);
+ assertion.validate(descComp, wodenContext);
} catch(WSDLException e) {
fail("Assertion Interface1010 threw WSDLException.");
}
@@ -104,7 +104,7 @@
interfac.setName(new NCName("name1"));
try {
- assertion.validate(descComp, assertionContext);
+ assertion.validate(descComp, wodenContext);
} catch(WSDLException e) {
fail("Assertion Interface1010 threw WSDLException.");
}
@@ -134,7 +134,7 @@
interfac3.setName(new NCName("name3"));
try {
- assertion.validate(descComp, assertionContext);
+ assertion.validate(descComp, wodenContext);
} catch(WSDLException e) {
fail("Assertion Interface1010 threw WSDLException.");
}
@@ -169,7 +169,7 @@
interfac2.addExtendedInterfaceName(interfac3.getName());
try {
- assertion.validate(descComp, assertionContext);
+ assertion.validate(descComp, wodenContext);
} catch(WSDLException e) {
fail("Assertion Interface1010 threw WSDLException.");
}
@@ -203,7 +203,7 @@
interfac2.addExtendedInterfaceName(interfac3.getName());
try {
- assertion.validate(descComp, assertionContext);
+ assertion.validate(descComp, wodenContext);
} catch(WSDLException e) {
fail("Assertion Interface1010 threw WSDLException.");
}
Copied: webservices/woden/branches/woden62/test/org/apache/woden/internal/wsdl20/assertions/WodenContextImpl.java (from r629481, webservices/woden/branches/woden62/test/org/apache/woden/internal/wsdl20/assertions/AssertionContextImpl.java)
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden62/test/org/apache/woden/internal/wsdl20/assertions/WodenContextImpl.java?p2=webservices/woden/branches/woden62/test/org/apache/woden/internal/wsdl20/assertions/WodenContextImpl.java&p1=webservices/woden/branches/woden62/test/org/apache/woden/internal/wsdl20/assertions/AssertionContextImpl.java&r1=629481&r2=629774&rev=629774&view=diff
==============================================================================
--- webservices/woden/branches/woden62/test/org/apache/woden/internal/wsdl20/assertions/AssertionContextImpl.java (original)
+++ webservices/woden/branches/woden62/test/org/apache/woden/internal/wsdl20/assertions/WodenContextImpl.java Thu Feb 21 05:19:27 2008
@@ -18,33 +18,33 @@
import org.apache.woden.ErrorReporter;
import org.apache.woden.resolver.URIResolver;
-import org.apache.woden.wsdl20.validation.AssertionContext;
+import org.apache.woden.wsdl20.validation.WodenContext;
/**
* Stub to allow for unit testing of assertions.
*
* @author John Kaputin (jkaputin@apache.org)
*/
-public class AssertionContextImpl implements AssertionContext {
+public class WodenContextImpl implements WodenContext {
private ErrorReporter errReporter;
private URIResolver uriResolver;
//package private ctor
- public AssertionContextImpl(ErrorReporter errReporter, URIResolver uriResolver) {
+ public WodenContextImpl(ErrorReporter errReporter, URIResolver uriResolver) {
this.errReporter = errReporter;
this.uriResolver = uriResolver;
}
/* (non-Javadoc)
- * @see org.apache.woden.wsdl20.validation.AssertionContext#getErrorReporter()
+ * @see org.apache.woden.wsdl20.validation.WodenContext#getErrorReporter()
*/
public ErrorReporter getErrorReporter() {
return this.errReporter;
}
/* (non-Javadoc)
- * @see org.apache.woden.wsdl20.validation.AssertionContext#getUriResolver()
+ * @see org.apache.woden.wsdl20.validation.WodenContext#getUriResolver()
*/
public URIResolver getUriResolver() {
return this.uriResolver;
---------------------------------------------------------------------
To unsubscribe, e-mail: woden-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: woden-dev-help@ws.apache.org