Author: jmarino
Date: Sun May 7 18:20:29 2006
New Revision: 404889
URL: http://svn.apache.org/viewcvs?rev=404889&view=rev
Log:
context refactors; package cleanup
Removed:
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/config/
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/config/
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/resources/org/apache/tuscany/container/java/config/
Modified:
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentBuilder.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/context/JavaAtomicContext.java
Modified:
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentBuilder.java?rev=404889&r1=404888&r2=404889&view=diff
==============================================================================
---
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentBuilder.java
(original)
+++
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentBuilder.java
Sun May 7 18:20:29 2006
@@ -50,7 +50,7 @@
}
PojoObjectFactory<?> factory = new PojoObjectFactory(ctr, null,
componentType.getInjectors());
return new JavaAtomicContext(name, factory,
componentType.isEagerInit(), componentType.getInitInvoker(),
- componentType.getDestroyInvoker(), injectors);
+ componentType.getDestroyInvoker(), injectors,
componentType.getMembers());
}
}
Modified:
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/context/JavaAtomicContext.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/context/JavaAtomicContext.java?rev=404889&r1=404888&r2=404889&view=diff
==============================================================================
---
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/context/JavaAtomicContext.java
(original)
+++
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/context/JavaAtomicContext.java
Sun May 7 18:20:29 2006
@@ -149,59 +149,5 @@
throw e;
}
}
- /**
- * Creates an <code>Injector</code> for a set of object factories
associated with a reference.
- */
-// private Injector createInjector(String refName, Class refClass, boolean
multiplicity, List<ObjectFactory> objectFactories,
-// Set<Field> fields, Set<Method> methods)
throws NoAccessorException, BuilderConfigException {
-// Field field;
-// Method method = null;
-// if (multiplicity) {
-// // since this is a multiplicity, we cannot match on business
interface type, so scan through the fields,
-// // matching on name and List or Array
-// field =
JavaIntrospectionHelper.findMultiplicityFieldByName(refName, fields);
-// if (field == null) {
-// // No fields found. Again, since this is a multiplicity, we
cannot match on business interface type, so
-// // scan through the fields, matching on name and List or
Array
-// method =
JavaIntrospectionHelper.findMultiplicityMethodByName(refName, methods);
-// if (method == null) {
-// throw new NoAccessorException(refName);
-// }
-// }
-// Injector injector;
-// // for multiplicities, we need to inject the reference proxy or
proxies using an object factory
-// // which first delegates to create the proxies and then returns
them in the appropriate List or array type
-// if (field != null) {
-// if (field.getType().isArray()) {
-// injector = new FieldInjector(field, new
ArrayMultiplicityObjectFactory(refClass, objectFactories));
-// } else {
-// injector = new FieldInjector(field, new
ListMultiplicityObjectFactory(objectFactories));
-// }
-// } else {
-// if (method.getParameterTypes()[0].isArray()) {
-// injector = new MethodInjector(method, new
ArrayMultiplicityObjectFactory(refClass, objectFactories));
-// } else {
-// injector = new MethodInjector(method, new
ListMultiplicityObjectFactory(objectFactories));
-// }
-// }
-// return injector;
-// } else {
-// field =
JavaIntrospectionHelper.findClosestMatchingField(refName, refClass, fields);
-// if (field == null) {
-// method =
JavaIntrospectionHelper.findClosestMatchingMethod(refName, new
Class[]{refClass}, methods);
-// if (method == null) {
-// throw new NoAccessorException(refName);
-// }
-// }
-// Injector injector;
-// if (field != null) {
-// injector = new FieldInjector(field, objectFactories.get(0));
-// } else {
-// injector = new MethodInjector(method,
objectFactories.get(0));
-// }
-// return injector;
-// }
-// }
-
-
+
}
