svn commit: r380035 - in /incubator/tuscany/java/sca: container.java/src/main/java/org/apache/tuscany/container/java/builder/ core/src/main/java/org/apache/tuscany/core/builder/ core/src/main/java/org/apache/tuscany/core/builder/impl/

[jm...@apache.org]

Author: jmarino
Date: Wed Feb 22 19:35:46 2006
New Revision: 380035

URL: http://svn.apache.org/viewcvs?rev=380035&view=rev
Log:
minor code and package refactorings for builders

Added:
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ProxyObjectFactory.java
      - copied, changed from r380031, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ProxyObjectFactory.java
Removed:
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ProxyObjectFactory.java
Modified:
    incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilder.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java

Modified: incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilder.java?rev=380035&r1=380034&r2=380035&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilder.java (original)
+++ incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilder.java Wed Feb 22 19:35:46 2006
@@ -15,8 +15,8 @@
 import org.apache.tuscany.core.builder.BuilderConfigException;
 import org.apache.tuscany.core.builder.BuilderException;
 import org.apache.tuscany.core.builder.NoAccessorException;
-import org.apache.tuscany.core.builder.ProxyObjectFactory;
 import org.apache.tuscany.core.builder.RuntimeConfigurationBuilder;
+import org.apache.tuscany.core.builder.impl.ProxyObjectFactory;
 import org.apache.tuscany.core.config.JavaIntrospectionHelper;
 import org.apache.tuscany.core.context.AggregateContext;
 import org.apache.tuscany.core.context.QualifiedName;

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java?rev=380035&r1=380034&r2=380035&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java Wed Feb 22 19:35:46 2006
@@ -59,20 +59,7 @@
             for (InvocationConfiguration sourceInvocationConfig : sourceFactory.getProxyConfiguration()
                     .getInvocationConfigurations().values()) {
                 // match invocation chains
-//<<<<<<< .mine
-////                InvocationConfiguration targetInvocationConfig = targetInvocationConfigs.get(sourceInvocationConfig
-////                        .getOperationType());
-//                // should be done w/.equals():
-//                InvocationConfiguration targetInvocationConfig = null;
-//                for (Map.Entry<OperationType,InvocationConfiguration> entry : targetInvocationConfigs.entrySet()) {
-//                    if (entry.getKey().getName().equals(sourceInvocationConfig.getOperationType().getName())){
-//                        targetInvocationConfig = entry.getValue();
-//                        break;
-//                    }
-//                }  
-//=======
                 InvocationConfiguration targetInvocationConfig = targetInvocationConfigs.get(sourceInvocationConfig.getMethod());
-//>>>>>>> .r379382
                 // if handler is configured, add that
                 if (targetInvocationConfig.getRequestHandlers() != null) {
                     sourceInvocationConfig.setTargetRequestChannel(new MessageChannelImpl(targetInvocationConfig.getRequestHandlers()));

Copied: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ProxyObjectFactory.java (from r380031, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ProxyObjectFactory.java)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ProxyObjectFactory.java?p2=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ProxyObjectFactory.java&p1=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ProxyObjectFactory.java&r1=380031&r2=380035&rev=380035&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ProxyObjectFactory.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ProxyObjectFactory.java Wed Feb 22 19:35:46 2006
@@ -11,7 +11,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.tuscany.core.builder;
+package org.apache.tuscany.core.builder.impl;
 
 import org.apache.tuscany.core.injection.ObjectCreationException;
 import org.apache.tuscany.core.injection.ObjectFactory;