svn commit: r535957 - in /tapestry/tapestry5/branches/hlship-20070503/tapestry-core/src: main/java/org/apache/tapestry/internal/ main/java/org/apache/tapestry/internal/test/ test/java/org/apache/tapestry/internal/services/

[hlship]

Author: hlship
Date: Mon May  7 12:19:06 2007
New Revision: 535957

URL: http://svn.apache.org/viewvc?view=rev&rev=535957
Log:
Change RegistryBuilder to invoke getLogName(), not getBuilderClass(), when 
creating a Log for a Module.

Modified:
    
tapestry/tapestry5/branches/hlship-20070503/tapestry-core/src/main/java/org/apache/tapestry/internal/SyntheticModuleDef.java
    
tapestry/tapestry5/branches/hlship-20070503/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryAppInitializer.java
    
tapestry/tapestry5/branches/hlship-20070503/tapestry-core/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java
    
tapestry/tapestry5/branches/hlship-20070503/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImplTest.java

Modified: 
tapestry/tapestry5/branches/hlship-20070503/tapestry-core/src/main/java/org/apache/tapestry/internal/SyntheticModuleDef.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20070503/tapestry-core/src/main/java/org/apache/tapestry/internal/SyntheticModuleDef.java?view=diff&rev=535957&r1=535956&r2=535957
==============================================================================
--- 
tapestry/tapestry5/branches/hlship-20070503/tapestry-core/src/main/java/org/apache/tapestry/internal/SyntheticModuleDef.java
 (original)
+++ 
tapestry/tapestry5/branches/hlship-20070503/tapestry-core/src/main/java/org/apache/tapestry/internal/SyntheticModuleDef.java
 Mon May  7 12:19:06 2007
@@ -29,23 +29,17 @@
  */
 public class SyntheticModuleDef implements ModuleDef
 {
-    private final Class _builderClass;
-
     private final Set<ContributionDef> _contributionDefs;
 
-    public SyntheticModuleDef(Class builderClass, ContributionDef... 
contributionDefs)
+    public SyntheticModuleDef(ContributionDef... contributionDefs)
     {
-        _builderClass = builderClass;
         _contributionDefs = CollectionFactory.newSet(contributionDefs);
     }
 
-    /**
-     * Returns an arbitrary class (this is necessary because of how the 
RegistryBuilder assigns a
-     * Log for each module, even a synthetic module.
-     */
+    /** Returns null. */
     public Class getBuilderClass()
     {
-        return _builderClass;
+        return null;
     }
 
     /** Returns the configured set. */

Modified: 
tapestry/tapestry5/branches/hlship-20070503/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryAppInitializer.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20070503/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryAppInitializer.java?view=diff&rev=535957&r1=535956&r2=535957
==============================================================================
--- 
tapestry/tapestry5/branches/hlship-20070503/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryAppInitializer.java
 (original)
+++ 
tapestry/tapestry5/branches/hlship-20070503/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryAppInitializer.java
 Mon May  7 12:19:06 2007
@@ -125,8 +125,7 @@
                         InternalConstants.TAPESTRY_ALIAS_MODE_SYMBOL, 
_aliasMode),
                 "before:ServletContext");
 
-        builder.add(new SyntheticModuleDef(TapestryAppInitializer.class, 
symbolSourceContribution,
-                aliasModeContribution));
+        builder.add(new SyntheticModuleDef(symbolSourceContribution, 
aliasModeContribution));
     }
 
     private void overrideServices(RegistryBuilder builder)

Modified: 
tapestry/tapestry5/branches/hlship-20070503/tapestry-core/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20070503/tapestry-core/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java?view=diff&rev=535957&r1=535956&r2=535957
==============================================================================
--- 
tapestry/tapestry5/branches/hlship-20070503/tapestry-core/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java
 (original)
+++ 
tapestry/tapestry5/branches/hlship-20070503/tapestry-core/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java
 Mon May  7 12:19:06 2007
@@ -107,7 +107,7 @@
         ContributionDef contribution = new 
SyntheticSymbolSourceContributionDef("AliasMode",
                 provider, "before:ApplicationDefaults");
 
-        ModuleDef module = new SyntheticModuleDef(InternalBaseTestCase.class, 
contribution);
+        ModuleDef module = new SyntheticModuleDef(contribution);
 
         builder.add(module);
 

Modified: 
tapestry/tapestry5/branches/hlship-20070503/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImplTest.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20070503/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImplTest.java?view=diff&rev=535957&r1=535956&r2=535957
==============================================================================
--- 
tapestry/tapestry5/branches/hlship-20070503/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImplTest.java
 (original)
+++ 
tapestry/tapestry5/branches/hlship-20070503/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImplTest.java
 Mon May  7 12:19:06 2007
@@ -287,7 +287,7 @@
         ContributionDef contribution = new 
SyntheticSymbolSourceContributionDef("AliasMode",
                 provider, "before:ApplicationDefaults");
 
-        ModuleDef module = new SyntheticModuleDef(InternalBaseTestCase.class, 
contribution);
+        ModuleDef module = new SyntheticModuleDef(contribution);
 
         builder.add(module);