Author: lu4242
Date: Fri Jun 25 21:48:32 2010
New Revision: 958125
URL: http://svn.apache.org/viewvc?rev=958125&view=rev
Log:
MYFACES-2714 Include uncompressed jsf.js file and use it when development mode is used
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/AliasResourceMetaImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/InternalClassLoaderResourceLoader.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/AliasResourceMetaImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/AliasResourceMetaImpl.java?rev=958125&r1=958124&r2=958125&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/AliasResourceMetaImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/AliasResourceMetaImpl.java Fri Jun 25 21:48:32 2010
@@ -27,13 +27,16 @@ package org.apache.myfaces.resource;
public class AliasResourceMetaImpl extends ResourceMetaImpl
{
private String _realResourceName;
+
+ private boolean _couldContainValueExpressions;
public AliasResourceMetaImpl(String prefix, String libraryName, String libraryVersion,
- String resourceName, String resourceVersion, String realResourceName)
+ String resourceName, String resourceVersion, String realResourceName, boolean couldContainValueExpressions)
{
super(prefix, libraryName, libraryVersion,
resourceName, resourceVersion);
_realResourceName = realResourceName;
+ _couldContainValueExpressions = couldContainValueExpressions;
}
public String getRealResourceName()
@@ -88,6 +91,6 @@ public class AliasResourceMetaImpl exten
@Override
public boolean couldResourceContainValueExpressions()
{
- return true;
+ return _couldContainValueExpressions;
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/InternalClassLoaderResourceLoader.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/InternalClassLoaderResourceLoader.java?rev=958125&r1=958124&r2=958125&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/InternalClassLoaderResourceLoader.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/InternalClassLoaderResourceLoader.java Fri Jun 25 21:48:32 2010
@@ -101,11 +101,11 @@ public class InternalClassLoaderResource
if (_useMultipleJsFilesForJsfUncompressedJs)
{
return new AliasResourceMetaImpl(prefix, libraryName, libraryVersion,
- resourceName, resourceVersion, org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils.JSF_UNCOMPRESSED_JS_RESOURCE_NAME);
+ resourceName, resourceVersion, org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils.JSF_UNCOMPRESSED_JS_RESOURCE_NAME, true);
}
else
{
- return new AliasResourceMetaImpl(prefix, libraryName, libraryVersion, resourceName, resourceVersion, "jsf-uncompressed-full.js");
+ return new AliasResourceMetaImpl(prefix, libraryName, libraryVersion, resourceName, resourceVersion, "jsf-uncompressed-full.js", false);
}
}
else if (libraryName != null && libraryName.startsWith("org.apache.myfaces.core"))