hivemind-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ahue...@apache.org
Subject svn commit: r472548 [2/2] - in /hivemind/branches/branch-2-0-annot: annotations/src/java/org/apache/hivemind/annotations/internal/ framework/src/java/org/apache/hivemind/definition/ framework/src/java/org/apache/hivemind/definition/impl/ framework/src/...
Date Wed, 08 Nov 2006 17:10:46 GMT
Modified: hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/TestToString.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/TestToString.java?view=diff&rev=472548&r1=472547&r2=472548
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/TestToString.java
(original)
+++ hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/TestToString.java
Wed Nov  8 09:10:43 2006
@@ -20,8 +20,10 @@
 
 import org.apache.hivemind.definition.ModuleDefinition;
 import org.apache.hivemind.definition.ServiceImplementationDefinition;
-import org.apache.hivemind.definition.ServicePointDefinition;
 import org.apache.hivemind.definition.Visibility;
+import org.apache.hivemind.definition.impl.ModuleDefinitionImpl;
+import org.apache.hivemind.definition.impl.ServiceImplementationDefinitionImpl;
+import org.apache.hivemind.definition.impl.ServicePointDefinitionImpl;
 import org.apache.hivemind.impl.InterceptorStackImpl;
 import org.apache.hivemind.impl.ModuleImpl;
 import org.apache.hivemind.impl.RegistryInfrastructureImpl;
@@ -51,10 +53,10 @@
         new RegistryInfrastructureImpl(null, Locale.ENGLISH).toString();
         new InterceptorStackImpl(null, mockServicePoint, null).toString();
 
-        ModuleDefinition md = new ModuleDefinition("module", null, null, null);
-        ServicePointDefinition spd = new ServicePointDefinition(md, "service", null,
+        ModuleDefinition md = new ModuleDefinitionImpl("module", null, null, null);
+        ServicePointDefinitionImpl spd = new ServicePointDefinitionImpl(md, "service", null,
                 Visibility.PUBLIC, Runnable.class.getName());
-        ServiceImplementationDefinition sid = new ServiceImplementationDefinition(md, 
+        ServiceImplementationDefinition sid = new ServiceImplementationDefinitionImpl(md,

                 null, null, ServiceModel.PRIMITIVE, true);
         spd.addImplementation(sid);
         new ServicePointImpl(module, spd).toString();

Modified: hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestInterceptors.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestInterceptors.java?view=diff&rev=472548&r1=472547&r2=472548
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestInterceptors.java
(original)
+++ hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestInterceptors.java
Wed Nov  8 09:10:43 2006
@@ -21,10 +21,10 @@
 
 import org.apache.hivemind.Location;
 import org.apache.hivemind.definition.ModuleDefinition;
-import org.apache.hivemind.definition.OrderedServiceInterceptorDefinition;
 import org.apache.hivemind.definition.ServiceInterceptorDefinition;
-import org.apache.hivemind.definition.ServicePointDefinition;
 import org.apache.hivemind.definition.Visibility;
+import org.apache.hivemind.definition.impl.OrderedServiceInterceptorDefinitionImpl;
+import org.apache.hivemind.definition.impl.ServicePointDefinitionImpl;
 import org.apache.hivemind.internal.Module;
 
 /**
@@ -48,7 +48,7 @@
 
     private ServicePointImpl newServicePoint(ModuleDefinition moduleDefinition, Location
l, Module module)
     {
-        ServicePointDefinition definition = new ServicePointDefinition(moduleDefinition,
"zip.zap", l, Visibility.PUBLIC, "foo.bar.Baz");
+        ServicePointDefinitionImpl definition = new ServicePointDefinitionImpl(moduleDefinition,
"zip.zap", l, Visibility.PUBLIC, "foo.bar.Baz");
         ServicePointImpl sp = new ServicePointImpl(module, definition);
         return sp;
     }
@@ -63,10 +63,10 @@
         ModuleDefinition moduleDef = createModuleDefinition("module");
         ServicePointImpl sp = newServicePoint(moduleDef, l, module);
         
-        ServiceInterceptorDefinition interceptor1 = new OrderedServiceInterceptorDefinition(moduleDef,
"Interceptor1", null, null,
+        ServiceInterceptorDefinition interceptor1 = new OrderedServiceInterceptorDefinitionImpl(moduleDef,
"Interceptor1", null, null,
                 null, null);
         sp.getServicePointDefinition().addInterceptor(interceptor1);
-        ServiceInterceptorDefinition interceptor2 = new OrderedServiceInterceptorDefinition(moduleDef,
"Interceptor2", null, null,
+        ServiceInterceptorDefinition interceptor2 = new OrderedServiceInterceptorDefinitionImpl(moduleDef,
"Interceptor2", null, null,
                 null, null);
         sp.getServicePointDefinition().addInterceptor(interceptor2);
 //        sp.getServicePointDefinition()setExtensionPointId("ExtensionPointId");
@@ -88,10 +88,10 @@
         ModuleDefinition moduleDef = createModuleDefinition("module");
         ServicePointImpl sp = newServicePoint(moduleDef, l, module);
         
-        ServiceInterceptorDefinition interceptor1 = new OrderedServiceInterceptorDefinition(moduleDef,
"Interceptor1", null, null,
+        ServiceInterceptorDefinition interceptor1 = new OrderedServiceInterceptorDefinitionImpl(moduleDef,
"Interceptor1", null, null,
                 null, null);
         sp.getServicePointDefinition().addInterceptor(interceptor1);
-        ServiceInterceptorDefinition interceptor2 = new OrderedServiceInterceptorDefinition(moduleDef,
"Interceptor2", null, null,
+        ServiceInterceptorDefinition interceptor2 = new OrderedServiceInterceptorDefinitionImpl(moduleDef,
"Interceptor2", null, null,
                 null, "Interceptor1");
         sp.getServicePointDefinition().addInterceptor(interceptor2);
         final List ordered = sp.getOrderedInterceptorContributions();

Modified: hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestRegistryInfrastructure.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestRegistryInfrastructure.java?view=diff&rev=472548&r1=472547&r2=472548
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestRegistryInfrastructure.java
(original)
+++ hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestRegistryInfrastructure.java
Wed Nov  8 09:10:43 2006
@@ -15,8 +15,8 @@
 
 import org.apache.hivemind.ApplicationRuntimeException;
 import org.apache.hivemind.definition.ModuleDefinition;
-import org.apache.hivemind.definition.ServicePointDefinition;
 import org.apache.hivemind.definition.Visibility;
+import org.apache.hivemind.definition.impl.ServicePointDefinitionImpl;
 import org.apache.hivemind.internal.ConfigurationPoint;
 import org.apache.hivemind.internal.RegistryInfrastructure;
 import org.apache.hivemind.internal.ServicePoint;
@@ -125,14 +125,14 @@
 
     private ServicePointImpl createServicePoint(ModuleDefinition moduleDefinition, final
ModuleImpl module, String id, Class serviceInterface, Visibility visibility)
     {
-        ServicePointDefinition definition = new ServicePointDefinition(moduleDefinition,
id, newLocation(), visibility, serviceInterface.getName());
+        ServicePointDefinitionImpl definition = new ServicePointDefinitionImpl(moduleDefinition,
id, newLocation(), visibility, serviceInterface.getName());
         final ServicePointImpl servicePoint2 = new ServicePointImpl(module, definition);
         return servicePoint2;
     }
 
     private ServicePointImpl createServicePoint(ModuleDefinition moduleDefinition, final
ModuleImpl module, String id, String serviceInterfaceName, Visibility visibility )
     {
-        ServicePointDefinition definition = new ServicePointDefinition(moduleDefinition,
id, newLocation(), visibility, serviceInterfaceName);
+        ServicePointDefinitionImpl definition = new ServicePointDefinitionImpl(moduleDefinition,
id, newLocation(), visibility, serviceInterfaceName);
         final ServicePointImpl servicePoint2 = new ServicePointImpl(module, definition);
         return servicePoint2;
     }

Modified: hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestRegistryInfrastructureConstructor.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestRegistryInfrastructureConstructor.java?view=diff&rev=472548&r1=472547&r2=472548
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestRegistryInfrastructureConstructor.java
(original)
+++ hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestRegistryInfrastructureConstructor.java
Wed Nov  8 09:10:43 2006
@@ -20,7 +20,7 @@
 import org.apache.hivemind.definition.ConfigurationPointDefinition;
 import org.apache.hivemind.definition.ModuleDefinition;
 import org.apache.hivemind.definition.RegistryDefinition;
-import org.apache.hivemind.definition.ServicePointDefinition;
+import org.apache.hivemind.definition.impl.ServicePointDefinitionImpl;
 import org.apache.hivemind.internal.ConfigurationPoint;
 import org.apache.hivemind.internal.RegistryInfrastructure;
 import org.apache.hivemind.internal.ServicePoint;
@@ -41,7 +41,7 @@
     	
         ModuleDefinition fooBar = createModuleDefinition("foo.bar");
 
-        ServicePointDefinition spd = createServicePointDefinition(fooBar, "sp1", Runnable.class);
+        ServicePointDefinitionImpl spd = createServicePointDefinition(fooBar, "sp1", Runnable.class);
 
         fooBar.addServicePoint(spd);
 

Modified: hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestServicePoint.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestServicePoint.java?view=diff&rev=472548&r1=472547&r2=472548
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestServicePoint.java
(original)
+++ hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestServicePoint.java
Wed Nov  8 09:10:43 2006
@@ -24,9 +24,9 @@
 import org.apache.hivemind.ApplicationRuntimeException;
 import org.apache.hivemind.Location;
 import org.apache.hivemind.definition.ModuleDefinition;
-import org.apache.hivemind.definition.ServiceImplementationDefinition;
-import org.apache.hivemind.definition.ServicePointDefinition;
 import org.apache.hivemind.definition.Visibility;
+import org.apache.hivemind.definition.impl.ServiceImplementationDefinitionImpl;
+import org.apache.hivemind.definition.impl.ServicePointDefinitionImpl;
 import org.apache.hivemind.internal.Module;
 import org.apache.hivemind.internal.ServiceModel;
 import org.apache.hivemind.internal.ServiceModelFactory;
@@ -60,7 +60,7 @@
         replayControls();
 
         ModuleDefinition moduleDefinition = createModuleDefinition("module");
-        ServicePointDefinition definition = new ServicePointDefinition(moduleDefinition,
"zip.zap", l, Visibility.PUBLIC, "foo.bar.Baz");
+        ServicePointDefinitionImpl definition = new ServicePointDefinitionImpl(moduleDefinition,
"zip.zap", l, Visibility.PUBLIC, "foo.bar.Baz");
         ServicePointImpl sp = new ServicePointImpl(module, definition);
 
         try
@@ -86,8 +86,8 @@
         Module module = (Module) modulec.getMock();
 
         ModuleDefinition moduleDef = createModuleDefinition("foo");
-        ServicePointDefinition definition = new ServicePointDefinition(moduleDef, "bar",
l, Visibility.PUBLIC, "java.util.List");
-        definition.addImplementation(new ServiceImplementationDefinition(moduleDef, l, null,
"fred", true));
+        ServicePointDefinitionImpl definition = new ServicePointDefinitionImpl(moduleDef,
"bar", l, Visibility.PUBLIC, "java.util.List");
+        definition.addImplementation(new ServiceImplementationDefinitionImpl(moduleDef, l,
null, "fred", true));
         ServicePointImpl sp = new ServicePointImpl(module, definition);
 
         Object service = new ArrayList();

Modified: hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestVisibility.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestVisibility.java?view=diff&rev=472548&r1=472547&r2=472548
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestVisibility.java
(original)
+++ hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestVisibility.java
Wed Nov  8 09:10:43 2006
@@ -19,8 +19,8 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hivemind.ApplicationRuntimeException;
-import org.apache.hivemind.definition.ConfigurationPointDefinition;
 import org.apache.hivemind.definition.Visibility;
+import org.apache.hivemind.definition.impl.ConfigurationPointDefinitionImpl;
 import org.apache.hivemind.internal.ConfigurationPoint;
 import org.apache.hivemind.internal.Module;
 import org.apache.hivemind.internal.ServicePoint;
@@ -44,7 +44,7 @@
 
         replayControls();
 
-        ConfigurationPointDefinition cpd = new ConfigurationPointDefinition(createModuleDefinition("module"));
+        ConfigurationPointDefinitionImpl cpd = new ConfigurationPointDefinitionImpl(createModuleDefinition("module"));
         cpd.setVisibility(Visibility.PUBLIC);
         ConfigurationPointImpl cp = new ConfigurationPointImpl(m, cpd);
 
@@ -59,7 +59,7 @@
 
         replayControls();
 
-        ConfigurationPointDefinition cpd = new ConfigurationPointDefinition(createModuleDefinition("module"));
+        ConfigurationPointDefinitionImpl cpd = new ConfigurationPointDefinitionImpl(createModuleDefinition("module"));
         cpd.setVisibility(Visibility.PUBLIC);
         ConfigurationPointImpl cp = new ConfigurationPointImpl(m, cpd);
 
@@ -75,7 +75,7 @@
 
         replayControls();
 
-        ConfigurationPointDefinition cpd = new ConfigurationPointDefinition(createModuleDefinition("module"));
+        ConfigurationPointDefinitionImpl cpd = new ConfigurationPointDefinitionImpl(createModuleDefinition("module"));
         cpd.setVisibility(Visibility.PRIVATE);
         ConfigurationPointImpl cp = new ConfigurationPointImpl(m, cpd);
 
@@ -90,7 +90,7 @@
 
         replayControls();
 
-        ConfigurationPointDefinition cpd = new ConfigurationPointDefinition(createModuleDefinition("module"));
+        ConfigurationPointDefinitionImpl cpd = new ConfigurationPointDefinitionImpl(createModuleDefinition("module"));
         cpd.setVisibility(Visibility.PRIVATE);
         ConfigurationPointImpl cp = new ConfigurationPointImpl(m, cpd);
 

Modified: hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/service/impl/TestLoggingInterceptorFactory.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/service/impl/TestLoggingInterceptorFactory.java?view=diff&rev=472548&r1=472547&r2=472548
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/service/impl/TestLoggingInterceptorFactory.java
(original)
+++ hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/service/impl/TestLoggingInterceptorFactory.java
Wed Nov  8 09:10:43 2006
@@ -23,8 +23,9 @@
 import org.apache.hivemind.definition.ModuleDefinition;
 import org.apache.hivemind.definition.RegistryDefinition;
 import org.apache.hivemind.definition.ServiceImplementationDefinition;
-import org.apache.hivemind.definition.ServicePointDefinition;
 import org.apache.hivemind.definition.construction.ImplementationConstructor;
+import org.apache.hivemind.definition.impl.ServiceImplementationDefinitionImpl;
+import org.apache.hivemind.definition.impl.ServicePointDefinitionImpl;
 import org.apache.hivemind.impl.InterceptorStackImpl;
 import org.apache.hivemind.internal.Module;
 import org.apache.hivemind.internal.ServiceModel;
@@ -126,8 +127,8 @@
         ModuleDefinition module = createModuleDefinition("hivemind.tests.serviceByInterface");
         definition.addModule(module);
         
-        ServicePointDefinition sp1 = createServicePointDefinition(module, "BeanInterface",
BeanInterface.class);
-        ServiceImplementationDefinition impl = new ServiceImplementationDefinition(module,
newLocation(),
+        ServicePointDefinitionImpl sp1 = createServicePointDefinition(module, "BeanInterface",
BeanInterface.class);
+        ServiceImplementationDefinition impl = new ServiceImplementationDefinitionImpl(module,
newLocation(),
                 constructor, ServiceModel.SINGLETON, true);
         sp1.addImplementation(impl);
         module.addServicePoint(sp1);

Modified: hivemind/branches/branch-2-0-annot/library/src/test/hivemind/test/lib/TestDefaultImplementationBuilder.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/library/src/test/hivemind/test/lib/TestDefaultImplementationBuilder.java?view=diff&rev=472548&r1=472547&r2=472548
==============================================================================
--- hivemind/branches/branch-2-0-annot/library/src/test/hivemind/test/lib/TestDefaultImplementationBuilder.java
(original)
+++ hivemind/branches/branch-2-0-annot/library/src/test/hivemind/test/lib/TestDefaultImplementationBuilder.java
Wed Nov  8 09:10:43 2006
@@ -21,7 +21,6 @@
 import org.apache.hivemind.lib.impl.DefaultImplementationBuilderImpl;
 import org.apache.hivemind.lib.impl.PlaceholderFactory;
 import org.apache.hivemind.service.impl.ClassFactoryImpl;
-import org.apache.hivemind.test.HiveMindTestCase;
 import org.apache.hivemind.xml.XmlTestCase;
 import org.easymock.MockControl;
 

Modified: hivemind/branches/branch-2-0-annot/library/src/test/hivemind/test/lib/TestEJBProxyFactory.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/library/src/test/hivemind/test/lib/TestEJBProxyFactory.java?view=diff&rev=472548&r1=472547&r2=472548
==============================================================================
--- hivemind/branches/branch-2-0-annot/library/src/test/hivemind/test/lib/TestEJBProxyFactory.java
(original)
+++ hivemind/branches/branch-2-0-annot/library/src/test/hivemind/test/lib/TestEJBProxyFactory.java
Wed Nov  8 09:10:43 2006
@@ -25,7 +25,6 @@
 
 import org.apache.hivemind.ApplicationRuntimeException;
 import org.apache.hivemind.Registry;
-import org.apache.hivemind.test.HiveMindTestCase;
 import org.apache.hivemind.xml.XmlTestCase;
 
 /**

Modified: hivemind/branches/branch-2-0-annot/xml/pom.xml
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/pom.xml?view=diff&rev=472548&r1=472547&r2=472548
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/pom.xml (original)
+++ hivemind/branches/branch-2-0-annot/xml/pom.xml Wed Nov  8 09:10:43 2006
@@ -74,17 +74,23 @@
            <artifactId>maven-jar-plugin</artifactId>
 	       <executions>
 	         <execution>
+	           <id>test-jar</id>
 	           <goals>
 	             <!-- Create jar with unit tests, so they can be reused by the other modules
-->
 	             <goal>test-jar</goal>
 	           </goals>
 	         </execution>
-	       </executions>
-           <configuration>
-             <archive>
-               <manifestFile>src/descriptor/META-INF/MANIFEST.MF</manifestFile>
-             </archive>
-           </configuration>
+            <execution>
+                <goals>
+                    <goal>package</goal>
+                </goals>
+                <configuration>
+	             <archive>
+	               <manifestFile>src/descriptor/META-INF/MANIFEST.MF</manifestFile>
+	             </archive>
+	            </configuration>
+            </execution>
+           </executions>
         </plugin>
       </plugins>
   	</build>

Modified: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlModuleDescriptorProcessor.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlModuleDescriptorProcessor.java?view=diff&rev=472548&r1=472547&r2=472548
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlModuleDescriptorProcessor.java
(original)
+++ hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlModuleDescriptorProcessor.java
Wed Nov  8 09:10:43 2006
@@ -15,12 +15,16 @@
 import org.apache.hivemind.conditional.Node;
 import org.apache.hivemind.conditional.Parser;
 import org.apache.hivemind.definition.ConfigurationPointDefinition;
-import org.apache.hivemind.definition.ContributionDefinition;
 import org.apache.hivemind.definition.ModuleDefinition;
 import org.apache.hivemind.definition.RegistryDefinition;
 import org.apache.hivemind.definition.ServiceImplementationDefinition;
-import org.apache.hivemind.definition.ServiceInterceptorDefinition;
 import org.apache.hivemind.definition.ServicePointDefinition;
+import org.apache.hivemind.definition.impl.ConfigurationPointDefinitionImpl;
+import org.apache.hivemind.definition.impl.ContributionDefinitionImpl;
+import org.apache.hivemind.definition.impl.ModuleDefinitionImpl;
+import org.apache.hivemind.definition.impl.ServiceImplementationDefinitionImpl;
+import org.apache.hivemind.definition.impl.ServiceInterceptorDefinitionImpl;
+import org.apache.hivemind.definition.impl.ServicePointDefinitionImpl;
 import org.apache.hivemind.impl.natures.XmlConfigurationPointNature;
 import org.apache.hivemind.impl.natures.XmlRegistryNature;
 import org.apache.hivemind.impl.natures.XmlServicePointNature;
@@ -78,7 +82,7 @@
 
         _moduleDescriptors.put(id, md);
 
-        ModuleDefinition module = new ModuleDefinition(id, md.getLocation(), md.getClassResolver(),
md.getPackageName());
+        ModuleDefinition module = new ModuleDefinitionImpl(id, md.getLocation(), md.getClassResolver(),
md.getPackageName());
         
         addSchemas(module, md);
 
@@ -144,7 +148,7 @@
         for (int i = 0; i < count; i++)
         {
             ServicePointDescriptor sd = (ServicePointDescriptor) services.get(i);
-            ServicePointDefinition servicePoint = new ServicePointDefinition(module, sd.getId(),
sd.getLocation(), 
+            ServicePointDefinitionImpl servicePoint = new ServicePointDefinitionImpl(module,
sd.getId(), sd.getLocation(), 
                     sd.getVisibility(), sd.getInterfaceClassName());
             module.addServicePoint(servicePoint);
 
@@ -195,7 +199,7 @@
         List interceptors = id.getInterceptors();
 
         if (builder != null) {
-            ServiceImplementationDefinition implementation = new ServiceImplementationDefinition(
+            ServiceImplementationDefinitionImpl implementation = new ServiceImplementationDefinitionImpl(
                     sourceModule, builder.getLocation(), builder.createConstructor(sourceModule.getId()),
                     builder.getServiceModel(), false);
             sourceModule.addServiceImplementation(qualifiedPointId, implementation); 
@@ -214,7 +218,7 @@
      * Adds internal service contributions; the contributions provided inplace with the service
      * definition.
      */
-    private void addInternalImplementations(ModuleDefinition module, ServicePointDefinition
point,
+    private void addInternalImplementations(ModuleDefinition module, ServicePointDefinitionImpl
point,
             ServicePointDescriptor spd)
     {
         InstanceBuilder builder = spd.getInstanceBuilder();
@@ -225,7 +229,7 @@
             return;
 
         if (builder != null) {
-            ServiceImplementationDefinition implementation = new ServiceImplementationDefinition(
+            ServiceImplementationDefinition implementation = new ServiceImplementationDefinitionImpl(
                     module, builder.getLocation(), builder.createConstructor(module.getId()),
                     builder.getServiceModel(), false);
             point.addImplementation(implementation);
@@ -255,7 +259,7 @@
             XmlConfigurationConstructor constructor = new XmlConfigurationConstructor(
                     cpd.getLocation());
             
-            ConfigurationPointDefinition configurationPoint = new ConfigurationPointDefinition(
+            ConfigurationPointDefinitionImpl configurationPoint = new ConfigurationPointDefinitionImpl(
                     module, cpd.getId(), cpd.getLocation(), cpd.getVisibility(), 
                     constructor, cpd.getContainerClassName(), cpd.getCount());
             module.addConfigurationPoint(configurationPoint);
@@ -296,7 +300,7 @@
             String pointId = cd.getConfigurationId();
             String qualifiedId = IdUtils.qualify(moduleId, pointId);
             
-            ContributionDefinition contribution = new ContributionDefinition(module, cd.getLocation(),
+            ContributionDefinitionImpl contribution = new ContributionDefinitionImpl(module,
cd.getLocation(),
                     new XmlContributionImpl(moduleId, cd.getElements())); 
             module.addContribution(qualifiedId, contribution);
 
@@ -314,7 +318,7 @@
         constructor.setParameters(id.getParameters());
         constructor.setPrecedingInterceptorIds(id.getAfter());
         constructor.setFollowingInterceptorIds(id.getBefore());
-        ServiceInterceptorDefinition interceptor = new ServiceInterceptorDefinition(
+        ServiceInterceptorDefinitionImpl interceptor = new ServiceInterceptorDefinitionImpl(
                 module, id.getName(), id.getLocation(), constructor);
         module.addServiceInterceptor(qualifiedPointId, interceptor);
     }



Mime
View raw message