You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/06/21 02:42:12 UTC
svn commit: r549307 - in /incubator/tuscany/java/sca/samples: ./
implementation-crud-extension/src/main/java/crud/
implementation-crud-extension/src/main/java/crud/impl/
implementation-crud-extension/src/main/java/crud/model/
implementation-crud-extens...
Author: jsdelfino
Date: Wed Jun 20 17:42:11 2007
New Revision: 549307
URL: http://svn.apache.org/viewvc?view=rev&rev=549307
Log:
Minor simplifications and cleanup of the sample extension.
Added:
incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/model/
incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/model/CRUDImplementation.java
- copied, changed from r548882, incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/model/CRUDImplementationFactory.java
- copied, changed from r548882, incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/model/DefaultCRUDImplementationFactory.java
- copied, changed from r548882, incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/DefaultCRUDImplementationFactory.java
Removed:
incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/DefaultCRUDImplementationFactory.java
Modified:
incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationProcessor.java
incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/module/CRUDModuleActivator.java
incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDInvoker.java
incubator/tuscany/java/sca/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
incubator/tuscany/java/sca/samples/pom.xml
Modified: incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java?view=diff&rev=549307&r1=549306&r2=549307
==============================================================================
--- incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java (original)
+++ incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java Wed Jun 20 17:42:11 2007
@@ -35,7 +35,7 @@
import org.apache.tuscany.sca.policy.PolicySet;
import crud.CRUD;
-import crud.CRUDImplementation;
+import crud.model.CRUDImplementation;
/**
* The model representing a sample CRUD implementation in an SCA assembly model.
Modified: incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationProcessor.java?view=diff&rev=549307&r1=549306&r2=549307
==============================================================================
--- incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationProcessor.java (original)
+++ incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationProcessor.java Wed Jun 20 17:42:11 2007
@@ -31,8 +31,8 @@
import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import crud.CRUDImplementation;
-import crud.CRUDImplementationFactory;
+import crud.model.CRUDImplementation;
+import crud.model.CRUDImplementationFactory;
/**
* Implements a STAX artifact processor for CRUD implementations.
Copied: incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/model/CRUDImplementation.java (from r548882, incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/model/CRUDImplementation.java?view=diff&rev=549307&p1=incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java&r1=548882&p2=incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/model/CRUDImplementation.java&r2=549307
==============================================================================
--- incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java (original)
+++ incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/model/CRUDImplementation.java Wed Jun 20 17:42:11 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package crud;
+package crud.model;
import org.apache.tuscany.sca.assembly.Implementation;
Copied: incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/model/CRUDImplementationFactory.java (from r548882, incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/model/CRUDImplementationFactory.java?view=diff&rev=549307&p1=incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java&r1=548882&p2=incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/model/CRUDImplementationFactory.java&r2=549307
==============================================================================
--- incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java (original)
+++ incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/model/CRUDImplementationFactory.java Wed Jun 20 17:42:11 2007
@@ -17,7 +17,7 @@
* under the License.
*/
-package crud;
+package crud.model;
/**
* A factory for the sample CRUD implementation model.
Copied: incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/model/DefaultCRUDImplementationFactory.java (from r548882, incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/DefaultCRUDImplementationFactory.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/model/DefaultCRUDImplementationFactory.java?view=diff&rev=549307&p1=incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/DefaultCRUDImplementationFactory.java&r1=548882&p2=incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/model/DefaultCRUDImplementationFactory.java&r2=549307
==============================================================================
--- incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/DefaultCRUDImplementationFactory.java (original)
+++ incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/model/DefaultCRUDImplementationFactory.java Wed Jun 20 17:42:11 2007
@@ -17,7 +17,7 @@
* under the License.
*/
-package crud;
+package crud.model;
import org.apache.tuscany.sca.assembly.AssemblyFactory;
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
Modified: incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/module/CRUDModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/module/CRUDModuleActivator.java?view=diff&rev=549307&r1=549306&r2=549307
==============================================================================
--- incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/module/CRUDModuleActivator.java (original)
+++ incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/module/CRUDModuleActivator.java Wed Jun 20 17:42:11 2007
@@ -31,9 +31,9 @@
import org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceIntrospectorExtensionPoint;
import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
-import crud.CRUDImplementationFactory;
-import crud.DefaultCRUDImplementationFactory;
import crud.impl.CRUDImplementationProcessor;
+import crud.model.CRUDImplementationFactory;
+import crud.model.DefaultCRUDImplementationFactory;
import crud.provider.CRUDImplementationProviderFactory;
/**
Modified: incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java?view=diff&rev=549307&r1=549306&r2=549307
==============================================================================
--- incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java (original)
+++ incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java Wed Jun 20 17:42:11 2007
@@ -24,8 +24,8 @@
import org.apache.tuscany.sca.runtime.RuntimeComponent;
import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import crud.CRUDImplementation;
import crud.backend.ResourceManager;
+import crud.model.CRUDImplementation;
/**
* The model representing a sample CRUD implementation in an SCA assembly model.
Modified: incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java?view=diff&rev=549307&r1=549306&r2=549307
==============================================================================
--- incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java (original)
+++ incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java Wed Jun 20 17:42:11 2007
@@ -22,7 +22,7 @@
import org.apache.tuscany.sca.provider.ImplementationProviderFactory;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import crud.CRUDImplementation;
+import crud.model.CRUDImplementation;
/**
* The model representing a sample CRUD implementation in an SCA assembly model.
Modified: incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDInvoker.java?view=diff&rev=549307&r1=549306&r2=549307
==============================================================================
--- incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDInvoker.java (original)
+++ incubator/tuscany/java/sca/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDInvoker.java Wed Jun 20 17:42:11 2007
@@ -19,8 +19,6 @@
package crud.provider;
-import java.lang.reflect.InvocationTargetException;
-
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.invocation.Invoker;
import org.apache.tuscany.sca.invocation.Message;
@@ -47,31 +45,26 @@
public Message invoke(Message msg) {
try {
Object[] args = msg.getBody();
- Object resp = doTheWork(args);
+ Object resp = null;
+
+ if (operation.getName().equals("create")) {
+ resp = resourceManager.createResource(args[0]);
+
+ } else if (operation.getName().equals("retrieve")) {
+ resp = resourceManager.retrieveResource((String)args[0]);
+
+ } else if (operation.getName().equals("update")) {
+ resp = resourceManager.updateResource((String)args[0], args[1]);
+
+ } else if (operation.getName().equals("delete")) {
+ resourceManager.deleteResource((String)args[0]);
+ }
+
msg.setBody(resp);
- } catch (InvocationTargetException e) {
+ } catch (Exception e) {
msg.setFaultBody(e.getCause());
}
return msg;
- }
-
- public Object doTheWork(Object[] args) throws InvocationTargetException {
- if (operation.getName().equals("create")) {
- return resourceManager.createResource(args[0]);
-
- } else if (operation.getName().equals("retrieve")) {
- return resourceManager.retrieveResource((String)args[0]);
-
- } else if (operation.getName().equals("update")) {
- return resourceManager.updateResource((String)args[0], args[1]);
-
- } else if (operation.getName().equals("delete")) {
- resourceManager.deleteResource((String)args[0]);
- return null;
-
- } else {
- return null;
- }
}
}
Modified: incubator/tuscany/java/sca/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java?view=diff&rev=549307&r1=549306&r2=549307
==============================================================================
--- incubator/tuscany/java/sca/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java (original)
+++ incubator/tuscany/java/sca/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java Wed Jun 20 17:42:11 2007
@@ -20,6 +20,7 @@
package crud.client;
import crud.CRUD;
+
import org.apache.tuscany.sca.host.embedded.SCADomain;
/**
Modified: incubator/tuscany/java/sca/samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/pom.xml?view=diff&rev=549307&r1=549306&r2=549307
==============================================================================
--- incubator/tuscany/java/sca/samples/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/pom.xml Wed Jun 20 17:42:11 2007
@@ -38,6 +38,7 @@
<modules>
<module>binding-echo</module>
<module>binding-echo-extension</module>
+ <module>binding-echo-simplified</module>
<module>calculator</module>
<module>calculator-rmi-reference</module>
<module>calculator-rmi-service</module>
@@ -53,6 +54,7 @@
<module>implementation-composite</module>
<module>implementation-crud</module>
<module>implementation-crud-extension</module>
+ <module>implementation-crud-simplified</module>
<!--
<module>loanapplication</module>
-->
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org