Author: jsdelfino
Date: Mon Aug 20 21:06:34 2007
New Revision: 567940
URL: http://svn.apache.org/viewvc?rev=567940&view=rev
Log:
Renamed binding.ajax to binding.dwr.
Added:
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/
- copied from r567732,
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/ajax/
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java
- copied, changed from r567732,
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/ajax/AjaxBinding.java
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java
- copied, changed from r567732,
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/ajax/AjaxBindingActivator.java
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java
- copied, changed from r567732,
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/ajax/AjaxInvoker.java
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java
- copied, changed from r567732,
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/ajax/AjaxInvokerFactory.java
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java
- copied, changed from r567732,
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/ajax/AjaxService.java
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java
- copied, changed from r567732,
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/ajax/AjaxServlet.java
Removed:
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/ajax/
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/AjaxBinding.java
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/AjaxBindingActivator.java
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/AjaxInvoker.java
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/AjaxInvokerFactory.java
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/AjaxService.java
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/AjaxServlet.java
Modified:
incubator/tuscany/java/sca/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.BindingActivator
Copied:
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java
(from r567732,
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/ajax/AjaxBinding.java)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java?p2=incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java&p1=incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/ajax/AjaxBinding.java&r1=567732&r2=567940&rev=567940&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/ajax/AjaxBinding.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java
Mon Aug 20 21:06:34 2007
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.sca.binding.ajax;
+package org.apache.tuscany.sca.binding.dwr;
@@ -25,7 +25,7 @@
/**
* The runtime representation of the <binding.dwr> SCDL
*/
-public class AjaxBinding {
+public class DWRBinding {
// Empty as <binding.dwr> doesn't use any additional attributes or
elements (yet).
Copied:
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java
(from r567732,
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/ajax/AjaxBindingActivator.java)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java?p2=incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java&p1=incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/ajax/AjaxBindingActivator.java&r1=567732&r2=567940&rev=567940&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/ajax/AjaxBindingActivator.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java
Mon Aug 20 21:06:34 2007
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.sca.binding.ajax;
+package org.apache.tuscany.sca.binding.dwr;
import org.apache.tuscany.sca.assembly.Binding;
import org.apache.tuscany.sca.http.ServletHost;
@@ -28,24 +28,24 @@
import org.apache.tuscany.sca.spi.ComponentLifecycle;
import org.apache.tuscany.sca.spi.InvokerFactory;
-public class AjaxBindingActivator implements BindingActivator<AjaxBinding>{
+public class DWRBindingActivator implements BindingActivator<DWRBinding>{
private ServletHost servletHost;
- public AjaxBindingActivator(ServletHost servletHost) {
+ public DWRBindingActivator(ServletHost servletHost) {
this.servletHost = servletHost;
}
- public Class<AjaxBinding> getBindingClass() {
- return AjaxBinding.class;
+ public Class<DWRBinding> getBindingClass() {
+ return DWRBinding.class;
}
- public InvokerFactory createInvokerFactory(RuntimeComponent rc,
RuntimeComponentReference rcr, Binding b, AjaxBinding ab) {
- return new AjaxInvokerFactory(rc, rcr, b, ab, servletHost);
+ public InvokerFactory createInvokerFactory(RuntimeComponent rc,
RuntimeComponentReference rcr, Binding b, DWRBinding ab) {
+ return new DWRInvokerFactory(rc, rcr, b, ab, servletHost);
}
- public ComponentLifecycle createService(RuntimeComponent rc,
RuntimeComponentService rcs, Binding b, AjaxBinding ab) {
- return new AjaxService(rc, rcs, b, ab, servletHost);
+ public ComponentLifecycle createService(RuntimeComponent rc,
RuntimeComponentService rcs, Binding b, DWRBinding ab) {
+ return new DWRService(rc, rcs, b, ab, servletHost);
}
}
Copied:
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java
(from r567732,
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/ajax/AjaxInvoker.java)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java?p2=incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java&p1=incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/ajax/AjaxInvoker.java&r1=567732&r2=567940&rev=567940&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/ajax/AjaxInvoker.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java
Mon Aug 20 21:06:34 2007
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.sca.binding.ajax;
+package org.apache.tuscany.sca.binding.dwr;
import java.util.Collection;
@@ -30,11 +30,11 @@
import org.directwebremoting.WebContextFactory;
import org.directwebremoting.proxy.dwr.Util;
-public class AjaxInvoker implements Invoker {
+public class DWRInvoker implements Invoker {
protected String referenceFunction;
- public AjaxInvoker(String referenceName, Operation operation) {
+ public DWRInvoker(String referenceName, Operation operation) {
this.referenceFunction = referenceName + "." + operation.getName();
}
@@ -42,7 +42,7 @@
invoke((Object[])requestMsg.getBody());
- // Ajax references can not return anything
+ // DWR references can not return anything
return new MessageImpl();
}
Copied:
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java
(from r567732,
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/ajax/AjaxInvokerFactory.java)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java?p2=incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java&p1=incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/ajax/AjaxInvokerFactory.java&r1=567732&r2=567940&rev=567940&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/ajax/AjaxInvokerFactory.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java
Mon Aug 20 21:06:34 2007
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.tuscany.sca.binding.ajax;
+package org.apache.tuscany.sca.binding.dwr;
-import static org.apache.tuscany.sca.binding.ajax.AjaxService.SERVLET_PATH;
+import static org.apache.tuscany.sca.binding.dwr.DWRService.SERVLET_PATH;
import org.apache.tuscany.sca.assembly.Binding;
import org.apache.tuscany.sca.http.ServletHost;
@@ -30,14 +30,14 @@
import org.apache.tuscany.sca.spi.ComponentLifecycle;
import org.apache.tuscany.sca.spi.InvokerFactory;
-public class AjaxInvokerFactory implements InvokerFactory, ComponentLifecycle {
+public class DWRInvokerFactory implements InvokerFactory, ComponentLifecycle {
protected RuntimeComponent runtimeComponent;
protected RuntimeComponentReference runtimeComponentReference;
protected Binding binding;
protected ServletHost servletHost;
- public AjaxInvokerFactory(RuntimeComponent rc, RuntimeComponentReference
rcr, Binding b, AjaxBinding ab, ServletHost servletHost) {
+ public DWRInvokerFactory(RuntimeComponent rc, RuntimeComponentReference
rcr, Binding b, DWRBinding ab, ServletHost servletHost) {
this.runtimeComponent = rc;
this.runtimeComponentReference = rcr;
this.binding = b;
@@ -45,16 +45,16 @@
}
public Invoker createInvoker(Operation operation) {
- return new AjaxInvoker(binding.getName(), operation);
+ return new DWRInvoker(binding.getName(), operation);
}
public void start() {
// there is no "getServlet" method on ServletHost so this has to use
remove/add
- AjaxServlet servlet = (AjaxServlet)
servletHost.removeServletMapping(SERVLET_PATH);
+ DWRServlet servlet = (DWRServlet)
servletHost.removeServletMapping(SERVLET_PATH);
if (servlet == null) {
- servlet = new AjaxServlet();
+ servlet = new DWRServlet();
}
servlet.addReference(binding.getName());
Copied:
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java
(from r567732,
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/ajax/AjaxService.java)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java?p2=incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java&p1=incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/ajax/AjaxService.java&r1=567732&r2=567940&rev=567940&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/ajax/AjaxService.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java
Mon Aug 20 21:06:34 2007
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.sca.binding.ajax;
+package org.apache.tuscany.sca.binding.dwr;
import org.apache.tuscany.sca.assembly.Binding;
import org.apache.tuscany.sca.core.invocation.JDKProxyFactory;
@@ -28,16 +28,16 @@
import org.apache.tuscany.sca.runtime.RuntimeComponentService;
import org.apache.tuscany.sca.spi.ComponentLifecycle;
-public class AjaxService implements ComponentLifecycle {
+public class DWRService implements ComponentLifecycle {
RuntimeComponent rc;
RuntimeComponentService rcs;
Binding binding;
protected ServletHost servletHost;
- public static final String SERVLET_PATH = AjaxServlet.AJAX_SERVLET_PATH +
"/*";
+ public static final String SERVLET_PATH = DWRServlet.AJAX_SERVLET_PATH +
"/*";
- public AjaxService(RuntimeComponent rc, RuntimeComponentService rcs,
Binding binding, AjaxBinding ab, ServletHost servletHost) {
+ public DWRService(RuntimeComponent rc, RuntimeComponentService rcs,
Binding binding, DWRBinding ab, ServletHost servletHost) {
this.rc = rc;
this.rcs = rcs;
this.binding = binding;
@@ -48,9 +48,9 @@
// there is no "getServlet" method on ServletHost so this has to use
remove/add
- AjaxServlet servlet = (AjaxServlet)
servletHost.removeServletMapping(SERVLET_PATH);
+ DWRServlet servlet = (DWRServlet)
servletHost.removeServletMapping(SERVLET_PATH);
if (servlet == null) {
- servlet = new AjaxServlet();
+ servlet = new DWRServlet();
}
Class<?> type =
((JavaInterface)rcs.getInterfaceContract().getInterface()).getJavaClass();
Copied:
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java
(from r567732,
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/ajax/AjaxServlet.java)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java?p2=incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java&p1=incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/ajax/AjaxServlet.java&r1=567732&r2=567940&rev=567940&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/ajax/AjaxServlet.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java
Mon Aug 20 21:06:34 2007
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.sca.binding.ajax;
+package org.apache.tuscany.sca.binding.dwr;
import java.io.BufferedReader;
import java.io.IOException;
@@ -57,12 +57,12 @@
import org.directwebremoting.servlet.UrlProcessor;
/**
- * Tuscany customized DWR Servlet to implement support for the Ajax binding
+ * Tuscany customized DWR Servlet to implement support for the DWR binding
*
- * Handles requests for SCA services and references that use <binding.ajax>,
- * and also the HTTP GET for the Tuscany ajax system script "scaDomain.js"
+ * Handles requests for SCA services and references that use <binding.dwr>,
+ * and also the HTTP GET for the Tuscany DWR system script "scaDomain.js"
*/
-public class AjaxServlet extends DwrServlet {
+public class DWRServlet extends DwrServlet {
private static final long serialVersionUID = 1L;
transient protected Map<String, ServiceHolder> services;
@@ -73,12 +73,12 @@
protected static final String SCADOMAIN_SCRIPT_PATH = "/scaDomain.js";
public static final String AJAX_SERVLET_PATH = "/SCADomain";
- public AjaxServlet() {
+ public DWRServlet() {
this.services = new HashMap<String, ServiceHolder>();
this.referenceNames = new ArrayList<String>();
this.initParams = new HashMap<String, String>();
- // maybe use <binding.ajax> attributes to define the init params
+ // maybe use <binding.dwr> attributes to define the init params
initParams.put("activeReverseAjaxEnabled", "true");
}
Modified:
incubator/tuscany/java/sca/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.BindingActivator
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.BindingActivator?rev=567940&r1=567939&r2=567940&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.BindingActivator
(original)
+++
incubator/tuscany/java/sca/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.BindingActivator
Mon Aug 20 21:06:34 2007
@@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.
# Implementation class for the ExtensionActivator
-org.apache.tuscany.sca.binding.ajax.AjaxBindingActivator
+org.apache.tuscany.sca.binding.dwr.DWRBindingActivator
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
