diff options
Diffstat (limited to 'sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache')
-rw-r--r-- | sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBinding.java (renamed from sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java) | 8 | ||||
-rw-r--r-- | sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBindingFactory.java (renamed from sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java) | 13 | ||||
-rw-r--r-- | sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTCacheContext.java (renamed from sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/http/HTTPCacheContext.java) | 9 | ||||
-rw-r--r-- | sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingFactoryImpl.java (renamed from sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java) | 14 | ||||
-rw-r--r-- | sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingImpl.java (renamed from sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java) | 6 | ||||
-rw-r--r-- | sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/xml/RESTBindingProcessor.java (renamed from sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java) | 34 |
6 files changed, 43 insertions, 41 deletions
diff --git a/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java b/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBinding.java index e0ab1cfff7..01dafc80a6 100644 --- a/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java +++ b/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBinding.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.tuscany.sca.binding.http; +package org.apache.tuscany.sca.binding.rest; import javax.xml.namespace.QName; import org.apache.tuscany.sca.assembly.Binding; /** - * HTTP binding model. + * REST binding model. * * @version $Rev$ $Date$ */ -public interface HTTPBinding extends Binding { - QName TYPE = new QName(SCA11_TUSCANY_NS, "binding.http"); +public interface RESTBinding extends Binding { + QName TYPE = new QName(SCA11_TUSCANY_NS, "binding.rest"); } diff --git a/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java b/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBindingFactory.java index 6ba6d8f934..38d68d532a 100644 --- a/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java +++ b/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBindingFactory.java @@ -17,19 +17,20 @@ * under the License. */ -package org.apache.tuscany.sca.binding.http; +package org.apache.tuscany.sca.binding.rest; + /** - * Factory for the HTTP binding model. + * Factory for the REST binding model. * * @version $Rev$ $Date$ */ -public interface HTTPBindingFactory { +public interface RESTBindingFactory { /** - * Creates a new HTTP binding. - * @return a new HTTP binding + * Creates a new REST binding. + * @return a new REST binding */ - HTTPBinding createHTTPBinding(); + RESTBinding createRESTBinding(); } diff --git a/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/http/HTTPCacheContext.java b/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTCacheContext.java index 372118fbf2..a6acbaf48e 100644 --- a/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/http/HTTPCacheContext.java +++ b/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTCacheContext.java @@ -17,13 +17,14 @@ * under the License. */ -package org.apache.tuscany.sca.binding.http; +package org.apache.tuscany.sca.binding.rest; import java.text.SimpleDateFormat; import java.util.Date; import javax.servlet.http.HttpServletRequest; + /** * A class to store cache settings for Atom and HTTP requests and responses. * @@ -36,7 +37,7 @@ import javax.servlet.http.HttpServletRequest; * If-Modified-Since, If-Unmodified-Since, If-Range. */ -public class HTTPCacheContext { +public class RESTCacheContext { public static final SimpleDateFormat RFC822DateFormat = new SimpleDateFormat( "EEE, dd MMM yyyy HH:mm:ss Z" ); // RFC 822 date time public boolean enabled; @@ -211,8 +212,8 @@ public class HTTPCacheContext { * @param request * @return */ - public static HTTPCacheContext getCacheContextFromRequest( HttpServletRequest request ) throws java.text.ParseException { - HTTPCacheContext context = new HTTPCacheContext(); + public static RESTCacheContext getCacheContextFromRequest( HttpServletRequest request ) throws java.text.ParseException { + RESTCacheContext context = new RESTCacheContext(); String eTag = request.getHeader( "If-Match" ); if ( eTag != null ) { diff --git a/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java b/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingFactoryImpl.java index 678cd1a426..00d5584190 100644 --- a/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java +++ b/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingFactoryImpl.java @@ -17,20 +17,20 @@ * under the License. */ -package org.apache.tuscany.sca.binding.http.impl; +package org.apache.tuscany.sca.binding.rest.impl; -import org.apache.tuscany.sca.binding.http.HTTPBinding; -import org.apache.tuscany.sca.binding.http.HTTPBindingFactory; +import org.apache.tuscany.sca.binding.rest.RESTBinding; +import org.apache.tuscany.sca.binding.rest.RESTBindingFactory; /** - * Factory for the HTTP binding model. + * Factory for the REST binding model. * * @version $Rev$ $Date$ */ -public class HTTPBindingFactoryImpl implements HTTPBindingFactory { +public class RESTBindingFactoryImpl implements RESTBindingFactory { - public HTTPBinding createHTTPBinding() { - return new HTTPBindingImpl(); + public RESTBinding createRESTBinding() { + return new RESTBindingImpl(); } } diff --git a/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java b/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingImpl.java index 2555799f5f..887d0d9878 100644 --- a/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java +++ b/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingImpl.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.tuscany.sca.binding.http.impl; +package org.apache.tuscany.sca.binding.rest.impl; import javax.xml.namespace.QName; import org.apache.tuscany.sca.assembly.OperationSelector; import org.apache.tuscany.sca.assembly.WireFormat; -import org.apache.tuscany.sca.binding.http.HTTPBinding; +import org.apache.tuscany.sca.binding.rest.RESTBinding; /** @@ -31,7 +31,7 @@ import org.apache.tuscany.sca.binding.http.HTTPBinding; * * @version $Rev$ $Date$ */ -class HTTPBindingImpl implements HTTPBinding { +class RESTBindingImpl implements RESTBinding { private String name; private String uri; diff --git a/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java b/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/xml/RESTBindingProcessor.java index bdec50bde0..304e778bce 100644 --- a/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java +++ b/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/xml/RESTBindingProcessor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.tuscany.sca.binding.http.xml; +package org.apache.tuscany.sca.binding.rest.xml; import static javax.xml.stream.XMLStreamConstants.END_ELEMENT; import static javax.xml.stream.XMLStreamConstants.START_ELEMENT; @@ -29,8 +29,8 @@ import javax.xml.stream.XMLStreamWriter; import org.apache.tuscany.sca.assembly.OperationSelector; import org.apache.tuscany.sca.assembly.WireFormat; -import org.apache.tuscany.sca.binding.http.HTTPBinding; -import org.apache.tuscany.sca.binding.http.HTTPBindingFactory; +import org.apache.tuscany.sca.binding.rest.RESTBinding; +import org.apache.tuscany.sca.binding.rest.RESTBindingFactory; import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.ContributionReadException; import org.apache.tuscany.sca.contribution.processor.ContributionResolveException; @@ -42,34 +42,34 @@ import org.apache.tuscany.sca.contribution.resolver.ModelResolver; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.core.FactoryExtensionPoint; -public class HTTPBindingProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<HTTPBinding> { +public class RESTBindingProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<RESTBinding> { private static final String NAME = "name"; private static final String URI = "uri"; - private HTTPBindingFactory httpBindingFactory; + private RESTBindingFactory httpBindingFactory; private StAXArtifactProcessor<Object> extensionProcessor; private StAXAttributeProcessor<Object> extensionAttributeProcessor; - public HTTPBindingProcessor(ExtensionPointRegistry extensionPoints, + public RESTBindingProcessor(ExtensionPointRegistry extensionPoints, StAXArtifactProcessor extensionProcessor, StAXAttributeProcessor extensionAttributeProcessor) { FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class); - this.httpBindingFactory = modelFactories.getFactory(HTTPBindingFactory.class); + this.httpBindingFactory = modelFactories.getFactory(RESTBindingFactory.class); this.extensionProcessor = (StAXArtifactProcessor<Object>)extensionProcessor; this.extensionAttributeProcessor = extensionAttributeProcessor; } public QName getArtifactType() { - return HTTPBinding.TYPE; + return RESTBinding.TYPE; } - public Class<HTTPBinding> getModelType() { - return HTTPBinding.class; + public Class<RESTBinding> getModelType() { + return RESTBinding.class; } - public HTTPBinding read(XMLStreamReader reader, ProcessorContext context) throws ContributionReadException, XMLStreamException { - HTTPBinding httpBinding = httpBindingFactory.createHTTPBinding(); + public RESTBinding read(XMLStreamReader reader, ProcessorContext context) throws ContributionReadException, XMLStreamException { + RESTBinding httpBinding = httpBindingFactory.createRESTBinding(); while(reader.hasNext()) { QName elementName = null; @@ -78,7 +78,7 @@ public class HTTPBindingProcessor extends BaseStAXArtifactProcessor implements S case START_ELEMENT: elementName = reader.getName(); - if (HTTPBinding.TYPE.equals(elementName)) { + if (RESTBinding.TYPE.equals(elementName)) { String name = getString(reader, NAME); if(name != null) { httpBinding.setName(name); @@ -101,7 +101,7 @@ public class HTTPBindingProcessor extends BaseStAXArtifactProcessor implements S } } - if (event == END_ELEMENT && HTTPBinding.TYPE.equals(reader.getName())) { + if (event == END_ELEMENT && RESTBinding.TYPE.equals(reader.getName())) { break; } @@ -114,10 +114,10 @@ public class HTTPBindingProcessor extends BaseStAXArtifactProcessor implements S return httpBinding; } - public void write(HTTPBinding httpBinding, XMLStreamWriter writer, ProcessorContext context) throws ContributionWriteException, XMLStreamException { + public void write(RESTBinding httpBinding, XMLStreamWriter writer, ProcessorContext context) throws ContributionWriteException, XMLStreamException { //writer.writeStartElement(Constants.SCA10_NS, BINDING_HTTP); - writeStart(writer, HTTPBinding.TYPE.getNamespaceURI(), HTTPBinding.TYPE.getLocalPart()); + writeStart(writer, RESTBinding.TYPE.getNamespaceURI(), RESTBinding.TYPE.getLocalPart()); // Write binding name if (httpBinding.getName() != null) { @@ -134,7 +134,7 @@ public class HTTPBindingProcessor extends BaseStAXArtifactProcessor implements S } - public void resolve(HTTPBinding model, ModelResolver resolver, ProcessorContext context) throws ContributionResolveException { + public void resolve(RESTBinding model, ModelResolver resolver, ProcessorContext context) throws ContributionResolveException { // Should not need to do anything here for now... } |