You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2007/03/19 09:29:30 UTC
svn commit: r519872 - in
/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core:
generator/GeneratorRegistryImpl.java
implementation/java/JavaPhysicalComponentGenerator.java
Author: jmarino
Date: Mon Mar 19 01:29:30 2007
New Revision: 519872
URL: http://svn.apache.org/viewvc?view=rev&rev=519872
Log:
have JPCG generate PWD; make addition of non-blocking interceptor definition conditional
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/generator/GeneratorRegistryImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentGenerator.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/generator/GeneratorRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/generator/GeneratorRegistryImpl.java?view=diff&rev=519872&r1=519871&r2=519872
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/generator/GeneratorRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/generator/GeneratorRegistryImpl.java Mon Mar 19 01:29:30 2007
@@ -108,7 +108,7 @@
GeneratorContext context) throws GenerationException {
PhysicalWireDefinition wireDefinition = createWireDefinition(contract, context);
- Class<?> type = componentDefinition.getClass();
+ Class<?> type = componentDefinition.getImplementation().getClass();
ComponentGenerator<C> targetGenerator = (ComponentGenerator<C>) componentGenerators.get(type);
if (targetGenerator == null) {
throw new GeneratorNotFoundException(type);
@@ -144,7 +144,7 @@
PhysicalWireTargetDefinition targetDefinition = targetGenerator.generateWireTarget(bindingDefinition, context);
wireDefinition.setTarget(targetDefinition);
- type = componentDefinition.getClass();
+ type = componentDefinition.getImplementation().getClass();
ComponentGenerator<C> sourceGenerator = (ComponentGenerator<C>) componentGenerators.get(type);
if (sourceGenerator == null) {
throw new GeneratorNotFoundException(type);
@@ -166,7 +166,7 @@
GeneratorContext context) throws GenerationException {
ServiceContract<?> contract = referenceDefinition.getServiceContract();
PhysicalWireDefinition wireDefinition = createWireDefinition(contract, context);
- Class<?> type = target.getClass();
+ Class<?> type = target.getImplementation().getClass();
ComponentGenerator<S> targetGenerator = (ComponentGenerator<S>) componentGenerators.get(type);
if (targetGenerator == null) {
throw new GeneratorNotFoundException(type);
@@ -175,7 +175,7 @@
targetGenerator.generateWireTarget(source, serviceDefinition, context);
wireDefinition.setTarget(targetDefinition);
- type = source.getClass();
+ type = source.getImplementation().getClass();
ComponentGenerator<T> sourceGenerator = (ComponentGenerator<T>) componentGenerators.get(type);
if (sourceGenerator == null) {
throw new GeneratorNotFoundException(type);
@@ -231,31 +231,35 @@
for (Operation o : contract.getOperations().values()) {
PhysicalOperationDefinition physicalOperation = mapOperation(o);
wireDefinition.addOperation(physicalOperation);
- // this is egregious
- // hardcode intent until we get the intent infrastructure in place
- IntentDefinition intent = new NonBlockingIntentDefinition();
- Class<? extends IntentDefinition> type = NonBlockingIntentDefinition.class;
- InterceptorGenerator generator = interceptorGenerators.get(type);
- if (generator == null) {
- throw new GeneratorNotFoundException(type);
+ if (o.isNonBlocking()) {
+ // this is egregious
+ // hardcode intent until we get the intent infrastructure in place
+ IntentDefinition intent = new NonBlockingIntentDefinition();
+ Class<? extends IntentDefinition> type = NonBlockingIntentDefinition.class;
+ InterceptorGenerator generator = interceptorGenerators.get(type);
+ if (generator == null) {
+ throw new GeneratorNotFoundException(type);
+ }
+ PhysicalInterceptorDefinition interceptorDefinition = generator.generate(intent, context);
+ physicalOperation.addInterceptor(interceptorDefinition);
}
- PhysicalInterceptorDefinition interceptorDefinition = generator.generate(intent, context);
- physicalOperation.addInterceptor(interceptorDefinition);
}
for (Operation o : contract.getCallbackOperations().values()) {
PhysicalOperationDefinition physicalOperation = mapOperation(o);
physicalOperation.setCallback(true);
wireDefinition.addOperation(physicalOperation);
- // this is egregious
- // hardcode intent until we get the intent infrastructure in place
- IntentDefinition intent = new NonBlockingIntentDefinition();
- Class<? extends IntentDefinition> type = NonBlockingIntentDefinition.class;
- InterceptorGenerator generator = interceptorGenerators.get(type);
- if (generator == null) {
- throw new GeneratorNotFoundException(type);
+ if (o.isNonBlocking()) {
+ // this is egregious
+ // hardcode intent until we get the intent infrastructure in place
+ IntentDefinition intent = new NonBlockingIntentDefinition();
+ Class<? extends IntentDefinition> type = NonBlockingIntentDefinition.class;
+ InterceptorGenerator generator = interceptorGenerators.get(type);
+ if (generator == null) {
+ throw new GeneratorNotFoundException(type);
+ }
+ PhysicalInterceptorDefinition interceptorDefinition = generator.generate(intent, context);
+ physicalOperation.addInterceptor(interceptorDefinition);
}
- PhysicalInterceptorDefinition interceptorDefinition = generator.generate(intent, context);
- physicalOperation.addInterceptor(interceptorDefinition);
}
return wireDefinition;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentGenerator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentGenerator.java?view=diff&rev=519872&r1=519871&r2=519872
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentGenerator.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentGenerator.java Mon Mar 19 01:29:30 2007
@@ -120,7 +120,9 @@
ServiceDefinition serviceDefinition,
GeneratorContext context)
throws GenerationException {
- return new JavaPhysicalWireTargetDefinition();
+ JavaPhysicalWireTargetDefinition wireDefinition = new JavaPhysicalWireTargetDefinition();
+ wireDefinition.setUri(definition.getUri());
+ return wireDefinition;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org