svn commit: r709470 - in /tuscany/branches/sca-equinox/modules/implementation-ejb/src: main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java

[rfeng]

Author: rfeng
Date: Fri Oct 31 09:48:03 2008
New Revision: 709470

URL: http://svn.apache.org/viewvc?rev=709470&view=rev
Log:
Clean up dependencies

Modified:
    
tuscany/branches/sca-equinox/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java
    
tuscany/branches/sca-equinox/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java

Modified: 
tuscany/branches/sca-equinox/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java
URL: 
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java?rev=709470&r1=709469&r2=709470&view=diff
==============================================================================
--- 
tuscany/branches/sca-equinox/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java
 (original)
+++ 
tuscany/branches/sca-equinox/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java
 Fri Oct 31 09:48:03 2008
@@ -27,7 +27,6 @@
 
 import org.apache.tuscany.sca.assembly.AssemblyFactory;
 import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.assembly.xml.Constants;
 import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
 import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
 import 
org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
@@ -40,7 +39,6 @@
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
 import org.apache.tuscany.sca.monitor.Problem.Severity;
-import org.apache.tuscany.sca.monitor.impl.ProblemImpl;
 
 
 /**
@@ -49,7 +47,8 @@
  * @version $Rev$ $Date$
  */
 public class EJBImplementationProcessor extends BaseStAXArtifactProcessor 
implements StAXArtifactProcessor<EJBImplementation> {
-    private static final QName IMPLEMENTATION_EJB = new 
QName(Constants.SCA10_NS, "implementation.ejb");
+    private static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";;
+    private static final QName IMPLEMENTATION_EJB = new QName(SCA10_NS, 
"implementation.ejb");
     
     private AssemblyFactory assemblyFactory;
     private EJBImplementationFactory implementationFactory;

Modified: 
tuscany/branches/sca-equinox/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java
URL: 
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java?rev=709470&r1=709469&r2=709470&view=diff
==============================================================================
--- 
tuscany/branches/sca-equinox/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java
 (original)
+++ 
tuscany/branches/sca-equinox/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java
 Fri Oct 31 09:48:03 2008
@@ -26,22 +26,15 @@
 
 import junit.framework.TestCase;
 
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
 import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
 import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
+import org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint;
 import 
org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
 import 
org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
 import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
 import 
org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
 import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.implementation.ejb.EJBImplementation;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
 
 /**
  * Test reading Node implementations.
@@ -61,13 +54,7 @@
         StAXArtifactProcessorExtensionPoint staxProcessors = new 
DefaultStAXArtifactProcessorExtensionPoint(extensionPoints);
         staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, 
inputFactory, null, null);
         
-        FactoryExtensionPoint modelFactories = 
extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
-        AssemblyFactory assemblyFactory = 
modelFactories.getFactory(AssemblyFactory.class);
-        SCABindingFactory scaBindingFactory = 
modelFactories.getFactory(SCABindingFactory.class);
-        UtilityExtensionPoint utilities = 
extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        InterfaceContractMapper mapper = 
utilities.getUtility(InterfaceContractMapper.class);
-        IntentAttachPointTypeFactory attachPointTypeFactory = 
modelFactories.getFactory(IntentAttachPointTypeFactory.class);
-        compositeBuilder = new CompositeBuilderImpl(assemblyFactory, 
scaBindingFactory, attachPointTypeFactory, mapper);
+        compositeBuilder = 
extensionPoints.getExtensionPoint(CompositeBuilderExtensionPoint.class).getCompositeBuilder("org.apache.tuscany.sca.assembly.builder.CompositeBuilder");
     }
 
     public void testReadComposite() throws Exception {