Author: lresende
Date: Thu Aug  9 16:03:41 2007
New Revision: 564415

URL: http://svn.apache.org/viewvc?view=rev&rev=564415
Log:
With changes from revision #564089 we don't need a listener to scan and 
register static sdo types anymore, neither we need import.sdo location in the 
samples/test cases.

Modified:
    
incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/alerts.composite
    
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
    
incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
    
incubator/tuscany/java/sca/itest/old/bindings/bindingscomposite/src/main/resources/bindingscomposite.composite
    
incubator/tuscany/java/sca/itest/old/bindings/bindingsutility/src/main/resources/bindingsutility.composite
    
incubator/tuscany/java/sca/itest/properties/src/main/resources/PropertyTest.composite
    
incubator/tuscany/java/sca/itest/wsdl/src/main/resources/SDOWSDLTest.composite
    
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/module/SDODataBindingModuleActivator.java

Modified: 
incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/alerts.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/alerts.composite?view=diff&rev=564415&r1=564414&r2=564415
==============================================================================
--- 
incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/alerts.composite
 (original)
+++ 
incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/alerts.composite
 Thu Aug  9 16:03:41 2007
@@ -24,8 +24,8 @@
     name="FeedAggregator">
     
     <!-- SDO factory classes -->    
-    <dbsdo:import.sdo 
factory="org.apache.tuscany.sca.demos.aggregator.service.ServiceFactory"/>      
  
-    <dbsdo:import.sdo 
factory="org.apache.tuscany.sca.demos.aggregator.types.TypesFactory"/> 
+    <!-- dbsdo:import.sdo 
factory="org.apache.tuscany.sca.demos.aggregator.service.ServiceFactory"/ -->
+    <!-- dbsdo:import.sdo 
factory="org.apache.tuscany.sca.demos.aggregator.types.TypesFactory"/ --> 
 
     <!-- The alerts rss service -->
     <service name="AlertsFeedServiceRSS" 
promote="AlertsFeedServiceComponent/Collection">

Modified: 
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite?view=diff&rev=564415&r1=564414&r2=564415
==============================================================================
--- 
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
 (original)
+++ 
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
 Thu Aug  9 16:03:41 2007
@@ -18,7 +18,7 @@
     * under the License.
 -->
 <composite name="intracomposite" xmlns="http://www.osoa.org/xmlns/sca/1.0"; 
xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"; 
xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance";>
-       <dbsdo:import.sdo 
factory="stockexceptiontestservice.scatesttool.ScatesttoolFactory"/>
+       <!-- dbsdo:import.sdo 
factory="stockexceptiontestservice.scatesttool.ScatesttoolFactory"/ -->
        
        <service name="exchangeJaxbService">
                <interface.java 
class="org.apache.tuscany.sca.test.exceptions.impl.StockExceptionTestJAXB"/>

Modified: 
incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite?view=diff&rev=564415&r1=564414&r2=564415
==============================================================================
--- 
incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
 (original)
+++ 
incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
 Thu Aug  9 16:03:41 2007
@@ -30,6 +30,6 @@
     </component>
 
     <!-- Move to the end to verify the fix for TUSCANY-1165 -->
-    <dbsdo:import.sdo 
factory="stockexceptiontestservice.scatesttool.ScatesttoolFactory" />
+    <!-- dbsdo:import.sdo 
factory="stockexceptiontestservice.scatesttool.ScatesttoolFactory" / -->
 
 </composite>

Modified: 
incubator/tuscany/java/sca/itest/old/bindings/bindingscomposite/src/main/resources/bindingscomposite.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/old/bindings/bindingscomposite/src/main/resources/bindingscomposite.composite?view=diff&rev=564415&r1=564414&r2=564415
==============================================================================
--- 
incubator/tuscany/java/sca/itest/old/bindings/bindingscomposite/src/main/resources/bindingscomposite.composite
 (original)
+++ 
incubator/tuscany/java/sca/itest/old/bindings/bindingscomposite/src/main/resources/bindingscomposite.composite
 Thu Aug  9 16:03:41 2007
@@ -22,8 +22,8 @@
     xmlns:v="http://www.osoa.org/xmlns/sca/values/1.0"; 
xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0";
     name="bindingscomposite">
 
-    <dbsdo:import.sdo location="wsdl/testtool.wsdl" />
-    <dbsdo:import.sdo location="wsdl/testutility.wsdl" />
+    <!-- dbsdo:import.sdo location="wsdl/testtool.wsdl" / -->
+    <!-- dbsdo:import.sdo location="wsdl/testutility.wsdl" / -->
 
     <service name="SCATestToolWSService">
         <interface.wsdl 
interface="http://scatesttool.scabeta1fvt#wsdl.interface(SCATestToolService)"

Modified: 
incubator/tuscany/java/sca/itest/old/bindings/bindingsutility/src/main/resources/bindingsutility.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/old/bindings/bindingsutility/src/main/resources/bindingsutility.composite?view=diff&rev=564415&r1=564414&r2=564415
==============================================================================
--- 
incubator/tuscany/java/sca/itest/old/bindings/bindingsutility/src/main/resources/bindingsutility.composite
 (original)
+++ 
incubator/tuscany/java/sca/itest/old/bindings/bindingsutility/src/main/resources/bindingsutility.composite
 Thu Aug  9 16:03:41 2007
@@ -22,7 +22,7 @@
        xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0";
     name="bindingsutility">
 
-    <dbsdo:import.sdo location="wsdl/testutility.wsdl" />
+    <!-- dbsdo:import.sdo location="wsdl/testutility.wsdl" / -->
 
     <service name="SCATestUtilityWSService">
         <interface.wsdl 
interface="http://scatestutil.scabeta1fvt#wsdl.interface(SCATestUtilityService)"

Modified: 
incubator/tuscany/java/sca/itest/properties/src/main/resources/PropertyTest.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/properties/src/main/resources/PropertyTest.composite?view=diff&rev=564415&r1=564414&r2=564415
==============================================================================
--- 
incubator/tuscany/java/sca/itest/properties/src/main/resources/PropertyTest.composite
 (original)
+++ 
incubator/tuscany/java/sca/itest/properties/src/main/resources/PropertyTest.composite
 Thu Aug  9 16:03:41 2007
@@ -28,7 +28,7 @@
     </service>           
            
     <dbsdo:import.sdo location="customer.xsd" />
-    <dbsdo:import.sdo factory="com.example.customer.sdo.SdoFactory" />
+    <!-- dbsdo:import.sdo factory="com.example.customer.sdo.SdoFactory" / -->
                
     <property name="number" type="xsd:int">1</property>
     <property name="complex" type="foo:MyComplexType" >

Modified: 
incubator/tuscany/java/sca/itest/wsdl/src/main/resources/SDOWSDLTest.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/wsdl/src/main/resources/SDOWSDLTest.composite?view=diff&rev=564415&r1=564414&r2=564415
==============================================================================
--- 
incubator/tuscany/java/sca/itest/wsdl/src/main/resources/SDOWSDLTest.composite 
(original)
+++ 
incubator/tuscany/java/sca/itest/wsdl/src/main/resources/SDOWSDLTest.composite 
Thu Aug  9 16:03:41 2007
@@ -19,8 +19,8 @@
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"; 
xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"; name="SDOWSDLTest">
 
-    <dbsdo:import.sdo 
xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0";
-        factory="com.bigbank.account.AccountFactory" />
+    <!-- dbsdo:import.sdo 
xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0";
+        factory="com.bigbank.account.AccountFactory" / -->
 
     <service name="AccountService1a2a3a4a" promote="Component2a3a4a">
         <interface.java 
interface="bigbank.account.services.accountdata.AccountDataService" />

Modified: 
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/module/SDODataBindingModuleActivator.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/module/SDODataBindingModuleActivator.java?view=diff&rev=564415&r1=564414&r2=564415
==============================================================================
--- 
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/module/SDODataBindingModuleActivator.java
 (original)
+++ 
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/module/SDODataBindingModuleActivator.java
 Thu Aug  9 16:03:41 2007
@@ -22,7 +22,6 @@
 import org.apache.tuscany.sca.assembly.AssemblyFactory;
 import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
 import 
org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import 
org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.core.ModuleActivator;
 import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
@@ -32,7 +31,6 @@
 import org.apache.tuscany.sca.databinding.sdo.HelperContextProcessor;
 import org.apache.tuscany.sca.databinding.sdo.HelperContextRegistry;
 import org.apache.tuscany.sca.databinding.sdo.HelperContextRegistryImpl;
-import org.apache.tuscany.sca.databinding.sdo.SDOTypeRegisterListener;
 import org.apache.tuscany.sca.databinding.sdo.ImportSDOProcessor;
 import org.apache.tuscany.sca.databinding.sdo.SDODataBinding;
 import org.apache.tuscany.sca.databinding.sdo.String2DataObject;
@@ -59,8 +57,8 @@
         HelperContextRegistry contextRegistry = new 
HelperContextRegistryImpl();
         processors.addArtifactProcessor(new 
ImportSDOProcessor(contextRegistry));
 
-        ContributionListenerExtensionPoint listeners = 
registry.getExtensionPoint(ContributionListenerExtensionPoint.class);
-        listeners.addContributionListener(new 
SDOTypeRegisterListener(contextRegistry));
+        //ContributionListenerExtensionPoint listeners = 
registry.getExtensionPoint(ContributionListenerExtensionPoint.class);
+        //listeners.addContributionListener(new 
SDOTypeRegisterListener(contextRegistry));
         
         JavaClassIntrospectorExtensionPoint introspectors = 
registry.getExtensionPoint(JavaClassIntrospectorExtensionPoint.class);
         introspectors.addClassVisitor(new 
HelperContextProcessor(assemblyFactory, contextRegistry));



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to