You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2010/03/01 13:16:30 UTC
svn commit: r917488 - in
/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting:
loaders/java/JavaDependencyScanner.java refresh/RefreshContext.java
Author: werpu
Date: Mon Mar 1 12:16:29 2010
New Revision: 917488
URL: http://svn.apache.org/viewvc?rev=917488&view=rev
Log:
https://issues.apache.org/jira/browse/EXTSCRIPT-74
fixed a small newly introduced registration bug... works again
now!
Modified:
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaDependencyScanner.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/refresh/RefreshContext.java
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaDependencyScanner.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaDependencyScanner.java?rev=917488&r1=917487&r2=917488&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaDependencyScanner.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaDependencyScanner.java Mon Mar 1 12:16:29 2010
@@ -25,10 +25,8 @@
import org.apache.myfaces.scripting.core.dependencyScan.DependencyScanner;
import org.apache.myfaces.scripting.core.dependencyScan.StandardDependencyScanner;
import org.apache.myfaces.scripting.core.dependencyScan.filter.WhitelistFilter;
-import org.apache.myfaces.scripting.core.dependencyScan.registry.DependencyMapRegistrationStrategy;
import org.apache.myfaces.scripting.core.dependencyScan.registry.DependencyRegistryImpl;
import org.apache.myfaces.scripting.core.dependencyScan.registry.ExternalFilterDependencyRegistry;
-import org.apache.myfaces.scripting.core.util.Strategy;
import org.apache.myfaces.scripting.core.util.WeavingContext;
import org.apache.myfaces.scripting.refresh.ReloadingMetadata;
@@ -96,7 +94,7 @@
ExternalFilterDependencyRegistry scanRegistry = (ExternalFilterDependencyRegistry) WeavingContext.getRefreshContext().getDependencyRegistry(getEngineType());
if (scanRegistry == null) {
scanRegistry = new DependencyRegistryImpl(getEngineType(), WeavingContext.getFileChangedDaemon().getDependencyMap());
-
+ WeavingContext.getRefreshContext().setDependencyRegistry(getEngineType(), scanRegistry);
} else {
scanRegistry.clearFilters();
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/refresh/RefreshContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/refresh/RefreshContext.java?rev=917488&r1=917487&r2=917488&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/refresh/RefreshContext.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/refresh/RefreshContext.java Mon Mar 1 12:16:29 2010
@@ -107,7 +107,7 @@
return _dependencyRegistry.getSubregistry(scriptingEngine);
}
- public void setDependencyRegistries(int scriptingEngine, DependencyRegistry registry) {
+ public void setDependencyRegistry(int scriptingEngine, DependencyRegistry registry) {
_dependencyRegistry.addSubregistry(scriptingEngine, registry);
}