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:44:14 UTC
svn commit: r519874 - in
/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core:
generator/GeneratorRegistryImpl.java
services/deployment/AssemblyServiceImpl.java
Author: jmarino
Date: Mon Mar 19 01:44:12 2007
New Revision: 519874
URL: http://svn.apache.org/viewvc?view=rev&rev=519874
Log:
fix generator registry where source and target during PWD creation was incorrect
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/services/deployment/AssemblyServiceImpl.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=519874&r1=519873&r2=519874
==============================================================================
--- 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:44:12 2007
@@ -167,21 +167,21 @@
ServiceContract<?> contract = referenceDefinition.getServiceContract();
PhysicalWireDefinition wireDefinition = createWireDefinition(contract, context);
Class<?> type = target.getImplementation().getClass();
- ComponentGenerator<S> targetGenerator = (ComponentGenerator<S>) componentGenerators.get(type);
+ ComponentGenerator<T> targetGenerator = (ComponentGenerator<T>) componentGenerators.get(type);
if (targetGenerator == null) {
throw new GeneratorNotFoundException(type);
}
PhysicalWireTargetDefinition targetDefinition =
- targetGenerator.generateWireTarget(source, serviceDefinition, context);
+ targetGenerator.generateWireTarget(target, serviceDefinition, context);
wireDefinition.setTarget(targetDefinition);
type = source.getImplementation().getClass();
- ComponentGenerator<T> sourceGenerator = (ComponentGenerator<T>) componentGenerators.get(type);
+ ComponentGenerator<S> sourceGenerator = (ComponentGenerator<S>) componentGenerators.get(type);
if (sourceGenerator == null) {
throw new GeneratorNotFoundException(type);
}
PhysicalWireSourceDefinition sourceDefinition =
- targetGenerator.generateWireSource(source, referenceDefinition, context);
+ sourceGenerator.generateWireSource(source, referenceDefinition, context);
wireDefinition.setSource(sourceDefinition);
context.getPhysicalChangeSet().addWireDefinition(wireDefinition);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/AssemblyServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/AssemblyServiceImpl.java?view=diff&rev=519874&r1=519873&r2=519874
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/AssemblyServiceImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/AssemblyServiceImpl.java Mon Mar 19 01:44:12 2007
@@ -211,7 +211,7 @@
}
}
-
+ System.out.println("------");
} catch (XMLStreamException e) {
throw new DocumentParseException(e);
} catch (LoaderException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org